Print

Print


Commit in hps-java on MAIN
src/main/resources/org/lcsim/hps/steering/TestRunOfflineRecon.lcsim+18-151.3 -> 1.4
                                         /HPSTestRunOnlineTracking.lcsim-451.4 removed
                                         /HPSTestRunOfflineTracking.lcsim-521.3 removed
                                         /HPSWriteRawDataFromMC.lcsim-421.2 removed
                                         /TestRunReconFromRawLcio.lcsim-631.1 removed
sandbox/HPSWriteRawDataFromMC.lcsim+42added 1.1
       /TestRunReconFromRawLcio.lcsim+63added 1.1
       /HPSTestRunOfflineTracking.lcsim+52added 1.1
       /HPSTestRunOnlineTracking.lcsim+45added 1.1
src/main/java/org/lcsim/hps/recon/tracking/TrackerReconDriver.java+31.22 -> 1.23
+223-217
4 added + 4 removed + 2 modified, total 10 files
clean up steering files and make a single recon steering file

hps-java/src/main/resources/org/lcsim/hps/steering
TestRunOfflineRecon.lcsim 1.3 -> 1.4
diff -u -r1.3 -r1.4
--- TestRunOfflineRecon.lcsim	1 Jun 2012 22:17:10 -0000	1.3
+++ TestRunOfflineRecon.lcsim	16 Aug 2012 23:55:42 -0000	1.4
@@ -1,37 +1,40 @@
 <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}</file>
-     </inputFiles>
-     <control>
-        <numberOfEvents>-1</numberOfEvents>
-     </control>
      <execute>
         <driver name="EventMarkerDriver"/>
-        <driver name="SVTSetupDriver"/>
-        <driver name="RawTrackerHitSensorSetup"/>
+        <driver name="HPSCalibrationDriver"/>
+        <driver name="RawTrackerHitFitterDriver" />
         <driver name="TrackerHitDriver"/>
         <driver name="TrackerReconDriver"/>
+        <driver name="EcalRawConverter" />
+        <driver name="EcalClusterer" />
         <driver name="LCIOWriter"/>
     </execute>    
     <drivers>    
-        <driver name="RawTrackerHitSensorSetup" type="org.lcsim.recon.tracking.digitization.sisim.config.RawTrackerHitSensorSetup" />
+        <driver name="HPSCalibrationDriver" type="org.lcsim.hps.monitoring.HPSCalibrationDriver"/>   
         <driver name="EventMarkerDriver"
                 type="org.lcsim.job.EventMarkerDriver">
             <eventInterval>1</eventInterval>
         </driver>        
-        <driver name="SVTSetupDriver" type="org.lcsim.hps.recon.tracking.HPSSVTSensorSetup">   
+        <driver name="RawTrackerHitFitterDriver" type="org.lcsim.hps.recon.tracking.HPSRawTrackerHitFitterDriver">
+            <fitAlgorithm>Analytic</fitAlgorithm>
+            <correctT0Shift>true</correctT0Shift>
         </driver>
-        <driver name="TrackerHitDriver" type="org.lcsim.hps.recon.tracking.TrackerHitDriver">
-                <rawTrackerHitCollectionName>SVTRawTrackerHits</rawTrackerHitCollectionName>
-        </driver>        
+        <driver name="TrackerHitDriver" type="org.lcsim.hps.users.mgraham.DataTrackerHitDriver" />        
         <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>
+            <debug>false</debug>
+            <strategyResource>/org/lcsim/hps/recon/tracking/strategies/HPS-TestRun-v2-357.xml</strategyResource>
             <stripMaxSeparation>20.0</stripMaxSeparation>
             <stripTolerance>1.0</stripTolerance>
         </driver>        
+        <driver name="EcalRawConverter" type="org.lcsim.hps.recon.ecal.HPSEcalRawConverterDriver">
+            <ecalCollectionName>EcalCalHits</ecalCollectionName>
+        </driver>
+        <driver name="EcalClusterer" type="org.lcsim.hps.recon.ecal.HPSEcalClusterer">
+            <ecalName>Ecal</ecalName>
+            <ecalCollectionName>EcalCalHits</ecalCollectionName>
+        </driver>
         <driver name="LCIOWriter"
              type="org.lcsim.util.loop.LCIODriver">
                  <outputFilePath>${outputFile}</outputFilePath>

hps-java/src/main/resources/org/lcsim/hps/steering
HPSTestRunOnlineTracking.lcsim removed after 1.4
diff -N HPSTestRunOnlineTracking.lcsim
--- HPSTestRunOnlineTracking.lcsim	14 Aug 2012 00:58:03 -0000	1.4
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<lcsim xmlns:xs="http://www.w3.org/2001/XMLSchema-instance" xs:noNamespaceSchemaLocation="http://www.lcsim.org/schemas/lcsim/1.0/lcsim.xsd">
-    <execute>
-        <driver name="EventMarkerDriver" />
-        <driver name="SVTSetupDriver" />
-        <driver name="EcalRawConverter" />
-        <driver name="EcalClusterer" />
-        <driver name="RawTrackerHitFitterDriver" />
-        <driver name="TrackerHitDriver" />
-        <driver name="TrackerReconDriver" />
-        <driver name="TrackingReconstructionPlots" />
-        <driver name="CleanupDriver" />
-    </execute>
-    <drivers>
-        <driver name="EventMarkerDriver" type="org.lcsim.job.EventMarkerDriver">
-            <eventInterval>1</eventInterval>
-        </driver>
-        <driver name="SVTSetupDriver" type="org.lcsim.hps.recon.tracking.HPSSVTSensorSetup" />
-        <driver name="EcalRawConverter" type="org.lcsim.hps.recon.ecal.HPSEcalRawConverterDriver">
-            <ecalCollectionName>EcalCalHits</ecalCollectionName>
-        </driver>
-        <driver name="EcalClusterer" type="org.lcsim.hps.recon.ecal.HPSEcalClusterer">
-            <ecalName>Ecal</ecalName>
-            <ecalCollectionName>EcalCalHits</ecalCollectionName>
-        </driver>
-        <driver name="RawTrackerHitFitterDriver" type="org.lcsim.hps.recon.tracking.HPSRawTrackerHitFitterDriver">
-            <rawHitCollectionName>SVTRawTrackerHits</rawHitCollectionName>
-            <fittedHitCollectionName>SVTFittedRawTrackerHits</fittedHitCollectionName>
-            <fitAlgorithm>Analytic</fitAlgorithm>
-        </driver>
-        <driver name="TrackerHitDriver" type="org.lcsim.hps.users.mgraham.DataTrackerHitDriver" />        
-        <driver name="TrackerReconDriver" type="org.lcsim.hps.recon.tracking.TrackerReconDriver">
-            <debug>false</debug>
-            <strategyResource>/org/lcsim/hps/recon/tracking/strategies/HPS-Test-4pt1.xml</strategyResource>
-            <stripMaxSeparation>20.0</stripMaxSeparation>
-            <stripTolerance>1.0</stripTolerance>
-        </driver>
-        <driver name="TrackingReconstructionPlots" type="org.lcsim.hps.monitoring.svt.TrackingReconstructionPlots">
-            <outputPlots>HPSTestRunTrackingPlots.aida</outputPlots>
-        </driver>
-        <driver name="CleanupDriver" type="org.lcsim.recon.tracking.digitization.sisim.config.ReadoutCleanupDriver">
-            <collectionNames>TrackerHits SVTRawTrackerHits SVTFittedRawTrackerHits</collectionNames>
-        </driver>  
-    </drivers>
-</lcsim>

hps-java/src/main/resources/org/lcsim/hps/steering
HPSTestRunOfflineTracking.lcsim removed after 1.3
diff -N HPSTestRunOfflineTracking.lcsim
--- HPSTestRunOfflineTracking.lcsim	14 Aug 2012 00:58:03 -0000	1.3
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<lcsim xmlns:xs="http://www.w3.org/2001/XMLSchema-instance" xs:noNamespaceSchemaLocation="http://www.lcsim.org/schemas/lcsim/1.0/lcsim.xsd">
-    <inputFiles>
-        <fileList>${fileList}</fileList>
-    </inputFiles>
-    <execute>
-        <driver name="EventMarkerDriver" />
-        <driver name="SVTSetupDriver" />
-        <driver name="EcalRawConverter" />
-        <driver name="EcalClusterer" />
-        <driver name="RawTrackerHitFitterDriver" />
-        <driver name="TrackerHitDriver" />
-        <driver name="TrackerReconDriver" />
-        <driver name="TrackingReconstructionPlots" />
-        <driver name="CleanupDriver" />
-        <driver name="LCIOWriter" />
-    </execute>
-    <drivers>
-        <driver name="EventMarkerDriver" type="org.lcsim.job.EventMarkerDriver">
-            <eventInterval>1</eventInterval>
-        </driver>
-        <driver name="SVTSetupDriver" type="org.lcsim.hps.recon.tracking.HPSSVTSensorSetup" />
-        <driver name="EcalRawConverter" type="org.lcsim.hps.recon.ecal.HPSEcalRawConverterDriver">
-            <ecalCollectionName>EcalCalHits</ecalCollectionName>
-        </driver>
-        <driver name="EcalClusterer" type="org.lcsim.hps.recon.ecal.HPSEcalClusterer">
-            <ecalName>Ecal</ecalName>
-            <ecalCollectionName>EcalCalHits</ecalCollectionName>
-        </driver>
-        <driver name="RawTrackerHitFitterDriver" type="org.lcsim.hps.recon.tracking.HPSRawTrackerHitFitterDriver">
-            <rawHitCollectionName>SVTRawTrackerHits</rawHitCollectionName>
-            <fittedHitCollectionName>SVTFittedRawTrackerHits</fittedHitCollectionName>
-            <fitAlgorithm>Analytic</fitAlgorithm>
-        </driver>
-        <driver name="TrackerHitDriver" type="org.lcsim.hps.users.mgraham.DataTrackerHitDriver" />        
-        <driver name="TrackerReconDriver" type="org.lcsim.hps.recon.tracking.TrackerReconDriver">
-            <debug>false</debug>
-            <strategyResource>/org/lcsim/hps/recon/tracking/strategies/HPS-Test-4pt1.xml</strategyResource>
-            <stripMaxSeparation>20.0</stripMaxSeparation>
-            <stripTolerance>1.0</stripTolerance>
-        </driver>
-        <driver name="TrackingReconstructionPlots" type="org.lcsim.hps.monitoring.svt.TrackingReconstructionPlots">
-            <outputPlots>HPSTrackingtrackingPlots.aida</outputPlots>
-        </driver>
-        <driver name="CleanupDriver" type="org.lcsim.recon.tracking.digitization.sisim.config.ReadoutCleanupDriver">
-            <collectionNames>TrackerHits SVTRawTrackerHits SVTFittedRawTrackerHits</collectionNames>
-        </driver>  
-        <driver name="LCIOWriter" type="org.lcsim.util.loop.LCIODriver">
-            <outputFilePath>${outputFile}</outputFilePath>
-        </driver>
-    </drivers>
-</lcsim>

hps-java/src/main/resources/org/lcsim/hps/steering
HPSWriteRawDataFromMC.lcsim removed after 1.2
diff -N HPSWriteRawDataFromMC.lcsim
--- HPSWriteRawDataFromMC.lcsim	25 Mar 2012 08:55:11 -0000	1.2
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,42 +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="EcalReadout"/>
-        <driver name="LCIOWriter"/>
-        <driver name="EvioConverter"/>
-    </execute>
-    <drivers>
-        <driver name="EventMarkerDriver" type="org.lcsim.job.EventMarkerDriver">
-            <eventInterval>100</eventInterval>
-        </driver>
-        <driver name="SVTSetupDriver"
-                type="org.lcsim.hps.recon.tracking.HPSSVTSensorSetup">   
-        </driver>
-        <driver name="TrackerDigiDriver"
-                type="org.lcsim.hps.recon.tracking.TrackerDigiDriver"/>
-        <driver name="EcalReadout"
-                type="org.lcsim.hps.recon.ecal.HPSEcalConverterAtoDDriver">
-            <ecalName>Ecal</ecalName>
-            <ecalCollectionName>EcalHits</ecalCollectionName>
-            <rawCollectionName>EcalRawHits</rawCollectionName>
-            <scale>0.08</scale>
-        </driver>
-        <driver name="LCIOWriter"
-                type="org.lcsim.util.loop.LCIODriver">
-            <outputFilePath>${inputFile}_rawData</outputFilePath>
-            <writeOnlyCollections>EcalRawHits RawTrackerHitMaker_RawTrackerHits</writeOnlyCollections>
-        </driver>
-        <driver name="EvioConverter" type="org.lcsim.hps.evio.MCRawDataToEvio4Converter"/>                                                                    
-    </drivers>
-</lcsim>

hps-java/src/main/resources/org/lcsim/hps/steering
TestRunReconFromRawLcio.lcsim removed after 1.1
diff -N TestRunReconFromRawLcio.lcsim
--- TestRunReconFromRawLcio.lcsim	1 Jun 2012 21:51:52 -0000	1.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,63 +0,0 @@
-<!--
-	Steering file to run offline reconstruction from Raw LCIO
-	author:  Omar Moreno <[log in to unmask]>
-	version: $Id: TestRunReconFromRawLcio.lcsim,v 1.1 2012/06/01 21:51:52 omoreno Exp $
--->
-
-<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}</file>
-   </inputFiles>
-
-   <control>
-      <numberOfEvents>-1</numberOfEvents>
-   </control>
-   
-   <execute>
-      <driver name="EventMarkerDriver"    />
-      <driver name="SVTSetupDriver"       />
-      <driver name="LoadCalibrations"     />
-      <driver name="RawTrackerHitSensorSetup" />
-      <driver name="EcalRawConverter"     />
-      <driver name="EcalClusterer"        /> 
-      <driver name="RawTrackerHitFitterDriver" />
-      <driver name="TrackerHitDriver"          /> 
-      <driver name="TrackerReconDriver"        /> 
-      <driver name="CleanupDriver"             />
-   </execute>
-
-   <drivers>
-      <driver name="EventMarkerDriver" type="org.lcsim.job.EventMarkerDriver">
-         <eventInterval>1000</eventInterval>
-         <marker>#</marker>
-      </driver>
-      <driver name="SVTSetupDriver" type="org.lcsim.hps.recon.tracking.HPSSVTSensorSetup"/>
-      <driver name="LoadCalibrations" type="org.lcsim.hps.recon.tracking.LoadCalibrationsDriver" />
-      <driver name="RawTrackerHitSensorSetup" type="org.lcsim.recon.tracking.digitization.sisim.config.RawTrackerHitSensorSetup" /> 
-      <driver name="EcalRawConverter" type="org.lcsim.hps.recon.ecal.HPSEcalRawConverterDriver">
-               <ecalCollectionName>EcalCalHits</ecalCollectionName>
-      </driver>
-      <driver name="EcalClusterer" type="org.lcsim.hps.recon.ecal.HPSEcalClusterer">
-         <ecalName>Ecal</ecalName>
-         <ecalCollectionName>EcalCalHits</ecalCollectionName>
-      </driver> 
-      <driver name="RawTrackerHitFitterDriver" type="org.lcsim.hps.recon.tracking.HPSRawTrackerHitFitterDriver">
-              <rawHitCollectionName>SVTRawTrackerHits</rawHitCollectionName>  
-              <fittedHitCollectionName>SVTFittedRawTrackerHits</fittedHitCollectionName> 
-              <fitAlgorithm>Analytic</fitAlgorithm>  
-      </driver>
-      <driver name="TrackerHitDriver" type="org.lcsim.hps.users.mgraham.DataTrackerHitDriver" />
-      <driver name="TrackerReconDriver" type="org.lcsim.hps.recon.tracking.TrackerReconDriver">
-               <debug>true</debug>
-               <strategyResource>/org/lcsim/hps/recon/tracking/strategies/HPS-TestRun-v2-135.xml</strategyResource>
-               <stripMaxSeparation>20.0</stripMaxSeparation>
-               <stripTolerance>1.0</stripTolerance>
-       </driver>
-       <driver name="CleanupDriver" type="org.lcsim.recon.tracking.digitization.sisim.config.ReadoutCleanupDriver">
-                <collectionNames>TrackerHits SVTRawTrackerHits  SVTFittedRawTrackerHits</collectionNames>
-       </driver>
-   </drivers>
-
-</lcsim>

hps-java/sandbox
HPSWriteRawDataFromMC.lcsim added at 1.1
diff -N HPSWriteRawDataFromMC.lcsim
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ HPSWriteRawDataFromMC.lcsim	16 Aug 2012 23:55:42 -0000	1.1
@@ -0,0 +1,42 @@
+<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="EcalReadout"/>
+        <driver name="LCIOWriter"/>
+        <driver name="EvioConverter"/>
+    </execute>
+    <drivers>
+        <driver name="EventMarkerDriver" type="org.lcsim.job.EventMarkerDriver">
+            <eventInterval>100</eventInterval>
+        </driver>
+        <driver name="SVTSetupDriver"
+                type="org.lcsim.hps.recon.tracking.HPSSVTSensorSetup">   
+        </driver>
+        <driver name="TrackerDigiDriver"
+                type="org.lcsim.hps.recon.tracking.TrackerDigiDriver"/>
+        <driver name="EcalReadout"
+                type="org.lcsim.hps.recon.ecal.HPSEcalConverterAtoDDriver">
+            <ecalName>Ecal</ecalName>
+            <ecalCollectionName>EcalHits</ecalCollectionName>
+            <rawCollectionName>EcalRawHits</rawCollectionName>
+            <scale>0.08</scale>
+        </driver>
+        <driver name="LCIOWriter"
+                type="org.lcsim.util.loop.LCIODriver">
+            <outputFilePath>${inputFile}_rawData</outputFilePath>
+            <writeOnlyCollections>EcalRawHits RawTrackerHitMaker_RawTrackerHits</writeOnlyCollections>
+        </driver>
+        <driver name="EvioConverter" type="org.lcsim.hps.evio.MCRawDataToEvio4Converter"/>                                                                    
+    </drivers>
+</lcsim>

hps-java/sandbox
TestRunReconFromRawLcio.lcsim added at 1.1
diff -N TestRunReconFromRawLcio.lcsim
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ TestRunReconFromRawLcio.lcsim	16 Aug 2012 23:55:42 -0000	1.1
@@ -0,0 +1,63 @@
+<!--
+	Steering file to run offline reconstruction from Raw LCIO
+	author:  Omar Moreno <[log in to unmask]>
+	version: $Id: TestRunReconFromRawLcio.lcsim,v 1.1 2012/08/16 23:55:42 meeg Exp $
+-->
+
+<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}</file>
+   </inputFiles>
+
+   <control>
+      <numberOfEvents>-1</numberOfEvents>
+   </control>
+   
+   <execute>
+      <driver name="EventMarkerDriver"    />
+      <driver name="SVTSetupDriver"       />
+      <driver name="LoadCalibrations"     />
+      <driver name="RawTrackerHitSensorSetup" />
+      <driver name="EcalRawConverter"     />
+      <driver name="EcalClusterer"        /> 
+      <driver name="RawTrackerHitFitterDriver" />
+      <driver name="TrackerHitDriver"          /> 
+      <driver name="TrackerReconDriver"        /> 
+      <driver name="CleanupDriver"             />
+   </execute>
+
+   <drivers>
+      <driver name="EventMarkerDriver" type="org.lcsim.job.EventMarkerDriver">
+         <eventInterval>1000</eventInterval>
+         <marker>#</marker>
+      </driver>
+      <driver name="SVTSetupDriver" type="org.lcsim.hps.recon.tracking.HPSSVTSensorSetup"/>
+      <driver name="LoadCalibrations" type="org.lcsim.hps.recon.tracking.LoadCalibrationsDriver" />
+      <driver name="RawTrackerHitSensorSetup" type="org.lcsim.recon.tracking.digitization.sisim.config.RawTrackerHitSensorSetup" /> 
+      <driver name="EcalRawConverter" type="org.lcsim.hps.recon.ecal.HPSEcalRawConverterDriver">
+               <ecalCollectionName>EcalCalHits</ecalCollectionName>
+      </driver>
+      <driver name="EcalClusterer" type="org.lcsim.hps.recon.ecal.HPSEcalClusterer">
+         <ecalName>Ecal</ecalName>
+         <ecalCollectionName>EcalCalHits</ecalCollectionName>
+      </driver> 
+      <driver name="RawTrackerHitFitterDriver" type="org.lcsim.hps.recon.tracking.HPSRawTrackerHitFitterDriver">
+              <rawHitCollectionName>SVTRawTrackerHits</rawHitCollectionName>  
+              <fittedHitCollectionName>SVTFittedRawTrackerHits</fittedHitCollectionName> 
+              <fitAlgorithm>Analytic</fitAlgorithm>  
+      </driver>
+      <driver name="TrackerHitDriver" type="org.lcsim.hps.users.mgraham.DataTrackerHitDriver" />
+      <driver name="TrackerReconDriver" type="org.lcsim.hps.recon.tracking.TrackerReconDriver">
+               <debug>true</debug>
+               <strategyResource>/org/lcsim/hps/recon/tracking/strategies/HPS-TestRun-v2-135.xml</strategyResource>
+               <stripMaxSeparation>20.0</stripMaxSeparation>
+               <stripTolerance>1.0</stripTolerance>
+       </driver>
+       <driver name="CleanupDriver" type="org.lcsim.recon.tracking.digitization.sisim.config.ReadoutCleanupDriver">
+                <collectionNames>TrackerHits SVTRawTrackerHits  SVTFittedRawTrackerHits</collectionNames>
+       </driver>
+   </drivers>
+
+</lcsim>

hps-java/sandbox
HPSTestRunOfflineTracking.lcsim added at 1.1
diff -N HPSTestRunOfflineTracking.lcsim
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ HPSTestRunOfflineTracking.lcsim	16 Aug 2012 23:55:42 -0000	1.1
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<lcsim xmlns:xs="http://www.w3.org/2001/XMLSchema-instance" xs:noNamespaceSchemaLocation="http://www.lcsim.org/schemas/lcsim/1.0/lcsim.xsd">
+    <inputFiles>
+        <fileList>${fileList}</fileList>
+    </inputFiles>
+    <execute>
+        <driver name="EventMarkerDriver" />
+        <driver name="SVTSetupDriver" />
+        <driver name="EcalRawConverter" />
+        <driver name="EcalClusterer" />
+        <driver name="RawTrackerHitFitterDriver" />
+        <driver name="TrackerHitDriver" />
+        <driver name="TrackerReconDriver" />
+        <driver name="TrackingReconstructionPlots" />
+        <driver name="CleanupDriver" />
+        <driver name="LCIOWriter" />
+    </execute>
+    <drivers>
+        <driver name="EventMarkerDriver" type="org.lcsim.job.EventMarkerDriver">
+            <eventInterval>1</eventInterval>
+        </driver>
+        <driver name="SVTSetupDriver" type="org.lcsim.hps.recon.tracking.HPSSVTSensorSetup" />
+        <driver name="EcalRawConverter" type="org.lcsim.hps.recon.ecal.HPSEcalRawConverterDriver">
+            <ecalCollectionName>EcalCalHits</ecalCollectionName>
+        </driver>
+        <driver name="EcalClusterer" type="org.lcsim.hps.recon.ecal.HPSEcalClusterer">
+            <ecalName>Ecal</ecalName>
+            <ecalCollectionName>EcalCalHits</ecalCollectionName>
+        </driver>
+        <driver name="RawTrackerHitFitterDriver" type="org.lcsim.hps.recon.tracking.HPSRawTrackerHitFitterDriver">
+            <rawHitCollectionName>SVTRawTrackerHits</rawHitCollectionName>
+            <fittedHitCollectionName>SVTFittedRawTrackerHits</fittedHitCollectionName>
+            <fitAlgorithm>Analytic</fitAlgorithm>
+        </driver>
+        <driver name="TrackerHitDriver" type="org.lcsim.hps.users.mgraham.DataTrackerHitDriver" />        
+        <driver name="TrackerReconDriver" type="org.lcsim.hps.recon.tracking.TrackerReconDriver">
+            <debug>false</debug>
+            <strategyResource>/org/lcsim/hps/recon/tracking/strategies/HPS-Test-4pt1.xml</strategyResource>
+            <stripMaxSeparation>20.0</stripMaxSeparation>
+            <stripTolerance>1.0</stripTolerance>
+        </driver>
+        <driver name="TrackingReconstructionPlots" type="org.lcsim.hps.monitoring.svt.TrackingReconstructionPlots">
+            <outputPlots>HPSTrackingtrackingPlots.aida</outputPlots>
+        </driver>
+        <driver name="CleanupDriver" type="org.lcsim.recon.tracking.digitization.sisim.config.ReadoutCleanupDriver">
+            <collectionNames>TrackerHits SVTRawTrackerHits SVTFittedRawTrackerHits</collectionNames>
+        </driver>  
+        <driver name="LCIOWriter" type="org.lcsim.util.loop.LCIODriver">
+            <outputFilePath>${outputFile}</outputFilePath>
+        </driver>
+    </drivers>
+</lcsim>

hps-java/sandbox
HPSTestRunOnlineTracking.lcsim added at 1.1
diff -N HPSTestRunOnlineTracking.lcsim
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ HPSTestRunOnlineTracking.lcsim	16 Aug 2012 23:55:42 -0000	1.1
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<lcsim xmlns:xs="http://www.w3.org/2001/XMLSchema-instance" xs:noNamespaceSchemaLocation="http://www.lcsim.org/schemas/lcsim/1.0/lcsim.xsd">
+    <execute>
+        <driver name="EventMarkerDriver" />
+        <driver name="SVTSetupDriver" />
+        <driver name="EcalRawConverter" />
+        <driver name="EcalClusterer" />
+        <driver name="RawTrackerHitFitterDriver" />
+        <driver name="TrackerHitDriver" />
+        <driver name="TrackerReconDriver" />
+        <driver name="TrackingReconstructionPlots" />
+        <driver name="CleanupDriver" />
+    </execute>
+    <drivers>
+        <driver name="EventMarkerDriver" type="org.lcsim.job.EventMarkerDriver">
+            <eventInterval>1</eventInterval>
+        </driver>
+        <driver name="SVTSetupDriver" type="org.lcsim.hps.recon.tracking.HPSSVTSensorSetup" />
+        <driver name="EcalRawConverter" type="org.lcsim.hps.recon.ecal.HPSEcalRawConverterDriver">
+            <ecalCollectionName>EcalCalHits</ecalCollectionName>
+        </driver>
+        <driver name="EcalClusterer" type="org.lcsim.hps.recon.ecal.HPSEcalClusterer">
+            <ecalName>Ecal</ecalName>
+            <ecalCollectionName>EcalCalHits</ecalCollectionName>
+        </driver>
+        <driver name="RawTrackerHitFitterDriver" type="org.lcsim.hps.recon.tracking.HPSRawTrackerHitFitterDriver">
+            <rawHitCollectionName>SVTRawTrackerHits</rawHitCollectionName>
+            <fittedHitCollectionName>SVTFittedRawTrackerHits</fittedHitCollectionName>
+            <fitAlgorithm>Analytic</fitAlgorithm>
+        </driver>
+        <driver name="TrackerHitDriver" type="org.lcsim.hps.users.mgraham.DataTrackerHitDriver" />        
+        <driver name="TrackerReconDriver" type="org.lcsim.hps.recon.tracking.TrackerReconDriver">
+            <debug>false</debug>
+            <strategyResource>/org/lcsim/hps/recon/tracking/strategies/HPS-Test-4pt1.xml</strategyResource>
+            <stripMaxSeparation>20.0</stripMaxSeparation>
+            <stripTolerance>1.0</stripTolerance>
+        </driver>
+        <driver name="TrackingReconstructionPlots" type="org.lcsim.hps.monitoring.svt.TrackingReconstructionPlots">
+            <outputPlots>HPSTestRunTrackingPlots.aida</outputPlots>
+        </driver>
+        <driver name="CleanupDriver" type="org.lcsim.recon.tracking.digitization.sisim.config.ReadoutCleanupDriver">
+            <collectionNames>TrackerHits SVTRawTrackerHits SVTFittedRawTrackerHits</collectionNames>
+        </driver>  
+    </drivers>
+</lcsim>

hps-java/src/main/java/org/lcsim/hps/recon/tracking
TrackerReconDriver.java 1.22 -> 1.23
diff -u -r1.22 -r1.23
--- TrackerReconDriver.java	6 Aug 2012 21:15:21 -0000	1.22
+++ TrackerReconDriver.java	16 Aug 2012 23:55:43 -0000	1.23
@@ -7,6 +7,7 @@
 
 import org.lcsim.event.EventHeader;
 import org.lcsim.event.Track;
+import org.lcsim.fit.helicaltrack.HelicalTrackHit;
 import org.lcsim.geometry.Detector;
 import org.lcsim.hps.event.HPSTransformations;
 import org.lcsim.recon.tracking.digitization.sisim.config.ReadoutCleanupDriver;
@@ -187,6 +188,8 @@
 
         // Debug printouts.
         if (debug) {
+            System.out.println("The HelicalTrackHit collection " + stInputCollectionName + " has " + event.get(HelicalTrackHit.class, stInputCollectionName).size() + " hits.");
+
             // Check for Tracks.
             List<Track> tracks = event.get(Track.class, trackCollectionName);
             System.out.println("The Track collection " + trackCollectionName + " has " + tracks.size() + " tracks.");
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