lcsim-contrib/src/main/java/org/lcsim/contrib/mgraham/sATLASDigi

diff -u -r1.1 -r1.2
--- FindableTrack.java	20 Apr 2009 21:19:43 -0000	1.1
+++ FindableTrack.java	21 Apr 2009 20:20:54 -0000	1.2
@@ -17,6 +17,9 @@

 import org.lcsim.detector.DetectorElementStore;
 import org.lcsim.detector.IDetectorElement;
 import org.lcsim.detector.IDetectorElementContainer;

+import org.lcsim.detector.identifier.IExpandedIdentifier;
+import org.lcsim.detector.identifier.IIdentifier;
+import org.lcsim.detector.identifier.IIdentifierHelper;

 import org.lcsim.event.EventHeader;
 import org.lcsim.event.MCParticle;
 import org.lcsim.event.RelationalTable;

@@ -24,6 +27,7 @@

 import org.lcsim.event.base.BaseRelationalTable;
 import org.lcsim.fit.helicaltrack.HelixParamCalculator;
 import org.lcsim.fit.helicaltrack.HitIdentifier;

+import org.lcsim.geometry.subdetector.BarrelEndcapFlag;

 import org.lcsim.recon.tracking.seedtracker.SeedLayer;
 import org.lcsim.recon.tracking.seedtracker.SeedLayer.SeedType;
 import org.lcsim.recon.tracking.seedtracker.SeedStrategy;

@@ -197,6 +201,23 @@

                 //  Get the detector element for this hit
                 IDetectorElement de = getDetectorElement(simhit);
 

+                //  Check names
+                String detname_old = _ID.getName(de);
+                String detname_new = simhit.getSubdetector().getName();
+                if (!detname_old.equals(detname_new)) {
+                    System.out.println("Detector name mismatch - old: "+detname_old+ " new: "+detname_new);
+                }
+                int layer_old = _ID.getLayer(de);
+                int layer_new = simhit.getLayer();
+                if (layer_old != layer_new) {
+                    System.out.println("Layer number mismatch - old: "+layer_old+" new: "+layer_new);
+                }
+                BarrelEndcapFlag be_old = _ID.getBarrelEndcapFlag(de);
+                BarrelEndcapFlag be_new = simhit.getBarrelEndcapFlag();
+                if (!be_old.equals(be_new)) {
+                    System.out.println("BarrelEndcapFlag mismatch - old: "+be_old+" new: "+be_new);
+                }
+

                 //  See if this hit is on the layer we are checking
                 if (!lyr.getDetName().equals(_ID.getName(de))) continue;
                 if (lyr.getLayer() != _ID.getLayer(de)) continue;