Commit in hps-java/src/main on MAIN | |||
java/org/lcsim/hps/users/phansson/TwoTrackAnlysis.java | +8 | -2 | 1.7 -> 1.8 |
java/org/lcsim/hps/util/TwoTrackFilterDriver.java | +1 | -1 | 1.1 -> 1.2 |
resources/org/lcsim/hps/steering/LCIOEventFilter.lcsim | +3 | -3 | 1.4 -> 1.5 |
/TwoTrackAnalysis.lcsim | +15 | -22 | 1.4 -> 1.5 |
+27 | -28 |
Fix steering and some debug
diff -u -r1.7 -r1.8 --- TwoTrackAnlysis.java 13 Feb 2013 18:52:10 -0000 1.7 +++ TwoTrackAnlysis.java 11 Mar 2013 02:08:41 -0000 1.8 @@ -146,7 +146,7 @@
@Override public void process(EventHeader event) {
- //if(this._debug)
+ if(this._debug)
System.out.println(this.getClass().getSimpleName() + ": processing event " + totalEvents + " which has event nr " + event.getEventNumber());
@@ -182,10 +182,16 @@
for(int i=0;i<tracklist.size();++i) { Track trk = tracklist.get(i);
+ if(this._debug) {
System.out.printf("%s: trk momentum (%.3f,%.3f,%.3f) chi2=%.3f\n",this.getClass().getSimpleName(),trk.getTrackStates().get(0).getMomentum()[0],trk.getTrackStates().get(0).getMomentum()[1],trk.getTrackStates().get(0).getMomentum()[2],trk.getChi2());
-
+ }
}
+ if(this._debug) + System.out.printf("%s: event nr %d has only %d tracks\n",this.getClass().getSimpleName(),event.getEventNumber(),tracklist.size()); + + +
if(tracklist.size()!=2) { return; }
diff -u -r1.1 -r1.2 --- TwoTrackFilterDriver.java 6 Mar 2013 03:10:22 -0000 1.1 +++ TwoTrackFilterDriver.java 11 Mar 2013 02:08:41 -0000 1.2 @@ -33,7 +33,7 @@
} if(this.debug) {
- System.out.printf("%s: %d tracks in this event\n",this.getClass().getSimpleName(),event.get(Track.class, trackCollectionName).size());
+ System.out.printf("%s: %d tracks in event %d\n",this.getClass().getSimpleName(),event.get(Track.class, trackCollectionName).size(),event.getEventNumber());
} if (event.get(Track.class, trackCollectionName).size()>1) {
diff -u -r1.4 -r1.5 --- LCIOEventFilter.lcsim 6 Mar 2013 02:36:44 -0000 1.4 +++ LCIOEventFilter.lcsim 11 Mar 2013 02:08:41 -0000 1.5 @@ -10,13 +10,15 @@
</control> <execute> <driver name="EventMarkerDriver"/>
+<!--
<driver name="CalibrationDriver"/> <driver name="RawTrackerHitSensorSetup"/> <driver name="RawTrackerHitFitterDriver" /> <driver name="TrackerHitDriver"/> <driver name="HelicalTrackHitDriver"/> <driver name="TrackerReconDriver"/>
- <driver name="TwoTrackFilter"/>
+--> + <driver name="TwoTrackFilter"/>
</execute> <drivers>
@@ -48,8 +50,6 @@
<driver name="TrackerReconDriver" type="org.lcsim.hps.recon.tracking.TrackerReconDriver"> <debug>false</debug>
- <includeMS>true</includeMS> - <strategyResource>/org/lcsim/hps/recon/tracking/strategies/HPS-TestRun-v2-357.xml</strategyResource>
</driver> </drivers> </lcsim>
\ No newline at end of file
diff -u -r1.4 -r1.5 --- TwoTrackAnalysis.lcsim 6 Mar 2013 02:37:12 -0000 1.4 +++ TwoTrackAnalysis.lcsim 11 Mar 2013 02:08:41 -0000 1.5 @@ -1,16 +1,15 @@
<lcsim xmlns:xs="http://www.w3.org/2001/XMLSchema-instance" xs:noNamespaceSchemaLocation="http://www.lcsim.org/schemas/lcsim/1.0/lcsim.xsd"> <inputFiles>
+ <fileRegExp baseDir="./../data/mc/v3/pair_filter-snapshot-1.6/">pairs_0.016x0_filt_readout_1.slcio</fileRegExp>
<!--<fileRegExp baseDir="./../data/mc/v3/pair_filter_ideal_readout/" >pairs.*twotrkfilt.*</fileRegExp>--> <!--<fileRegExp baseDir="./../data/mc/v3/pair_filter/" >hps.*1351.*evio.*</fileRegExp>--> <!--<fileRegExp baseDir="./../data/mc/v3/pair_filter/pairs_2trkfilter/" >pairs.*filt.*recon.*</fileRegExp>--> <!--<fileRegExp baseDir="./../data/mc/v3/pair_filter/pairs_2trkfilter_old/" >pairs.*filt.*recon.*</fileRegExp>--> <!--<fileRegExp baseDir="./../data/mc/v3/" >egs.*filt.*recon.*</fileRegExp>-->
- <!--<fileRegExp baseDir="./../data/mc/SVT-CF" >.*</fileRegExp>--> - <!--<fileRegExp baseDir="./../data/mc/SVT-CF-THINSI" >.*</fileRegExp>-->
</inputFiles> <control>
- <numberOfEvents>-1</numberOfEvents>
+ <numberOfEvents>10000</numberOfEvents>
<printInputFiles>true</printInputFiles> <printDriversDetailed>true</printDriversDetailed> </control>
@@ -31,7 +30,6 @@
<!-- <driver name="LCIOWriter"/> --> <driver name="TwoTrackAnalysis"/>
- <driver name="CleanupDriver"/>
</execute>
@@ -53,10 +51,6 @@
<driver name="TrackingReconstructionPlots" type="org.lcsim.hps.monitoring.svt.TrackingReconstructionPlots"> <outputPlots></outputPlots> </driver>
- <driver name="CleanupDriver" - type="org.lcsim.recon.tracking.digitization.sisim.config.ReadoutCleanupDriver"> - <collectionNames>TrackerHits SVTRawTrackerHits SVTFittedRawTrackerHits</collectionNames> - </driver>
<driver name="HelicalTrackHitResidualsDriver" type="org.lcsim.hps.recon.tracking.HelicalTrackHitResidualsDriver"> <debug>false</debug> <hideFrame>false</hideFrame>
@@ -65,7 +59,11 @@
-
+ + + + +
<driver name="CalibrationDriver" type="org.lcsim.hps.monitoring.CalibrationDriver"> <runNumber>${runNumber}</runNumber> </driver>
@@ -78,19 +76,18 @@
<fitAlgorithm>Analytic</fitAlgorithm> <correctT0Shift>true</correctT0Shift> </driver>
- <driver name="TrackerHitDriver" type="org.lcsim.hps.users.mgraham.DataTrackerHitDriver" />
+ <driver name="TrackerHitDriver" type="org.lcsim.hps.users.mgraham.DataTrackerHitDriver" />
<driver name="HelicalTrackHitDriver" type="org.lcsim.hps.recon.tracking.HelicalTrackHitDriver"> <debug>false</debug> <layerGeometryType>Common</layerGeometryType>
- <epsParallel>0.01</epsParallel> - </driver>
+ <maxSeperation>20.0</maxSeperation> + <tolerance>1.0</tolerance> + </driver>
<driver name="TrackerReconDriver" type="org.lcsim.hps.recon.tracking.TrackerReconDriver"> <debug>false</debug>
- <includeMS>true</includeMS>
<strategyResource>/org/lcsim/hps/recon/tracking/strategies/HPS-TestRun-v2-357.xml</strategyResource>
- <trackCollectionName>MatchedTracks</trackCollectionName>
</driver> <driver name="EcalRawConverter" type="org.lcsim.hps.recon.ecal.EcalRawConverterDriver"> <ecalCollectionName>EcalCalHits</ecalCollectionName>
@@ -100,18 +97,14 @@
<ecalCollectionName>EcalCalHits</ecalCollectionName> </driver> <driver name="LCIOWriter"
- type="org.lcsim.util.loop.LCIODriver"> - <outputFilePath>/Users/phansson/work/HPS/software/reco/run/hps_recon.slcio</outputFilePath>
+ type="org.lcsim.util.loop.LCIODriver"> + <!--<outputFilePath>${outputFile}.slcio</outputFilePath>-->
</driver>
- - - <driver name="EcalTriggerFilter" type="org.lcsim.hps.recon.ecal.EcalTriggerFilterDriver"> - <inputCollection>EcalCorrectedHits</inputCollection> - <outputCollection>EcalFilteredHits</outputCollection> - </driver>
+ +
</drivers>
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