Commit in hps-java/src/main/java/org/lcsim/hps on MAIN | |||
evio/TestRunTriggeredReconToLcio.java | +3 | -1 | 1.4 -> 1.5 |
/TestRunTriggeredReconToEvio.java | +3 | 1.15 -> 1.16 | |
recon/tracking/HPSHelicalTrackHitDriver.java | +15 | -1 | 1.10 -> 1.11 |
/TrackerReconDriver.java | +17 | -14 | 1.21 -> 1.22 |
/SVTDataToRawTrackerHitDriver.java | +5 | -5 | 1.12 -> 1.13 |
recon/ecal/TestRunTriggerDriver.java | +13 | -8 | 1.4 -> 1.5 |
+56 | -29 |
cleanup and bug fixes in SVT recon
diff -u -r1.4 -r1.5 --- TestRunTriggeredReconToLcio.java 3 Aug 2012 23:14:39 -0000 1.4 +++ TestRunTriggeredReconToLcio.java 6 Aug 2012 21:15:21 -0000 1.5 @@ -12,7 +12,6 @@
import org.lcsim.event.MCParticle; import org.lcsim.event.base.BaseLCSimEvent; import org.lcsim.hps.recon.ecal.HPSTriggerDriver;
-import org.lcsim.hps.util.ClockSingleton;
import org.lcsim.util.Driver; import org.lcsim.util.lcio.LCIOWriter;
@@ -62,6 +61,7 @@
} }
+ @Override
protected void startOfData() { writers = new ArrayList<HitWriter>();
@@ -84,6 +84,7 @@
events = new LinkedList<EventHeader>(); }
+ @Override
protected void endOfData() { System.out.println(this.getClass().getSimpleName() + " - wrote " + eventsWritten + " events in job."); try {
@@ -93,6 +94,7 @@
} }
+ @Override
protected void process(EventHeader event) { if (event.hasCollection(MCParticle.class, MCEvent.MC_PARTICLES)) { mcParticles = event.getMCParticles();
diff -u -r1.15 -r1.16 --- TestRunTriggeredReconToEvio.java 3 Aug 2012 23:14:39 -0000 1.15 +++ TestRunTriggeredReconToEvio.java 6 Aug 2012 21:15:21 -0000 1.16 @@ -57,6 +57,7 @@
} }
+ @Override
protected void startOfData() { try { writer = new EventWriter(evioOutputFile);
@@ -82,6 +83,7 @@
builderQueue = new LinkedList<QueuedEtEvent>(); }
+ @Override
protected void endOfData() { System.out.println(this.getClass().getSimpleName() + " - wrote " + eventsWritten + " EVIO events in job."); try {
@@ -93,6 +95,7 @@
} }
+ @Override
protected void process(EventHeader event) { if (HPSTriggerDriver.triggerBit()) { // Make a new EVIO event.
diff -u -r1.10 -r1.11 --- HPSHelicalTrackHitDriver.java 31 Jul 2012 21:30:33 -0000 1.10 +++ HPSHelicalTrackHitDriver.java 6 Aug 2012 21:15:21 -0000 1.11 @@ -87,11 +87,12 @@
this.subdetectorName = subdetectorName; }
+ @Override
public void detectorChanged(Detector detector) { // Setup default stereo pairings, which should work for even number of // modules. List<SiTrackerModule> modules = detector.getSubdetector(subdetectorName).getDetectorElement().findDescendants(SiTrackerModule.class);
- if (modules.size() == 0) {
+ if (modules.isEmpty()) {
throw new RuntimeException("No SiTrackerModules found in detector."); } int nmodules = modules.size();
@@ -116,6 +117,7 @@
* * @param event EventHeader of the event to be processed */
+ @Override
public void process(EventHeader event) { super.process(event);
@@ -252,6 +254,18 @@
_colnames.add(colname); }
+ public void setCollection(String colname) { + _colnames.clear(); + _colnames.add(colname); + } + + public void setCollectionNames(String[] collectionNames) { + _colnames.clear(); + for (String colname : collectionNames) { + _colnames.add(colname); + } + } +
/** * Name of the HelicalTrackHit collection to be put back in the event. *
diff -u -r1.21 -r1.22 --- TrackerReconDriver.java 31 Jul 2012 21:30:33 -0000 1.21 +++ TrackerReconDriver.java 6 Aug 2012 21:15:21 -0000 1.22 @@ -28,7 +28,6 @@
public final class TrackerReconDriver extends Driver { // Debug flag.
- //private final static boolean DEBUG = false;
private boolean debug = false; // Tracks found across all events. int ntracks = 0;
@@ -38,8 +37,8 @@
Detector detector = null; // Default B-field value. private double bfield = 0.5;
- // SimTrackerHit input collection for readout cleanup. - private String simTrackerHitCollectionName = "TrackerHits";
+ // TrackerHit readout name for readout cleanup. + private String trackerReadoutName = "TrackerHits";
// Tracking strategies resource path. private String strategyResource = "HPS-Test-1pt3.xml"; // Output track collection.
@@ -47,12 +46,18 @@
// HelicalTrackHit input collection. private String stInputCollectionName = "RotatedHelicalTrackHits"; HPSHelicalTrackHitDriver hthdriver = new HPSHelicalTrackHitDriver();
+ private boolean runHelicalTrackHitDriver = true;
public TrackerReconDriver() { } public void setDebug(boolean debug) { this.debug = debug;
+ hthdriver.setDebug(debug); + } + + public void setRunHelicalTrackHitDriver(boolean runHelicalTrackHitDriver) { + this.runHelicalTrackHitDriver = runHelicalTrackHitDriver;
} public void setSubdetectorName(String subdetectorName) {
@@ -108,12 +113,13 @@
* collection in the event. */ public void setSimTrackerHitCollectionName(String simTrackerHitCollectionName) {
- this.simTrackerHitCollectionName = simTrackerHitCollectionName;
+ hthdriver.setCollection(simTrackerHitCollectionName);
} /** * This is used to setup the Drivers after XML config. */
+ @Override
public void detectorChanged(Detector detector) { // Cache Detector object. this.detector = detector;
@@ -138,8 +144,10 @@
// 1) Driver to create HelicalTrackHits expected by Seedtracker. // // TODO Make this step its own separate Driver??? (Matt)
- add(hthdriver); - hthdriver.addCollection(simTrackerHitCollectionName);
+ + if (runHelicalTrackHitDriver) { + add(hthdriver); + }
// // 2) Driver to run Seed Tracker.
@@ -164,21 +172,15 @@
// 3) Cleanup the readouts for next event. // List<String> readoutCleanup = new ArrayList<String>();
- readoutCleanup.add(this.simTrackerHitCollectionName);
+ readoutCleanup.add(this.trackerReadoutName);
add(new ReadoutCleanupDriver(readoutCleanup)); } /**
- * Call super for child processing at start of data. - */ - public void startOfData() { - super.startOfData(); - } - - /**
* This method is used to run the reconstruction and print debug * information. */
+ @Override
public void process(EventHeader event) { // This call runs the track reconstruction using the sub-Drivers. super.process(event);
@@ -203,6 +205,7 @@
ntracks += event.get(Track.class, trackCollectionName).size(); }
+ @Override
public void endOfData() { if (debug) { System.out.println("-------------------------------------------");
diff -u -r1.12 -r1.13 --- SVTDataToRawTrackerHitDriver.java 13 Jul 2012 23:10:20 -0000 1.12 +++ SVTDataToRawTrackerHitDriver.java 6 Aug 2012 21:15:21 -0000 1.13 @@ -16,7 +16,7 @@
* * @author Jeremy McCormick <[log in to unmask]> * @author Omar Moreno <[log in to unmask]>
- * $Id: SVTDataToRawTrackerHitDriver.java,v 1.12 2012/07/13 23:10:20 omoreno Exp $
+ * $Id: SVTDataToRawTrackerHitDriver.java,v 1.13 2012/08/06 21:15:21 meeg Exp $
*/ public class SVTDataToRawTrackerHitDriver extends Driver {
@@ -52,10 +52,10 @@
} List<HPSSVTData> svtDataCollection = event.get(HPSSVTData.class, svtDataCollectionName);
- if (svtDataCollection.isEmpty()) { - System.out.println(svtDataCollectionName + " is empty; skipping event"); - return; - }
+// if (svtDataCollection.isEmpty()) { +// System.out.println(svtDataCollectionName + " is empty; skipping event"); +// return; +// }
List<RawTrackerHit> hits = new ArrayList<RawTrackerHit>(); for (HPSSVTData svtData : svtDataCollection) {
diff -u -r1.4 -r1.5 --- TestRunTriggerDriver.java 3 Aug 2012 00:05:26 -0000 1.4 +++ TestRunTriggerDriver.java 6 Aug 2012 21:15:21 -0000 1.5 @@ -12,20 +12,17 @@
* * @author Omar Moreno <[log in to unmask]> * @author Sho Uemura <[log in to unmask]>
- * @version $Id: TestRunTriggerDriver.java,v 1.4 2012/08/03 00:05:26 meeg Exp $
+ * @version $Id: TestRunTriggerDriver.java,v 1.5 2012/08/06 21:15:21 meeg Exp $
*/ public class TestRunTriggerDriver extends HPSTriggerDriver {
- // A list to contain all cluster pairs in an event - List<HPSEcalCluster[]> clusterPairs; - int nTriggers; - int totalEvents;
+ boolean triggerThisCycle = false; + int cycleCounter = 0;
private double clusterEnergyLow = 10; // int deadtimelessTriggerCount; private int topBits = 0, botBits = 0; public TestRunTriggerDriver() {
- clusterPairs = new LinkedList<HPSEcalCluster[]>();
} @Override
@@ -50,9 +47,17 @@
@Override protected boolean triggerDecision(EventHeader event) {
- // Get the list of raw ECal hits.
+ cycleCounter++; +
if (event.hasCollection(HPSEcalCluster.class, clusterCollectionName)) {
- boolean trigger = testTrigger(event.get(HPSEcalCluster.class, clusterCollectionName));
+ if (testTrigger(event.get(HPSEcalCluster.class, clusterCollectionName))) { + triggerThisCycle = true; + } + } + + if (cycleCounter % 4 == 0) { + boolean trigger = triggerThisCycle; + triggerThisCycle = false;
return trigger; } else { return false;
Use REPLY-ALL to reply to list
To unsubscribe from the LCD-CVS list, click the following link:
https://listserv.slac.stanford.edu/cgi-bin/wa?SUBED1=LCD-CVS&A=1