lcsim/src/org/lcsim/detector/driver
diff -u -r1.1 -r1.2
--- SimTrackerHitIdentifierReadoutDriver.java 22 May 2007 22:45:36 -0000 1.1
+++ SimTrackerHitIdentifierReadoutDriver.java 23 May 2007 00:09:38 -0000 1.2
@@ -1,12 +1,13 @@
package org.lcsim.detector.driver;
-import java.util.ArrayList;
import java.util.List;
-import org.lcsim.detector.DetectorElement;
import org.lcsim.detector.DetectorElementStore;
import org.lcsim.detector.IDetectorElement;
import org.lcsim.detector.IReadout;
+import org.lcsim.detector.identifier.IExpandedIdentifier;
+import org.lcsim.detector.identifier.IIdentifier;
+import org.lcsim.detector.identifier.IIdentifierHelper;
import org.lcsim.detector.identifier.Identifier;
import org.lcsim.event.EventHeader;
import org.lcsim.event.SimTrackerHit;
@@ -27,18 +28,20 @@
}
protected void process(EventHeader header)
- {
+ {
super.process(header);
List<List<SimTrackerHit>> collections = header.get(SimTrackerHit.class);
for ( List<SimTrackerHit> collection : collections )
{
if ( canHandle( header.getMetaData( collection ).getName() ) )
{
+ IIdentifierHelper helper = header.getMetaData(collection).getIDDecoder().getSubdetector().getDetectorElement().getIdentifierHelper();
for ( SimTrackerHit hit : collection )
{
IDetectorElement deSubdet = hit.getSubdetector().getDetectorElement();
+ IIdentifier hitId = new Identifier(hit.getCellID());
IDetectorElement deHit =
- DetectorElementStore.getInstance().findDetectorElement(new Identifier(hit.getCellID()));
+ DetectorElementStore.getInstance().findDetectorElement(hitId);
hit.setDetectorElement( deHit );
IReadout ro = deHit.getReadout();
ro.addHit( hit );
lcsim/test/org/lcsim/detector/driver
diff -u -r1.2 -r1.3
--- SimTrackerDigitizationTest.java 7 May 2007 23:42:58 -0000 1.2
+++ SimTrackerDigitizationTest.java 23 May 2007 00:09:38 -0000 1.3
@@ -44,7 +44,6 @@
public static Test suite()
{
-// return new TestSuite(SimTrackerHitPositionalReadoutDriverTest.class);
return new TestSuite(SimTrackerDigitizationTest.class);
}
@@ -62,7 +61,7 @@
LCSimLoop loop = new LCSimLoop();
loop.setLCIORecordSource(file);
- loop.add( new SimTrackerHitPositionalReadoutDriver(new String[] {"SiTrackerBarrel_RO"} ) );
+ loop.add( new SimTrackerHitIdentifierReadoutDriver(new String[] {"SiTrackerBarrel_RO"} ) );
loop.add( new TestDriver() );
loop.loop(5);
loop.dispose();