GeomConverter/sandbox
diff -u -r1.1 -r1.2
--- DetectorIdHelper.java 24 Aug 2007 23:44:23 -0000 1.1
+++ DetectorIdHelper.java 25 Aug 2007 03:49:25 -0000 1.2
@@ -11,70 +11,80 @@
public class DetectorIdHelper
extends IdentifierHelper
{
- // Index of system field in the dictionary.
+ // Index of system field in the dictionary
int systemIndex=-1;
- // Index of barrel field in the dictionary.
+ // Index of barrel field in the dictionary
int barrelIndex=-1;
- // Barrel or endcap flag.
+ // Barrel or endcap flag
public final static int BARREL=0;
public final static int ENDCAP_POSITIVE=1;
public final static int ENDCAP_NEGATIVE=-1;
- // Subsystem id values.
+ // Subsystem id values
public final static int UNKNOWN=0;
public final static int VTX=1;
- public final static int SIT=2;
- public final static int TPC=3;
- public final static int ECAL=4;
- public final static int HCAL=5;
- public final static int MUON=6;
- public final static int FORWARD=7;
- public final static int LUMI=8;
+ public final static int VTK_ENDCAP=2;
+ public final static int SIT=3;
+ public final static int SIT_ENDCAP=4;
+ public final static int TPC=5;
+ public final static int ECAL=6;
+ public final static int ECAL_ENDCAP=7;
+ public final static int HCAL=8;
+ public final static int HCAL_ENDCAP=9;
+ public final static int MUON=10;
+ public final static int MUON_ENDCAP=11;
+ public final static int FORWARD=12;
+ public final static int LUMI=13;
- // Barrel or endcap.
+ // Barrel or endcap
IIdentifier barrelId;
IIdentifier endcapPositiveId;
IIdentifier endcapNegativeId;
- // Vertex detector.
+ // Vertex detector
IIdentifier vtxId;
IIdentifier vtxBarrelId;
+ IIdentifier vtxEndcapId;
IIdentifier vtxEndcapPositiveId;
IIdentifier vtxEndcapNegativeId;
- // Silicon tracker.
+ // Silicon tracker
IIdentifier sitId;
IIdentifier sitBarrelId;
+ IIdentifier sitEndcapId;
IIdentifier sitEndcapPositiveId;
IIdentifier sitEndcapNegativeId;
- // TPC.
+ // TPC
IIdentifier tpcId;
- // Ecal.
+ // Ecal
IIdentifier ecalId;
IIdentifier ecalBarrelId;
+ IIdentifier ecalEndcapId;
IIdentifier ecalEndcapPositiveId;
IIdentifier ecalEndcapNegativeId;
- // Hcal.
+ // Hcal
IIdentifier hcalId;
- IIdentifier hcalBarrelId;
+ IIdentifier hcalBarrelId;
+ IIdentifier hcalEndcapId;
IIdentifier hcalEndcapPositiveId;
IIdentifier hcalEndcapNegativeId;
- // Muon.
+ // Muon
IIdentifier muonId;
IIdentifier muonBarrelId;
+ IIdentifier muonEndcapId;
IIdentifier muonEndcapPositiveId;
IIdentifier muonEndcapNegativeId;
- // Forward calorimeter.
+ // Forward calorimeter
IIdentifier forwardId;
- // Luminosity monitor.
+ // Luminosity monitor
IIdentifier lumiId;
DetectorIdHelper(IIdentifierDictionary dict) throws FieldNotFoundException, InvalidIndexException
@@ -139,7 +149,6 @@
IIdentifier id = pack(expid);
return id;
}
-
private IIdentifier makeBarrelId(int barrel) throws InvalidIndexException
{
IExpandedIdentifier expid =
@@ -175,6 +184,7 @@
return endcapNegativeId;
}
+
public IIdentifier getVtxId()
{
return vtxId;
@@ -185,6 +195,10 @@
return vtxBarrelId;
}
+ public IIdentifier getVtxEndcapId()
+ {
+ return vtxEndcapId;
+ }
public IIdentifier getVtxEndcapPositiveId()
{
return vtxEndcapPositiveId;
@@ -195,11 +209,15 @@
return vtxEndcapNegativeId;
}
+
public IIdentifier getSitId()
{
return sitId;
}
-
+ public IIdentifier getSitEndcapId()
+ {
+ return sitEndcapId;
+ }
public IIdentifier getSitBarrelId()
{
return sitBarrelId;
@@ -220,10 +238,15 @@
return tpcId;
}
+
public IIdentifier getEcalId()
{
return ecalId;
}
+ public IIdentifier getEcalEndcapId()
+ {
+ return ecalEndcapId;
+ }
public IIdentifier getEcalBarrelId()
{
@@ -235,11 +258,12 @@
return ecalEndcapNegativeId;
}
- public IIdentifier getEcalEndcapPositiveId()
+ public IIdentifier getEcalEndcapPositiveId()
{
return ecalEndcapPositiveId;
}
+
public IIdentifier getHcalId()
{
return hcalId;
@@ -260,6 +284,7 @@
return hcalEndcapPositiveId;
}
+
public IIdentifier getMuonId()
{
return muonId;
@@ -269,7 +294,10 @@
{
return muonBarrelId;
}
-
+ public IIdentifier getMuonEndcapId()
+ {
+ return muonEndcapId;
+ }
public IIdentifier getMuonEndcapNegativeId()
{
return muonEndcapNegativeId;
@@ -280,16 +308,19 @@
return muonEndcapPositiveId;
}
+
public IIdentifier getFowardId()
{
return forwardId;
}
+
public IIdentifier getLumiId()
{
return lumiId;
}
+
public boolean isBarrel(IIdentifier i)
{
try {
@@ -328,6 +359,7 @@
}
}
+
public boolean isTracker(IIdentifier i)
{
return isVtx(i) || isTpc(i) || isSit(i);
@@ -348,6 +380,7 @@
return isTracker(i) && isEndcapNegative(i);
}
+
public boolean isCalorimeter(IIdentifier i)
{
return isEcal(i) || isHcal(i) || isMuon(i) || isForward(i) || isLumi(i);
@@ -393,6 +426,7 @@
return isVtx(i) && isEndcapNegative(i);
}
+
public boolean isSit(IIdentifier i)
{
return compareSystem(i,SIT);
@@ -423,6 +457,7 @@
return compareSystem(i,TPC);
}
+
public boolean isEcal(IIdentifier i)
{
return compareSystem(i,ECAL);
@@ -482,7 +517,6 @@
{
return isMuon(i) && isBarrel(i);
}
-
public boolean isMuonEndcap(IIdentifier i)
{
return isMuon(i) && isEndcap(i);
@@ -498,11 +532,13 @@
return isMuon(i) && isMuonEndcapNegative(i);
}
+
public boolean isForward(IIdentifier i)
{
return compareSystem(i,FORWARD);
}
+
public boolean isLumi(IIdentifier i)
{
return compareSystem(i,LUMI);
