lcsim/src/org/lcsim/contrib/seedtracker
diff -u -r1.3 -r1.4
--- HitIdentifier.java 14 Mar 2008 17:49:09 -0000 1.3
+++ HitIdentifier.java 12 May 2008 05:02:46 -0000 1.4
@@ -37,7 +37,7 @@
IDetectorElement de = delist.get(0);
String detname = getName(de);
BarrelEndcapFlag beflag = getBarrelEndcapFlag(de);
- int layer = getLayer(de, beflag);
+ int layer = getLayer(de);
if (delist.size() == 2) layer = layer / 2;
return detname+layer+beflag;
}
@@ -71,20 +71,12 @@
while (de.getParent().getParent() != null) de = de.getParent();
// Find the name of this detector
String detname = de.getName();
+ System.out.println(detname);
return detname;
}
- private int getLayer(IDetectorElement de, BarrelEndcapFlag beflag) {
- int layer = 666;
- // Are we in the barrel?
- if (beflag == BarrelEndcapFlag.BARREL) {
- // Find the detector element two levels below the top
- while (de.getParent().getParent().getParent() != null) de = de.getParent();
- } else {
- // Find the detector element three levels below the top
- while (de.getParent().getParent().getParent().getParent() != null) de = de.getParent();
- }
- // Get the DetectorIdentifierHelper
+ private int getLayer(IDetectorElement de) {
+ int layer = -1;
IIdentifierHelper hlp = de.getIdentifierHelper();
if (hlp instanceof DetectorIdentifierHelper) {
DetectorIdentifierHelper dehlp = (DetectorIdentifierHelper) hlp;