Print

Print


Author: [log in to unmask]
Date: Thu Feb  5 19:33:30 2015
New Revision: 2059

Log:
Attempting commit on steering files again. Legacy clusterer replaced with GTPOnline clusterer for all non-test run steering files. No tests were performed; file authors should handle this.

Modified:
    java/trunk/steering-files/src/main/resources/org/hps/steering/monitoring/ECalBasicMonitoring.lcsim
    java/trunk/steering-files/src/main/resources/org/hps/steering/monitoring/ECalMonitoring.lcsim
    java/trunk/steering-files/src/main/resources/org/hps/steering/monitoring/EcalMonitoringFinal.lcsim
    java/trunk/steering-files/src/main/resources/org/hps/steering/monitoring/OnlineTracking.lcsim
    java/trunk/steering-files/src/main/resources/org/hps/steering/monitoring/SVTBasicMonitoring.lcsim
    java/trunk/steering-files/src/main/resources/org/hps/steering/monitoring/SVTEventDisplay.lcsim
    java/trunk/steering-files/src/main/resources/org/hps/steering/monitoring/SVTMonitoring.lcsim
    java/trunk/steering-files/src/main/resources/org/hps/steering/recon/GBLReco.lcsim
    java/trunk/steering-files/src/main/resources/org/hps/steering/recon/TestRunOfflineRecon.lcsim
    java/trunk/steering-files/src/main/resources/org/hps/steering/recon/TestRunOfflineReconTwoTrkFilter.lcsim

Modified: java/trunk/steering-files/src/main/resources/org/hps/steering/monitoring/ECalBasicMonitoring.lcsim
 =============================================================================
--- java/trunk/steering-files/src/main/resources/org/hps/steering/monitoring/ECalBasicMonitoring.lcsim	(original)
+++ java/trunk/steering-files/src/main/resources/org/hps/steering/monitoring/ECalBasicMonitoring.lcsim	Thu Feb  5 19:33:30 2015
@@ -1,21 +1,30 @@
-<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="EcalRawConverter" />
-        <driver name="EcalClusterer" />
-        <driver name="EcalMonitoringPlots" />
-    </execute>
-    <drivers>
-        <driver name="EventMarkerDriver" type="org.lcsim.job.EventMarkerDriver">
-            <eventInterval>1</eventInterval>
-        </driver>
-        <driver name="EcalRawConverter" type="org.hps.recon.ecal.EcalRawConverterDriver">
-            <applyBadCrystalMap>false</applyBadCrystalMap>
-            <use2014Gain>false</use2014Gain>
-        </driver>
-        <driver name="EcalClusterer" type="org.hps.recon.ecal.cluster.ClusterDriver">
-            <clustererName>LegacyClusterer</clustererName>
-        </driver>
-        <driver name="EcalMonitoringPlots" type="org.hps.monitoring.ecal.plots.BasicMonitoringPlotsDriver" />
-    </drivers>
+<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="EcalRawConverter" />
+        <driver name="EcalClusterer" />
+        <driver name="EcalMonitoringPlots" />
+    </execute>
+    <drivers>
+        <driver name="EventMarkerDriver" type="org.lcsim.job.EventMarkerDriver">
+            <eventInterval>1</eventInterval>
+        </driver>
+        
+        <driver name="EcalRawConverter" type="org.hps.recon.ecal.EcalRawConverterDriver">
+            <applyBadCrystalMap>false</applyBadCrystalMap>
+            <use2014Gain>false</use2014Gain>
+        </driver>
+        
+        <driver name="EcalClusterer" type="org.hps.recon.ecal.cluster.GTPOnlineClusterDriver">
+            <verbose>false</verbose>
+            <logLevel>WARNING</logLevel>
+            <windowAfter>2</windowAfter>
+            <windowBefore>2</windowBefore>
+            <seedEnergyThreshold>0.100</seedEnergyThreshold>
+            <inputHitCollectionName>EcalCalHits</inputHitCollectionName>
+            <outputClusterCollectionName>EcalClusters</outputClusterCollectionName>
+        </driver>
+        
+        <driver name="EcalMonitoringPlots" type="org.hps.monitoring.ecal.plots.BasicMonitoringPlotsDriver" />
+    </drivers>
 </lcsim>

Modified: java/trunk/steering-files/src/main/resources/org/hps/steering/monitoring/ECalMonitoring.lcsim
 =============================================================================
--- java/trunk/steering-files/src/main/resources/org/hps/steering/monitoring/ECalMonitoring.lcsim	(original)
+++ java/trunk/steering-files/src/main/resources/org/hps/steering/monitoring/ECalMonitoring.lcsim	Thu Feb  5 19:33:30 2015
@@ -1,40 +1,50 @@
-
-<lcsim xmlns:xs="http://www.w3.org/2001/XMLSchema-instance" 
-       xs:noNamespaceSchemaLocation="http://www.lcsim.org/schemas/lcsim/1.0/lcsim.xsd">       
-    <control>
-        <numberOfEvents>-1</numberOfEvents>
-        <printInputFiles>true</printInputFiles>
-        <printDriversDetailed>true</printDriversDetailed>
-    </control>    
-    <execute>
-        <driver name="EventMarkerDriver"/>
-        <driver name="EcalRawConverter"/>
-        <driver name="EcalClusterer"/>
-        <driver name="EcalMonitoringPlots"/>
-        <driver name="EcalHitPlots"/>
-        <driver name="EcalWindowPlots"/>
-    </execute>    
-    <drivers>
-        <driver name="EcalRawConverter" type="org.hps.recon.ecal.EcalRawConverterDriver">
-            <applyBadCrystalMap>false</applyBadCrystalMap>
-            <use2014Gain>false</use2014Gain>
-        </driver>
-        <driver name="EcalClusterer" type="org.hps.recon.ecal.cluster.ClusterDriver">
-            <clustererName>LegacyClusterer</clustererName>
-        </driver>             
-        <driver name="EcalMonitoringPlots" type="org.hps.monitoring.ecal.plots.EcalMonitoringPlots">
-            <inputCollection>EcalCalHits</inputCollection>
-            <eventRefreshRate>100</eventRefreshRate>
-        </driver>
-         <driver name="EcalHitPlots" type="org.hps.monitoring.ecal.plots.EcalHitPlots">
-            <inputCollection>EcalCalHits</inputCollection>         
-        </driver>
-        <driver name="EcalWindowPlots" type="org.hps.monitoring.ecal.plots.EcalWindowPlotsXY">
-            <inputCollection>EcalReadoutHits</inputCollection>
-        </driver>     
-        <driver name="EventMarkerDriver"
-                type="org.lcsim.job.EventMarkerDriver">
-            <eventInterval>1</eventInterval>
-        </driver>       
-    </drivers>
-</lcsim>
+
+<lcsim xmlns:xs="http://www.w3.org/2001/XMLSchema-instance" 
+       xs:noNamespaceSchemaLocation="http://www.lcsim.org/schemas/lcsim/1.0/lcsim.xsd">       
+    <control>
+        <numberOfEvents>-1</numberOfEvents>
+        <printInputFiles>true</printInputFiles>
+        <printDriversDetailed>true</printDriversDetailed>
+    </control>    
+    <execute>
+        <driver name="EventMarkerDriver"/>
+        <driver name="EcalRawConverter"/>
+        <driver name="EcalClusterer"/>
+        <driver name="EcalMonitoringPlots"/>
+        <driver name="EcalHitPlots"/>
+        <driver name="EcalWindowPlots"/>
+    </execute>    
+    <drivers>
+        <driver name="EcalRawConverter" type="org.hps.recon.ecal.EcalRawConverterDriver">
+            <applyBadCrystalMap>false</applyBadCrystalMap>
+            <use2014Gain>false</use2014Gain>
+        </driver>
+        
+        <driver name="EcalClusterer" type="org.hps.recon.ecal.cluster.GTPOnlineClusterDriver">
+            <verbose>false</verbose>
+            <logLevel>WARNING</logLevel>
+            <windowAfter>2</windowAfter>
+            <windowBefore>2</windowBefore>
+            <seedEnergyThreshold>0.100</seedEnergyThreshold>
+            <inputHitCollectionName>EcalCalHits</inputHitCollectionName>
+            <outputClusterCollectionName>EcalClusters</outputClusterCollectionName>
+        </driver>
+        
+        <driver name="EcalMonitoringPlots" type="org.hps.monitoring.ecal.plots.EcalMonitoringPlots">
+            <inputCollection>EcalCalHits</inputCollection>
+            <eventRefreshRate>100</eventRefreshRate>
+        </driver>
+        
+        <driver name="EcalHitPlots" type="org.hps.monitoring.ecal.plots.EcalHitPlots">
+            <inputCollection>EcalCalHits</inputCollection>         
+        </driver>
+        
+        <driver name="EcalWindowPlots" type="org.hps.monitoring.ecal.plots.EcalWindowPlotsXY">
+            <inputCollection>EcalReadoutHits</inputCollection>
+        </driver>
+        
+        <driver name="EventMarkerDriver" type="org.lcsim.job.EventMarkerDriver">
+            <eventInterval>1</eventInterval>
+        </driver>       
+    </drivers>
+</lcsim>

Modified: java/trunk/steering-files/src/main/resources/org/hps/steering/monitoring/EcalMonitoringFinal.lcsim
 =============================================================================
--- java/trunk/steering-files/src/main/resources/org/hps/steering/monitoring/EcalMonitoringFinal.lcsim	(original)
+++ java/trunk/steering-files/src/main/resources/org/hps/steering/monitoring/EcalMonitoringFinal.lcsim	Thu Feb  5 19:33:30 2015
@@ -1,91 +1,101 @@
-
-<lcsim xmlns:xs="http://www.w3.org/2001/XMLSchema-instance" xs:noNamespaceSchemaLocation="http://www.lcsim.org/schemas/lcsim/1.0/lcsim.xsd">
-    <control>
-        <numberOfEvents>-1</numberOfEvents>
-        <printInputFiles>true</printInputFiles>
-        <printDriversDetailed>true</printDriversDetailed>
-    </control>
-    <execute>
-        <!-- <driver name="EventMarkerDriver"/> -->
-        <driver name="EcalRawConverter" />
-        <driver name="EcalClusterer" />
-        <driver name="EcalMonitoringPlots" />      <!-- General plots -->
-        <driver name="EcalHitPlots" />             <!-- Single hit distributions -->
-        <driver name="EcalClusterPlots" />         <!-- Clusters distributions -->
-        <driver name="EcalDaqPlots" />              <!-- DAQ Plots -->
-        <driver name="EcalEventDisplay" />          <!-- Ecal event display -->
-<!--    <driver name="EcalWindowPlots"/>        -->
-
-<!--   <driver name="EcalEvsX"/>    -->           
-<!--    <driver name="TriggerPlots"/>-->
-<!--
-        <driver name="EcalEventMonitor"/>
-        <driver name="EcalDaqPlots"/>
--->
-        <!--<driver name="AidaSaveDriver"/>-->
-    </execute>   
-    
-<!--  Here starts the drivers description -->
-    <drivers>
-        <driver name="EventMarkerDriver" type="org.lcsim.job.EventMarkerDriver">
-            <eventInterval>1</eventInterval>
-        </driver>
-        <driver name="EcalRawConverter" type="org.hps.recon.ecal.EcalRawConverterDriver">
-<!--            <threshold>150</threshold>-->
-            <applyBadCrystalMap>false</applyBadCrystalMap>
-            <use2014Gain>false</use2014Gain> 
-<!--            <dropBadFADC>true</dropBadFADC>-->
-        </driver>
-        <driver name="EcalClusterer" type="org.hps.recon.ecal.cluster.ClusterDriver">
-            <clustererName>LegacyClusterer</clustererName> 
-            <!-- <addEMin>0.010</addEMin> -->
-            <cuts>0.05 0.010</cuts>
-        </driver>
-        <driver name="EcalMonitoringPlots" type="org.hps.monitoring.ecal.plots.EcalMonitoringPlots">
-            <inputCollection>EcalCalHits</inputCollection>
-            <eventRefreshRate>5</eventRefreshRate>
-            <accumulateHits>false</accumulateHits>
-        </driver>
-        <driver name="EcalHitPlots" type="org.hps.monitoring.ecal.plots.EcalHitPlots">
-            <inputCollection>EcalCalHits</inputCollection>
-            <maxE>2.0</maxE>
-            <logScale>false</logScale>
-        </driver>
-        <driver name="EcalClusterPlots" type="org.hps.monitoring.ecal.plots.EcalClusterPlots">
-            <maxE>2.0</maxE>
-            <logScale>false</logScale>
-        </driver>
-        <driver name="EcalDaqPlots" type="org.hps.monitoring.ecal.plots.EcalDaqPlots">
-            <inputCollection>EcalCalHits</inputCollection>
-        </driver>
-        <driver name="EcalEventDisplay" type="org.hps.monitoring.ecal.plots.EcalEventDisplay">
-            <inputCollection>EcalCalHits</inputCollection>
-            <inputCollectionRaw>EcalReadoutHits</inputCollectionRaw>
-            <inputClusterCollection>EcalClusters</inputClusterCollection>
-            <pedSamples>20</pedSamples>
-            <maxEch>2.0</maxEch>
-            <minEch>0.005</minEch>
-            <eventRefreshRate>1</eventRefreshRate>
-        </driver>
-<!-- Here are commented drivers -->
-          <!--<driver name="EcalClusterer" type="org.hps.recon.ecal.HPSEcalCTPClusterer"> -->
-        
-          <!--  <driver name="EcalEvsX" type="org.hps.monitoring.ecal.EcalEvsX">
-            <targetZ>674</targetZ>
-            <inputCollection>EcalClusters</inputCollection>
-        </driver> -->
-        <!-- <driver name="EcalWindowPlots" type="org.hps.monitoring.drivers.ecal.plots.EcalWindowPlots">
-            <inputCollection>EcalReadoutHits</inputCollection>
-        </driver> -->
-        <!-- <driver name="EcalPedestalPlots" type="org.hps.monitoring.drivers.ecal.EcalPedestalPlots">
-            <inputCollection>EcalCalHits</inputCollection>
-            <eventRefreshRate>100</eventRefreshRate>
-        </driver>-->
-       <!--  <driver name="TriggerPlots" type="org.hps.monitoring.ecal.TriggerPlots">
-            <clusterEnergyCut>0.500</clusterEnergyCut>
-        </driver>-->
-          <!-- <driver name="AidaSaveDriver" type="org.lcsim.job.AidaSaveDriver">
-            <outputFileName>triggerEPlots</outputFileName>
-        </driver> -->
-    </drivers>
-</lcsim>
+
+<lcsim xmlns:xs="http://www.w3.org/2001/XMLSchema-instance" xs:noNamespaceSchemaLocation="http://www.lcsim.org/schemas/lcsim/1.0/lcsim.xsd">
+    <control>
+        <numberOfEvents>-1</numberOfEvents>
+        <printInputFiles>true</printInputFiles>
+        <printDriversDetailed>true</printDriversDetailed>
+    </control>
+    <execute>
+        <!-- <driver name="EventMarkerDriver"/> -->
+        
+        <driver name="EcalRawConverter" />
+        <driver name="EcalClusterer" />
+        <driver name="EcalMonitoringPlots" />      <!-- General plots -->
+        <driver name="EcalHitPlots" />             <!-- Single hit distributions -->
+        <driver name="EcalClusterPlots" />         <!-- Clusters distributions -->
+        <driver name="EcalDaqPlots" />             <!-- DAQ Plots -->
+        <driver name="EcalEventDisplay" />         <!-- Ecal event display -->
+        
+        <!-- <driver name="EcalWindowPlots"/>  -->
+        <!-- <driver name="EcalEvsX"/>         -->           
+        <!-- <driver name="TriggerPlots"/>     -->
+        <!-- <driver name="EcalEventMonitor"/> -->
+        <!-- <driver name="AidaSaveDriver"/>   -->
+    </execute>   
+    
+    <drivers>
+        <driver name="EventMarkerDriver" type="org.lcsim.job.EventMarkerDriver">
+            <eventInterval>1</eventInterval>
+        </driver>
+        
+        <driver name="EcalRawConverter" type="org.hps.recon.ecal.EcalRawConverterDriver">
+            <applyBadCrystalMap>false</applyBadCrystalMap>
+            <use2014Gain>false</use2014Gain> 
+        </driver>
+        
+        <driver name="EcalClusterer" type="org.hps.recon.ecal.cluster.GTPOnlineClusterDriver">
+            <verbose>false</verbose>
+            <logLevel>WARNING</logLevel>
+            <windowAfter>2</windowAfter>
+            <windowBefore>2</windowBefore>
+            <seedEnergyThreshold>0.100</seedEnergyThreshold>
+            <inputHitCollectionName>EcalCalHits</inputHitCollectionName>
+            <outputClusterCollectionName>EcalClusters</outputClusterCollectionName>
+        </driver>
+        
+        <driver name="EcalMonitoringPlots" type="org.hps.monitoring.ecal.plots.EcalMonitoringPlots">
+            <inputCollection>EcalCalHits</inputCollection>
+            <eventRefreshRate>5</eventRefreshRate>
+            <accumulateHits>false</accumulateHits>
+        </driver>
+        
+        <driver name="EcalHitPlots" type="org.hps.monitoring.ecal.plots.EcalHitPlots">
+            <inputCollection>EcalCalHits</inputCollection>
+            <maxE>2.0</maxE>
+            <logScale>false</logScale>
+        </driver>
+        
+        <driver name="EcalClusterPlots" type="org.hps.monitoring.ecal.plots.EcalClusterPlots">
+            <maxE>2.0</maxE>
+            <logScale>false</logScale>
+        </driver>
+        
+        <driver name="EcalDaqPlots" type="org.hps.monitoring.ecal.plots.EcalDaqPlots">
+            <inputCollection>EcalCalHits</inputCollection>
+        </driver>
+        
+        <driver name="EcalEventDisplay" type="org.hps.monitoring.ecal.plots.EcalEventDisplay">
+            <inputCollection>EcalCalHits</inputCollection>
+            <inputCollectionRaw>EcalReadoutHits</inputCollectionRaw>
+            <inputClusterCollection>EcalClusters</inputClusterCollection>
+            <pedSamples>20</pedSamples>
+            <maxEch>2.0</maxEch>
+            <minEch>0.005</minEch>
+            <eventRefreshRate>1</eventRefreshRate>
+        </driver>
+        
+        <!--<driver name="EcalClusterer" type="org.hps.recon.ecal.HPSEcalCTPClusterer"> -->
+        
+        <!--  <driver name="EcalEvsX" type="org.hps.monitoring.ecal.EcalEvsX">
+            <targetZ>674</targetZ>
+            <inputCollection>EcalClusters</inputCollection>
+        </driver> -->
+        
+        <!-- <driver name="EcalWindowPlots" type="org.hps.monitoring.drivers.ecal.plots.EcalWindowPlots">
+            <inputCollection>EcalReadoutHits</inputCollection>
+        </driver> -->
+        
+        <!-- <driver name="EcalPedestalPlots" type="org.hps.monitoring.drivers.ecal.EcalPedestalPlots">
+            <inputCollection>EcalCalHits</inputCollection>
+            <eventRefreshRate>100</eventRefreshRate>
+        </driver> -->
+        
+        <!--  <driver name="TriggerPlots" type="org.hps.monitoring.ecal.TriggerPlots">
+            <clusterEnergyCut>0.500</clusterEnergyCut>
+        </driver> -->
+        
+        <!-- <driver name="AidaSaveDriver" type="org.lcsim.job.AidaSaveDriver">
+            <outputFileName>triggerEPlots</outputFileName>
+        </driver> -->
+    </drivers>
+</lcsim>

Modified: java/trunk/steering-files/src/main/resources/org/hps/steering/monitoring/OnlineTracking.lcsim
 =============================================================================
--- java/trunk/steering-files/src/main/resources/org/hps/steering/monitoring/OnlineTracking.lcsim	(original)
+++ java/trunk/steering-files/src/main/resources/org/hps/steering/monitoring/OnlineTracking.lcsim	Thu Feb  5 19:33:30 2015
@@ -1,93 +1,101 @@
-<lcsim xmlns:xs="http://www.w3.org/2001/XMLSchema-instance"
-    xs:noNamespaceSchemaLocation="http://www.lcsim.org/schemas/lcsim/1.0/lcsim.xsd">
-    <control>
-        <numberOfEvents>-1</numberOfEvents>
-        <printInputFiles>false</printInputFiles>
-        <printDriversDetailed>false</printDriversDetailed>
-    </control>
-    <execute>
-        <driver name="EventMarkerDriver" />
-        <driver name="EcalRawConverter" />
-        <driver name="EcalClusterer" />
-        <driver name="SVTOccupancyPlots" />
-        <driver name="SVTEventPlots" />
-        <driver name="SVTPulsePlots" />
-        <driver name="RawTrackerHitFitterDriver" />
-        <driver name="TrackerHitDriver" />
-        <driver name="SVTHitRecoPlots" />
-        <driver name="HelicalTrackHitDriver" />
-        <driver name="TrackerReconDriver" />
-        <driver name="TrackingReconstructionPlots" />
-        <driver name="CleanupDriver" />
-    </execute>
-    <drivers>
-        <driver name="EcalRawConverter" type="org.hps.recon.ecal.EcalRawConverterDriver">
-            <ecalCollectionName>EcalCalHits</ecalCollectionName>
-            <use2014Gain>false</use2014Gain>
-        </driver>
-        <driver name="EcalClusterer" type="org.hps.recon.ecal.cluster.ClusterDriver">
-            <clustererName>LegacyClusterer</clustererName>
-        </driver>
-        <driver name="RawTrackerHitFitterDriver"
-            type="org.hps.recon.tracking.RawTrackerHitFitterDriver">
-            <rawHitCollectionName>SVTRawTrackerHits</rawHitCollectionName>
-            <fittedHitCollectionName>SVTFittedRawTrackerHits</fittedHitCollectionName>
-            <fitAlgorithm>Analytic</fitAlgorithm>
-        </driver>
-        <driver name="TrackerHitDriver"
-            type="org.hps.recon.tracking.DataTrackerHitDriver">
-            <clusterSeedThreshold>3.0</clusterSeedThreshold>
-            <clusterNeighborThreshold>3.0</clusterNeighborThreshold>
-            <clusterThreshold>3.0</clusterThreshold>
-        </driver>
-        <driver name="SVTEventPlots"
-            type="org.hps.monitoring.drivers.svt.SVTEventInfo">
-            <outputPlots>svtEventInfoPlots.aida</outputPlots>
-        </driver>
-        <driver name="SVTHitRecoPlots"
-            type="org.hps.monitoring.drivers.svt.SVTHitReconstructionPlots">
-            <fittedTrackerHitCollectionName>SVTFittedRawTrackerHits</fittedTrackerHitCollectionName>
-            <outputPlots>svtHitRecoPlots.aida</outputPlots>
-        </driver>
-        <driver name="SVTHitCorrPlots"
-            type="org.hps.monitoring.drivers.svt.SVTHitRecoCorrelations">
-            <rawTrackerHitCollectionName>SVTRawTrackerHits</rawTrackerHitCollectionName>
-            <fittedTrackerHitCollectionName>SVTFittedRawTrackerHits</fittedTrackerHitCollectionName>
-            <outputPlots>svtHitRecoCorrPlots.aida</outputPlots>
-        </driver>
-        <driver name="SVTPulsePlots"
-            type="org.hps.monitoring.drivers.svt.SVTHitPulsePlots">
-            <rawTrackerHitCollectionName>SVTRawTrackerHits</rawTrackerHitCollectionName>
-            <outputPlots>svtPulsePlots.aida</outputPlots>
-        </driver>
-        <driver name="SVTOccupancyPlots"
-            type="org.hps.monitoring.drivers.svt.SensorOccupancyPlotsDriver">
-            <rawTrackerHitCollectionName>SVTRawTrackerHits</rawTrackerHitCollectionName>
-            <eventRefreshRate>100</eventRefreshRate>
-        </driver>
-        <driver name="SVTEventDisplay"
-            type="org.hps.monitoring.drivers.svt.SVTEventDisplay">
-        </driver>
-        <driver name="EventMarkerDriver" type="org.lcsim.job.EventMarkerDriver">
-            <eventInterval>1000</eventInterval>
-        </driver>
-        <driver name="HelicalTrackHitDriver"
-            type="org.hps.recon.tracking.HelicalTrackHitDriver">
-            <debug>false</debug>
-            <maxSeperation>20.0</maxSeperation>
-            <tolerance>1.0</tolerance>
-        </driver>
-        <driver name="TrackerReconDriver" type="org.hps.recon.tracking.TrackerReconDriver">
-            <debug>false</debug>
-            <strategyResource>/org/hps/recon/tracking/strategies/HPS-Test-4pt1.xml</strategyResource>
-        </driver>
-        <driver name="TrackingReconstructionPlots"
-            type="org.hps.monitoring.drivers.svt.TrackingReconstructionPlots">
-            <outputPlots>trackingPlots.aida</outputPlots>
-        </driver>
-        <driver name="CleanupDriver"
-            type="org.lcsim.recon.tracking.digitization.sisim.config.ReadoutCleanupDriver">
-            <collectionNames>TrackerHits SVTRawTrackerHits SVTFittedRawTrackerHits StripClusterer_SiTrackerHitStrip1D</collectionNames>
-        </driver>
-    </drivers>
-</lcsim>
+<lcsim xmlns:xs="http://www.w3.org/2001/XMLSchema-instance"
+    xs:noNamespaceSchemaLocation="http://www.lcsim.org/schemas/lcsim/1.0/lcsim.xsd">
+    <control>
+        <numberOfEvents>-1</numberOfEvents>
+        <printInputFiles>false</printInputFiles>
+        <printDriversDetailed>false</printDriversDetailed>
+    </control>
+    <execute>
+        <driver name="EventMarkerDriver" />
+        <driver name="EcalRawConverter" />
+        <driver name="EcalClusterer" />
+        <driver name="SVTOccupancyPlots" />
+        <driver name="SVTEventPlots" />
+        <driver name="SVTPulsePlots" />
+        <driver name="RawTrackerHitFitterDriver" />
+        <driver name="TrackerHitDriver" />
+        <driver name="SVTHitRecoPlots" />
+        <driver name="HelicalTrackHitDriver" />
+        <driver name="TrackerReconDriver" />
+        <driver name="TrackingReconstructionPlots" />
+        <driver name="CleanupDriver" />
+    </execute>
+    <drivers>
+        <driver name="EcalRawConverter" type="org.hps.recon.ecal.EcalRawConverterDriver">
+            <ecalCollectionName>EcalCalHits</ecalCollectionName>
+            <use2014Gain>false</use2014Gain>
+        </driver>
+        
+        <driver name="EcalClusterer" type="org.hps.recon.ecal.cluster.GTPOnlineClusterDriver">
+            <verbose>false</verbose>
+            <logLevel>WARNING</logLevel>
+            <windowAfter>2</windowAfter>
+            <windowBefore>2</windowBefore>
+            <seedEnergyThreshold>0.100</seedEnergyThreshold>
+            <inputHitCollectionName>EcalCalHits</inputHitCollectionName>
+            <outputClusterCollectionName>EcalClusters</outputClusterCollectionName>
+        </driver>
+        
+        <driver name="RawTrackerHitFitterDriver" type="org.hps.recon.tracking.RawTrackerHitFitterDriver">
+            <rawHitCollectionName>SVTRawTrackerHits</rawHitCollectionName>
+            <fittedHitCollectionName>SVTFittedRawTrackerHits</fittedHitCollectionName>
+            <fitAlgorithm>Analytic</fitAlgorithm>
+        </driver>
+        
+        <driver name="TrackerHitDriver" type="org.hps.recon.tracking.DataTrackerHitDriver">
+            <clusterSeedThreshold>3.0</clusterSeedThreshold>
+            <clusterNeighborThreshold>3.0</clusterNeighborThreshold>
+            <clusterThreshold>3.0</clusterThreshold>
+        </driver>
+        
+        <driver name="SVTEventPlots" type="org.hps.monitoring.drivers.svt.SVTEventInfo">
+            <outputPlots>svtEventInfoPlots.aida</outputPlots>
+        </driver>
+        
+        <driver name="SVTHitRecoPlots" type="org.hps.monitoring.drivers.svt.SVTHitReconstructionPlots">
+            <fittedTrackerHitCollectionName>SVTFittedRawTrackerHits</fittedTrackerHitCollectionName>
+            <outputPlots>svtHitRecoPlots.aida</outputPlots>
+        </driver>
+        
+        <driver name="SVTHitCorrPlots" type="org.hps.monitoring.drivers.svt.SVTHitRecoCorrelations">
+            <rawTrackerHitCollectionName>SVTRawTrackerHits</rawTrackerHitCollectionName>
+            <fittedTrackerHitCollectionName>SVTFittedRawTrackerHits</fittedTrackerHitCollectionName>
+            <outputPlots>svtHitRecoCorrPlots.aida</outputPlots>
+        </driver>
+        
+        <driver name="SVTPulsePlots" type="org.hps.monitoring.drivers.svt.SVTHitPulsePlots">
+            <rawTrackerHitCollectionName>SVTRawTrackerHits</rawTrackerHitCollectionName>
+            <outputPlots>svtPulsePlots.aida</outputPlots>
+        </driver>
+        
+        <driver name="SVTOccupancyPlots" type="org.hps.monitoring.drivers.svt.SensorOccupancyPlotsDriver">
+            <rawTrackerHitCollectionName>SVTRawTrackerHits</rawTrackerHitCollectionName>
+            <eventRefreshRate>100</eventRefreshRate>
+        </driver>
+        
+        <driver name="SVTEventDisplay" type="org.hps.monitoring.drivers.svt.SVTEventDisplay" />
+        
+        <driver name="EventMarkerDriver" type="org.lcsim.job.EventMarkerDriver">
+            <eventInterval>1000</eventInterval>
+        </driver>
+        
+        <driver name="HelicalTrackHitDriver" type="org.hps.recon.tracking.HelicalTrackHitDriver">
+            <debug>false</debug>
+            <maxSeperation>20.0</maxSeperation>
+            <tolerance>1.0</tolerance>
+        </driver>
+        
+        <driver name="TrackerReconDriver" type="org.hps.recon.tracking.TrackerReconDriver">
+            <debug>false</debug>
+            <strategyResource>/org/hps/recon/tracking/strategies/HPS-Test-4pt1.xml</strategyResource>
+        </driver>
+        
+        <driver name="TrackingReconstructionPlots" type="org.hps.monitoring.drivers.svt.TrackingReconstructionPlots">
+            <outputPlots>trackingPlots.aida</outputPlots>
+        </driver>
+        
+        <driver name="CleanupDriver" type="org.lcsim.recon.tracking.digitization.sisim.config.ReadoutCleanupDriver">
+            <collectionNames>TrackerHits SVTRawTrackerHits SVTFittedRawTrackerHits StripClusterer_SiTrackerHitStrip1D</collectionNames>
+        </driver>
+    </drivers>
+</lcsim>

Modified: java/trunk/steering-files/src/main/resources/org/hps/steering/monitoring/SVTBasicMonitoring.lcsim
 =============================================================================
--- java/trunk/steering-files/src/main/resources/org/hps/steering/monitoring/SVTBasicMonitoring.lcsim	(original)
+++ java/trunk/steering-files/src/main/resources/org/hps/steering/monitoring/SVTBasicMonitoring.lcsim	Thu Feb  5 19:33:30 2015
@@ -1,46 +1,52 @@
-<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="EcalRawConverter"/>
-        <driver name="EcalClusterer"/>
-        <driver name="RawTrackerHitFitterDriver"/>
-        <driver name="TrackerHitDriver"/>
-        <driver name="HelicalTrackHitDriver"/>
-        <driver name="TrackerReconDriver"/>
-        <driver name="SVTBasicMonitoringPlots"/>
-        <driver name="CleanupDriver"/>
-    </execute>    
-    <drivers>
-        <driver name="EcalRawConverter" type="org.hps.recon.ecal.EcalRawConverterDriver">
-            <ecalCollectionName>EcalCalHits</ecalCollectionName>
-        </driver>
-        <driver name="EcalClusterer" type="org.hps.recon.ecal.cluster.ClusterDriver">
-            <clustererName>LegacyClusterer</clustererName>
-        </driver>
-        <driver name="RawTrackerHitFitterDriver" type="org.hps.recon.tracking.RawTrackerHitFitterDriver">
-            <fitAlgorithm>Analytic</fitAlgorithm>
-        </driver>
-        <driver name="TrackerHitDriver" type="org.hps.recon.tracking.DataTrackerHitDriver"/>
-        <driver name="CleanupDriver" type="org.lcsim.recon.tracking.digitization.sisim.config.ReadoutCleanupDriver">
-            <collectionNames>TrackerHits</collectionNames>
-        </driver>
-        <driver name="EventMarkerDriver" type="org.lcsim.job.EventMarkerDriver">
-            <eventInterval>1</eventInterval>
-        </driver>
-        <!-- This Driver probably needs to be replaced with one specific to HPS.  JM -->
-        <driver name="HelicalTrackHitDriver" type="org.lcsim.fit.helicaltrack.HelicalTrackHitDriver">
-            <!-- <debug>false</debug>  -->
-            <maxSeperation>20.0</maxSeperation>
-            <tolerance>1.0</tolerance>
-        </driver>
-        <driver name="TrackerReconDriver" type="org.hps.recon.tracking.TrackerReconDriver">
-            <debug>false</debug>
-        </driver>        
-        <!-- Fixed this from BasicSVTMonitoringPlots which seems to have disappeared or been renamed.  JM -->
-        <driver name="SVTBasicMonitoringPlots" type="org.hps.monitoring.drivers.svt.SVTMonitoringPlots">
-            <inputCollection>SVTRawTrackerHits</inputCollection>
-            <!-- <singleEvent>false</singleEvent>  -->
-        </driver>
-    </drivers>
-</lcsim>
+<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="EcalRawConverter"/>
+        <driver name="EcalClusterer"/>
+        <driver name="RawTrackerHitFitterDriver"/>
+        <driver name="TrackerHitDriver"/>
+        <driver name="HelicalTrackHitDriver"/>
+        <driver name="TrackerReconDriver"/>
+        <driver name="SVTBasicMonitoringPlots"/>
+        <driver name="CleanupDriver"/>
+    </execute>    
+    <drivers>
+        <driver name="EcalRawConverter" type="org.hps.recon.ecal.EcalRawConverterDriver">
+            <ecalCollectionName>EcalCalHits</ecalCollectionName>
+        </driver>
+        <driver name="EcalClusterer" type="org.hps.recon.ecal.cluster.GTPOnlineClusterDriver">
+            <verbose>false</verbose>
+            <logLevel>WARNING</logLevel>
+            <windowAfter>2</windowAfter>
+            <windowBefore>2</windowBefore>
+            <seedEnergyThreshold>0.100</seedEnergyThreshold>
+            <inputHitCollectionName>EcalCalHits</inputHitCollectionName>
+            <outputClusterCollectionName>EcalClusters</outputClusterCollectionName>
+        </driver>
+        <driver name="RawTrackerHitFitterDriver" type="org.hps.recon.tracking.RawTrackerHitFitterDriver">
+            <fitAlgorithm>Analytic</fitAlgorithm>
+        </driver>
+        <driver name="TrackerHitDriver" type="org.hps.recon.tracking.DataTrackerHitDriver"/>
+        <driver name="CleanupDriver" type="org.lcsim.recon.tracking.digitization.sisim.config.ReadoutCleanupDriver">
+            <collectionNames>TrackerHits</collectionNames>
+        </driver>
+        <driver name="EventMarkerDriver" type="org.lcsim.job.EventMarkerDriver">
+            <eventInterval>1</eventInterval>
+        </driver>
+        <!-- This Driver probably needs to be replaced with one specific to HPS.  JM -->
+        <driver name="HelicalTrackHitDriver" type="org.lcsim.fit.helicaltrack.HelicalTrackHitDriver">
+            <!-- <debug>false</debug>  -->
+            <maxSeperation>20.0</maxSeperation>
+            <tolerance>1.0</tolerance>
+        </driver>
+        <driver name="TrackerReconDriver" type="org.hps.recon.tracking.TrackerReconDriver">
+            <debug>false</debug>
+        </driver>        
+        <!-- Fixed this from BasicSVTMonitoringPlots which seems to have disappeared or been renamed.  JM -->
+        <driver name="SVTBasicMonitoringPlots" type="org.hps.monitoring.drivers.svt.SVTMonitoringPlots">
+            <inputCollection>SVTRawTrackerHits</inputCollection>
+            <!-- <singleEvent>false</singleEvent>  -->
+        </driver>
+    </drivers>
+</lcsim>

Modified: java/trunk/steering-files/src/main/resources/org/hps/steering/monitoring/SVTEventDisplay.lcsim
 =============================================================================
--- java/trunk/steering-files/src/main/resources/org/hps/steering/monitoring/SVTEventDisplay.lcsim	(original)
+++ java/trunk/steering-files/src/main/resources/org/hps/steering/monitoring/SVTEventDisplay.lcsim	Thu Feb  5 19:33:30 2015
@@ -1,49 +1,55 @@
-<lcsim xmlns:xs="http://www.w3.org/2001/XMLSchema-instance" xs:noNamespaceSchemaLocation="http://www.lcsim.org/schemas/lcsim/1.0/lcsim.xsd">
-    <control>
-        <numberOfEvents>-1</numberOfEvents>
-        <printInputFiles>true</printInputFiles>
-        <printDriversDetailed>true</printDriversDetailed>
-    </control>
-    <execute>
-        <driver name="EventMarkerDriver" />
-        <driver name="EcalRawConverter" />
-        <driver name="EcalClusterer" />
-        <driver name="RawTrackerHitFitterDriver" />
-        <driver name="TrackerHitDriver" />
-        <driver name="HelicalTrackHitDriver" />
-        <driver name="TrackerReconDriver" />
-        <driver name="SVTSimpleEventDisplay" />
-        <driver name="CleanupDriver" />
-    </execute>
-    <drivers>
-        <driver name="EcalRawConverter" type="org.hps.recon.ecal.EcalRawConverterDriver">
-            <ecalCollectionName>EcalCalHits</ecalCollectionName>
-            <use2014Gain>false</use2014Gain>
-        </driver>
-        <driver name="EcalClusterer" type="org.hps.recon.ecal.cluster.ClusterDriver">
-            <clustererName>LegacyClusterer</clustererName>
-        </driver>
-        <driver name="RawTrackerHitFitterDriver" type="org.hps.recon.tracking.RawTrackerHitFitterDriver">
-            <fitAlgorithm>Analytic</fitAlgorithm>
-        </driver>
-        <driver name="TrackerHitDriver" type="org.hps.recon.tracking.DataTrackerHitDriver" />
-        <driver name="CleanupDriver" type="org.lcsim.recon.tracking.digitization.sisim.config.ReadoutCleanupDriver">
-            <collectionNames>TrackerHits</collectionNames>
-        </driver>
-        <driver name="EventMarkerDriver" type="org.lcsim.job.EventMarkerDriver">
-            <eventInterval>1</eventInterval>
-        </driver>
-        <driver name="HelicalTrackHitDriver" type="org.hps.recon.tracking.HelicalTrackHitDriver">
-            <debug>false</debug>
-            <maxSeperation>20.0</maxSeperation>
-            <tolerance>1.0</tolerance>
-        </driver>
-        <driver name="TrackerReconDriver" type="org.hps.recon.tracking.TrackerReconDriver">
-            <debug>false</debug>
-        </driver>
-        <driver name="SVTSimpleEventDisplay" type="org.hps.monitoring.drivers.svt.SVTSimpleEventDisplay">
-            <inputCollection>SVTRawTrackerHits</inputCollection>
-            <singleEvent>false</singleEvent>
-        </driver>
-    </drivers>
+<lcsim xmlns:xs="http://www.w3.org/2001/XMLSchema-instance" xs:noNamespaceSchemaLocation="http://www.lcsim.org/schemas/lcsim/1.0/lcsim.xsd">
+    <control>
+        <numberOfEvents>-1</numberOfEvents>
+        <printInputFiles>true</printInputFiles>
+        <printDriversDetailed>true</printDriversDetailed>
+    </control>
+    <execute>
+        <driver name="EventMarkerDriver" />
+        <driver name="EcalRawConverter" />
+        <driver name="EcalClusterer" />
+        <driver name="RawTrackerHitFitterDriver" />
+        <driver name="TrackerHitDriver" />
+        <driver name="HelicalTrackHitDriver" />
+        <driver name="TrackerReconDriver" />
+        <driver name="SVTSimpleEventDisplay" />
+        <driver name="CleanupDriver" />
+    </execute>
+    <drivers>
+        <driver name="EcalRawConverter" type="org.hps.recon.ecal.EcalRawConverterDriver">
+            <ecalCollectionName>EcalCalHits</ecalCollectionName>
+            <use2014Gain>false</use2014Gain>
+        </driver>
+        <driver name="EcalClusterer" type="org.hps.recon.ecal.cluster.GTPOnlineClusterDriver">
+            <verbose>false</verbose>
+            <logLevel>WARNING</logLevel>
+            <windowAfter>2</windowAfter>
+            <windowBefore>2</windowBefore>
+            <seedEnergyThreshold>0.100</seedEnergyThreshold>
+            <inputHitCollectionName>EcalCalHits</inputHitCollectionName>
+            <outputClusterCollectionName>EcalClusters</outputClusterCollectionName>
+        </driver>
+        <driver name="RawTrackerHitFitterDriver" type="org.hps.recon.tracking.RawTrackerHitFitterDriver">
+            <fitAlgorithm>Analytic</fitAlgorithm>
+        </driver>
+        <driver name="TrackerHitDriver" type="org.hps.recon.tracking.DataTrackerHitDriver" />
+        <driver name="CleanupDriver" type="org.lcsim.recon.tracking.digitization.sisim.config.ReadoutCleanupDriver">
+            <collectionNames>TrackerHits</collectionNames>
+        </driver>
+        <driver name="EventMarkerDriver" type="org.lcsim.job.EventMarkerDriver">
+            <eventInterval>1</eventInterval>
+        </driver>
+        <driver name="HelicalTrackHitDriver" type="org.hps.recon.tracking.HelicalTrackHitDriver">
+            <debug>false</debug>
+            <maxSeperation>20.0</maxSeperation>
+            <tolerance>1.0</tolerance>
+        </driver>
+        <driver name="TrackerReconDriver" type="org.hps.recon.tracking.TrackerReconDriver">
+            <debug>false</debug>
+        </driver>
+        <driver name="SVTSimpleEventDisplay" type="org.hps.monitoring.drivers.svt.SVTSimpleEventDisplay">
+            <inputCollection>SVTRawTrackerHits</inputCollection>
+            <singleEvent>false</singleEvent>
+        </driver>
+    </drivers>
 </lcsim>

Modified: java/trunk/steering-files/src/main/resources/org/hps/steering/monitoring/SVTMonitoring.lcsim
 =============================================================================
--- java/trunk/steering-files/src/main/resources/org/hps/steering/monitoring/SVTMonitoring.lcsim	(original)
+++ java/trunk/steering-files/src/main/resources/org/hps/steering/monitoring/SVTMonitoring.lcsim	Thu Feb  5 19:33:30 2015
@@ -1,82 +1,88 @@
-<?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="RawTrackerHitSensorSetup"/>
-        <driver name="SVTPulsePlots"/>
-        
-        <driver name="RawTrackerHitFitterDriver" />
-        <driver name="SVTPulseFitPlots"/>
-<!--        <driver name="SVTMonitoringPlots"/>-->
-
-        <driver name="TrackerHitDriver" />
-        <driver name="SVTHitRecoPlots"/>
-
-        <driver name="HelicalTrackHitDriver" />
-        <driver name="TrackerReconDriver" />
-<!--        <driver name="SVTSimpleEventDisplay"/>-->
-<!--        <driver name="TrackTimePlots"/>-->
-
-        <driver name="EcalRawConverter" />
-        <driver name="EcalClusterer" />
-        <driver name="TrackingReconstructionPlots" />
-        <driver name="CleanupDriver"/>
-        <driver name="AidaSaveDriver"/>
-    </execute>
-    <drivers>
-        <driver name="EventMarkerDriver" type="org.lcsim.job.EventMarkerDriver">
-            <eventInterval>1</eventInterval>
-        </driver>
-        <driver name="RawTrackerHitSensorSetup" type="org.lcsim.recon.tracking.digitization.sisim.config.RawTrackerHitSensorSetup"/>
-        <driver name="EcalRawConverter" type="org.hps.recon.ecal.EcalRawConverterDriver">
-            <ecalCollectionName>EcalCalHits</ecalCollectionName>
-            <use2014Gain>false</use2014Gain>
-        </driver>
-        <driver name="EcalClusterer" type="org.hps.recon.ecal.cluster.ClusterDriver">
-            <clustererName>LegacyClusterer</clustererName>
-        </driver>
-        <driver name="RawTrackerHitFitterDriver" type="org.hps.recon.tracking.RawTrackerHitFitterDriver">
-            <fitAlgorithm>Analytic</fitAlgorithm>
-            <correctT0Shift>true</correctT0Shift>
-        </driver>
-        <driver name="TrackerHitDriver" type="org.hps.recon.tracking.DataTrackerHitDriver" /> 
-        <driver name="HelicalTrackHitDriver"
-                type="org.hps.recon.tracking.HelicalTrackHitDriver">
-            <debug>false</debug>
-            <maxSeperation>20.0</maxSeperation>
-            <tolerance>1.0</tolerance>
-        </driver>
-        <driver name="TrackerReconDriver" type="org.hps.recon.tracking.TrackerReconDriver">
-            <debug>false</debug>
-            <strategyResource>/org/hps/recon/tracking/strategies/HPS-Test-4pt1.xml</strategyResource>
-        </driver>
-        <driver name="TrackingReconstructionPlots" type="org.hps.monitoring.drivers.svt.TrackingReconstructionPlots">
-<!--            <outputPlots>HPSTestRunTrackingPlots.aida</outputPlots>-->
-        </driver>
-        <driver name="SVTSimpleEventDisplay" type="org.hps.monitoring.drivers.svt.SVTSimpleEventDisplay">
-            <inputCollection>SVTRawTrackerHits</inputCollection>
-            <singleEvent>false</singleEvent>
-        </driver>
-        <driver name="SVTMonitoringPlots" type="org.hps.monitoring.drivers.svt.SVTMonitoringPlots">
-        </driver>
-        <driver name="SVTPulseFitPlots"
-                type="org.hps.monitoring.drivers.svt.SVTPulseFitPlots">
-            <fittedTrackerHitCollectionName>SVTFittedRawTrackerHits</fittedTrackerHitCollectionName>   
-        </driver>        
-        <driver name="SVTPulsePlots"
-                type="org.hps.monitoring.drivers.svt.SVTHitPulsePlots">
-            <rawTrackerHitCollectionName>SVTRawTrackerHits</rawTrackerHitCollectionName>   
-        </driver>    
-        <driver name="SVTHitRecoPlots"
-                type="org.hps.monitoring.drivers.svt.SVTHitReconstructionPlots">
-            <fittedTrackerHitCollectionName>SVTFittedRawTrackerHits</fittedTrackerHitCollectionName>   
-        </driver>
-        <driver name="TrackTimePlots" type="org.hps.monitoring.drivers.svt.TrackTimePlots"/>
-        <driver name="CleanupDriver" type="org.lcsim.recon.tracking.digitization.sisim.config.ReadoutCleanupDriver">
-            <collectionNames>TrackerHits</collectionNames>
-        </driver> 
-        <driver name="AidaSaveDriver" type="org.lcsim.job.AidaSaveDriver">
-            <outputFileName>svtmon_plots2</outputFileName>
-        </driver>
-    </drivers>
-</lcsim>
+<?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="RawTrackerHitSensorSetup"/>
+        <driver name="SVTPulsePlots"/>
+        
+        <driver name="RawTrackerHitFitterDriver" />
+        <driver name="SVTPulseFitPlots"/>
+<!--        <driver name="SVTMonitoringPlots"/>-->
+
+        <driver name="TrackerHitDriver" />
+        <driver name="SVTHitRecoPlots"/>
+
+        <driver name="HelicalTrackHitDriver" />
+        <driver name="TrackerReconDriver" />
+<!--        <driver name="SVTSimpleEventDisplay"/>-->
+<!--        <driver name="TrackTimePlots"/>-->
+
+        <driver name="EcalRawConverter" />
+        <driver name="EcalClusterer" />
+        <driver name="TrackingReconstructionPlots" />
+        <driver name="CleanupDriver"/>
+        <driver name="AidaSaveDriver"/>
+    </execute>
+    <drivers>
+        <driver name="EventMarkerDriver" type="org.lcsim.job.EventMarkerDriver">
+            <eventInterval>1</eventInterval>
+        </driver>
+        <driver name="RawTrackerHitSensorSetup" type="org.lcsim.recon.tracking.digitization.sisim.config.RawTrackerHitSensorSetup"/>
+        <driver name="EcalRawConverter" type="org.hps.recon.ecal.EcalRawConverterDriver">
+            <ecalCollectionName>EcalCalHits</ecalCollectionName>
+            <use2014Gain>false</use2014Gain>
+        </driver>
+        <driver name="EcalClusterer" type="org.hps.recon.ecal.cluster.GTPOnlineClusterDriver">
+            <verbose>false</verbose>
+            <logLevel>WARNING</logLevel>
+            <windowAfter>2</windowAfter>
+            <windowBefore>2</windowBefore>
+            <seedEnergyThreshold>0.100</seedEnergyThreshold>
+            <inputHitCollectionName>EcalCalHits</inputHitCollectionName>
+            <outputClusterCollectionName>EcalClusters</outputClusterCollectionName>
+        </driver>
+        <driver name="RawTrackerHitFitterDriver" type="org.hps.recon.tracking.RawTrackerHitFitterDriver">
+            <fitAlgorithm>Analytic</fitAlgorithm>
+            <correctT0Shift>true</correctT0Shift>
+        </driver>
+        <driver name="TrackerHitDriver" type="org.hps.recon.tracking.DataTrackerHitDriver" /> 
+        <driver name="HelicalTrackHitDriver"
+                type="org.hps.recon.tracking.HelicalTrackHitDriver">
+            <debug>false</debug>
+            <maxSeperation>20.0</maxSeperation>
+            <tolerance>1.0</tolerance>
+        </driver>
+        <driver name="TrackerReconDriver" type="org.hps.recon.tracking.TrackerReconDriver">
+            <debug>false</debug>
+            <strategyResource>/org/hps/recon/tracking/strategies/HPS-Test-4pt1.xml</strategyResource>
+        </driver>
+        <driver name="TrackingReconstructionPlots" type="org.hps.monitoring.drivers.svt.TrackingReconstructionPlots">
+<!--            <outputPlots>HPSTestRunTrackingPlots.aida</outputPlots>-->
+        </driver>
+        <driver name="SVTSimpleEventDisplay" type="org.hps.monitoring.drivers.svt.SVTSimpleEventDisplay">
+            <inputCollection>SVTRawTrackerHits</inputCollection>
+            <singleEvent>false</singleEvent>
+        </driver>
+        <driver name="SVTMonitoringPlots" type="org.hps.monitoring.drivers.svt.SVTMonitoringPlots">
+        </driver>
+        <driver name="SVTPulseFitPlots"
+                type="org.hps.monitoring.drivers.svt.SVTPulseFitPlots">
+            <fittedTrackerHitCollectionName>SVTFittedRawTrackerHits</fittedTrackerHitCollectionName>   
+        </driver>        
+        <driver name="SVTPulsePlots"
+                type="org.hps.monitoring.drivers.svt.SVTHitPulsePlots">
+            <rawTrackerHitCollectionName>SVTRawTrackerHits</rawTrackerHitCollectionName>   
+        </driver>    
+        <driver name="SVTHitRecoPlots"
+                type="org.hps.monitoring.drivers.svt.SVTHitReconstructionPlots">
+            <fittedTrackerHitCollectionName>SVTFittedRawTrackerHits</fittedTrackerHitCollectionName>   
+        </driver>
+        <driver name="TrackTimePlots" type="org.hps.monitoring.drivers.svt.TrackTimePlots"/>
+        <driver name="CleanupDriver" type="org.lcsim.recon.tracking.digitization.sisim.config.ReadoutCleanupDriver">
+            <collectionNames>TrackerHits</collectionNames>
+        </driver> 
+        <driver name="AidaSaveDriver" type="org.lcsim.job.AidaSaveDriver">
+            <outputFileName>svtmon_plots2</outputFileName>
+        </driver>
+    </drivers>
+</lcsim>

Modified: java/trunk/steering-files/src/main/resources/org/hps/steering/recon/GBLReco.lcsim
 =============================================================================
--- java/trunk/steering-files/src/main/resources/org/hps/steering/recon/GBLReco.lcsim	(original)
+++ java/trunk/steering-files/src/main/resources/org/hps/steering/recon/GBLReco.lcsim	Thu Feb  5 19:33:30 2015
@@ -1,58 +1,76 @@
-<lcsim xmlns:xs="http://www.w3.org/2001/XMLSchema-instance" xs:noNamespaceSchemaLocation="http://www.lcsim.org/schemas/lcsim/1.0/lcsim.xsd">
-    <control>
-        <numberOfEvents>-1</numberOfEvents>
-        <printInputFiles>true</printInputFiles>
-        <printDriversDetailed>true</printDriversDetailed>
-    </control>
-    <execute>
-        <driver name="EventMarkerDriver" />
-        <driver name="SvtSensorSetup" />
-        <driver name="RawTrackerHitSensorSetup" />
-        <driver name="BadChannelFilter" />
-        <driver name="RawTrackerHitFitterDriver" />
-        <driver name="TrackerHitDriver" />
-        <driver name="HelicalTrackHitDriver" />
-        <driver name="TrackerReconDriver" />
-        <driver name="EcalRawConverter" />
-        <driver name="EcalClusterer" />
-        <driver name="GBLDriver" />
-        <driver name="CleanupDriver" />
-    </execute>
-    <drivers>
-        <driver name="EventMarkerDriver" type="org.lcsim.job.EventMarkerDriver">
-            <eventInterval>100</eventInterval>
-        </driver>
-        <driver name="GBLDriver" type="org.hps.recon.tracking.gbl.GBLOutputDriver">
-            <debug>0</debug>
-            <isMC>${isMC}</isMC>
-            <gblFileName>gblinput.txt</gblFileName>
-        </driver>
-        <driver name="ConditionsDriver" type="org.hps.conditions.ConditionsDriver" />
-        <driver name="SvtSensorSetup" type="org.hps.recon.tracking.SvtSensorSetup" />
-<!-- Reconstruction drivers below -->
-        <driver name="RawTrackerHitSensorSetup" type="org.lcsim.recon.tracking.digitization.sisim.config.RawTrackerHitSensorSetup" />
-        <driver name="BadChannelFilter" type="org.hps.recon.tracking.SVTBadChannelFilterDriver" />
-        <driver name="RawTrackerHitFitterDriver" type="org.hps.recon.tracking.RawTrackerHitFitterDriver">
-            <fitAlgorithm>Analytic</fitAlgorithm>
-            <correctT0Shift>false</correctT0Shift>
-        </driver>
-        <driver name="TrackerHitDriver" type="org.hps.recon.tracking.DataTrackerHitDriver" />
-        <driver name="HelicalTrackHitDriver" type="org.hps.recon.tracking.HelicalTrackHitDriver">
-            <debug>false</debug>
-            <maxSeperation>20.0</maxSeperation>
-            <tolerance>1.0</tolerance>
-        </driver>
-        <driver name="TrackerReconDriver" type="org.hps.recon.tracking.TrackerReconDriver">
-            <debug>false</debug>
-            <strategyResource>/org/hps/recon/tracking/strategies/HPS-TestRun-357.xml</strategyResource>
-            <!-- <strategyResource>/org/hps/recon/tracking/strategies/${strategy}.xml</strategyResource>-->
-        </driver>
-        <driver name="EcalRawConverter" type="org.hps.recon.ecal.EcalRawConverterDriver">
-            <ecalCollectionName>EcalCalHits</ecalCollectionName>
-        </driver>
-        <driver name="EcalClusterer" type="org.hps.recon.ecal.cluster.ClusterDriver">
-            <clustererName>LegacyClusterer</clustererName>
-        </driver>
-        <driver name="CleanupDriver" type="org.lcsim.recon.tracking.digitization.sisim.config.ReadoutCleanupDriver" />
-    </drivers>
+<lcsim xmlns:xs="http://www.w3.org/2001/XMLSchema-instance" xs:noNamespaceSchemaLocation="http://www.lcsim.org/schemas/lcsim/1.0/lcsim.xsd">
+    <control>
+        <numberOfEvents>-1</numberOfEvents>
+        <printInputFiles>true</printInputFiles>
+        <printDriversDetailed>true</printDriversDetailed>
+    </control>
+    <execute>
+        <driver name="EventMarkerDriver" />
+        <driver name="SvtSensorSetup" />
+        <driver name="RawTrackerHitSensorSetup" />
+        <driver name="BadChannelFilter" />
+        <driver name="RawTrackerHitFitterDriver" />
+        <driver name="TrackerHitDriver" />
+        <driver name="HelicalTrackHitDriver" />
+        <driver name="TrackerReconDriver" />
+        <driver name="EcalRawConverter" />
+        <driver name="EcalClusterer" />
+        <driver name="GBLDriver" />
+        <driver name="CleanupDriver" />
+    </execute>
+    <drivers>
+        <driver name="EventMarkerDriver" type="org.lcsim.job.EventMarkerDriver">
+            <eventInterval>100</eventInterval>
+        </driver>
+        
+        <driver name="GBLDriver" type="org.hps.recon.tracking.gbl.GBLOutputDriver">
+            <debug>0</debug>
+            <isMC>${isMC}</isMC>
+            <gblFileName>gblinput.txt</gblFileName>
+        </driver>
+        
+        <driver name="ConditionsDriver" type="org.hps.conditions.ConditionsDriver" />
+        
+        <driver name="SvtSensorSetup" type="org.hps.recon.tracking.SvtSensorSetup" />
+        
+        <!-- Reconstruction drivers below -->
+        <driver name="RawTrackerHitSensorSetup" type="org.lcsim.recon.tracking.digitization.sisim.config.RawTrackerHitSensorSetup" />
+        
+        <driver name="BadChannelFilter" type="org.hps.recon.tracking.SVTBadChannelFilterDriver" />
+        
+        <driver name="RawTrackerHitFitterDriver" type="org.hps.recon.tracking.RawTrackerHitFitterDriver">
+            <fitAlgorithm>Analytic</fitAlgorithm>
+            <correctT0Shift>false</correctT0Shift>
+        </driver>
+        
+        <driver name="TrackerHitDriver" type="org.hps.recon.tracking.DataTrackerHitDriver" />
+        
+        <driver name="HelicalTrackHitDriver" type="org.hps.recon.tracking.HelicalTrackHitDriver">
+            <debug>false</debug>
+            <maxSeperation>20.0</maxSeperation>
+            <tolerance>1.0</tolerance>
+        </driver>
+        
+        <driver name="TrackerReconDriver" type="org.hps.recon.tracking.TrackerReconDriver">
+            <debug>false</debug>
+            <strategyResource>/org/hps/recon/tracking/strategies/HPS-TestRun-357.xml</strategyResource>
+            <!-- <strategyResource>/org/hps/recon/tracking/strategies/${strategy}.xml</strategyResource>-->
+        </driver>
+        
+        <driver name="EcalRawConverter" type="org.hps.recon.ecal.EcalRawConverterDriver">
+            <ecalCollectionName>EcalCalHits</ecalCollectionName>
+        </driver>
+        
+        <driver name="EcalClusterer" type="org.hps.recon.ecal.cluster.GTPOnlineClusterDriver">
+            <verbose>false</verbose>
+            <logLevel>WARNING</logLevel>
+            <windowAfter>2</windowAfter>
+            <windowBefore>2</windowBefore>
+            <seedEnergyThreshold>0.100</seedEnergyThreshold>
+            <inputHitCollectionName>EcalCalHits</inputHitCollectionName>
+            <outputClusterCollectionName>EcalClusters</outputClusterCollectionName>
+        </driver>
+        
+        <driver name="CleanupDriver" type="org.lcsim.recon.tracking.digitization.sisim.config.ReadoutCleanupDriver" />
+    </drivers>
 </lcsim>

Modified: java/trunk/steering-files/src/main/resources/org/hps/steering/recon/TestRunOfflineRecon.lcsim
 =============================================================================
--- java/trunk/steering-files/src/main/resources/org/hps/steering/recon/TestRunOfflineRecon.lcsim	(original)
+++ java/trunk/steering-files/src/main/resources/org/hps/steering/recon/TestRunOfflineRecon.lcsim	Thu Feb  5 19:33:30 2015
@@ -1,58 +1,69 @@
-<!-- 
-  Offline reconstruction for test run (photon) data.
-  @author Sho Uemura <[log in to unmask]>
--->
-<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="SvtSensorSetup" />
-        <driver name="RawTrackerHitSensorSetup"/>
-        <driver name="BadChannelFilter" />
-        <driver name="RawTrackerHitFitterDriver" />
-        <driver name="TrackerHitDriver"/>
-        <driver name="HelicalTrackHitDriver"/>
-        <driver name="TrackerReconDriver"/>
-        <driver name="EcalRawConverter" />
-        <driver name="EcalClusterer" />
-        <driver name="ReconParticle" /> 
-        <driver name="TrackDataDriver" />               
-        <driver name="LCIOWriter"/>
-        <driver name="CleanupDriver"/>
-    </execute>    
-    <drivers>    
-        <driver name="SvtSensorSetup" type="org.hps.recon.tracking.SvtSensorSetup" />
-        <driver name="EventMarkerDriver" type="org.lcsim.job.EventMarkerDriver">
-            <eventInterval>100</eventInterval>
-        </driver>        
-        <driver name="RawTrackerHitSensorSetup" type="org.lcsim.recon.tracking.digitization.sisim.config.RawTrackerHitSensorSetup"/>
-        <driver name="BadChannelFilter" type="org.hps.recon.tracking.SVTBadChannelFilterDriver" /> 
-        <driver name="RawTrackerHitFitterDriver" type="org.hps.recon.tracking.RawTrackerHitFitterDriver">
-            <fitAlgorithm>Analytic</fitAlgorithm>
-            <correctT0Shift>true</correctT0Shift>
-        </driver>
-        <driver name="TrackerHitDriver" type="org.hps.recon.tracking.DataTrackerHitDriver" />     
-        <driver name="HelicalTrackHitDriver" type="org.hps.recon.tracking.HelicalTrackHitDriver">
-            <debug>false</debug>
-            <maxSeperation>20.0</maxSeperation>
-            <tolerance>1.0</tolerance>
-        </driver>
-        <driver name="TrackerReconDriver" type="org.hps.recon.tracking.TrackerReconDriver">
-            <debug>false</debug>
-		    <strategyResource>/org/hps/recon/tracking/strategies/HPS-Test-All.xml</strategyResource>
-        </driver>        
-        <driver name="EcalRawConverter" type="org.hps.recon.ecal.EcalRawConverterDriver">
-            <ecalCollectionName>EcalCalHits</ecalCollectionName>
-        </driver>
-        <driver name="EcalClusterer" type="org.hps.recon.ecal.cluster.ClusterDriver">
-            <clustererName>LegacyClusterer</clustererName>
-        </driver>
-        <driver name="ReconParticle" type="org.hps.recon.particle.TestRunReconParticleDriver">          
-        </driver>
-        <driver name="TrackDataDriver" type="org.hps.recon.tracking.TrackDataDriver" />
-        <driver name="LCIOWriter" type="org.lcsim.util.loop.LCIODriver">
-            <outputFilePath>${outputFile}.slcio</outputFilePath>
-        </driver>
-        <driver name="CleanupDriver" type="org.lcsim.recon.tracking.digitization.sisim.config.ReadoutCleanupDriver"/>
-    </drivers>
-</lcsim>
+<!-- 
+  Offline reconstruction for test run (photon) data.
+  @author Sho Uemura <[log in to unmask]>
+-->
+<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="SvtSensorSetup" />
+        <driver name="RawTrackerHitSensorSetup"/>
+        <driver name="BadChannelFilter" />
+        <driver name="RawTrackerHitFitterDriver" />
+        <driver name="TrackerHitDriver"/>
+        <driver name="HelicalTrackHitDriver"/>
+        <driver name="TrackerReconDriver"/>
+        <driver name="EcalRawConverter" />
+        <driver name="EcalClusterer" />
+        <driver name="ReconParticle" /> 
+        <driver name="TrackDataDriver" />               
+        <driver name="LCIOWriter"/>
+        <driver name="CleanupDriver"/>
+    </execute>    
+    <drivers>    
+        <driver name="SvtSensorSetup" type="org.hps.recon.tracking.SvtSensorSetup" />
+        
+        <driver name="EventMarkerDriver" type="org.lcsim.job.EventMarkerDriver">
+            <eventInterval>100</eventInterval>
+        </driver>
+        
+        <driver name="RawTrackerHitSensorSetup" type="org.lcsim.recon.tracking.digitization.sisim.config.RawTrackerHitSensorSetup"/>
+        
+        <driver name="BadChannelFilter" type="org.hps.recon.tracking.SVTBadChannelFilterDriver" /> 
+        
+        <driver name="RawTrackerHitFitterDriver" type="org.hps.recon.tracking.RawTrackerHitFitterDriver">
+            <fitAlgorithm>Analytic</fitAlgorithm>
+            <correctT0Shift>true</correctT0Shift>
+        </driver>
+        
+        <driver name="TrackerHitDriver" type="org.hps.recon.tracking.DataTrackerHitDriver" />
+        
+        <driver name="HelicalTrackHitDriver" type="org.hps.recon.tracking.HelicalTrackHitDriver">
+            <debug>false</debug>
+            <maxSeperation>20.0</maxSeperation>
+            <tolerance>1.0</tolerance>
+        </driver>
+        
+        <driver name="TrackerReconDriver" type="org.hps.recon.tracking.TrackerReconDriver">
+            <debug>false</debug>
+		 <strategyResource>/org/hps/recon/tracking/strategies/HPS-Test-All.xml</strategyResource>
+        </driver>
+        
+        <driver name="EcalRawConverter" type="org.hps.recon.ecal.EcalRawConverterDriver">
+            <ecalCollectionName>EcalCalHits</ecalCollectionName>
+        </driver>
+        
+        <driver name="EcalClusterer" type="org.hps.recon.ecal.cluster.ClusterDriver">            
+            <clustererName>LegacyClusterer</clustererName>
+        </driver>
+        
+        <driver name="ReconParticle" type="org.hps.recon.particle.TestRunReconParticleDriver" />  
+        
+        <driver name="TrackDataDriver" type="org.hps.recon.tracking.TrackDataDriver" />
+        
+        <driver name="LCIOWriter" type="org.lcsim.util.loop.LCIODriver">
+            <outputFilePath>${outputFile}.slcio</outputFilePath>
+        </driver>
+        
+        <driver name="CleanupDriver" type="org.lcsim.recon.tracking.digitization.sisim.config.ReadoutCleanupDriver"/>
+    </drivers>
+</lcsim>

Modified: java/trunk/steering-files/src/main/resources/org/hps/steering/recon/TestRunOfflineReconTwoTrkFilter.lcsim
 =============================================================================
--- java/trunk/steering-files/src/main/resources/org/hps/steering/recon/TestRunOfflineReconTwoTrkFilter.lcsim	(original)
+++ java/trunk/steering-files/src/main/resources/org/hps/steering/recon/TestRunOfflineReconTwoTrkFilter.lcsim	Thu Feb  5 19:33:30 2015
@@ -1,51 +1,57 @@
-<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="SvtSensorSetup" />
-        <driver name="RawTrackerHitSensorSetup"/>
-        <driver name="RawTrackerHitFitterDriver" />
-        <driver name="TrackerHitDriver"/>
-        <driver name="HelicalTrackHitDriver"/>
-        <driver name="TrackerReconDriver"/>
-        <driver name="EcalRawConverter" />
-        <driver name="EcalClusterer" />
-        <driver name="TwoTrackFilter"/>
-        <driver name="CleanupDriver"/>
-    </execute>    
-    <drivers>    
-        <driver name="SvtSensorSetup" type="org.hps.recon.tracking.SvtSensorSetup" />
-        <driver name="EventMarkerDriver"
-                type="org.lcsim.job.EventMarkerDriver">
-            <eventInterval>1000</eventInterval>
-        </driver>        
-        <driver name="RawTrackerHitSensorSetup" type="org.lcsim.recon.tracking.digitization.sisim.config.RawTrackerHitSensorSetup"/>
-        <driver name="RawTrackerHitFitterDriver" type="org.hps.recon.tracking.RawTrackerHitFitterDriver">
-            <fitAlgorithm>Analytic</fitAlgorithm>
-            <correctT0Shift>true</correctT0Shift>
-        </driver>
-        <driver name="TrackerHitDriver" type="org.hps.recon.tracking.DataTrackerHitDriver" />     
-        <driver name="HelicalTrackHitDriver"
-                type="org.hps.recon.tracking.HelicalTrackHitDriver">
-            <debug>false</debug>
-            <maxSeperation>20.0</maxSeperation>
-            <tolerance>1.0</tolerance>
-        </driver>
-        <driver name="TrackerReconDriver"
-                type="org.hps.recon.tracking.TrackerReconDriver">
-            <debug>false</debug>
-        </driver>        
-        <driver name="EcalRawConverter" type="org.hps.recon.ecal.EcalRawConverterDriver">
-            <ecalCollectionName>EcalCalHits</ecalCollectionName>
-        </driver>
-        <driver name="EcalClusterer" type="org.hps.recon.ecal.cluster.ClusterDriver">
-            <clustererName>LegacyClusterer</clustererName>
-        </driver>
-        <driver name="TwoTrackFilter" 
-                type="org.hps.util.TwoTrackFilterDriver">
-            <debug>false</debug>
-            <outputFilePath>${outputFile}</outputFilePath>
-        </driver>
-        <driver name="CleanupDriver" type="org.lcsim.recon.tracking.digitization.sisim.config.ReadoutCleanupDriver"/>
-    </drivers>
-</lcsim>
+<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="SvtSensorSetup" />
+        <driver name="RawTrackerHitSensorSetup"/>
+        <driver name="RawTrackerHitFitterDriver" />
+        <driver name="TrackerHitDriver"/>
+        <driver name="HelicalTrackHitDriver"/>
+        <driver name="TrackerReconDriver"/>
+        <driver name="EcalRawConverter" />
+        <driver name="EcalClusterer" />
+        <driver name="TwoTrackFilter"/>
+        <driver name="CleanupDriver"/>
+    </execute>    
+    <drivers>    
+        <driver name="SvtSensorSetup" type="org.hps.recon.tracking.SvtSensorSetup" />
+        
+        <driver name="EventMarkerDriver" type="org.lcsim.job.EventMarkerDriver">
+            <eventInterval>1000</eventInterval>
+        </driver>
+        
+        <driver name="RawTrackerHitSensorSetup" type="org.lcsim.recon.tracking.digitization.sisim.config.RawTrackerHitSensorSetup"/>
+        
+        <driver name="RawTrackerHitFitterDriver" type="org.hps.recon.tracking.RawTrackerHitFitterDriver">
+            <fitAlgorithm>Analytic</fitAlgorithm>
+            <correctT0Shift>true</correctT0Shift>
+        </driver>
+        
+        <driver name="TrackerHitDriver" type="org.hps.recon.tracking.DataTrackerHitDriver" />
+        
+        <driver name="HelicalTrackHitDriver" type="org.hps.recon.tracking.HelicalTrackHitDriver">
+            <debug>false</debug>
+            <maxSeperation>20.0</maxSeperation>
+            <tolerance>1.0</tolerance>
+        </driver>
+        
+        <driver name="TrackerReconDriver" type="org.hps.recon.tracking.TrackerReconDriver">
+            <debug>false</debug>
+        </driver>
+        
+        <driver name="EcalRawConverter" type="org.hps.recon.ecal.EcalRawConverterDriver">
+            <ecalCollectionName>EcalCalHits</ecalCollectionName>
+        </driver>
+        
+        <driver name="EcalClusterer" type="org.hps.recon.ecal.cluster.ClusterDriver">            
+            <clustererName>LegacyClusterer</clustererName>
+        </driver>
+        
+        <driver name="TwoTrackFilter" type="org.hps.util.TwoTrackFilterDriver">
+            <debug>false</debug>
+            <outputFilePath>${outputFile}</outputFilePath>
+        </driver>
+        
+        <driver name="CleanupDriver" type="org.lcsim.recon.tracking.digitization.sisim.config.ReadoutCleanupDriver"/>
+    </drivers>
+</lcsim>