GeomConverter/sandbox/detector

diff -u -r1.3 -r1.4
--- DetectorID.java	18 May 2007 23:45:44 -0000	1.3
+++ DetectorID.java	24 Jul 2007 23:33:36 -0000	1.4
@@ -8,10 +8,14 @@

  * 
  * @author Jeremy McCormick 
  */

-public interface DetectorID 

+public interface DetectorIdentifierHelper 
+extends IdentifierHelper

 {

+    public int getSystemId(Identifier i);
+    public int getBarrelFlag(Identifier i);
+	

     public boolean isVertex(Identifier i);

-    public boolean isSiTracker(Identifier i);

+    public boolean isTracker(Identifier i);

     public boolean isTPC(Identifier i);
     public boolean isEcal(Identifier i);
     public boolean isHcal(Identifier i);

@@ -20,26 +24,11 @@

     public boolean isLuminosityMonitor(Identifier i);
     public boolean isGammaCalorimeter(Identifier i);
     

-    public boolean isBarrel();
-    public boolean isEndcap();
-    public boolean isEndcapPositive();
-    public boolean isEndcapNegative();

+    public boolean isBarrel(Identifier i);
+    public boolean isEndcap(Identifier i);
+    public boolean isEndcapPositive(Identifier i);
+    public boolean isEndcapNegative(Identifier i);

-    public IIdentifier getVertexId();
-    public IIdentifier getSiTrackerId();
-    public IIdentifier getTPCId();
-    public IIdentifier getEcalId();
-    public IIdentifier getHcalId();
-    public IIdentifier getMuonId();
-    public IIdentifier getForwardCalorimeterId();
-    public IIdentifier getLuminosityMuonitorId();
-    public IIdentifier getGammaCalorimeterId();
-    
-    public IIdentifier getBarrelId();
-    public IIdentifier getEndcapId();
-    public IIdentifier getEndcapPositiveId();
-    public IIdentifier getEndcapNegativeId();
-    

     public int getVertexValue();
     public int getSiTrackerValue();
     public int getTPCValue();

@@ -54,4 +43,19 @@

     public int getEndcapValue();
     public int getEndcapPositiveValue();
     public int getEndcapNegativeValue();

+    
+    public IIdentifier getVertexId();
+    public IIdentifier getSiTrackerId();
+    public IIdentifier getTPCId();
+    public IIdentifier getEcalId();
+    public IIdentifier getHcalId();
+    public IIdentifier getMuonId();
+    public IIdentifier getForwardCalorimeterId();
+    public IIdentifier getLuminosityMuonitorId();
+    public IIdentifier getGammaCalorimeterId();
+    
+    public IIdentifier getBarrelId();
+    public IIdentifier getEndcapId();
+    public IIdentifier getEndcapPositiveId();
+    public IIdentifier getEndcapNegativeId();

 }

\ No newline at end of file

GeomConverter/sandbox/detector

diff -N IDetectorXMLConverter.java
--- IDetectorXMLConverter.java	28 Feb 2007 19:48:21 -0000	1.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,6 +0,0 @@

-package org.lcsim.detector;
-
-public interface IDetectorXMLConverter<T>
-{
-	
-}