GeomConverter/sandbox/detector

diff -u -r1.2 -r1.3
--- DetectorID.java	6 Mar 2007 20:22:14 -0000	1.2
+++ DetectorID.java	18 May 2007 23:45:44 -0000	1.3
@@ -3,88 +3,55 @@

 import org.lcsim.contrib.JeremyMcCormick.identifier.Identifier;
 
 /**

- * Idea for global detector identifier based on AtlasDetectorID.
- * @author jeremym
- *

+ * Idea for global detector identifier based on 
+ * <a href="http://alxr.usatlas.bnl.gov/lxr/source/atlas/DetectorDescription/AtlasDetDescr/AtlasDetDescr/AtlasDetectorID.h">AtlasDetectorID</a>.
+ * 
+ * @author Jeremy McCormick 

  */
 public interface DetectorID 
 {

-	public boolean isVertex(Identifier i);
-	public boolean isVertexBarrel(Identifier i);
-	public boolean isVertexEndcapPositive(Identifier i);
-	public boolean isVertexEndCapNegative(Identifier i);
-	
-	public boolean isForwardCalorimeter(Identifier i);	
-	public boolean isLuminosityMonitor(Identifier i);	
-	public boolean isGammaCal(Identifier i);
-	
-	public boolean isTracker(Identifier i);
-	public boolean isTrackerBarrel(Identifier i);
-	public boolean isTrackerEndcapPositive(Identifier i);
-	public boolean isTrackerEndcapNegative(Identifier i);
-	
-	public boolean isTPC(Identifier i);
-	
-	public boolean isEcalBarrel(Identifier i);
-	public boolean isEcalEndcap(Identifier i);
-	
-	public boolean isHadBarrel(Identifier i);
-	public boolean isHadEndcap(Identifier i);
-	
-	public boolean isMuonBarrel(Identifier i);
-	public boolean isMuonEndcap(Identifier i);
-	
-	public Identifier getVertexBarrelID();
-	public Identifier getVertexEndcapID();
-	public Identifier getForwardCalorimeterID();
-	public Identifier getLuminosityMonitorID();
-	public Identifier getGammaCalID();
-	public Identifier getTrackerBarrelID();
-	public Identifier getTrackerEndcapID();
-	public Identifier getTPCID();
-	public Identifier getEcalBarrelID();
-	public Identifier getEcalEndcapID();
-	public Identifier getHadBarrelID();
-	public Identifier getHadEndcapID();
-	public Identifier getMuonBarrelID();
-	public Identifier getMuonEndcapID();
-	
-	public int getVertexBarrelValue();
-	public int getVertexEndcapValue();
-	public int getForwardCalorimeterValue();
-	public int getLuminosityMonitorValue();
-	public int getGammaCalValue();
-	public int getTrackerBarrelValue();
-	public int getTrackerEndcapValue();
-	public int getTPCValue();
-	public int getEcalBarrelValue();
-	public int getEcalEndcapValue();
-	public int getHadBarrelValue();
-	public int getHadEndcapValue();
-	public int getMuonBarrelValue();
-	public int getMuonEndcapValue();
-	
-
-	
-	
-	/*
-	 
-	 VertexBarrel
-	 VertexEndcap
-	 ForwardCalorimeter
-	 LuminosityMonitor
-	 GammaCal
-	 TrackerBarrel
-	 TrackerEndcap
-	 TPC
-	 EcalBarrel
-	 EcalEndcap
-	 HadBarrel
-	 HadEndcap
-	 MuonBarrel
-	 MuonEndcap	 	 	 
-	 
-	 */
-	
-	
-}

+    public boolean isVertex(Identifier i);
+    public boolean isSiTracker(Identifier i);
+    public boolean isTPC(Identifier i);
+    public boolean isEcal(Identifier i);
+    public boolean isHcal(Identifier i);
+    public boolean isMuon(Identifier i);
+    public boolean isForwardCalorimeter(Identifier i);
+    public boolean isLuminosityMonitor(Identifier i);
+    public boolean isGammaCalorimeter(Identifier i);
+    
+    public boolean isBarrel();
+    public boolean isEndcap();
+    public boolean isEndcapPositive();
+    public boolean isEndcapNegative();
+        
+    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();
+    public int getEcalValue();
+    public int getHcalValue();
+    public int getMuonValue();
+    public int getForwardCalorimeterValue();
+    public int getLuminosityMonitorValue();
+    public int getGammCalorimeterValue();
+    
+    public int getBarrelValue();
+    public int getEndcapValue();
+    public int getEndcapPositiveValue();
+    public int getEndcapNegativeValue();
+}

\ No newline at end of file