diff -u -r1.1 -r1.2
--- DetectorIdentifierHelperTest.java	9 Apr 2008 14:04:06 -0000	1.1
+++ DetectorIdentifierHelperTest.java	12 Mar 2009 23:44:43 -0000	1.2
@@ -8,7 +8,8 @@

 import junit.framework.TestCase;
 
 import org.freehep.record.loop.LoopException;

-import org.lcsim.detector.driver.*;

+import org.lcsim.detector.DetectorIdentifierHelper;
+import org.lcsim.detector.IDetectorElement;

 import org.lcsim.detector.identifier.IIdentifier;
 import org.lcsim.detector.identifier.Identifier;
 import org.lcsim.event.EventHeader;

@@ -19,256 +20,261 @@

 import org.lcsim.util.Driver;
 import org.lcsim.util.cache.FileCache;
 import org.lcsim.util.loop.LCSimLoop;

-import org.lcsim.detector.IDetectorElement;
-import org.lcsim.detector.DetectorIdentifierHelper;

 
 /**
  * Tests the functionality of {@link org.lcsim.detector.DetectorIdHelper}
  * on an sid01 LCIO file.
  *
  * @author Jeremy McCormick <[log in to unmask]>

- * @version $Id: DetectorIdentifierHelperTest.java,v 1.1 2008/04/09 14:04:06 tknelson Exp $

+ * @version $Id: DetectorIdentifierHelperTest.java,v 1.2 2009/03/12 23:44:43 jeremy Exp $

  */
 
 public class DetectorIdentifierHelperTest extends TestCase
 {

-   public void testDetectorIdHelper()
-   {
-      File file = null;
-      try
-      {
-         FileCache cache = new FileCache();
-         file = cache.getCachedFile(new URL("http://www.lcsim.org/test/lcio/pythiaZPoleuds-0-1000_SLIC-v2r3p7_geant4-v9r0p1_LCPhys_sid01.slcio"));
-         LCSimLoop loop = new LCSimLoop();
-         loop.setLCIORecordSource(file);
-         loop.add(new TrackerDriver());
-         loop.add(new CalorimeterDriver());
-         loop.loop(1,null);
-         loop.dispose();
-      }
-      catch (IOException x)
-      {
-         throw new RuntimeException(x);
-      }
-      catch (LoopException x)
-      {
-         throw new RuntimeException(x);
-      }
-   }
-   
-   class CalorimeterDriver extends Driver
-   {
-      protected void process(EventHeader event)
-      {
-         int ecalBarrel, ecalEndcap, hcalBarrel, hcalEndcap, forwardEcal, lumi, muonBarrel, muonEndcap;
-         ecalBarrel = ecalEndcap = hcalBarrel = hcalEndcap = forwardEcal = lumi = muonBarrel = muonEndcap = 0;
-         List<List<SimCalorimeterHit>> collections = event.get(SimCalorimeterHit.class);
-         for (List<SimCalorimeterHit> collection: collections)
-         {
-            LCMetaData meta = event.getMetaData(collection);
-            String collectionName = meta.getName(); 
-            Subdetector subdet = meta.getIDDecoder().getSubdetector();
-            IDetectorElement deSubdet = subdet.getDetectorElement();
-            DetectorIdentifierHelper idHelper = (DetectorIdentifierHelper)deSubdet.getIdentifierHelper();
-            
-            for (SimCalorimeterHit hit : collection)
-            {
-               IIdentifier hitId = new Identifier(hit.getCellID());
-               
-               assertTrue(idHelper.isCalorimeter(hitId));
-               
-               if (subdet.isBarrel())
-               {
-                  assertTrue(idHelper.isBarrel(hitId));
-                  assertTrue(idHelper.isCalorimeterBarrel(hitId));
-               }
-               
-               if (subdet.isEndcap())
-               {
-                  assertTrue(idHelper.isEndcap(hitId));
-                  assertTrue(idHelper.isCalorimeterEndcap(hitId));
-                  
-                  if (hit.getPosition()[2] > 0)
-                  {
-                     assertTrue(idHelper.isCalorimeterEndcapPositive(hitId));
-                  }
-                  else
-                  {
-                     assertTrue(idHelper.isCalorimeterEndcapNegative(hitId));
-                  }
-               }
-               
-               if (collectionName.equals("EcalBarrHits"))
-               {
-                  assertTrue(idHelper.isEcal(hitId));
-                  assertTrue(idHelper.isBarrel(hitId));
-               }
-               
-               if (collectionName.equals("EcalEndcapHits"))
-               {
-                  assertTrue(idHelper.isEcal(hitId));
-                  assertTrue(idHelper.isEcalEndcap(hitId));
-                  if (hit.getPosition()[2] > 0)
-                  {
-                     assertTrue(idHelper.isEcalEndcapPositive(hitId));
-                  }
-                  else
-                  {
-                     assertTrue(idHelper.isEcalEndcapNegative(hitId));
-                  }
-               }
-               
-               if (collectionName.equals("HcalBarrHits"))
-               {
-                  assertTrue(idHelper.isHcal(hitId));
-                  assertTrue(idHelper.isHcalBarrel(hitId));
-               }
-               
-               if (collectionName.equals("HcalEndcapHits"))
-               {
-                  assertTrue(idHelper.isHcal(hitId));
-                  assertTrue(idHelper.isHcalEndcap(hitId));
-                  if (hit.getPosition()[2] > 0)
-                  {
-                     assertTrue(idHelper.isHcalEndcapPositive(hitId));
-                  }
-                  else
-                  {
-                     assertTrue(idHelper.isHcalEndcapNegative(hitId));
-                  }
-               }
-               
-               if (collectionName.equals("MuonBarrHits"))
-               {
-                  assertTrue(idHelper.isMuon(hitId));
-                  assertTrue(idHelper.isMuonBarrel(hitId));
-               }
-               
-               if (collectionName.equals("MuonEndcapHits"))
-               {
-                  assertTrue(idHelper.isMuon(hitId));
-                  assertTrue(idHelper.isMuonEndcap(hitId));
-                  if (hit.getPosition()[2] > 0)
-                  {
-                     assertTrue(idHelper.isMuonEndcapPositive(hitId));
-                  }
-                  else
-                  {
-                     assertTrue(idHelper.isMuonEndcapNegative(hitId));
-                  }
-               }
-               
-               if (collectionName.equals("LuminosityMonitorHits"))
-               {
-                  assertTrue(idHelper.isLumi(hitId));
-                  
-                  if (hit.getPosition()[2] > 0)
-                  {
-                     assertTrue(idHelper.isLumiEndcapPositive(hitId));
-                  }
-                  else
-                  {
-                     assertTrue(idHelper.isLumiEndcapNegative(hitId));
-                  }
-               }
-               
-               if (collectionName.equals("ForwardEcalEndcapHits"))
-               {
-                  assertTrue(idHelper.isEcalForward(hitId));
-                  
-                  if (hit.getPosition()[2] > 0)
-                  {
-                     assertTrue(idHelper.isEcalForwardEndcapPositive(hitId));
-                  }
-                  else
-                  {
-                     assertTrue(idHelper.isEcalForwardEndcapNegative(hitId));
-                  }
-               }
-            }
-         }
-      }
-   }
-   
-   class TrackerDriver extends Driver
-   {
-      protected void process(EventHeader event)
-      {
-         event.getDetector();
-         int sitBarrel, sitEndcap, vtxBarrel, vtxEndcap;
-         sitBarrel = sitEndcap = vtxBarrel = vtxEndcap = 0;
-         List<List<SimTrackerHit>> collections = event.get(SimTrackerHit.class);
-         for (List<SimTrackerHit> collection : collections)
-         {
-            LCMetaData meta = event.getMetaData(collection);
-            String collectionName = meta.getName();
-            Subdetector subdet = meta.getIDDecoder().getSubdetector();
-            if (subdet == null)
-               throw new RuntimeException("Oops!  Subdetector for collection " + meta.getName() + " is null!");
-            IDetectorElement deSubdet = subdet.getDetectorElement();
-            DetectorIdentifierHelper idHelper = (DetectorIdentifierHelper)deSubdet.getIdentifierHelper();
-            
-            IIdentifier subdetId = deSubdet.getIdentifier();
-            
-            for (SimTrackerHit hit : collection)
-            {
-               IIdentifier hitId = new Identifier(hit.getCellID());
-               
-               assertTrue(idHelper.isTracker(hitId));
-               
-               if (subdet.isBarrel())
-               {
-                  assertTrue(idHelper.isBarrel(hitId));
-                  assertTrue(idHelper.isTrackerBarrel(hitId));
-               }
-               
-               if (subdet.isEndcap())
-               {
-                  assertTrue(idHelper.isEndcap(hitId));
-                  assertTrue(idHelper.isTrackerEndcap(hitId));
-               }
-               
-               if (collectionName.equals("TkrBarrHits"))
-               {
-                  assertTrue(idHelper.isSit(hitId));
-                  assertTrue(idHelper.isSitBarrel(hitId));
-               }
-               
-               if (collectionName.equals("TkrEndcapHits"))
-               {
-                  assertTrue(idHelper.isSit(hitId));
-                  assertTrue(idHelper.isSitEndcap(hitId));
-                  if (hit.getPoint()[2] > 0)
-                  {
-                     assertTrue(idHelper.isSitEndcapPositive(hitId));
-                  }
-                  else
-                  {
-                     assertTrue(idHelper.isSitEndcapNegative(hitId));
-                  }
-               }
-               
-               if (collectionName.equals("VtxBarrHits"))
-               {
-                  assertTrue(idHelper.isVtx(hitId));
-                  assertTrue(idHelper.isVtxBarrel(hitId));
-               }
-               
-               if (collectionName.equals("VtxEndcapHits"))
-               {
-                  assertTrue(idHelper.isVtx(hitId));
-                  assertTrue(idHelper.isVtxEndcap(hitId));
-                  if (hit.getPoint()[2] > 0)
-                  {
-                     assertTrue(idHelper.isVtxEndcapPositive(hitId));
-                  }
-                  else
-                  {
-                     assertTrue(idHelper.isVtxEndcapNegative(hitId));
-                  }
-               }
-            }
-         }         
-      }
-   }

+	public void testDetectorIdHelper()
+	{
+		File file = null;
+		try
+		{
+			FileCache cache = new FileCache();
+			file = cache.getCachedFile(new URL("http://www.lcsim.org/test/lcio/muons10_Theta4-176_1-10GeV_SLIC-v2r5p3_geant4-v9r1p2_LCPhys_sid02.slcio"));
+			LCSimLoop loop = new LCSimLoop();
+			loop.setLCIORecordSource(file);
+			loop.add(new TrackerDriver());
+			loop.add(new CalorimeterDriver());
+			loop.loop(1,null);
+			loop.dispose();
+		}
+		catch (IOException x)
+		{
+			throw new RuntimeException(x);
+		}
+		catch (LoopException x)
+		{
+			throw new RuntimeException(x);
+		}
+	}
+
+	class CalorimeterDriver extends Driver
+	{
+		protected void process(EventHeader event)
+		{
+			//int ecalBarrel, ecalEndcap, hcalBarrel, hcalEndcap, forwardEcal, lumi, muonBarrel, muonEndcap;
+			//ecalBarrel = ecalEndcap = hcalBarrel = hcalEndcap = forwardEcal = lumi = muonBarrel = muonEndcap = 0;
+			List<List<SimCalorimeterHit>> collections = event.get(SimCalorimeterHit.class);
+			for (List<SimCalorimeterHit> collection: collections)
+			{
+				LCMetaData meta = event.getMetaData(collection);
+				String collectionName = meta.getName(); 
+				Subdetector subdet = meta.getIDDecoder().getSubdetector();
+				IDetectorElement deSubdet = subdet.getDetectorElement();
+
+				if (deSubdet != null)
+				{
+					DetectorIdentifierHelper idHelper = (DetectorIdentifierHelper)deSubdet.getIdentifierHelper();
+
+					if (idHelper != null)					
+					{
+						for (SimCalorimeterHit hit : collection)
+						{
+							IIdentifier hitId = new Identifier(hit.getCellID());
+							
+							assertTrue(idHelper.isCalorimeter(hitId));
+
+							if (subdet.isBarrel())
+							{
+								assertTrue(idHelper.isBarrel(hitId));
+								assertTrue(idHelper.isCalorimeterBarrel(hitId));
+							}
+
+							if (subdet.isEndcap())
+							{
+								assertTrue(idHelper.isEndcap(hitId));
+								assertTrue(idHelper.isCalorimeterEndcap(hitId));
+
+								if (hit.getPosition()[2] > 0)
+								{
+									assertTrue(idHelper.isCalorimeterEndcapPositive(hitId));
+								}
+								else
+								{
+									assertTrue(idHelper.isCalorimeterEndcapNegative(hitId));
+								}
+							}
+
+							if (collectionName.equals("EcalBarrHits"))
+							{
+								assertTrue(idHelper.isEcal(hitId));
+								assertTrue(idHelper.isBarrel(hitId));
+							}
+
+							if (collectionName.equals("EcalEndcapHits"))
+							{
+								assertTrue(idHelper.isEcal(hitId));
+								assertTrue(idHelper.isEcalEndcap(hitId));
+								if (hit.getPosition()[2] > 0)
+								{
+									assertTrue(idHelper.isEcalEndcapPositive(hitId));
+								}
+								else
+								{
+									assertTrue(idHelper.isEcalEndcapNegative(hitId));
+								}
+							}
+
+							if (collectionName.equals("HcalBarrHits"))
+							{
+								assertTrue(idHelper.isHcal(hitId));
+								assertTrue(idHelper.isHcalBarrel(hitId));
+							}
+
+							if (collectionName.equals("HcalEndcapHits"))
+							{
+								assertTrue(idHelper.isHcal(hitId));
+								assertTrue(idHelper.isHcalEndcap(hitId));
+								if (hit.getPosition()[2] > 0)
+								{
+									assertTrue(idHelper.isHcalEndcapPositive(hitId));
+								}
+								else
+								{
+									assertTrue(idHelper.isHcalEndcapNegative(hitId));
+								}
+							}
+
+							if (collectionName.equals("MuonBarrHits"))
+							{
+								assertTrue(idHelper.isMuon(hitId));
+								assertTrue(idHelper.isMuonBarrel(hitId));
+							}
+
+							if (collectionName.equals("MuonEndcapHits"))
+							{
+								assertTrue(idHelper.isMuon(hitId));
+								assertTrue(idHelper.isMuonEndcap(hitId));
+								if (hit.getPosition()[2] > 0)
+								{
+									assertTrue(idHelper.isMuonEndcapPositive(hitId));
+								}
+								else
+								{
+									assertTrue(idHelper.isMuonEndcapNegative(hitId));
+								}
+							}
+
+							if (collectionName.equals("LuminosityMonitorHits"))
+							{
+								assertTrue(idHelper.isLumi(hitId));
+
+								if (hit.getPosition()[2] > 0)
+								{
+									assertTrue(idHelper.isLumiEndcapPositive(hitId));
+								}
+								else
+								{
+									assertTrue(idHelper.isLumiEndcapNegative(hitId));
+								}
+							}
+
+							if (collectionName.equals("ForwardEcalEndcapHits"))
+							{
+								assertTrue(idHelper.isEcalForward(hitId));
+
+								if (hit.getPosition()[2] > 0)
+								{
+									assertTrue(idHelper.isEcalForwardEndcapPositive(hitId));
+								}
+								else
+								{
+									assertTrue(idHelper.isEcalForwardEndcapNegative(hitId));
+								}
+							}
+						}
+					}
+				}
+			}
+		}
+	}
+
+	class TrackerDriver extends Driver
+	{
+		protected void process(EventHeader event)
+		{
+			event.getDetector();
+			int sitBarrel, sitEndcap, vtxBarrel, vtxEndcap;
+			sitBarrel = sitEndcap = vtxBarrel = vtxEndcap = 0;
+			List<List<SimTrackerHit>> collections = event.get(SimTrackerHit.class);
+			for (List<SimTrackerHit> collection : collections)
+			{
+				LCMetaData meta = event.getMetaData(collection);
+				String collectionName = meta.getName();
+				Subdetector subdet = meta.getIDDecoder().getSubdetector();
+				if (subdet == null)
+					throw new RuntimeException("Oops!  Subdetector for collection " + meta.getName() + " is null!");
+				IDetectorElement deSubdet = subdet.getDetectorElement();
+				DetectorIdentifierHelper idHelper = (DetectorIdentifierHelper)deSubdet.getIdentifierHelper();
+
+				IIdentifier subdetId = deSubdet.getIdentifier();
+
+				for (SimTrackerHit hit : collection)
+				{
+					IIdentifier hitId = new Identifier(hit.getCellID());
+
+					assertTrue(idHelper.isTracker(hitId));
+
+					if (subdet.isBarrel())
+					{
+						assertTrue(idHelper.isBarrel(hitId));
+						assertTrue(idHelper.isTrackerBarrel(hitId));
+					}
+
+					if (subdet.isEndcap())
+					{
+						assertTrue(idHelper.isEndcap(hitId));
+						assertTrue(idHelper.isTrackerEndcap(hitId));
+					}
+
+					if (collectionName.equals("TkrBarrHits"))
+					{
+						assertTrue(idHelper.isSit(hitId));
+						assertTrue(idHelper.isSitBarrel(hitId));
+					}
+
+					if (collectionName.equals("TkrEndcapHits"))
+					{
+						assertTrue(idHelper.isSit(hitId));
+						assertTrue(idHelper.isSitEndcap(hitId));
+						if (hit.getPoint()[2] > 0)
+						{
+							assertTrue(idHelper.isSitEndcapPositive(hitId));
+						}
+						else
+						{
+							assertTrue(idHelper.isSitEndcapNegative(hitId));
+						}
+					}
+
+					if (collectionName.equals("VtxBarrHits"))
+					{
+						assertTrue(idHelper.isVtx(hitId));
+						assertTrue(idHelper.isVtxBarrel(hitId));
+					}
+
+					if (collectionName.equals("VtxEndcapHits"))
+					{
+						assertTrue(idHelper.isVtx(hitId));
+						assertTrue(idHelper.isVtxEndcap(hitId));
+						if (hit.getPoint()[2] > 0)
+						{
+							assertTrue(idHelper.isVtxEndcapPositive(hitId));
+						}
+						else
+						{
+							assertTrue(idHelper.isVtxEndcapNegative(hitId));
+						}
+					}
+				}
+			}         
+		}
+	}

 }

\ No newline at end of file