hps-java/src/main/java/org/lcsim/hps/recon/tracking
diff -u -r1.2 -r1.3
--- TrackerHitDriver.java 22 Mar 2012 02:21:17 -0000 1.2
+++ TrackerHitDriver.java 17 Apr 2012 18:14:01 -0000 1.3
@@ -7,7 +7,6 @@
import java.util.Map;
import java.util.Set;
-import org.lcsim.detector.DetectorElementStore;
import org.lcsim.detector.IDetectorElement;
import org.lcsim.detector.identifier.IExpandedIdentifier;
import org.lcsim.detector.identifier.IIdentifier;
@@ -16,12 +15,10 @@
import org.lcsim.detector.tracker.silicon.SiTrackerModule;
import org.lcsim.event.EventHeader;
import org.lcsim.event.RawTrackerHit;
-import org.lcsim.event.SimTrackerHit;
import org.lcsim.geometry.Detector;
import org.lcsim.recon.tracking.digitization.sisim.BasicReadoutChip;
import org.lcsim.recon.tracking.digitization.sisim.CDFSiSensorSim;
import org.lcsim.recon.tracking.digitization.sisim.NearestNeighborRMS;
-import org.lcsim.recon.tracking.digitization.sisim.SiDigitizer;
import org.lcsim.recon.tracking.digitization.sisim.SiTrackerHit;
import org.lcsim.recon.tracking.digitization.sisim.SiTrackerHitStrip1D;
import org.lcsim.recon.tracking.digitization.sisim.StripHitMaker;
@@ -34,7 +31,7 @@
* algorithm like Seed Tracker.
*
* @author jeremym
- * @version $Id: TrackerHitDriver.java,v 1.2 2012/03/22 02:21:17 jeremy Exp $
+ * @version $Id: TrackerHitDriver.java,v 1.3 2012/04/17 18:14:01 jeremy Exp $
*/
public class TrackerHitDriver extends Driver {
@@ -223,27 +220,23 @@
* This is executed before detectorChanged and initialization of
* digitization objects is done here.
*/
+ /*
public void startOfData() {
- // At start of job, setup digitization objects needed by this Driver.
- initialize();
-
- // If readouts not already set, set them up.
- if (readouts.size() != 0) {
- //System.out.println("Adding SimTrackerHitIdentifierReadoutDriver with readouts: " + readouts);
- super.add(new SimTrackerHitReadoutDriver(readouts));
- }
- super.startOfData();
- readouts.clear(); // FIXME Is this needed?
+ System.out.println("startOfData");
+
}
+ */
/**
* Do initialization once we get a Detector.
*/
public void detectorChanged(Detector detector) {
+
+ System.out.println(getClass().getSimpleName() + ".detectorChanged");
// Call sub-Driver's detectorChanged methods.
- super.detectorChanged(detector);
+ //super.detectorChanged(detector);
// Process detectors specified by path, otherwise process entire detector.
IDetectorElement deDetector = detector.getDetectorElement();
@@ -265,6 +258,19 @@
for (SiSensor sensor : processSensors) {
sensorMap.put(sensor.getIdentifier().getValue(), sensor);
}
+
+ // Remaining lines moved from startOfData() ...
+
+ // At start of job, setup digitization objects needed by this Driver.
+ initialize();
+
+ // If readouts not already set, set them up.
+ if (readouts.size() != 0) {
+ //System.out.println("Adding SimTrackerHitIdentifierReadoutDriver with readouts: " + readouts);
+ super.add(new SimTrackerHitReadoutDriver(readouts));
+ }
+ super.startOfData();
+ readouts.clear(); // FIXME Is this needed?
}
private static IIdentifier makeSensorId(Detector detector, RawTrackerHit hit) {