diff -u -r1.2 -r1.3
--- CalorimeterHitDetectorElementTest.java	18 Mar 2009 04:05:10 -0000	1.2
+++ CalorimeterHitDetectorElementTest.java	23 Mar 2009 18:56:01 -0000	1.3
@@ -6,6 +6,7 @@

 
 import junit.framework.TestCase;
 

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

 import org.lcsim.detector.identifier.IIdentifierHelper;
 import org.lcsim.detector.solids.Inside;
 import org.lcsim.event.CalorimeterHit;

@@ -104,6 +105,7 @@

 
                     // TODO: Replace with comparison against DetectorElement's
                     // identifier once CylindricalCalorimeter sensors have them.

+                    /*

                     if (!hit.getDetectorElement().getName().contains(
                             "layer" + layern))
                     {

@@ -114,6 +116,12 @@

                                         + hit.getDetectorElement().getName()
                                         + ">.");
                     }

+                    */
+                    
+                    IIdentifier deid = hit.getDetectorElement().getIdentifier();
+                    int delayer = helper.getValue(deid, "layer");
+                    
+                    TestCase.assertEquals("Layer numbers of DE and hit are not equal.",delayer,layern);

 
                     ++checkedHits;
                 }