 |
 |
| Commit in hps-java on MAIN | |||
| src/main/java/org/lcsim/hps/recon/tracking/TrackerDigiDriver.java | +10 | -14 | 1.8 -> 1.9 |
| sandbox/HPSTrackingDefaults.lcsim | -52 | 1.1 removed | |
| src/main/resources/org/lcsim/hps/steering/HPSTrackingDefaults.lcsim | +52 | 1.6 -> 1.7 | |
| +62 | -66 | ||
restore HPSTrackingDefaults.lcsim
diff -u -r1.8 -r1.9 --- TrackerDigiDriver.java 19 Mar 2012 21:59:24 -0000 1.8 +++ TrackerDigiDriver.java 7 Aug 2012 20:18:17 -0000 1.9 @@ -30,24 +30,20 @@
* algorithm like Seed Tracker. * * @author jeremym
- * @version $Id: TrackerDigiDriver.java,v 1.8 2012/03/19 21:59:24 jeremy Exp $
+ * @version $Id: TrackerDigiDriver.java,v 1.9 2012/08/07 20:18:17 meeg Exp $
*/
public class TrackerDigiDriver extends Driver {
// Debug switch for development.
- private boolean debug = false;
+ private boolean debug = false;
// Collection name.
private String readoutCollectionName = "TrackerHits";
-
// Subdetector name.
private String subdetectorName = "Tracker";
-
// Name of RawTrackerHit output collection.
private String rawTrackerHitOutputCollectionName = "RawTrackerHitMaker_RawTrackerHits";
-
// Name of StripHit1D output collection.
private String stripHitOutputCollectionName = "StripClusterer_SiTrackerHitStrip1D";
-
// Readout parameters.
private double readoutNoiseIntercept = 270.0;
private double readoutNoiseSlope = 36.0;
@@ -55,14 +51,12 @@
private double readoutNeighborThreshold = 4.0;
private int readoutNBits = 10;
private int readoutDynamicRange = 40;
-
// Clustering parameters.
private double clusterSeedThreshold = 4.0;
private double clusterNeighborThreshold = 3.0;
private double clusterThreshold = 4.0;
private int clusterMaxSize = 10;
private int clusterCentralStripAveragingThreshold = 4;
-
// Clustering errors by number of TrackerHits.
private static final double clusterErrorMultiplier = 1.0;
private double oneClusterErr = clusterErrorMultiplier / Math.sqrt(12.);
@@ -70,14 +64,12 @@
private double threeClusterErr = clusterErrorMultiplier / 3.0;
private double fourClusterErr = clusterErrorMultiplier / 2.0;
private double fiveClusterErr = clusterErrorMultiplier / 1.0;
-
// Various data lists required by digitization.
private List<String> readouts = new ArrayList<String>();
private List<String> processPaths = new ArrayList<String>();
private List<IDetectorElement> processDEs = new ArrayList<IDetectorElement>();
private Set<SiSensor> processSensors = new HashSet<SiSensor>();
private Set<SiTrackerModule> processModules = new HashSet<SiTrackerModule>();
-
// Digi class objects.
private SiDigitizer stripDigitizer;
private StripHitMaker stripClusterer;
@@ -284,10 +276,14 @@
// Debug prints.
if (debug) {
- List<SimTrackerHit> simHits = event.get(SimTrackerHit.class, this.readoutCollectionName);
- System.out.println("SimTrackerHit collection " + this.readoutCollectionName + " has " + simHits.size() + " hits.");
- System.out.println("RawTrackerHit collection " + this.rawTrackerHitOutputCollectionName + " has " + rawHits.size() + " hits.");
- System.out.println("TrackerHit collection " + this.stripHitOutputCollectionName + " has " + stripHits1D.size() + " hits.");
+ if (event.hasCollection(SimTrackerHit.class, this.readoutCollectionName)) {
+ List<SimTrackerHit> simHits = event.get(SimTrackerHit.class, this.readoutCollectionName);
+ System.out.println("SimTrackerHit collection " + this.readoutCollectionName + " has " + simHits.size() + " hits.");
+ System.out.println("RawTrackerHit collection " + this.rawTrackerHitOutputCollectionName + " has " + rawHits.size() + " hits.");
+ System.out.println("TrackerHit collection " + this.stripHitOutputCollectionName + " has " + stripHits1D.size() + " hits.");
+ } else {
+ System.out.println("SimTrackerHit collection " + this.readoutCollectionName + " not found.");
+ }
}
// Put output hits into collection.
diff -N HPSTrackingDefaults.lcsim --- HPSTrackingDefaults.lcsim 24 May 2012 19:46:14 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,52 +0,0 @@
-<lcsim xmlns:xs="http://www.w3.org/2001/XMLSchema-instance"
- xs:noNamespaceSchemaLocation="http://www.lcsim.org/schemas/lcsim/1.0/lcsim.xsd">
-
- <inputFiles>
- <file>${inputFile}.slcio</file>
- </inputFiles>
-
- <control>
- <numberOfEvents>-1</numberOfEvents>
- <printInputFiles>true</printInputFiles>
- <printDriversDetailed>true</printDriversDetailed>
- </control>
-
- <execute>
- <driver name="EventMarkerDriver"/>
- <driver name="SVTSetupDriver"/>
- <driver name="TrackerDigiDriver"/>
- <driver name="TrackerReconDriver"/>
- <driver name="LCIOWriter"/>
- </execute>
-
- <drivers>
-
- <driver name="SVTSetupDriver"
- type="org.lcsim.hps.recon.tracking.HPSSVTSensorSetup">
- </driver>
-
- <driver name="EventMarkerDriver"
- type="org.lcsim.job.EventMarkerDriver">
- <eventInterval>1</eventInterval>
- </driver>
-
- <driver name="TrackerDigiDriver"
- type="org.lcsim.hps.recon.tracking.TrackerDigiDriver">
- <debug>true</debug>
- </driver>
-
- <driver name="TrackerReconDriver"
- type="org.lcsim.hps.recon.tracking.TrackerReconDriver">
- <debug>true</debug>
- <strategyResource>/org/lcsim/hps/recon/tracking/strategies/HPS-Test-4pt0.xml</strategyResource>
- <stripMaxSeparation>20.0</stripMaxSeparation>
- <stripTolerance>1.0</stripTolerance>
- </driver>
-
- <driver name="LCIOWriter"
- type="org.lcsim.util.loop.LCIODriver">
- <outputFilePath>${inputFile}_trackRecon</outputFilePath>
- </driver>
-
- </drivers>
-</lcsim>
diff -N HPSTrackingDefaults.lcsim --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ HPSTrackingDefaults.lcsim 7 Aug 2012 20:18:17 -0000 1.7 @@ -0,0 +1,52 @@
+<lcsim xmlns:xs="http://www.w3.org/2001/XMLSchema-instance"
+ xs:noNamespaceSchemaLocation="http://www.lcsim.org/schemas/lcsim/1.0/lcsim.xsd">
+
+ <inputFiles>
+ <file>${inputFile}.slcio</file>
+ </inputFiles>
+
+ <control>
+ <numberOfEvents>-1</numberOfEvents>
+ <printInputFiles>true</printInputFiles>
+ <printDriversDetailed>true</printDriversDetailed>
+ </control>
+
+ <execute>
+ <driver name="EventMarkerDriver"/>
+ <driver name="SVTSetupDriver"/>
+ <driver name="TrackerDigiDriver"/>
+ <driver name="TrackerReconDriver"/>
+ <driver name="LCIOWriter"/>
+ </execute>
+
+ <drivers>
+
+ <driver name="SVTSetupDriver"
+ type="org.lcsim.hps.recon.tracking.HPSSVTSensorSetup">
+ </driver>
+
+ <driver name="EventMarkerDriver"
+ type="org.lcsim.job.EventMarkerDriver">
+ <eventInterval>1</eventInterval>
+ </driver>
+
+ <driver name="TrackerDigiDriver"
+ type="org.lcsim.hps.recon.tracking.TrackerDigiDriver">
+ <debug>true</debug>
+ </driver>
+
+ <driver name="TrackerReconDriver"
+ type="org.lcsim.hps.recon.tracking.TrackerReconDriver">
+ <debug>true</debug>
+ <strategyResource>/org/lcsim/hps/recon/tracking/strategies/HPS-Test-4pt0.xml</strategyResource>
+ <stripMaxSeparation>20.0</stripMaxSeparation>
+ <stripTolerance>1.0</stripTolerance>
+ </driver>
+
+ <driver name="LCIOWriter"
+ type="org.lcsim.util.loop.LCIODriver">
+ <outputFilePath>${inputFile}_trackRecon</outputFilePath>
+ </driver>
+
+ </drivers>
+</lcsim>
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