hps-java/src/main/resources/org/lcsim/hps/steering/users/phansson

diff -u -r1.3 -r1.4
--- TwoTrackAnalysis.lcsim	25 Apr 2013 21:42:08 -0000	1.3
+++ TwoTrackAnalysis.lcsim	14 Jul 2013 05:56:28 -0000	1.4
@@ -4,8 +4,17 @@

         <!--<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/v3/pair_filter-snapshot-1.6/">pairs_0.0018x0_filt_.*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>-->

@@ -15,7 +24,7 @@

         <!--<fileRegExp baseDir="./../data/mc/v3/" >egs.*filt.*recon.*</fileRegExp>-->
     </inputFiles>
     <control>

-        <numberOfEvents>-1</numberOfEvents>

+        <numberOfEvents>1000000</numberOfEvents>

         <printInputFiles>true</printInputFiles>
         <printDriversDetailed>true</printDriversDetailed>
     </control>    

@@ -29,25 +38,35 @@

         <driver name="TrackerReconDriver"/>
         <driver name="EcalRawConverter" />
         <driver name="EcalClusterer" />

-<!--    <driver name="TrackingReconstructionPlots"/>-->

+        <driver name="TrackingReconstructionPlots"/>

 <!--    <driver name="MCParticlePlots"/> -->
 <!--    <driver name="TruthMomentumAnalysis"/> -->

-<!--        <driver name="HelicalTrackHitResidualsDriver"/> -->

+<!--    <driver name="HelicalTrackHitResidualsDriver"/> -->

 <!--    <driver name="LCIOWriter"/> -->

-        <driver name="TwoTrackAnalysis"/>

+<!--        <driver name="TwoTrackAnalysis"/> -->
+    <driver name="GBLDriver"/> 
+<!--        <driver name="PrintGeometryDriver"/>-->

 
 
 
     </execute>    
 
     <drivers>

+        <driver name="GBLDriver"
+                type="org.lcsim.hps.users.phansson.GBLOutputDriver">
+                <debug>0</debug>
+                <hideFrame>false</hideFrame>
+                <outputPlotFileName></outputPlotFileName>
+                <gblFileName>gblinput.txt</gblFileName>
+	</driver>

         <driver name="TwoTrackAnalysis" 
                 type="org.lcsim.hps.users.phansson.TwoTrackAnlysis">
                 <debug>false</debug>

-                <hideFrame>true</hideFrame>

+                <hideFrame>false</hideFrame>

                 <outputPlotFileName></outputPlotFileName>
                 <outputNameTextTuple>${outputFile}</outputNameTextTuple>
                 <trackCollectionName>MatchedTracks</trackCollectionName>

+                <targetPosition>-670.</targetPosition>

 	</driver>
         <driver name="TruthMomentumAnalysis" 
                 type="org.lcsim.hps.users.phansson.TruthMomentumResolutionDriver">

@@ -62,6 +81,7 @@

             <debug>false</debug>
             <hideFrame>false</hideFrame>
         </driver>

+        <driver name="PrintGeometryDriver" type="org.lcsim.hps.util.PrintGeometryDriver"/>

@@ -72,7 +92,7 @@

 
 
         <driver name="CalibrationDriver" type="org.lcsim.hps.monitoring.CalibrationDriver">

-                <runNumber>${runNumber}</runNumber>

+  <!--              <runNumber>${runNumber}</runNumber> -->

         </driver>
         <driver name="EventMarkerDriver"
                 type="org.lcsim.job.EventMarkerDriver">

@@ -81,13 +101,13 @@

         <driver name="RawTrackerHitSensorSetup" type="org.lcsim.recon.tracking.digitization.sisim.config.RawTrackerHitSensorSetup"/>
         <driver name="RawTrackerHitFitterDriver" type="org.lcsim.hps.recon.tracking.HPSRawTrackerHitFitterDriver">
             <fitAlgorithm>Analytic</fitAlgorithm>

-            <correctT0Shift>true</correctT0Shift>

+            <correctT0Shift>false</correctT0Shift>

         </driver>
         <driver name="TrackerHitDriver" type="org.lcsim.hps.recon.tracking.DataTrackerHitDriver" />     
         <driver name="HelicalTrackHitDriver"
                 type="org.lcsim.hps.recon.tracking.HelicalTrackHitDriver">
             <debug>false</debug>

-            <layerGeometryType>Common</layerGeometryType>

+            <layerGeometryType>Split</layerGeometryType>

             <maxSeperation>20.0</maxSeperation>
             <tolerance>1.0</tolerance>
         </driver>

@@ -95,6 +115,7 @@

                 type="org.lcsim.hps.recon.tracking.TrackerReconDriver">
             <debug>false</debug>
             <!--<strategyResource>/org/lcsim/hps/recon/tracking/strategies/HPS-TestRun-v2-357.xml</strategyResource>-->

+            <useHPSMaterialManager>true</useHPSMaterialManager>

         </driver>        
         <driver name="EcalRawConverter" type="org.lcsim.hps.recon.ecal.EcalRawConverterDriver">
             <ecalCollectionName>EcalCalHits</ecalCollectionName>