Print

Print


Commit in java/trunk/steering-files/src/main/resources/org/hps/steering on MAIN
recon/GBLReco.lcsim+1-11063 -> 1064
users/phansson/TestRunReadoutToLcio.lcsim+16-41063 -> 1064
              /TwoTrackAnalysis.lcsim+14-91063 -> 1064
+31-14
3 modified files
bring up to head

java/trunk/steering-files/src/main/resources/org/hps/steering/recon
GBLReco.lcsim 1063 -> 1064
--- java/trunk/steering-files/src/main/resources/org/hps/steering/recon/GBLReco.lcsim	2014-09-19 04:22:05 UTC (rev 1063)
+++ java/trunk/steering-files/src/main/resources/org/hps/steering/recon/GBLReco.lcsim	2014-09-19 04:31:42 UTC (rev 1064)
@@ -23,7 +23,7 @@
     </execute>    
 
     <drivers>
-        <driver name="GBLDriver"
+		<driver name="GBLDriver"
                 type="org.hps.recon.tracking.gbl.GBLOutputDriver">
                 <debug>0</debug>
                 <isMC>${isMC}</isMC>

java/trunk/steering-files/src/main/resources/org/hps/steering/users/phansson
TestRunReadoutToLcio.lcsim 1063 -> 1064
--- java/trunk/steering-files/src/main/resources/org/hps/steering/users/phansson/TestRunReadoutToLcio.lcsim	2014-09-19 04:22:05 UTC (rev 1063)
+++ java/trunk/steering-files/src/main/resources/org/hps/steering/users/phansson/TestRunReadoutToLcio.lcsim	2014-09-19 04:31:42 UTC (rev 1064)
@@ -5,22 +5,29 @@
        xs:noNamespaceSchemaLocation="http://www.lcsim.org/schemas/lcsim/1.0/lcsim.xsd">
     <execute>
         <driver name="EventMarkerDriver"/>
-        <!--
+                <!--
+        <driver name="HPSSVTSensorSetup"/>   
+
         <driver name="CalibrationDriver"/>   
         <driver name="SimpleSVTReadout"/>
-        -->
+        
+        <driver name="TrackerDigiDriver"/>
         <driver name="TrackingGeometryChecker"/>
-        <driver name="TrackerDigiDriver"/>
+        <driver name="LCIOWriter"/>
         <driver name="CleanupDriver"/>
+    -->
     </execute> 
 
     <drivers>
         <driver name="EventMarkerDriver" type="org.lcsim.job.EventMarkerDriver">
             <eventInterval>1000</eventInterval>
         </driver> 
+        <!--
         <driver name="CalibrationDriver" type="org.hps.conditions.deprecated.CalibrationDriver">
             <runNumber>1351</runNumber>
-        </driver>        
+        </driver>  
+        <driver name="HPSSVTSensorSetup" type="org.hps.conditions.deprecated.HPSSVTSensorSetup"/>
+          
         <driver name="SimpleSVTReadout" type="org.hps.readout.svt.SimpleSvtReadout"/>
         <driver name="TrackerDigiDriver"
                 type="org.hps.recon.tracking.SimpleTrackerDigiDriver">
@@ -30,6 +37,11 @@
             <collectionNames>TrackerHits</collectionNames>
         </driver> 
         <driver name="TrackingGeometryChecker" type="org.hps.users.phansson.TrackingGeometryChecker"/>
+        <driver name="LCIOWriter"
+                type="org.lcsim.util.loop.LCIODriver">
+            <outputFilePath>${outputFile}</outputFilePath>
+        </driver>
+        -->
     </drivers>
 </lcsim>
 	

java/trunk/steering-files/src/main/resources/org/hps/steering/users/phansson
TwoTrackAnalysis.lcsim 1063 -> 1064
--- java/trunk/steering-files/src/main/resources/org/hps/steering/users/phansson/TwoTrackAnalysis.lcsim	2014-09-19 04:22:05 UTC (rev 1063)
+++ java/trunk/steering-files/src/main/resources/org/hps/steering/users/phansson/TwoTrackAnalysis.lcsim	2014-09-19 04:31:42 UTC (rev 1064)
@@ -2,9 +2,12 @@
        xs:noNamespaceSchemaLocation="http://www.lcsim.org/schemas/lcsim/1.0/lcsim.xsd">
     <inputFiles>
         <!--<fileRegExp baseDir="./../data/mc/HPS-TestRun-v5/1.8-SNAPSHOT-recoil-101013/">egs_5.5gev_0.016x0_500mb_recoil_readout_[0-9].slcio</fileRegExp>-->
+    	<fileRegExp baseDir="./../data/testrun/mc/HPS-TestRun-v7/">egs_5.5gev_0.016x0_500mb_90na_readout_\d\d.slcio</fileRegExp>
+    
+    
     </inputFiles>
     <control>
-        <numberOfEvents>-1</numberOfEvents>
+        <numberOfEvents>1000000000</numberOfEvents>
         <printInputFiles>true</printInputFiles>
         <printDriversDetailed>true</printDriversDetailed>
     </control>    
@@ -19,12 +22,11 @@
         <driver name="TrackerReconDriver"/>
         <driver name="EcalRawConverter" />
         <driver name="EcalClusterer" />
-<!--        <driver name="TrackingReconstructionPlots"/> -->
 <!--    <driver name="MCParticlePlots"/> -->
 <!--    <driver name="TruthMomentumAnalysis"/> -->
 <!--    <driver name="LCIOWriter"/> -->
         <driver name="ROOTFlatTupleDriver"/> 
-<!--	    <driver name="GBLDriver"/> -->
+	    <driver name="GBLOutputDriver"/> 
 <!--        <driver name="PrintGeometryDriver"/>-->
 
 
@@ -32,13 +34,18 @@
     </execute>    
 
     <drivers>
-        <driver name="GBLDriver"
+        <driver name="GBLOutputDriver"
                 type="org.hps.recon.tracking.gbl.GBLOutputDriver">
                 <debug>0</debug>
                 <isMC>${isMC}</isMC>
                 <outputPlotFileName></outputPlotFileName>
                 <gblFileName>gblinput.txt</gblFileName>
 	</driver>
+ 	<driver name="GBLDriver"
+                type="org.hps.recon.tracking.gbl.GBLDriver">
+                <debug>0</debug>
+                
+	</driver>
         <driver name="ROOTFlatTupleDriver" 
                 type="org.hps.users.phansson.ROOTFlatTupleDriver">
                 <debug>false</debug>
@@ -53,10 +60,7 @@
                 <debug>false</debug>
          </driver>
          <driver name="MCParticlePlots" type="org.hps.analysis.ecal.HPSMCParticlePlotsDriver" />
-     	<driver name="TrackingReconstructionPlots" type="org.hps.monitoring.drivers.svt.TrackingReconstructionPlots">
-                <outputPlots></outputPlots>
-        </driver>
-        <driver name="PrintGeometryDriver" type="org.hps.analysis.examples.PrintGeometryDriver"/>
+     	<driver name="PrintGeometryDriver" type="org.hps.analysis.examples.PrintGeometryDriver"/>
         
 
 
@@ -90,7 +94,8 @@
         <driver name="TrackerReconDriver"
                 type="org.hps.recon.tracking.TrackerReconDriver">
             <debug>false</debug>
-            <strategyResource>/org/hps/recon/tracking/strategies/HPS-Test-All.xml</strategyResource>
+            <!--<strategyResource>/org/lcsim/hps/recon/tracking/strategies/HPS-Test-All.xml</strategyResource>-->
+            <strategyResource>/org/lcsim/hps/recon/tracking/strategies/${strategy}.xml</strategyResource>
         </driver>        
         <driver name="EcalRawConverter" type="org.hps.recon.ecal.EcalRawConverterDriver">
             <ecalCollectionName>EcalCalHits</ecalCollectionName>
SVNspam 0.1