Commit in hps-java/src/main/resources/org/lcsim/hps/steering/users/phansson on MAIN
HPSTrackingDefaults.lcsim+4-191.5 -> 1.6
TwoTrackAnalysis.lcsim+6-241.6 -> 1.7
+10-43
2 modified files
Cleaning up

hps-java/src/main/resources/org/lcsim/hps/steering/users/phansson
HPSTrackingDefaults.lcsim 1.5 -> 1.6
diff -u -r1.5 -r1.6
--- HPSTrackingDefaults.lcsim	16 Sep 2013 20:24:33 -0000	1.5
+++ HPSTrackingDefaults.lcsim	11 Oct 2013 22:15:59 -0000	1.6
@@ -3,13 +3,10 @@
        xs:noNamespaceSchemaLocation="http://www.lcsim.org/schemas/lcsim/1.0/lcsim.xsd">
     <inputFiles>
 <!--
-        <fileRegExp baseDir="../data/mc/HPS-Proposal2014-v3-2pt2/">ap2\.2gev40mevall_.*_200ux40u_beamspot_gammactau_0cm_30mrad_all_recon.slcio</fileRegExp>
-        <fileRegExp baseDir="../data/mc/HPS-Proposal2014-v3-2pt2/">ap2\.2gev40mevall_.*_0ux0u_beamspot_gammactau_0cm_30mrad_all.slcio</fileRegExp>
-        <fileRegExp baseDir="../data/mc/HPS-Proposal2014-v3-2pt2/">ap2\.2gev40mevall_.*_0ux0u_beamspot_gammactau_0cm_10mrad_0offset_500ev.slcio</fileRegExp>
 -->
     </inputFiles>
     <control>
-        <numberOfEvents>100</numberOfEvents>
+        <numberOfEvents>3000</numberOfEvents>
         <printInputFiles>true</printInputFiles>
         <printDriversDetailed>true</printDriversDetailed>
     </control>
@@ -21,7 +18,6 @@
         <driver name="HelicalTrackHitDriver"/>
         <driver name="TrackerReconDriver"/>
         <!-- <driver name="LCIOWriter"/> -->
-        <!--<driver name="TwoTrackAnalysis"/>-->
         <driver name="GBLDriver"/> 
 
 
@@ -32,18 +28,9 @@
         <driver name="GBLDriver"
                 type="org.lcsim.hps.recon.tracking.gbl.GBLOutputDriver">
                 <debug>0</debug>
-                <hideFrame>true</hideFrame>
-                <outputPlotFileName></outputPlotFileName>
-                <gblFileName>gblinput.txt</gblFileName>
-	</driver>
-        <driver name="TwoTrackAnalysis" 
-                type="org.lcsim.hps.users.phansson.TwoTrackAnlysis">
-                <debug>true</debug>
                 <hideFrame>false</hideFrame>
                 <outputPlotFileName></outputPlotFileName>
-                <outputNameTextTuple>${outputFile}</outputNameTextTuple>
-                <trackCollectionName>MatchedTracks</trackCollectionName>
-                <targetPosition>0.</targetPosition>
+                <gblFileName>gblinput.txt</gblFileName>
 	</driver>
         <driver name="CalibrationDriver" type="org.lcsim.hps.monitoring.CalibrationDriver">
 <!--            <runNumber>1351</runNumber>    -->
@@ -69,14 +56,12 @@
         <driver name="TrackerReconDriver"
                 type="org.lcsim.hps.recon.tracking.TrackerReconDriver">
             <debug>false</debug>
-            <!--<strategyResource>/org/lcsim/hps/recon/tracking/strategies/HPS-Full.xml</strategyResource>-->
-            <strategyResource>/org/lcsim/hps/recon/tracking/strategies/HPS-TestRun-357.xml</strategyResource>
-            
+            <strategyResource>/org/lcsim/hps/recon/tracking/strategies/HPS-Full.xml</strategyResource>
         </driver>
 
         <driver name="LCIOWriter"
                 type="org.lcsim.util.loop.LCIODriver">
-            <outputFilePath>${outputFile}</outputFilePath>
+            <!--<outputFilePath>${outputFile}</outputFilePath>-->
         </driver>
                                                                     
     </drivers>

hps-java/src/main/resources/org/lcsim/hps/steering/users/phansson
TwoTrackAnalysis.lcsim 1.6 -> 1.7
diff -u -r1.6 -r1.7
--- TwoTrackAnalysis.lcsim	16 Sep 2013 20:24:33 -0000	1.6
+++ TwoTrackAnalysis.lcsim	11 Oct 2013 22:15:59 -0000	1.7
@@ -1,30 +1,12 @@
 <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/snapshot-1.6/">egs.*_0.016x0.*recon_[0-9].*slcio</fileRegExp>-->
-        <!--<fileRegExp baseDir="./../data/1.6-snapshot/" >hps.*1351.*evio\.0.*twotrkfilt.*slcio</fileRegExp>-->
-        <!--<fileRegExp baseDir="./../data/1.6-snapshot/" >hps.*1354.*evio\.1.*twotrkfilt.*slcio</fileRegExp>-->
-        <!--<fileRegExp baseDir="./../data/1.6-snapshot/" >hps.*1353.*evio\.0.*twotrkfilt.*slcio</fileRegExp>-->    
- 
-        <fileRegExp baseDir="../data/mc/1.7-snapshot-130626/HPS-TestRun-v4/">pairs.*gauss_recon.*twotrk.*slcio</fileRegExp>
-
-<!--
-       <fileRegExp baseDir="../data/mc/v3/pairs-recoil-1.6-snapshot/hps-java-1.6-SNAPSHOT-bin-130421/HPS-Test-357/">.*twotrkfilt_.*slcio</fileRegExp>
-        <fileRegExp baseDir="../data/mc/v3/pairs-recoil-1.6-snapshot/hps-java-1.6-SNAPSHOT-bin-130421/HPS-Test-4pt1/">.*twotrkfilt_.*slcio</fileRegExp>
-        <fileRegExp baseDir="../data/mc/v3/pairs-recoil-1.6-snapshot/hps-java-1.6-SNAPSHOT-bin-130421/">egs_5.5gev_0.016x0_500mb_recoil_recon_twotrkfilt_.*slcio</fileRegExp>
-        <fileRegExp baseDir="../data/1.6-snapshot/130421/">hps_001351.evio_recon_twotrkfilt.slcio</fileRegExp> 
--->
-       <!--<fileRegExp baseDir="./../data/mc/v3/pair_filter-snapshot-1.6/">pairs_0.0018x0_filt_.*twotrkfilt.*slcio</fileRegExp>-->
-        <!--<fileRegExp baseDir="./../data/mc/v3/pair_filter-snapshot-1.6/">pairs_0.0045x0_filt_.*twotrkfilt.*slcio</fileRegExp>-->
-        <!--<fileRegExp baseDir="./../data/mc/v3/pair_filter-snapshot-1.6/">pairs_0.016x0_filt_.*twotrkfilt.*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/v3/snapshot-1.6/">egs.*_0.016x0.*recon_[0-9].*slcio</fileRegExp>
+        -->
     </inputFiles>
     <control>
-        <numberOfEvents>1000000</numberOfEvents>
+        <numberOfEvents>1000</numberOfEvents>
         <printInputFiles>true</printInputFiles>
         <printDriversDetailed>true</printDriversDetailed>
     </control>    
@@ -38,7 +20,7 @@
         <driver name="TrackerReconDriver"/>
         <driver name="EcalRawConverter" />
         <driver name="EcalClusterer" />
-        <driver name="TrackingReconstructionPlots"/>
+<!--        <driver name="TrackingReconstructionPlots"/> -->
 <!--    <driver name="MCParticlePlots"/> -->
 <!--    <driver name="TruthMomentumAnalysis"/> -->
 <!--    <driver name="HelicalTrackHitResidualsDriver"/> -->
@@ -114,7 +96,7 @@
         <driver name="TrackerReconDriver"
                 type="org.lcsim.hps.recon.tracking.TrackerReconDriver">
             <debug>false</debug>
-            <!--<strategyResource>/org/lcsim/hps/recon/tracking/strategies/HPS-TestRun-357.xml</strategyResource>-->
+            <strategyResource>/org/lcsim/hps/recon/tracking/strategies/HPS-TestRun-357.xml</strategyResource>
             <useHPSMaterialManager>true</useHPSMaterialManager>
         </driver>        
         <driver name="EcalRawConverter" type="org.lcsim.hps.recon.ecal.EcalRawConverterDriver">
CVSspam 0.2.12


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