java/trunk/steering-files/src/main/resources/org/hps/steering/users/phansson

--- java/trunk/steering-files/src/main/resources/org/hps/steering/users/phansson/HPSTrackingDefaults.lcsim	2014-09-26 04:04:03 UTC (rev 1101)
+++ java/trunk/steering-files/src/main/resources/org/hps/steering/users/phansson/HPSTrackingDefaults.lcsim	2014-09-29 19:43:18 UTC (rev 1102)
@@ -13,54 +13,54 @@

 
     <execute>
         <driver name="EventMarkerDriver"/>

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

         <driver name="CalibrationDriver"/>

-        <driver name="TrackerDigiDriver"/>

+        <driver name="TrackerDigiDriver"/> 
+        <driver name="RawTrackerHitFitterDriver" />
+        <driver name="TrackerHitDriver"/>
+        -->

         <driver name="HelicalTrackHitDriver"/>
         <driver name="TrackerReconDriver"/>

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

+        <driver name="LCIOWriter"/>

 
 
 
     </execute>    
  
     <drivers>

-        <driver name="GBLDriver"
-                type="org.hps.recon.tracking.gbl.GBLOutputDriver">
-                <debug>0</debug>
-                <outputPlotFileName></outputPlotFileName>
-                <gblFileName>gblinput.txt</gblFileName>
-	</driver>
-        <driver name="CalibrationDriver" type="org.hps.conditions.deprecated.CalibrationDriver">
-<!--            <runNumber>1351</runNumber>    -->
-        </driver>
-
-        <driver name="EventMarkerDriver"

+       	<driver name="EventMarkerDriver"

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

-    
-        <driver name="TrackerDigiDriver" type="org.hps.recon.tracking.SimpleTrackerDigiDriver">
-<!--            <dropBadChannels>true</dropBadChannels>-->
-            <debug>false</debug>

+ 		<driver name="HPSSVTSensorSetup" type="org.hps.conditions.deprecated.HPSSVTSensorSetup"/>
+        
+        <driver name="RawTrackerHitFitterDriver" type="org.hps.recon.tracking.RawTrackerHitFitterDriver">
+        	<debug>true</debug>
+            <fitAlgorithm>Analytic</fitAlgorithm>
+            <correctT0Shift>true</correctT0Shift>

         </driver>

-              

+        
+        <driver name="TrackerHitDriver" type="org.hps.recon.tracking.DataTrackerHitDriver">
+        	<debug>true</debug>
+        </driver>     
+        

         <driver name="HelicalTrackHitDriver"
                 type="org.hps.recon.tracking.HelicalTrackHitDriver">

-            <debug>false</debug>

+            <debug>true</debug>

             <maxSeperation>20.0</maxSeperation>
             <tolerance>1.0</tolerance>
         </driver>
         
         <driver name="TrackerReconDriver"
                 type="org.hps.recon.tracking.TrackerReconDriver">

-            <debug>false</debug>

+            <debug>true</debug>

             <strategyResource>/org/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>

java/trunk/steering-files/src/main/resources/org/hps/steering/users/phansson

--- java/trunk/steering-files/src/main/resources/org/hps/steering/users/phansson/TestRunReadoutToLcio.lcsim	2014-09-26 04:04:03 UTC (rev 1101)
+++ java/trunk/steering-files/src/main/resources/org/hps/steering/users/phansson/TestRunReadoutToLcio.lcsim	2014-09-29 19:43:18 UTC (rev 1102)
@@ -5,43 +5,78 @@

        xs:noNamespaceSchemaLocation="http://www.lcsim.org/schemas/lcsim/1.0/lcsim.xsd">
     <execute>
         <driver name="EventMarkerDriver"/>

-                <!--

         <driver name="HPSSVTSensorSetup"/>   

-
-        <driver name="CalibrationDriver"/>   

+        <driver name="CalibrationDriver"/>
+        <driver name="BadChannelFilter" />
+<!--        <driver name="EcalReadout"/>
+        <driver name="EcalConverter"/>
+        <driver name="EcalTriggerFilter"/>
+        <driver name="EcalClusterer"/>
+        <driver name="EcalTrigger"/>
+-->

         <driver name="SimpleSVTReadout"/>

-        
-        <driver name="TrackerDigiDriver"/>
-        <driver name="TrackingGeometryChecker"/>
-        <driver name="LCIOWriter"/>

+        <driver name="ClockDriver"/>
+        <driver name="TestRunReconToLcio"/>

         <driver name="CleanupDriver"/>

-    -->

     </execute> 
 
     <drivers>
         <driver name="EventMarkerDriver" type="org.lcsim.job.EventMarkerDriver">
             <eventInterval>1000</eventInterval>
         </driver> 

-        <!--

+        <driver name="HPSSVTSensorSetup" type="org.hps.conditions.deprecated.HPSSVTSensorSetup"/>
+        

         <driver name="CalibrationDriver" type="org.hps.conditions.deprecated.CalibrationDriver">

-            <runNumber>1351</runNumber>
-        </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">
-            <debug>true</debug>

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

         </driver>

+        <driver name="TestRunReconToLcio" type="org.hps.evio.TestRunTriggeredReconToLcio">
+            <outputFile>${outputFile}.slcio</outputFile>
+        </driver>
+        <driver name="BadChannelFilter" type="org.hps.recon.tracking.SVTBadChannelFilterDriver" /> 	
+        <driver name="EcalReadout" type="org.hps.readout.ecal.FADCEcalReadoutDriver">
+            <coincidenceWindow>8</coincidenceWindow>
+            <ecalName>Ecal</ecalName>
+            <ecalCollectionName>EcalHits</ecalCollectionName>
+            <ecalRawCollectionName>EcalRawHits</ecalRawCollectionName>
+            <constantTriggerWindow>false</constantTriggerWindow>
+            <scaleFactor>128</scaleFactor>
+            <triggerThreshold>80</triggerThreshold>
+            <readoutThreshold>50</readoutThreshold>
+            <pePerMeV>2.0</pePerMeV>
+            <use2014Gain>false</use2014Gain>
+            <pulseShape>CRRC</pulseShape>
+            <tp>14.0</tp>
+        </driver>
+
+        <driver name="EcalConverter" type="org.hps.recon.ecal.EcalConverterDriver">
+            <rawCollectionName>EcalRawHits</rawCollectionName>
+            <ecalCollectionName>EcalCorrectedHits</ecalCollectionName>
+            <scale>1</scale>
+        </driver>	
+        
+        <driver name="EcalTriggerFilter" type="org.hps.recon.ecal.EcalTriggerFilterDriver">
+            <inputCollection>EcalCorrectedHits</inputCollection>
+            <outputCollection>EcalFilteredHits</outputCollection>
+        </driver>
+
+        <driver name="EcalClusterer" type="org.hps.recon.ecal.CTPEcalClusterer">
+            <ecalName>Ecal</ecalName>
+            <clusterWindow>32.0</clusterWindow>
+            <ecalCollectionName>EcalFilteredHits</ecalCollectionName>
+        </driver>
+
+        <driver name="EcalTrigger" type="org.hps.readout.ecal.TestRunTriggerDriver">
+            <clusterCollectionName>EcalClusters</clusterCollectionName>
+            <deadTime>10</deadTime>
+            <outputFileName>${outputFile}.triggers</outputFileName>
+        </driver>	
+        <driver name="SimpleSVTReadout" type="org.hps.readout.svt.SimpleSvtReadout">
+        </driver>
+
+        <driver name="ClockDriver" type="org.hps.readout.ecal.ClockDriver"/>

         <driver name="CleanupDriver" type="org.lcsim.recon.tracking.digitization.sisim.config.ReadoutCleanupDriver">
             <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>