LISTSERV 16.5 - HPS-SVN Archives

Subscriber's Corner
Email Lists
HPS-SVN Archives

HPS-SVN@LISTSERV.SLAC.STANFORD.EDU

View:

Message:
[
First
Last
]
By Topic:
[
First
Last
]
By Author:
[
First
Last
]
Font:
Proportional Font
		LISTSERV Archives
		HPS-SVN Home
		HPS-SVN October 2016
Subject:
r4526 - in /java/branches/converter-div/steering-files/src/main/resources/org/hps/steering: monitoring/ readout/ recon/
From:
[log in to unmask]
Reply-To:
Notification of commits to the hps svn repository <[log in to unmask]>
Date:
Fri, 21 Oct 2016 19:33:45 -0000
Content-Type:
text/plain
Parts/Attachments:
text/plain (1841 lines)
Author: [log in to unmask]
Date: Fri Oct 21 12:33:41 2016
New Revision: 4526

Log: (empty)

Modified:
    java/branches/converter-div/steering-files/src/main/resources/org/hps/steering/monitoring/EcalBasicMonitoring.lcsim
    java/branches/converter-div/steering-files/src/main/resources/org/hps/steering/monitoring/EcalLedCommissioning.lcsim
    java/branches/converter-div/steering-files/src/main/resources/org/hps/steering/monitoring/EcalLedSequenceMonitoringApp.lcsim
    java/branches/converter-div/steering-files/src/main/resources/org/hps/steering/monitoring/EcalLedSequenceStandalone.lcsim
    java/branches/converter-div/steering-files/src/main/resources/org/hps/steering/monitoring/EcalMonitoring.lcsim
    java/branches/converter-div/steering-files/src/main/resources/org/hps/steering/monitoring/EcalMonitoringFinal.lcsim
    java/branches/converter-div/steering-files/src/main/resources/org/hps/steering/monitoring/EcalMonitoringOnly.lcsim
    java/branches/converter-div/steering-files/src/main/resources/org/hps/steering/monitoring/EcalPedestalMonitor.lcsim
    java/branches/converter-div/steering-files/src/main/resources/org/hps/steering/monitoring/EcalPedestalViewer.lcsim
    java/branches/converter-div/steering-files/src/main/resources/org/hps/steering/monitoring/EcalTriggerMonitoring.lcsim
    java/branches/converter-div/steering-files/src/main/resources/org/hps/steering/monitoring/EcalTriggerWindowMonitoring.lcsim
    java/branches/converter-div/steering-files/src/main/resources/org/hps/steering/monitoring/ExampleMonitoringPlots.lcsim
    java/branches/converter-div/steering-files/src/main/resources/org/hps/steering/monitoring/Layers4to6TrackingMonitoring.lcsim
    java/branches/converter-div/steering-files/src/main/resources/org/hps/steering/monitoring/LooseTrackingAndReconMonitoring.lcsim
    java/branches/converter-div/steering-files/src/main/resources/org/hps/steering/monitoring/OnlineTracking.lcsim
    java/branches/converter-div/steering-files/src/main/resources/org/hps/steering/monitoring/SVTMonitoring.lcsim
    java/branches/converter-div/steering-files/src/main/resources/org/hps/steering/monitoring/TrackingAndReconMonitoring.lcsim
    java/branches/converter-div/steering-files/src/main/resources/org/hps/steering/monitoring/TriggerDiagnosticsMonitoring.lcsim
    java/branches/converter-div/steering-files/src/main/resources/org/hps/steering/readout/CommRun2014TightPairs.lcsim
    java/branches/converter-div/steering-files/src/main/resources/org/hps/steering/readout/EngineeringRun2014PresTrigPairs0.lcsim
    java/branches/converter-div/steering-files/src/main/resources/org/hps/steering/readout/EngineeringRun2014PresTrigPairs1.lcsim
    java/branches/converter-div/steering-files/src/main/resources/org/hps/steering/readout/EngineeringRun2014PresTrigSingles0.lcsim
    java/branches/converter-div/steering-files/src/main/resources/org/hps/steering/readout/EngineeringRun2014PresTrigSingles1.lcsim
    java/branches/converter-div/steering-files/src/main/resources/org/hps/steering/readout/EngineeringRun2014PrescaledTriggers.lcsim
    java/branches/converter-div/steering-files/src/main/resources/org/hps/steering/readout/EngineeringRun2015TrigPairs1.lcsim
    java/branches/converter-div/steering-files/src/main/resources/org/hps/steering/readout/EngineeringRun2015TrigPairs1_Pass2.lcsim
    java/branches/converter-div/steering-files/src/main/resources/org/hps/steering/readout/EngineeringRun2015TrigSingles1.lcsim
    java/branches/converter-div/steering-files/src/main/resources/org/hps/steering/readout/EngineeringRun2015TrigSingles1_Pass2.lcsim
    java/branches/converter-div/steering-files/src/main/resources/org/hps/steering/readout/HPS2014ReadoutNoPileup.lcsim
    java/branches/converter-div/steering-files/src/main/resources/org/hps/steering/readout/HPS2014ReadoutToEvio.lcsim
    java/branches/converter-div/steering-files/src/main/resources/org/hps/steering/readout/HPS2014ReadoutToLcio.lcsim
    java/branches/converter-div/steering-files/src/main/resources/org/hps/steering/readout/HPS2014TruthReadoutToLcio.lcsim
    java/branches/converter-div/steering-files/src/main/resources/org/hps/steering/readout/MockPulserTrigger.lcsim
    java/branches/converter-div/steering-files/src/main/resources/org/hps/steering/readout/PhysicsRun2016TrigPair0.lcsim
    java/branches/converter-div/steering-files/src/main/resources/org/hps/steering/readout/PhysicsRun2016TrigPairs1.lcsim
    java/branches/converter-div/steering-files/src/main/resources/org/hps/steering/readout/PhysicsRun2016TrigSingles1.lcsim
    java/branches/converter-div/steering-files/src/main/resources/org/hps/steering/readout/TestRunReadoutToEvio.lcsim
    java/branches/converter-div/steering-files/src/main/resources/org/hps/steering/readout/TestRunReadoutToLcio.lcsim
    java/branches/converter-div/steering-files/src/main/resources/org/hps/steering/readout/TestRunReadoutToLcio2014.lcsim
    java/branches/converter-div/steering-files/src/main/resources/org/hps/steering/recon/EngineeringRun2014EcalRecon.lcsim
    java/branches/converter-div/steering-files/src/main/resources/org/hps/steering/recon/EngineeringRun2014EcalReconMC.lcsim
    java/branches/converter-div/steering-files/src/main/resources/org/hps/steering/recon/EngineeringRun2014EcalRecon_Pass1.lcsim
    java/branches/converter-div/steering-files/src/main/resources/org/hps/steering/recon/EngineeringRun2015EcalRecon.lcsim
    java/branches/converter-div/steering-files/src/main/resources/org/hps/steering/recon/EngineeringRun2015FullRecon.lcsim
    java/branches/converter-div/steering-files/src/main/resources/org/hps/steering/recon/EngineeringRun2015FullReconMC.lcsim
    java/branches/converter-div/steering-files/src/main/resources/org/hps/steering/recon/EngineeringRun2015HitRecon.lcsim
    java/branches/converter-div/steering-files/src/main/resources/org/hps/steering/recon/HPS2014OfflineTruthRecon.lcsim
    java/branches/converter-div/steering-files/src/main/resources/org/hps/steering/recon/PhysicsRun2016FullRecon.lcsim

Modified: java/branches/converter-div/steering-files/src/main/resources/org/hps/steering/monitoring/EcalBasicMonitoring.lcsim
 =============================================================================
--- java/branches/converter-div/steering-files/src/main/resources/org/hps/steering/monitoring/EcalBasicMonitoring.lcsim	(original)
+++ java/branches/converter-div/steering-files/src/main/resources/org/hps/steering/monitoring/EcalBasicMonitoring.lcsim	Fri Oct 21 12:33:41 2016
@@ -2,6 +2,8 @@
     <execute>
         <driver name="EventMarkerDriver" />
         <driver name="EcalRawConverter" />
+        <driver name="EcalGains"/>
+        <driver name="EcalTimeCorrection"/>
         <driver name="EcalClusterer" />
         <driver name="EcalMonitoringPlots" />
     </execute>
@@ -11,8 +13,17 @@
         </driver>
         <driver name="EcalRawConverter" type="org.hps.recon.ecal.EcalRawConverterDriver">
             <applyBadCrystalMap>false</applyBadCrystalMap>
+        	<ecalCollectionName>EcalUncalHits</ecalCollectionName>
+        </driver>
+        <driver name="EcalGains" type="org.hps.recon.ecal.EcalGainDriver">
+       		<inputHitsCollectionName>EcalUncalHits</inputHitsCollectionName>
             <use2014Gain>false</use2014Gain>
+            <outputHitsCollectionName>EcalGainHits</outputHitsCollectionName>
         </driver>
+        <driver name="EcalTimeCorrection" type="org.hps.recon.ecal.EcalTimeCorrectionDriver">
+       		<inputHitsCollectionName>EcalGainHits</inputHitsCollectionName>
+            <outputHitsCollectionName>EcalCalHits</outputHitsCollectionName>
+        </driver> 
         <driver name="EcalClusterer" type="org.hps.recon.ecal.cluster.GTPOnlineClusterDriver">
             <verbose>false</verbose>
             <logLevel>WARNING</logLevel>

Modified: java/branches/converter-div/steering-files/src/main/resources/org/hps/steering/monitoring/EcalLedCommissioning.lcsim
 =============================================================================
--- java/branches/converter-div/steering-files/src/main/resources/org/hps/steering/monitoring/EcalLedCommissioning.lcsim	(original)
+++ java/branches/converter-div/steering-files/src/main/resources/org/hps/steering/monitoring/EcalLedCommissioning.lcsim	Fri Oct 21 12:33:41 2016
@@ -2,6 +2,8 @@
     <execute>
         <driver name="EventMarkerDriver" />
         <driver name="EcalRawConverter" />
+        <driver name="EcalGains"/>
+        <driver name="EcalTimeCorrection"/>
         <driver name="EcalEventDisplay" />         <!-- Ecal event display -->
     </execute>
     <drivers>
@@ -10,7 +12,18 @@
         </driver>
         <driver name="EcalRawConverter" type="org.hps.recon.ecal.EcalRawConverterDriver">
             <applyBadCrystalMap>false</applyBadCrystalMap>
+        	<ecalCollectionName>EcalUncalHits</ecalCollectionName>
+            
         </driver>
+        <driver name="EcalGains" type="org.hps.recon.ecal.EcalGainDriver">
+       		<inputHitsCollectionName>EcalUncalHits</inputHitsCollectionName>
+            <use2014Gain>false</use2014Gain>
+            <outputHitsCollectionName>EcalGainHits</outputHitsCollectionName>
+        </driver>
+        <driver name="EcalTimeCorrection" type="org.hps.recon.ecal.EcalTimeCorrectionDriver">
+       		<inputHitsCollectionName>EcalGainHits</inputHitsCollectionName>
+            <outputHitsCollectionName>EcalCalHits</outputHitsCollectionName>
+        </driver>  
         <driver name="EcalEventDisplay" type="org.hps.monitoring.ecal.plots.EcalEventDisplayWithRawWaveform">
             <inputCollection>EcalCalHits</inputCollection>
             <inputCollectionRaw>EcalReadoutHits</inputCollectionRaw>

Modified: java/branches/converter-div/steering-files/src/main/resources/org/hps/steering/monitoring/EcalLedSequenceMonitoringApp.lcsim
 =============================================================================
--- java/branches/converter-div/steering-files/src/main/resources/org/hps/steering/monitoring/EcalLedSequenceMonitoringApp.lcsim	(original)
+++ java/branches/converter-div/steering-files/src/main/resources/org/hps/steering/monitoring/EcalLedSequenceMonitoringApp.lcsim	Fri Oct 21 12:33:41 2016
@@ -3,7 +3,9 @@
     <execute>
         <driver name="EventMarkerDriver"/>
         <driver name="EcalRunningPedestal"/>
-        <driver name="EcalRawConverter" />    
+        <driver name="EcalRawConverter" />
+        <driver name="EcalGains"/>
+        <driver name="EcalTimeCorrection"/>
         <driver name="LedAnalysisDriver"/>
         <driver name="EcalEventDisplay" />         <!-- Ecal event display -->
         <driver name="AidaSaveDriver"/>
@@ -17,14 +19,22 @@
             <maxLookbackEvents>50</maxLookbackEvents>
         </driver>
         <driver name="EcalRawConverter" type="org.hps.recon.ecal.EcalRawConverterDriver">
-            <ecalCollectionName>EcalCalHits</ecalCollectionName>
-            <use2014Gain>false</use2014Gain>
+            <ecalCollectionName>EcalUncalHits</ecalCollectionName>
+            
             <useTimestamps>false</useTimestamps>
             <useTruthTime>false</useTruthTime>
             <useRunningPedestal>true</useRunningPedestal>
+            </driver>       
+        <driver name="EcalGains" type="org.hps.recon.ecal.EcalGainDriver">
+       		<inputHitsCollectionName>EcalUncalHits</inputHitsCollectionName>
+            <use2014Gain>false</use2014Gain>
+            <outputHitsCollectionName>EcalGainHits</outputHitsCollectionName>
+        </driver>
+        <driver name="EcalTimeCorrection" type="org.hps.recon.ecal.EcalTimeCorrectionDriver">
+       		<inputHitsCollectionName>EcalGainHits</inputHitsCollectionName>
             <useTimeWalkCorrection>true</useTimeWalkCorrection>
-        </driver>       
-        
+            <outputHitsCollectionName>EcalCalHits</outputHitsCollectionName>
+        </driver> 
           <driver name="EcalEventDisplay" type="org.hps.monitoring.ecal.plots.EcalEventDisplay">
             <inputCollection>EcalCalHits</inputCollection>
             <inputCollectionRaw>EcalReadoutHits</inputCollectionRaw>

Modified: java/branches/converter-div/steering-files/src/main/resources/org/hps/steering/monitoring/EcalLedSequenceStandalone.lcsim
 =============================================================================
--- java/branches/converter-div/steering-files/src/main/resources/org/hps/steering/monitoring/EcalLedSequenceStandalone.lcsim	(original)
+++ java/branches/converter-div/steering-files/src/main/resources/org/hps/steering/monitoring/EcalLedSequenceStandalone.lcsim	Fri Oct 21 12:33:41 2016
@@ -4,7 +4,9 @@
 	    	<driver name="EventMarkerDriver"/>
 	        <driver name="EcalRunningPedestal"/>
 	  	    <driver name="EcalRawConverter" />    
-	        <driver name="LedAnalysisDriver"/>
+	        <driver name="EcalGains"/>
+        	<driver name="EcalTimeCorrection"/>
+        	<driver name="LedAnalysisDriver"/>
 	        <driver name="AidaSaveDriver"/>	     
 	    </execute>           
 	    <drivers>    
@@ -16,14 +18,23 @@
 	            <maxLookbackEvents>50</maxLookbackEvents>
 	        </driver>
 	        <driver name="EcalRawConverter" type="org.hps.recon.ecal.EcalRawConverterDriver">
-	            <ecalCollectionName>EcalCalHits</ecalCollectionName>
+	            <ecalCollectionName>EcalUncalHits</ecalCollectionName>
 	            <useTimestamps>false</useTimestamps>
 	            <useTruthTime>false</useTruthTime>
 	            <useRunningPedestal>true</useRunningPedestal>
-	            <useTimeWalkCorrection>true</useTimeWalkCorrection>
 	            <nsa>60</nsa>  <!-- these are critical since the defaults in software are 100 - 20, as in prod. runs -->
        		    <nsb>16</nsb>
-	        </driver>       
+	        </driver>
+	        <driver name="EcalGains" type="org.hps.recon.ecal.EcalGainDriver">
+       			<inputHitsCollectionName>EcalUncalHits</inputHitsCollectionName>
+            	<use2014Gain>false</use2014Gain>
+            	<outputHitsCollectionName>EcalGainHits</outputHitsCollectionName>
+        	</driver>
+        	<driver name="EcalTimeCorrection" type="org.hps.recon.ecal.EcalTimeCorrectionDriver">
+       			<inputHitsCollectionName>EcalGainHits</inputHitsCollectionName>
+            	<useTimeWalkCorrection>true</useTimeWalkCorrection>
+            	<outputHitsCollectionName>EcalCalHits</outputHitsCollectionName>
+        	</driver>        
 	  <!--     <driver name="EcalEventDisplay" type="org.hps.monitoring.ecal.plots.EcalEventDisplay">
 	            <inputCollection>EcalCalHits</inputCollection>
 	            <inputCollectionRaw>EcalReadoutHits</inputCollectionRaw>

Modified: java/branches/converter-div/steering-files/src/main/resources/org/hps/steering/monitoring/EcalMonitoring.lcsim
 =============================================================================
--- java/branches/converter-div/steering-files/src/main/resources/org/hps/steering/monitoring/EcalMonitoring.lcsim	(original)
+++ java/branches/converter-div/steering-files/src/main/resources/org/hps/steering/monitoring/EcalMonitoring.lcsim	Fri Oct 21 12:33:41 2016
@@ -3,6 +3,8 @@
     <execute>
         <driver name="EventMarkerDriver" />
         <driver name="EcalRawConverter" />
+        <driver name="EcalGains"/>
+        <driver name="EcalTimeCorrection"/>
         <driver name="EcalClusterer" />
         <driver name="EcalMonitoringPlots" />
         <driver name="EcalHitPlots" />
@@ -11,8 +13,17 @@
     <drivers>
         <driver name="EcalRawConverter" type="org.hps.recon.ecal.EcalRawConverterDriver">
             <applyBadCrystalMap>false</applyBadCrystalMap>
+            <ecalCollectionName>EcalUncalHits</ecalCollectionName>
+        </driver>
+         <driver name="EcalGains" type="org.hps.recon.ecal.EcalGainDriver">
+       		<inputHitsCollectionName>EcalUncalHits</inputHitsCollectionName>
             <use2014Gain>false</use2014Gain>
+            <outputHitsCollectionName>EcalGainHits</outputHitsCollectionName>
         </driver>
+        <driver name="EcalTimeCorrection" type="org.hps.recon.ecal.EcalTimeCorrectionDriver">
+       		<inputHitsCollectionName>EcalGainHits</inputHitsCollectionName>
+            <outputHitsCollectionName>EcalCalHits</outputHitsCollectionName>
+        </driver>  
         <driver name="EcalClusterer" type="org.hps.recon.ecal.cluster.GTPOnlineClusterDriver">
             <verbose>false</verbose>
             <logLevel>WARNING</logLevel>

Modified: java/branches/converter-div/steering-files/src/main/resources/org/hps/steering/monitoring/EcalMonitoringFinal.lcsim
 =============================================================================
--- java/branches/converter-div/steering-files/src/main/resources/org/hps/steering/monitoring/EcalMonitoringFinal.lcsim	(original)
+++ java/branches/converter-div/steering-files/src/main/resources/org/hps/steering/monitoring/EcalMonitoringFinal.lcsim	Fri Oct 21 12:33:41 2016
@@ -2,6 +2,8 @@
     <execute>
         <driver name="EcalRawConverter" />
         <driver name="EcalClusterer" />
+        <driver name="EcalGains"/>
+        <driver name="EcalTimeCorrection"/>
         <driver name="EcalMonitoringPlots" />      <!-- General plots -->
         <driver name="EcalHitPlots" />             <!-- Single hit distributions -->
         <driver name="EcalClusterPlots" />         <!-- Clusters distributions -->
@@ -20,12 +22,10 @@
         </driver>
         
         <driver name="EcalRawConverter" type="org.hps.recon.ecal.EcalRawConverterDriver">
-            <ecalCollectionName>EcalCalHits</ecalCollectionName>
-            <use2014Gain>false</use2014Gain>
+            <ecalCollectionName>EcalUncalHits</ecalCollectionName>
             <useTimestamps>false</useTimestamps>
             <useTruthTime>false</useTruthTime>
             <useRunningPedestal>false</useRunningPedestal>
-            <useTimeWalkCorrection>false</useTimeWalkCorrection>
             <emulateFirmware>true</emulateFirmware>
             <emulateMode7>false</emulateMode7>
             <leadingEdgeThreshold>12</leadingEdgeThreshold>
@@ -33,7 +33,16 @@
             <nsb>20</nsb>
             <nPeak>3</nPeak>
         </driver>
-        
+        <driver name="EcalGains" type="org.hps.recon.ecal.EcalGainDriver">
+       		<inputHitsCollectionName>EcalUncalHits</inputHitsCollectionName>
+            <use2014Gain>false</use2014Gain>
+            <outputHitsCollectionName>EcalGainHits</outputHitsCollectionName>
+        </driver>
+        <driver name="EcalTimeCorrection" type="org.hps.recon.ecal.EcalTimeCorrectionDriver">
+       		<inputHitsCollectionName>EcalGainHits</inputHitsCollectionName>
+            <useTimeWalkCorrection>false</useTimeWalkCorrection>
+            <outputHitsCollectionName>EcalCalHits</outputHitsCollectionName>
+        </driver> 
 
         <driver name="EcalClusterer" type="org.hps.recon.ecal.cluster.ReconClusterDriver">
             <logLevel>WARNING</logLevel>

Modified: java/branches/converter-div/steering-files/src/main/resources/org/hps/steering/monitoring/EcalMonitoringOnly.lcsim
 =============================================================================
--- java/branches/converter-div/steering-files/src/main/resources/org/hps/steering/monitoring/EcalMonitoringOnly.lcsim	(original)
+++ java/branches/converter-div/steering-files/src/main/resources/org/hps/steering/monitoring/EcalMonitoringOnly.lcsim	Fri Oct 21 12:33:41 2016
@@ -2,6 +2,8 @@
     <execute>
         <driver name="EcalRawConverter" />
         <driver name="EcalClusterer" />
+        <driver name="EcalGains"/>
+        <driver name="EcalTimeCorrection"/>
         <driver name="EcalMonitoringPlots" />      <!-- General plots -->
         <driver name="EcalHitPlots" />             <!-- Single hit distributions -->
         <driver name="EcalClusterPlots" />         <!-- Clusters distributions -->
@@ -20,12 +22,10 @@
         </driver>
         
         <driver name="EcalRawConverter" type="org.hps.recon.ecal.EcalRawConverterDriver">
-            <ecalCollectionName>EcalCalHits</ecalCollectionName>
-            <use2014Gain>false</use2014Gain>
+            <ecalCollectionName>EcalUncalHits</ecalCollectionName>
             <useTimestamps>false</useTimestamps>
             <useTruthTime>false</useTruthTime>
             <useRunningPedestal>false</useRunningPedestal>
-            <useTimeWalkCorrection>false</useTimeWalkCorrection>
             <emulateFirmware>true</emulateFirmware>
             <emulateMode7>false</emulateMode7>
             <leadingEdgeThreshold>12</leadingEdgeThreshold>
@@ -33,6 +33,16 @@
             <nsb>20</nsb>
             <nPeak>3</nPeak>
         </driver>
+        <driver name="EcalGains" type="org.hps.recon.ecal.EcalGainDriver">
+       		<inputHitsCollectionName>EcalUncalHits</inputHitsCollectionName>
+            <use2014Gain>false</use2014Gain>
+            <outputHitsCollectionName>EcalGainHits</outputHitsCollectionName>
+        </driver>
+        <driver name="EcalTimeCorrection" type="org.hps.recon.ecal.EcalTimeCorrectionDriver">
+       		<inputHitsCollectionName>EcalGainHits</inputHitsCollectionName>
+            <useTimeWalkCorrection>false</useTimeWalkCorrection>
+            <outputHitsCollectionName>EcalCalHits</outputHitsCollectionName>
+        </driver>  
         
 
         <driver name="EcalClusterer" type="org.hps.recon.ecal.cluster.ReconClusterDriver">

Modified: java/branches/converter-div/steering-files/src/main/resources/org/hps/steering/monitoring/EcalPedestalMonitor.lcsim
 =============================================================================
--- java/branches/converter-div/steering-files/src/main/resources/org/hps/steering/monitoring/EcalPedestalMonitor.lcsim	(original)
+++ java/branches/converter-div/steering-files/src/main/resources/org/hps/steering/monitoring/EcalPedestalMonitor.lcsim	Fri Oct 21 12:33:41 2016
@@ -2,13 +2,25 @@
     xs:noNamespaceSchemaLocation="http://www.lcsim.org/schemas/lcsim/1.0/lcsim.xsd">
     <execute>
         <driver name="EcalRawConverter" />
+        <driver name="EcalGains"/>
+        <driver name="EcalTimeCorrection"/>
+        
         <driver name="EcalRunningPedestal"/>
         <driver name="EcalPedestalMonitor"/>
         <driver name="CleanupDriver" />
     </execute>
     <drivers>
         <driver name="EcalRawConverter" type="org.hps.recon.ecal.EcalRawConverterDriver">
+        	<ecalCollectionName>EcalUncalHits</ecalCollectionName>
         </driver>
+        <driver name="EcalGains" type="org.hps.recon.ecal.EcalGainDriver">
+       		<inputHitsCollectionName>EcalUncalHits</inputHitsCollectionName>
+            <outputHitsCollectionName>EcalGainHits</outputHitsCollectionName>
+        </driver>
+        <driver name="EcalTimeCorrection" type="org.hps.recon.ecal.EcalTimeCorrectionDriver">
+       		<inputHitsCollectionName>EcalGainHits</inputHitsCollectionName>
+            <outputHitsCollectionName>EcalCalHits</outputHitsCollectionName>
+        </driver>  
         <driver name="EcalRunningPedestal" type="org.hps.recon.ecal.EcalRunningPedestalDriver">
             <minLookbackEvents>10</minLookbackEvents>
             <maxLookbackEvents>50</maxLookbackEvents>

Modified: java/branches/converter-div/steering-files/src/main/resources/org/hps/steering/monitoring/EcalPedestalViewer.lcsim
 =============================================================================
--- java/branches/converter-div/steering-files/src/main/resources/org/hps/steering/monitoring/EcalPedestalViewer.lcsim	(original)
+++ java/branches/converter-div/steering-files/src/main/resources/org/hps/steering/monitoring/EcalPedestalViewer.lcsim	Fri Oct 21 12:33:41 2016
@@ -2,13 +2,25 @@
     xs:noNamespaceSchemaLocation="http://www.lcsim.org/schemas/lcsim/1.0/lcsim.xsd">
     <execute>
         <driver name="EcalRawConverter" />
+        <driver name="EcalGains"/>
+        <driver name="EcalTimeCorrection"/>
+        
         <driver name="EcalPedestalCalculator"/>
         <driver name="EcalPedestalViewer"/>
         <driver name="CleanupDriver" />
     </execute>
     <drivers>
         <driver name="EcalRawConverter" type="org.hps.recon.ecal.EcalRawConverterDriver">
+        	<ecalCollectionName>EcalUncalHits</ecalCollectionName>
         </driver>
+        <driver name="EcalGains" type="org.hps.recon.ecal.EcalGainDriver">
+       		<inputHitsCollectionName>EcalUncalHits</inputHitsCollectionName>
+            <outputHitsCollectionName>EcalGainHits</outputHitsCollectionName>
+        </driver>
+        <driver name="EcalTimeCorrection" type="org.hps.recon.ecal.EcalTimeCorrectionDriver">
+       		<inputHitsCollectionName>EcalGainHits</inputHitsCollectionName>
+            <outputHitsCollectionName>EcalCalHits</outputHitsCollectionName>
+        </driver>  
         <driver name="EcalPedestalCalculator" type="org.hps.recon.ecal.EcalPedestalCalculator">
         </driver>
         <driver name="EcalPedestalViewer" type="org.hps.monitoring.ecal.plots.EcalPedestalViewer">

Modified: java/branches/converter-div/steering-files/src/main/resources/org/hps/steering/monitoring/EcalTriggerMonitoring.lcsim
 =============================================================================
--- java/branches/converter-div/steering-files/src/main/resources/org/hps/steering/monitoring/EcalTriggerMonitoring.lcsim	(original)
+++ java/branches/converter-div/steering-files/src/main/resources/org/hps/steering/monitoring/EcalTriggerMonitoring.lcsim	Fri Oct 21 12:33:41 2016
@@ -2,6 +2,8 @@
     <execute>
         <driver name="EventMarkerDriver" />
         <driver name="EcalRawConverter" />
+        <driver name="EcalGains"/>
+        <driver name="EcalTimeCorrection"/>
         <driver name="EcalTriggerFilter" />
         <driver name="EcalClusterer" />
 <!--        <driver name="EcalPedestalPlots"/>-->
@@ -26,7 +28,17 @@
             <dropBadFADC>true</dropBadFADC>
             <tp>14.0</tp>
             <truncateScale>1</truncateScale>
+        	<ecalCollectionName>EcalUncalHits</ecalCollectionName>
         </driver>
+        <driver name="EcalGains" type="org.hps.recon.ecal.EcalGainDriver">
+       		<inputHitsCollectionName>EcalUncalHits</inputHitsCollectionName>
+            <outputHitsCollectionName>EcalGainHits</outputHitsCollectionName>
+        </driver>
+        <driver name="EcalTimeCorrection" type="org.hps.recon.ecal.EcalTimeCorrectionDriver">
+       		<inputHitsCollectionName>EcalGainHits</inputHitsCollectionName>
+            <outputHitsCollectionName>EcalCalHits</outputHitsCollectionName>
+        </driver>  
+        
         <driver name="EcalTriggerFilter" type="org.hps.recon.ecal.EcalTriggerFilterDriver">
             <inputCollection>EcalCalHits</inputCollection>
             <outputCollection>EcalFilteredHits</outputCollection>

Modified: java/branches/converter-div/steering-files/src/main/resources/org/hps/steering/monitoring/EcalTriggerWindowMonitoring.lcsim
 =============================================================================
--- java/branches/converter-div/steering-files/src/main/resources/org/hps/steering/monitoring/EcalTriggerWindowMonitoring.lcsim	(original)
+++ java/branches/converter-div/steering-files/src/main/resources/org/hps/steering/monitoring/EcalTriggerWindowMonitoring.lcsim	Fri Oct 21 12:33:41 2016
@@ -3,6 +3,8 @@
         <driver name="EventMarkerDriver" />
         <driver name="FADCConverter" />
         <driver name="EcalRawConverter" />
+        <driver name="EcalGains"/>
+        <driver name="EcalTimeCorrection"/>
         <driver name="EcalClusterer" />
         <!-- <driver name="EcalIntegralPedestalPlots" />  -->
         <driver name="EcalMonitoringPlots" />
@@ -24,9 +26,19 @@
             <!--<integralWindow>35</integralWindow> Deprecated, now use the equivalent in NSA/NSB-->
             <nsa>120</nsa>
             <nsb>20</nsb>
+            
+        	<ecalCollectionName>EcalUncalHits</ecalCollectionName>
+        </driver>
+        <driver name="EcalGains" type="org.hps.recon.ecal.EcalGainDriver">
+       		<inputHitsCollectionName>EcalUncalHits</inputHitsCollectionName>
             <gain>1.0</gain>
             <use2014Gain>false</use2014Gain>
+            <outputHitsCollectionName>EcalGainHits</outputHitsCollectionName>
         </driver>
+        <driver name="EcalTimeCorrection" type="org.hps.recon.ecal.EcalTimeCorrectionDriver">
+       		<inputHitsCollectionName>EcalGainHits</inputHitsCollectionName>
+            <outputHitsCollectionName>EcalCalHits</outputHitsCollectionName>
+        </driver> 
         <driver name="EcalDaqPlots" type="org.hps.monitoring.ecal.plots.EcalDaqPlots">
         </driver>
         <driver name="EcalMonitoringPlots" type="org.hps.monitoring.ecal.plots.EcalMonitoringPlots">

Modified: java/branches/converter-div/steering-files/src/main/resources/org/hps/steering/monitoring/ExampleMonitoringPlots.lcsim
 =============================================================================
--- java/branches/converter-div/steering-files/src/main/resources/org/hps/steering/monitoring/ExampleMonitoringPlots.lcsim	(original)
+++ java/branches/converter-div/steering-files/src/main/resources/org/hps/steering/monitoring/ExampleMonitoringPlots.lcsim	Fri Oct 21 12:33:41 2016
@@ -1,6 +1,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="EcalRawConverter" />
+        <driver name="EcalGains"/>
+        <driver name="EcalTimeCorrection"/>
         <driver name="ReconClusterer" />
         <driver name="ExamplePlotDriver" />
     </execute>
@@ -9,11 +11,19 @@
             <eventInterval>1</eventInterval>
         </driver>
         <driver name="EcalRawConverter" type="org.hps.recon.ecal.EcalRawConverterDriver">
-            <ecalCollectionName>EcalCalHits</ecalCollectionName>
-            <use2014Gain>false</use2014Gain>
             <useTimestamps>false</useTimestamps>
             <useTruthTime>false</useTruthTime>
+        	<ecalCollectionName>EcalUncalHits</ecalCollectionName>
         </driver>
+        <driver name="EcalGains" type="org.hps.recon.ecal.EcalGainDriver">
+       		<inputHitsCollectionName>EcalUncalHits</inputHitsCollectionName>
+             <use2014Gain>false</use2014Gain>
+            <outputHitsCollectionName>EcalGainHits</outputHitsCollectionName>
+        </driver>
+        <driver name="EcalTimeCorrection" type="org.hps.recon.ecal.EcalTimeCorrectionDriver">
+       		<inputHitsCollectionName>EcalGainHits</inputHitsCollectionName>
+            <outputHitsCollectionName>EcalCalHits</outputHitsCollectionName>
+        </driver> 
         <driver name="ReconClusterer" type="org.hps.recon.ecal.cluster.ReconClusterDriver">
             <logLevel>WARNING</logLevel>
             <outputClusterCollectionName>EcalClusters</outputClusterCollectionName>

Modified: java/branches/converter-div/steering-files/src/main/resources/org/hps/steering/monitoring/Layers4to6TrackingMonitoring.lcsim
 =============================================================================
--- java/branches/converter-div/steering-files/src/main/resources/org/hps/steering/monitoring/Layers4to6TrackingMonitoring.lcsim	(original)
+++ java/branches/converter-div/steering-files/src/main/resources/org/hps/steering/monitoring/Layers4to6TrackingMonitoring.lcsim	Fri Oct 21 12:33:41 2016
@@ -17,7 +17,9 @@
         <!--  regular tracking and recon -->
         <driver name="FullTrackerReconDriver"/> 
         <driver name="TrackDataDriver"/>   
-        <driver name="EcalRawConverter" /> 
+        <driver name="EcalRawConverter" />
+        <driver name="EcalGains"/>
+        <driver name="EcalTimeCorrection"/>
         <driver name="EcalClusterer" />
         <driver name="ReconParticle" /> 
         <!-- Online Monitoring Drivers -->
@@ -75,19 +77,27 @@
         <driver name="TrackDataDriver" type="org.hps.recon.tracking.TrackDataDriver">
         </driver>
         <driver name="EcalRawConverter" type="org.hps.recon.ecal.EcalRawConverterDriver">
-            <ecalCollectionName>EcalCalHits</ecalCollectionName>
-            <use2014Gain>false</use2014Gain>
             <useTimestamps>false</useTimestamps>
             <useTruthTime>false</useTruthTime>
             <useRunningPedestal>false</useRunningPedestal>
-            <useTimeWalkCorrection>false</useTimeWalkCorrection>
             <emulateFirmware>true</emulateFirmware>
             <emulateMode7>false</emulateMode7>
             <leadingEdgeThreshold>12</leadingEdgeThreshold>
             <nsa>100</nsa>
             <nsb>20</nsb>
             <nPeak>3</nPeak>
+            <ecalCollectionName>EcalUncalHits</ecalCollectionName>
         </driver>
+        <driver name="EcalGains" type="org.hps.recon.ecal.EcalGainDriver">
+       		<inputHitsCollectionName>EcalUncalHits</inputHitsCollectionName>
+            <use2014Gain>false</use2014Gain>
+            <outputHitsCollectionName>EcalGainHits</outputHitsCollectionName>
+        </driver>
+        <driver name="EcalTimeCorrection" type="org.hps.recon.ecal.EcalTimeCorrectionDriver">
+       		<inputHitsCollectionName>EcalGainHits</inputHitsCollectionName>
+            <useTimeWalkCorrection>false</useTimeWalkCorrection>
+            <outputHitsCollectionName>EcalCalHits</outputHitsCollectionName>
+        </driver> 
         <driver name="EcalClusterer" type="org.hps.recon.ecal.cluster.ReconClusterDriver">
             <logLevel>WARNING</logLevel>
             <outputClusterCollectionName>EcalClusters</outputClusterCollectionName>

Modified: java/branches/converter-div/steering-files/src/main/resources/org/hps/steering/monitoring/LooseTrackingAndReconMonitoring.lcsim
 =============================================================================
--- java/branches/converter-div/steering-files/src/main/resources/org/hps/steering/monitoring/LooseTrackingAndReconMonitoring.lcsim	(original)
+++ java/branches/converter-div/steering-files/src/main/resources/org/hps/steering/monitoring/LooseTrackingAndReconMonitoring.lcsim	Fri Oct 21 12:33:41 2016
@@ -14,6 +14,8 @@
         <driver name="FullTrackerReconDriver"/> 
         <driver name="TrackDataDriver"/>   
         <driver name="EcalRawConverter" /> 
+        <driver name="EcalGains"/>
+        <driver name="EcalTimeCorrection"/>
         <driver name="EcalClusterer" />
         <driver name="ReconParticle" /> 
         <!-- Online Monitoring Drivers -->
@@ -59,19 +61,27 @@
         <driver name="TrackDataDriver" type="org.hps.recon.tracking.TrackDataDriver">
         </driver>
         <driver name="EcalRawConverter" type="org.hps.recon.ecal.EcalRawConverterDriver">
-            <ecalCollectionName>EcalCalHits</ecalCollectionName>
-            <use2014Gain>false</use2014Gain>
             <useTimestamps>false</useTimestamps>
             <useTruthTime>false</useTruthTime>
             <useRunningPedestal>false</useRunningPedestal>
-            <useTimeWalkCorrection>false</useTimeWalkCorrection>
             <emulateFirmware>true</emulateFirmware>
             <emulateMode7>false</emulateMode7>
             <leadingEdgeThreshold>12</leadingEdgeThreshold>
             <nsa>100</nsa>
             <nsb>20</nsb>
             <nPeak>3</nPeak>
+            <ecalCollectionName>EcalUncalHits</ecalCollectionName>
         </driver>
+        <driver name="EcalGains" type="org.hps.recon.ecal.EcalGainDriver">
+       		<inputHitsCollectionName>EcalUncalHits</inputHitsCollectionName>
+            <use2014Gain>false</use2014Gain>
+            <outputHitsCollectionName>EcalGainHits</outputHitsCollectionName>
+        </driver>
+        <driver name="EcalTimeCorrection" type="org.hps.recon.ecal.EcalTimeCorrectionDriver">
+       		<inputHitsCollectionName>EcalGainHits</inputHitsCollectionName>
+            <useTimeWalkCorrection>false</useTimeWalkCorrection>
+            <outputHitsCollectionName>EcalCalHits</outputHitsCollectionName>
+        </driver> 
         <driver name="EcalClusterer" type="org.hps.recon.ecal.cluster.ReconClusterDriver">
             <logLevel>WARNING</logLevel>
             <outputClusterCollectionName>EcalClusters</outputClusterCollectionName>

Modified: java/branches/converter-div/steering-files/src/main/resources/org/hps/steering/monitoring/OnlineTracking.lcsim
 =============================================================================
--- java/branches/converter-div/steering-files/src/main/resources/org/hps/steering/monitoring/OnlineTracking.lcsim	(original)
+++ java/branches/converter-div/steering-files/src/main/resources/org/hps/steering/monitoring/OnlineTracking.lcsim	Fri Oct 21 12:33:41 2016
@@ -2,6 +2,8 @@
     <execute>
         <driver name="EventMarkerDriver" />
         <driver name="EcalRawConverter" />
+        <driver name="EcalGains"/>
+        <driver name="EcalTimeCorrection"/>
         <driver name="EcalClusterer" />
         <driver name="SVTOccupancyPlots" />
         <driver name="RawTrackerHitFitterDriver" />
@@ -13,9 +15,19 @@
     </execute>
     <drivers>
         <driver name="EcalRawConverter" type="org.hps.recon.ecal.EcalRawConverterDriver">
-            <ecalCollectionName>EcalCalHits</ecalCollectionName>
+             
+        	<ecalCollectionName>EcalUncalHits</ecalCollectionName>
+        </driver>
+        <driver name="EcalGains" type="org.hps.recon.ecal.EcalGainDriver">
+       		<inputHitsCollectionName>EcalUncalHits</inputHitsCollectionName>
             <use2014Gain>false</use2014Gain>
+            <outputHitsCollectionName>EcalGainHits</outputHitsCollectionName>
         </driver>
+        <driver name="EcalTimeCorrection" type="org.hps.recon.ecal.EcalTimeCorrectionDriver">
+       		<inputHitsCollectionName>EcalGainHits</inputHitsCollectionName>
+            <outputHitsCollectionName>EcalCalHits</outputHitsCollectionName>
+        </driver>  
+        
         <driver name="EcalClusterer" type="org.hps.recon.ecal.cluster.GTPOnlineClusterDriver">
             <verbose>false</verbose>
             <logLevel>WARNING</logLevel>

Modified: java/branches/converter-div/steering-files/src/main/resources/org/hps/steering/monitoring/SVTMonitoring.lcsim
 =============================================================================
--- java/branches/converter-div/steering-files/src/main/resources/org/hps/steering/monitoring/SVTMonitoring.lcsim	(original)
+++ java/branches/converter-div/steering-files/src/main/resources/org/hps/steering/monitoring/SVTMonitoring.lcsim	Fri Oct 21 12:33:41 2016
@@ -7,6 +7,8 @@
         <driver name="HelicalTrackHitDriver" />
         <driver name="TrackerReconDriver" />
         <driver name="EcalRawConverter" />
+        <driver name="EcalGains"/>
+        <driver name="EcalTimeCorrection"/>
         <driver name="EcalClusterer" />
         <driver name="CleanupDriver" />
         <driver name="AidaSaveDriver" />
@@ -17,9 +19,17 @@
         </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>
+            <ecalCollectionName>EcalUncalHits</ecalCollectionName>
+        </driver>
+        <driver name="EcalGains" type="org.hps.recon.ecal.EcalGainDriver">
+       		<inputHitsCollectionName>EcalUncalHits</inputHitsCollectionName>
             <use2014Gain>false</use2014Gain>
+            <outputHitsCollectionName>EcalGainHits</outputHitsCollectionName>
         </driver>
+        <driver name="EcalTimeCorrection" type="org.hps.recon.ecal.EcalTimeCorrectionDriver">
+       		<inputHitsCollectionName>EcalGainHits</inputHitsCollectionName>
+            <outputHitsCollectionName>EcalCalHits</outputHitsCollectionName>
+        </driver>  
         <driver name="EcalClusterer" type="org.hps.recon.ecal.cluster.GTPOnlineClusterDriver">
             <verbose>false</verbose>
             <logLevel>WARNING</logLevel>

Modified: java/branches/converter-div/steering-files/src/main/resources/org/hps/steering/monitoring/TrackingAndReconMonitoring.lcsim
 =============================================================================
--- java/branches/converter-div/steering-files/src/main/resources/org/hps/steering/monitoring/TrackingAndReconMonitoring.lcsim	(original)
+++ java/branches/converter-div/steering-files/src/main/resources/org/hps/steering/monitoring/TrackingAndReconMonitoring.lcsim	Fri Oct 21 12:33:41 2016
@@ -12,7 +12,9 @@
         <driver name="HelicalTrackHitDriver" />
         <driver name="TrackerReconDriver"/> 
         <driver name="TrackDataDriver"/>   
-        <driver name="EcalRawConverter" /> 
+        <driver name="EcalRawConverter" />
+        <driver name="EcalGains"/>
+        <driver name="EcalTimeCorrection"/> 
         <driver name="EcalClusterer" />
         <driver name="ReconParticle" /> 
         <!-- Online Monitoring Drivers -->
@@ -58,19 +60,27 @@
         <driver name="TrackDataDriver" type="org.hps.recon.tracking.TrackDataDriver">
         </driver>
         <driver name="EcalRawConverter" type="org.hps.recon.ecal.EcalRawConverterDriver">
-            <ecalCollectionName>EcalCalHits</ecalCollectionName>
-            <use2014Gain>false</use2014Gain>
             <useTimestamps>false</useTimestamps>
             <useTruthTime>false</useTruthTime>
             <useRunningPedestal>false</useRunningPedestal>
-            <useTimeWalkCorrection>false</useTimeWalkCorrection>
             <emulateFirmware>true</emulateFirmware>
             <emulateMode7>false</emulateMode7>
             <leadingEdgeThreshold>12</leadingEdgeThreshold>
             <nsa>100</nsa>
             <nsb>20</nsb>
             <nPeak>3</nPeak>
+            <ecalCollectionName>EcalUncalHits</ecalCollectionName>
         </driver>
+        <driver name="EcalGains" type="org.hps.recon.ecal.EcalGainDriver">
+       		<inputHitsCollectionName>EcalUncalHits</inputHitsCollectionName>
+            <use2014Gain>false</use2014Gain>
+            <outputHitsCollectionName>EcalGainHits</outputHitsCollectionName>
+        </driver>
+        <driver name="EcalTimeCorrection" type="org.hps.recon.ecal.EcalTimeCorrectionDriver">
+       		<inputHitsCollectionName>EcalGainHits</inputHitsCollectionName>
+            <useTimeWalkCorrection>false</useTimeWalkCorrection>
+            <outputHitsCollectionName>EcalCalHits</outputHitsCollectionName>
+        </driver>  
         <driver name="EcalClusterer" type="org.hps.recon.ecal.cluster.ReconClusterDriver">
             <logLevel>WARNING</logLevel>
             <outputClusterCollectionName>EcalClusters</outputClusterCollectionName>

Modified: java/branches/converter-div/steering-files/src/main/resources/org/hps/steering/monitoring/TriggerDiagnosticsMonitoring.lcsim
 =============================================================================
--- java/branches/converter-div/steering-files/src/main/resources/org/hps/steering/monitoring/TriggerDiagnosticsMonitoring.lcsim	(original)
+++ java/branches/converter-div/steering-files/src/main/resources/org/hps/steering/monitoring/TriggerDiagnosticsMonitoring.lcsim	Fri Oct 21 12:33:41 2016
@@ -4,6 +4,8 @@
         <driver name="ConditionsDriver"/>
         <driver name="DAQConfig"/>
         <driver name="EcalRawConverter"/>
+        <driver name="EcalGains"/>
+        <driver name="EcalTimeCorrection"/>
         <driver name="GTPTestDriver"/>
         <driver name="TriggerDiagnostics"/>
         <!--
@@ -21,12 +23,9 @@
         </driver>        
         <driver name="DAQConfig" type="org.hps.record.daqconfig.DAQConfigDriver"/>
         <driver name="EcalRawConverter" type="org.hps.recon.ecal.EcalRawConverterDriver">
-            <ecalCollectionName>EcalCalHits</ecalCollectionName>
-            <use2014Gain>false</use2014Gain>
             <useTimestamps>false</useTimestamps>
             <useTruthTime>false</useTruthTime>
             <useRunningPedestal>false</useRunningPedestal>
-            <useTimeWalkCorrection>false</useTimeWalkCorrection>
             <emulateFirmware>true</emulateFirmware>
             <emulateMode7>false</emulateMode7>
             <leadingEdgeThreshold>12</leadingEdgeThreshold>
@@ -34,7 +33,18 @@
             <nsa>100</nsa>
             <nsb>20</nsb>
             <nPeak>3</nPeak>
-        </driver>        
+            <ecalCollectionName>EcalUncalHits</ecalCollectionName>
+        </driver>
+        <driver name="EcalGains" type="org.hps.recon.ecal.EcalGainDriver">
+       		<inputHitsCollectionName>EcalUncalHits</inputHitsCollectionName>
+            <use2014Gain>false</use2014Gain>
+            <outputHitsCollectionName>EcalGainHits</outputHitsCollectionName>
+        </driver>
+        <driver name="EcalTimeCorrection" type="org.hps.recon.ecal.EcalTimeCorrectionDriver">
+       		<inputHitsCollectionName>EcalGainHits</inputHitsCollectionName>
+            <useTimeWalkCorrection>false</useTimeWalkCorrection>
+            <outputHitsCollectionName>EcalCalHits</outputHitsCollectionName>
+        </driver> 
         <driver name="GTPTestDriver" type="org.hps.recon.ecal.cluster.GTPOnlineClusterDriver">
             <inputHitCollectionName>EcalCalHits</inputHitCollectionName>
             <!-- <seedEnergyThreshold>0.500</seedEnergyThreshold>

Modified: java/branches/converter-div/steering-files/src/main/resources/org/hps/steering/readout/CommRun2014TightPairs.lcsim
 =============================================================================
--- java/branches/converter-div/steering-files/src/main/resources/org/hps/steering/readout/CommRun2014TightPairs.lcsim	(original)
+++ java/branches/converter-div/steering-files/src/main/resources/org/hps/steering/readout/CommRun2014TightPairs.lcsim	Fri Oct 21 12:33:41 2016
@@ -11,6 +11,8 @@
         <driver name="EventMarkerDriver"/>          
         <driver name="EcalReadout"/>
         <driver name="EcalConverter"/>
+        <driver name="EcalGains"/>
+        <driver name="EcalTimeCorrection"/>
         <driver name="EcalClusterer"/>
         <driver name="PairTrigger1"/>
         <driver name="TestRunReconToLcio"/>
@@ -40,11 +42,19 @@
         </driver>
         <driver name="EcalConverter" type="org.hps.recon.ecal.EcalRawConverterDriver">
             <rawCollectionName>EcalRawHits</rawCollectionName>
-            <ecalCollectionName>EcalCorrectedHits</ecalCollectionName>
-            <applyBadCrystalMap>false</applyBadCrystalMap>
-            <use2014Gain>false</use2014Gain>      
+            <ecalCollectionName>EcalUncalHits</ecalCollectionName>
+            <applyBadCrystalMap>false</applyBadCrystalMap>      
             <debug>true</debug>
         </driver>   
+        <driver name="EcalGains" type="org.hps.recon.ecal.EcalGainDriver">
+       		<inputHitsCollectionName>EcalUncalHits</inputHitsCollectionName>
+            <use2014Gain>false</use2014Gain>
+            <outputHitsCollectionName>EcalGainHits</outputHitsCollectionName>
+        </driver>
+        <driver name="EcalTimeCorrection" type="org.hps.recon.ecal.EcalTimeCorrectionDriver">
+       		<inputHitsCollectionName>EcalGainHits</inputHitsCollectionName>
+            <outputHitsCollectionName>EcalCorrectedHits</outputHitsCollectionName>
+        </driver>  
         <driver name="EcalClusterer" type="org.hps.recon.ecal.cluster.GTPClusterDriver">
             <inputHitCollectionName>EcalCorrectedHits</inputHitCollectionName>
             <clusterWindow>1</clusterWindow>

Modified: java/branches/converter-div/steering-files/src/main/resources/org/hps/steering/readout/EngineeringRun2014PresTrigPairs0.lcsim
 =============================================================================
--- java/branches/converter-div/steering-files/src/main/resources/org/hps/steering/readout/EngineeringRun2014PresTrigPairs0.lcsim	(original)
+++ java/branches/converter-div/steering-files/src/main/resources/org/hps/steering/readout/EngineeringRun2014PresTrigPairs0.lcsim	Fri Oct 21 12:33:41 2016
@@ -8,6 +8,8 @@
         <driver name="EventMarkerDriver"/>          
         <driver name="EcalReadout"/>
         <driver name="EcalConverter"/>
+        <driver name="EcalGains"/>
+        <driver name="EcalTimeCorrection"/>
         <driver name="EcalClustererGTP"/>
         <driver name="PairTrigger0"/>
         <driver name="TestRunReconToLcio"/>
@@ -44,12 +46,21 @@
         <driver name="EcalConverter" type="org.hps.recon.ecal.EcalRawConverterDriver">
             <rawCollectionName>EcalRawHits</rawCollectionName>
             <!--rawCollectionName>EcalCalHits</rawCollectionName-->
-            <ecalCollectionName>EcalCorrectedHits</ecalCollectionName>
+            <ecalCollectionName>EcalUncalHits</ecalCollectionName>
             <applyBadCrystalMap>false</applyBadCrystalMap>
             <nsa>100</nsa>
             <nsb>20</nsb>
-            <use2014Gain>false</use2014Gain> 
+            
         </driver>   
+        <driver name="EcalGains" type="org.hps.recon.ecal.EcalGainDriver">
+       		<inputHitsCollectionName>EcalUncalHits</inputHitsCollectionName>
+            <use2014Gain>false</use2014Gain>
+            <outputHitsCollectionName>EcalGainHits</outputHitsCollectionName>
+        </driver>
+        <driver name="EcalTimeCorrection" type="org.hps.recon.ecal.EcalTimeCorrectionDriver">
+       		<inputHitsCollectionName>EcalGainHits</inputHitsCollectionName>
+            <outputHitsCollectionName>EcalCorrectedHits</outputHitsCollectionName>
+        </driver>  
         <driver name="EcalClustererGTP" type="org.hps.recon.ecal.cluster.GTPClusterDriver">
             <inputHitCollectionName>EcalCorrectedHits</inputHitCollectionName>
             <outputClusterCollectionName>EcalClusters</outputClusterCollectionName>            

Modified: java/branches/converter-div/steering-files/src/main/resources/org/hps/steering/readout/EngineeringRun2014PresTrigPairs1.lcsim
 =============================================================================
--- java/branches/converter-div/steering-files/src/main/resources/org/hps/steering/readout/EngineeringRun2014PresTrigPairs1.lcsim	(original)
+++ java/branches/converter-div/steering-files/src/main/resources/org/hps/steering/readout/EngineeringRun2014PresTrigPairs1.lcsim	Fri Oct 21 12:33:41 2016
@@ -8,6 +8,8 @@
         <driver name="EventMarkerDriver"/>          
         <driver name="EcalReadout"/>
         <driver name="EcalConverter"/>
+        <driver name="EcalGains"/>
+        <driver name="EcalTimeCorrection"/>
         <driver name="EcalClustererGTP"/>
         <driver name="PairTrigger1"/>
         <driver name="TestRunReconToLcio"/>
@@ -44,12 +46,21 @@
         <driver name="EcalConverter" type="org.hps.recon.ecal.EcalRawConverterDriver">
             <rawCollectionName>EcalRawHits</rawCollectionName>
             <!--rawCollectionName>EcalCalHits</rawCollectionName-->
-            <ecalCollectionName>EcalCorrectedHits</ecalCollectionName>
+            <ecalCollectionName>EcalUncalHits</ecalCollectionName>
             <applyBadCrystalMap>false</applyBadCrystalMap>
             <nsa>100</nsa>
             <nsb>20</nsb>
             <use2014Gain>false</use2014Gain> 
-        </driver>   
+        </driver> 
+        <driver name="EcalGains" type="org.hps.recon.ecal.EcalGainDriver">
+       		<inputHitsCollectionName>EcalUncalHits</inputHitsCollectionName>
+            <use2014Gain>false</use2014Gain>
+            <outputHitsCollectionName>EcalGainHits</outputHitsCollectionName>
+        </driver>
+        <driver name="EcalTimeCorrection" type="org.hps.recon.ecal.EcalTimeCorrectionDriver">
+       		<inputHitsCollectionName>EcalGainHits</inputHitsCollectionName>
+            <outputHitsCollectionName>EcalCorrectedHits</outputHitsCollectionName>
+        </driver>    
         <driver name="EcalClustererGTP" type="org.hps.recon.ecal.cluster.GTPClusterDriver">
             <inputHitCollectionName>EcalCorrectedHits</inputHitCollectionName>
             <outputClusterCollectionName>EcalClusters</outputClusterCollectionName>            

Modified: java/branches/converter-div/steering-files/src/main/resources/org/hps/steering/readout/EngineeringRun2014PresTrigSingles0.lcsim
 =============================================================================
--- java/branches/converter-div/steering-files/src/main/resources/org/hps/steering/readout/EngineeringRun2014PresTrigSingles0.lcsim	(original)
+++ java/branches/converter-div/steering-files/src/main/resources/org/hps/steering/readout/EngineeringRun2014PresTrigSingles0.lcsim	Fri Oct 21 12:33:41 2016
@@ -8,6 +8,8 @@
         <driver name="EventMarkerDriver"/>          
         <driver name="EcalReadout"/>
         <driver name="EcalConverter"/>
+        <driver name="EcalGains"/>
+        <driver name="EcalTimeCorrection"/>
         <driver name="EcalClustererGTP"/>
         <driver name="SinglesTrigger0"/>
         <driver name="TestRunReconToLcio"/>
@@ -44,12 +46,20 @@
         <driver name="EcalConverter" type="org.hps.recon.ecal.EcalRawConverterDriver">
             <rawCollectionName>EcalRawHits</rawCollectionName>
             <!--rawCollectionName>EcalCalHits</rawCollectionName-->
-            <ecalCollectionName>EcalCorrectedHits</ecalCollectionName>
+            <ecalCollectionName>EcalUncalHits</ecalCollectionName>
             <applyBadCrystalMap>false</applyBadCrystalMap>
             <nsa>100</nsa>
             <nsb>20</nsb>
             <use2014Gain>false</use2014Gain> 
+        </driver>
+        <driver name="EcalGains" type="org.hps.recon.ecal.EcalGainDriver">
+       		<inputHitsCollectionName>EcalUncalHits</inputHitsCollectionName>
+            <outputHitsCollectionName>EcalGainHits</outputHitsCollectionName>
         </driver>   
+        <driver name="EcalTimeCorrection" type="org.hps.recon.ecal.EcalTimeCorrectionDriver">
+       		<inputHitsCollectionName>EcalGainHits</inputHitsCollectionName>
+            <outputHitsCollectionName>EcalCorrectedHits</outputHitsCollectionName>
+        </driver> 
         <driver name="EcalClustererGTP" type="org.hps.recon.ecal.cluster.GTPClusterDriver">
             <inputHitCollectionName>EcalCorrectedHits</inputHitCollectionName>
             <outputClusterCollectionName>EcalClusters</outputClusterCollectionName>            

Modified: java/branches/converter-div/steering-files/src/main/resources/org/hps/steering/readout/EngineeringRun2014PresTrigSingles1.lcsim
 =============================================================================
--- java/branches/converter-div/steering-files/src/main/resources/org/hps/steering/readout/EngineeringRun2014PresTrigSingles1.lcsim	(original)
+++ java/branches/converter-div/steering-files/src/main/resources/org/hps/steering/readout/EngineeringRun2014PresTrigSingles1.lcsim	Fri Oct 21 12:33:41 2016
@@ -8,6 +8,8 @@
         <driver name="EventMarkerDriver"/>          
         <driver name="EcalReadout"/>
         <driver name="EcalConverter"/>
+        <driver name="EcalGains"/>
+        <driver name="EcalTimeCorrection"/>
         <driver name="EcalClustererGTP"/>
         <driver name="SinglesTrigger1"/>
         <driver name="TestRunReconToLcio"/>
@@ -44,12 +46,21 @@
         <driver name="EcalConverter" type="org.hps.recon.ecal.EcalRawConverterDriver">
             <rawCollectionName>EcalRawHits</rawCollectionName>
             <!--rawCollectionName>EcalCalHits</rawCollectionName-->
-            <ecalCollectionName>EcalCorrectedHits</ecalCollectionName>
+            <ecalCollectionName>EcalUncalHits</ecalCollectionName>
             <applyBadCrystalMap>false</applyBadCrystalMap>
             <nsa>100</nsa>
             <nsb>20</nsb>
+            
+        </driver>   
+        <driver name="EcalGains" type="org.hps.recon.ecal.EcalGainDriver">
+       		<inputHitsCollectionName>EcalUncalHits</inputHitsCollectionName>
             <use2014Gain>false</use2014Gain> 
-        </driver>   
+            <outputHitsCollectionName>EcalGainHits</outputHitsCollectionName>
+        </driver>
+        <driver name="EcalTimeCorrection" type="org.hps.recon.ecal.EcalTimeCorrectionDriver">
+       		<inputHitsCollectionName>EcalGainHits</inputHitsCollectionName>
+            <outputHitsCollectionName>EcalCorrectedHits</outputHitsCollectionName>
+        </driver>  
         <driver name="EcalClustererGTP" type="org.hps.recon.ecal.cluster.GTPClusterDriver">
             <inputHitCollectionName>EcalCorrectedHits</inputHitCollectionName>
             <outputClusterCollectionName>EcalClusters</outputClusterCollectionName>            

Modified: java/branches/converter-div/steering-files/src/main/resources/org/hps/steering/readout/EngineeringRun2014PrescaledTriggers.lcsim
 =============================================================================
--- java/branches/converter-div/steering-files/src/main/resources/org/hps/steering/readout/EngineeringRun2014PrescaledTriggers.lcsim	(original)
+++ java/branches/converter-div/steering-files/src/main/resources/org/hps/steering/readout/EngineeringRun2014PrescaledTriggers.lcsim	Fri Oct 21 12:33:41 2016
@@ -9,6 +9,8 @@
         <driver name="EventMarkerDriver"/>          
         <driver name="EcalReadout"/>
         <driver name="EcalConverter"/>
+        <driver name="EcalGains"/>
+        <driver name="EcalTimeCorrection"/>
         <driver name="EcalClustererGTP"/>
         <driver name="EcalClusterer"/>
         <driver name="PairTrigger1"/>
@@ -49,12 +51,20 @@
         <driver name="EcalConverter" type="org.hps.recon.ecal.EcalRawConverterDriver">
             <rawCollectionName>EcalRawHits</rawCollectionName>
             <!--rawCollectionName>EcalCalHits</rawCollectionName-->
-            <ecalCollectionName>EcalCorrectedHits</ecalCollectionName>
+            <ecalCollectionName>EcalUncalHits</ecalCollectionName>
             <applyBadCrystalMap>false</applyBadCrystalMap>
             <nsa>100</nsa>
             <nsb>20</nsb>
-            <use2014Gain>false</use2014Gain> 
         </driver>   
+        <driver name="EcalGains" type="org.hps.recon.ecal.EcalGainDriver">
+       		<inputHitsCollectionName>EcalUncalHits</inputHitsCollectionName>
+            <use2014Gain>false</use2014Gain>
+            <outputHitsCollectionName>EcalGainHits</outputHitsCollectionName>
+        </driver>
+        <driver name="EcalTimeCorrection" type="org.hps.recon.ecal.EcalTimeCorrectionDriver">
+       		<inputHitsCollectionName>EcalGainHits</inputHitsCollectionName>
+            <outputHitsCollectionName>EcalCorrectedHits</outputHitsCollectionName>
+        </driver>  
         <driver name="EcalClustererGTP" type="org.hps.recon.ecal.cluster.GTPClusterDriver">
             <inputHitCollectionName>EcalCorrectedHits</inputHitCollectionName>
             <outputClusterCollectionName>EcalClusters</outputClusterCollectionName>            

Modified: java/branches/converter-div/steering-files/src/main/resources/org/hps/steering/readout/EngineeringRun2015TrigPairs1.lcsim
 =============================================================================
--- java/branches/converter-div/steering-files/src/main/resources/org/hps/steering/readout/EngineeringRun2015TrigPairs1.lcsim	(original)
+++ java/branches/converter-div/steering-files/src/main/resources/org/hps/steering/readout/EngineeringRun2015TrigPairs1.lcsim	Fri Oct 21 12:33:41 2016
@@ -10,6 +10,8 @@
 <!--  Readout Simulation -->
         <driver name="EcalReadout"/>
         <driver name="EcalConverter"/>
+        <driver name="EcalGains"/>
+        <driver name="EcalTimeCorrection"/>
         <driver name="EcalClustererGTP"/>
         <driver name="PairTrigger1"/>
         <driver name="SimpleSVTReadout" />
@@ -44,12 +46,20 @@
         </driver>
         <driver name="EcalConverter" type="org.hps.recon.ecal.EcalRawConverterDriver">
             <rawCollectionName>EcalRawHits</rawCollectionName>
-            <ecalCollectionName>EcalCorrectedHits</ecalCollectionName>
+            <ecalCollectionName>EcalUncalHits</ecalCollectionName>
             <applyBadCrystalMap>false</applyBadCrystalMap>
             <nsa>100</nsa>
             <nsb>20</nsb>
+        </driver>   
+        <driver name="EcalGains" type="org.hps.recon.ecal.EcalGainDriver">
+       		<inputHitsCollectionName>EcalUncalHits</inputHitsCollectionName>
             <use2014Gain>false</use2014Gain> 
-        </driver>   
+            <outputHitsCollectionName>EcalGainHits</outputHitsCollectionName>
+        </driver>
+        <driver name="EcalTimeCorrection" type="org.hps.recon.ecal.EcalTimeCorrectionDriver">
+       		<inputHitsCollectionName>EcalGainHits</inputHitsCollectionName>
+            <outputHitsCollectionName>EcalCorrectedHits</outputHitsCollectionName>
+        </driver>  
         <driver name="EcalClustererGTP" type="org.hps.recon.ecal.cluster.GTPClusterDriver">
             <!--
             Hit Time Coincidence:         +/-16 ns

Modified: java/branches/converter-div/steering-files/src/main/resources/org/hps/steering/readout/EngineeringRun2015TrigPairs1_Pass2.lcsim
 =============================================================================
--- java/branches/converter-div/steering-files/src/main/resources/org/hps/steering/readout/EngineeringRun2015TrigPairs1_Pass2.lcsim	(original)
+++ java/branches/converter-div/steering-files/src/main/resources/org/hps/steering/readout/EngineeringRun2015TrigPairs1_Pass2.lcsim	Fri Oct 21 12:33:41 2016
@@ -11,6 +11,8 @@
         <!--  Readout Simulation -->
         <driver name="EcalReadout"/>
         <driver name="EcalConverter"/>
+        <driver name="EcalGains"/>
+        <driver name="EcalTimeCorrection"/>
         <driver name="EcalClustererGTP"/>
         <driver name="PairTrigger1"/>
         <driver name="SimpleSVTReadout" />
@@ -41,8 +43,16 @@
         </driver>
         <driver name="EcalConverter" type="org.hps.recon.ecal.EcalRawConverterDriver">
             <rawCollectionName>EcalRawHits</rawCollectionName>
-            <ecalCollectionName>EcalCorrectedHits</ecalCollectionName>
+            <ecalCollectionName>EcalUncalHits</ecalCollectionName>
         </driver>   
+        <driver name="EcalGains" type="org.hps.recon.ecal.EcalGainDriver">
+       		<inputHitsCollectionName>EcalUncalHits</inputHitsCollectionName>
+            <outputHitsCollectionName>EcalGainHits</outputHitsCollectionName>
+        </driver>
+        <driver name="EcalTimeCorrection" type="org.hps.recon.ecal.EcalTimeCorrectionDriver">
+       		<inputHitsCollectionName>EcalGainHits</inputHitsCollectionName>
+            <outputHitsCollectionName>EcalCorrectedHits</outputHitsCollectionName>
+        </driver>  
         <driver name="EcalClustererGTP" type="org.hps.recon.ecal.cluster.GTPClusterDriver">
             <!--
             Hit Time Coincidence:         +/-16 ns

Modified: java/branches/converter-div/steering-files/src/main/resources/org/hps/steering/readout/EngineeringRun2015TrigSingles1.lcsim
 =============================================================================
--- java/branches/converter-div/steering-files/src/main/resources/org/hps/steering/readout/EngineeringRun2015TrigSingles1.lcsim	(original)
+++ java/branches/converter-div/steering-files/src/main/resources/org/hps/steering/readout/EngineeringRun2015TrigSingles1.lcsim	Fri Oct 21 12:33:41 2016
@@ -10,6 +10,8 @@
         <!--  Readout Simulation -->
         <driver name="EcalReadout"/>
         <driver name="EcalConverter"/>
+        <driver name="EcalGains"/>
+        <driver name="EcalTimeCorrection"/>
         <driver name="EcalClustererGTP"/>
         <driver name="SinglesTrigger1"/>
         <driver name="SimpleSVTReadout" />
@@ -44,12 +46,20 @@
         </driver>
         <driver name="EcalConverter" type="org.hps.recon.ecal.EcalRawConverterDriver">
             <rawCollectionName>EcalRawHits</rawCollectionName>
-            <ecalCollectionName>EcalCorrectedHits</ecalCollectionName>
+            <ecalCollectionName>EcalUncalHits</ecalCollectionName>
             <applyBadCrystalMap>false</applyBadCrystalMap>
             <nsa>100</nsa>
             <nsb>20</nsb>
-            <use2014Gain>false</use2014Gain> 
         </driver>   
+        <driver name="EcalGains" type="org.hps.recon.ecal.EcalGainDriver">
+       		<inputHitsCollectionName>EcalUncalHits</inputHitsCollectionName>
+            <use2014Gain>false</use2014Gain>
+            <outputHitsCollectionName>EcalGainHits</outputHitsCollectionName>
+        </driver>
+        <driver name="EcalTimeCorrection" type="org.hps.recon.ecal.EcalTimeCorrectionDriver">
+       		<inputHitsCollectionName>EcalGainHits</inputHitsCollectionName>
+            <outputHitsCollectionName>EcalCorrectedHits</outputHitsCollectionName>
+        </driver>  
         <driver name="EcalClustererGTP" type="org.hps.recon.ecal.cluster.GTPClusterDriver">
             <!--
             Hit Time Coincidence:         +/-16 ns

Modified: java/branches/converter-div/steering-files/src/main/resources/org/hps/steering/readout/EngineeringRun2015TrigSingles1_Pass2.lcsim
 =============================================================================
--- java/branches/converter-div/steering-files/src/main/resources/org/hps/steering/readout/EngineeringRun2015TrigSingles1_Pass2.lcsim	(original)
+++ java/branches/converter-div/steering-files/src/main/resources/org/hps/steering/readout/EngineeringRun2015TrigSingles1_Pass2.lcsim	Fri Oct 21 12:33:41 2016
@@ -11,6 +11,8 @@
         <!--  Readout Simulation -->
         <driver name="EcalReadout"/>
         <driver name="EcalConverter"/>
+        <driver name="EcalGains"/>
+        <driver name="EcalTimeCorrection"/>
         <driver name="EcalClustererGTP"/>
         <driver name="SinglesTrigger1"/>
         <driver name="SimpleSVTReadout" />
@@ -41,8 +43,17 @@
         </driver>
         <driver name="EcalConverter" type="org.hps.recon.ecal.EcalRawConverterDriver">
             <rawCollectionName>EcalRawHits</rawCollectionName>
-            <ecalCollectionName>EcalCorrectedHits</ecalCollectionName>
+            <ecalCollectionName>EcalUncalHits</ecalCollectionName>
         </driver>   
+        <driver name="EcalGains" type="org.hps.recon.ecal.EcalGainDriver">
+       		<inputHitsCollectionName>EcalUncalHits</inputHitsCollectionName>
+            <use2014Gain>false</use2014Gain> 
+            <outputHitsCollectionName>EcalGainHits</outputHitsCollectionName>
+        </driver>
+        <driver name="EcalTimeCorrection" type="org.hps.recon.ecal.EcalTimeCorrectionDriver">
+       		<inputHitsCollectionName>EcalGainHits</inputHitsCollectionName>
+            <outputHitsCollectionName>EcalCorrectedHits</outputHitsCollectionName>
+        </driver>  
         <driver name="EcalClustererGTP" type="org.hps.recon.ecal.cluster.GTPClusterDriver">
             <!--
             Hit Time Coincidence:         +/-16 ns

Modified: java/branches/converter-div/steering-files/src/main/resources/org/hps/steering/readout/HPS2014ReadoutNoPileup.lcsim
 =============================================================================
--- java/branches/converter-div/steering-files/src/main/resources/org/hps/steering/readout/HPS2014ReadoutNoPileup.lcsim	(original)
+++ java/branches/converter-div/steering-files/src/main/resources/org/hps/steering/readout/HPS2014ReadoutNoPileup.lcsim	Fri Oct 21 12:33:41 2016
@@ -32,11 +32,11 @@
             <constantGain>0.15</constantGain>
         </driver>
         <driver name="EcalReadoutConverterDriver" type="org.hps.recon.ecal.EcalRawConverterDriver">                              
-            <use2014Gain>false</use2014Gain> 
-            <runBackwards>true</runBackwards>
+           <runBackwards>true</runBackwards>
             <rawCollectionName>EcalReadoutHits</rawCollectionName>           
             <ecalCollectionName>EcalReadoutAnalogHits</ecalCollectionName>
         </driver>
+         
         <driver name="EcalTriggerClusterer" type="org.hps.recon.ecal.cluster.GTPClusterDriver">
             <clusterWindow>0</clusterWindow>            
             <inputHitCollectionName>EcalReadoutAnalogHits</inputHitCollectionName>

Modified: java/branches/converter-div/steering-files/src/main/resources/org/hps/steering/readout/HPS2014ReadoutToEvio.lcsim
 =============================================================================
--- java/branches/converter-div/steering-files/src/main/resources/org/hps/steering/readout/HPS2014ReadoutToEvio.lcsim	(original)
+++ java/branches/converter-div/steering-files/src/main/resources/org/hps/steering/readout/HPS2014ReadoutToEvio.lcsim	Fri Oct 21 12:33:41 2016
@@ -9,6 +9,8 @@
         <driver name="ConditionsDriver"/> 
         <driver name="EcalReadout"/>
         <driver name="EcalConverter"/>
+        <driver name="EcalGains"/>
+        <driver name="EcalTimeCorrection"/>
         <driver name="EcalClusterer"/>
         <driver name="EcalTrigger"/>
         <driver name="SimpleSVTReadout"/>
@@ -39,12 +41,21 @@
         </driver>
         <driver name="EcalConverter" type="org.hps.recon.ecal.EcalRawConverterDriver">
             <rawCollectionName>EcalRawHits</rawCollectionName>
-            <ecalCollectionName>EcalCorrectedHits</ecalCollectionName>
+            <ecalCollectionName>EcalUncalHits</ecalCollectionName>
             <!--<gain>0.15</gain>-->
             <applyBadCrystalMap>false</applyBadCrystalMap>
             <use2014Gain>true</use2014Gain>
             <!--            <debug>true</debug>-->
         </driver>   
+        <driver name="EcalGains" type="org.hps.recon.ecal.EcalGainDriver">
+       		<inputHitsCollectionName>EcalUncalHits</inputHitsCollectionName>
+            <use2014Gain>false</use2014Gain>
+            <outputHitsCollectionName>EcalGainHits</outputHitsCollectionName>
+        </driver>
+        <driver name="EcalTimeCorrection" type="org.hps.recon.ecal.EcalTimeCorrectionDriver">
+       		<inputHitsCollectionName>EcalGainHits</inputHitsCollectionName>
+            <outputHitsCollectionName>EcalCorrectedHits</outputHitsCollectionName>
+        </driver>  
         <driver name="EcalClusterer" type="org.hps.recon.ecal.cluster.GTPClusterDriver">
             <inputHitCollectionName>EcalCorrectedHits</inputHitCollectionName>
             <clusterWindow>1</clusterWindow>

Modified: java/branches/converter-div/steering-files/src/main/resources/org/hps/steering/readout/HPS2014ReadoutToLcio.lcsim
 =============================================================================
--- java/branches/converter-div/steering-files/src/main/resources/org/hps/steering/readout/HPS2014ReadoutToLcio.lcsim	(original)
+++ java/branches/converter-div/steering-files/src/main/resources/org/hps/steering/readout/HPS2014ReadoutToLcio.lcsim	Fri Oct 21 12:33:41 2016
@@ -8,6 +8,8 @@
         <driver name="ConditionsDriver"/>
         <driver name="EcalReadout" />
         <driver name="EcalConverter" />
+        <driver name="EcalGains"/>
+        <driver name="EcalTimeCorrection"/>
         <driver name="EcalClusterer" />
         <driver name="EcalTrigger" />
         <driver name="SimpleSVTReadout" />
@@ -39,12 +41,20 @@
         </driver>
         <driver name="EcalConverter" type="org.hps.recon.ecal.EcalRawConverterDriver">
             <rawCollectionName>EcalRawHits</rawCollectionName>
-            <ecalCollectionName>EcalCorrectedHits</ecalCollectionName>
+            <ecalCollectionName>EcalUncalHits</ecalCollectionName>
             <!--  <gain>0.15</gain> -->
             <applyBadCrystalMap>false</applyBadCrystalMap>
-            <use2014Gain>true</use2014Gain>
             <!--  <debug>true</debug> -->
         </driver>
+        <driver name="EcalGains" type="org.hps.recon.ecal.EcalGainDriver">
+       		<inputHitsCollectionName>EcalUncalHits</inputHitsCollectionName>
+            <use2014Gain>true</use2014Gain>
+            <outputHitsCollectionName>EcalGainHits</outputHitsCollectionName>
+        </driver>
+        <driver name="EcalTimeCorrection" type="org.hps.recon.ecal.EcalTimeCorrectionDriver">
+       		<inputHitsCollectionName>EcalGainHits</inputHitsCollectionName>
+            <outputHitsCollectionName>EcalCorrectedHits</outputHitsCollectionName>
+        </driver>  
         <driver name="EcalClusterer" type="org.hps.recon.ecal.cluster.GTPClusterDriver">
             <clusterWindow>1</clusterWindow>
             <inputHitCollectionName>EcalCorrectedHits</inputHitCollectionName>

Modified: java/branches/converter-div/steering-files/src/main/resources/org/hps/steering/readout/HPS2014TruthReadoutToLcio.lcsim
 =============================================================================
--- java/branches/converter-div/steering-files/src/main/resources/org/hps/steering/readout/HPS2014TruthReadoutToLcio.lcsim	(original)
+++ java/branches/converter-div/steering-files/src/main/resources/org/hps/steering/readout/HPS2014TruthReadoutToLcio.lcsim	Fri Oct 21 12:33:41 2016
@@ -10,6 +10,8 @@
         <driver name="ConditionsDriver"/>
         <driver name="EcalReadout"/>
         <driver name="EcalConverter"/>
+        <driver name="EcalGains"/>
+        <driver name="EcalTimeCorrection"/>
         <driver name="EcalClusterer"/>
         <driver name="EcalTrigger"/>
         <driver name="SimpleSVTReadout"/>
@@ -42,12 +44,20 @@
         </driver>
         <driver name="EcalConverter" type="org.hps.recon.ecal.EcalRawConverterDriver">
             <rawCollectionName>EcalRawHits</rawCollectionName>
-            <ecalCollectionName>EcalCorrectedHits</ecalCollectionName>
+            <ecalCollectionName>EcalUncalHits</ecalCollectionName>
             <!--            <gain>0.15</gain>-->
             <applyBadCrystalMap>false</applyBadCrystalMap>
-            <use2014Gain>true</use2014Gain>
             <!--            <debug>true</debug>-->
         </driver>   
+        <driver name="EcalGains" type="org.hps.recon.ecal.EcalGainDriver">
+       		<inputHitsCollectionName>EcalUncalHits</inputHitsCollectionName>
+            <use2014Gain>false</use2014Gain>
+            <outputHitsCollectionName>EcalGainHits</outputHitsCollectionName>
+        </driver>
+        <driver name="EcalTimeCorrection" type="org.hps.recon.ecal.EcalTimeCorrectionDriver">
+       		<inputHitsCollectionName>EcalGainHits</inputHitsCollectionName>
+            <outputHitsCollectionName>EcalCorrectedHits</outputHitsCollectionName>
+        </driver>  
         <driver name="EcalClusterer" type="org.hps.recon.ecal.cluster.GTPClusterDriver">
             <inputHitCollectionName>EcalCorrectedHits</inputHitCollectionName>
             <clusterWindow>1</clusterWindow>

Modified: java/branches/converter-div/steering-files/src/main/resources/org/hps/steering/readout/MockPulserTrigger.lcsim
 =============================================================================
--- java/branches/converter-div/steering-files/src/main/resources/org/hps/steering/readout/MockPulserTrigger.lcsim	(original)
+++ java/branches/converter-div/steering-files/src/main/resources/org/hps/steering/readout/MockPulserTrigger.lcsim	Fri Oct 21 12:33:41 2016
@@ -11,6 +11,8 @@
         <!--  Readout Simulation -->
         <driver name="EcalReadout"/>
         <driver name="EcalConverter"/>
+        <driver name="EcalGains"/>
+        <driver name="EcalTimeCorrection"/>
         <driver name="EcalClustererGTP"/>
         <driver name="SinglesTrigger1"/>
         <driver name="SimpleSVTReadout" />
@@ -41,8 +43,16 @@
         </driver>
         <driver name="EcalConverter" type="org.hps.recon.ecal.EcalRawConverterDriver">
             <rawCollectionName>EcalRawHits</rawCollectionName>
-            <ecalCollectionName>EcalCorrectedHits</ecalCollectionName>
+            <ecalCollectionName>EcalUncalHits</ecalCollectionName>
         </driver>   
+        <driver name="EcalGains" type="org.hps.recon.ecal.EcalGainDriver">
+       		<inputHitsCollectionName>EcalUncalHits</inputHitsCollectionName>
+            <outputHitsCollectionName>EcalGainHits</outputHitsCollectionName>
+        </driver>
+        <driver name="EcalTimeCorrection" type="org.hps.recon.ecal.EcalTimeCorrectionDriver">
+       		<inputHitsCollectionName>EcalGainHits</inputHitsCollectionName>
+            <outputHitsCollectionName>EcalCorrectedHits</outputHitsCollectionName>
+        </driver>  
         <driver name="EcalClustererGTP" type="org.hps.recon.ecal.cluster.GTPClusterDriver">
             <!--
             Hit Time Coincidence:         +/-16 ns

Modified: java/branches/converter-div/steering-files/src/main/resources/org/hps/steering/readout/PhysicsRun2016TrigPair0.lcsim
 =============================================================================
--- java/branches/converter-div/steering-files/src/main/resources/org/hps/steering/readout/PhysicsRun2016TrigPair0.lcsim	(original)
+++ java/branches/converter-div/steering-files/src/main/resources/org/hps/steering/readout/PhysicsRun2016TrigPair0.lcsim	Fri Oct 21 12:33:41 2016
@@ -11,6 +11,8 @@
         <!--  Readout Simulation -->
         <driver name="EcalReadout"/>
         <driver name="EcalConverter"/>
+        <driver name="EcalGains"/>
+        <driver name="EcalTimeCorrection"/>
         <driver name="EcalClustererGTP"/>
         <driver name="PairTrigger1"/>
         <driver name="SimpleSVTReadout" />
@@ -41,8 +43,16 @@
         </driver>
         <driver name="EcalConverter" type="org.hps.recon.ecal.EcalRawConverterDriver">
             <rawCollectionName>EcalRawHits</rawCollectionName>
-            <ecalCollectionName>EcalCorrectedHits</ecalCollectionName>
-        </driver>   
+            <ecalCollectionName>EcalUncalHits</ecalCollectionName>
+        </driver>
+        <driver name="EcalGains" type="org.hps.recon.ecal.EcalGainDriver">
+       		<inputHitsCollectionName>EcalUncalHits</inputHitsCollectionName>
+            <outputHitsCollectionName>EcalGainHits</outputHitsCollectionName>
+        </driver>
+        <driver name="EcalTimeCorrection" type="org.hps.recon.ecal.EcalTimeCorrectionDriver">
+       		<inputHitsCollectionName>EcalGainHits</inputHitsCollectionName>
+            <outputHitsCollectionName>EcalCorrectedHits</outputHitsCollectionName>
+        </driver>  
         <driver name="EcalClustererGTP" type="org.hps.recon.ecal.cluster.GTPClusterDriver">
             <!--
             Hit Time Coincidence:         +/-16 ns

Modified: java/branches/converter-div/steering-files/src/main/resources/org/hps/steering/readout/PhysicsRun2016TrigPairs1.lcsim
 =============================================================================
--- java/branches/converter-div/steering-files/src/main/resources/org/hps/steering/readout/PhysicsRun2016TrigPairs1.lcsim	(original)
+++ java/branches/converter-div/steering-files/src/main/resources/org/hps/steering/readout/PhysicsRun2016TrigPairs1.lcsim	Fri Oct 21 12:33:41 2016
@@ -11,6 +11,8 @@
         <!--  Readout Simulation -->
         <driver name="EcalReadout"/>
         <driver name="EcalConverter"/>
+        <driver name="EcalGains"/>
+        <driver name="EcalTimeCorrection"/>
         <driver name="EcalClustererGTP"/>
         <driver name="PairTrigger1"/>
         <driver name="SimpleSVTReadout" />
@@ -41,8 +43,16 @@
         </driver>
         <driver name="EcalConverter" type="org.hps.recon.ecal.EcalRawConverterDriver">
             <rawCollectionName>EcalRawHits</rawCollectionName>
-            <ecalCollectionName>EcalCorrectedHits</ecalCollectionName>
-        </driver>   
+            <ecalCollectionName>EcalUncalHits</ecalCollectionName>
+        </driver>
+        <driver name="EcalGains" type="org.hps.recon.ecal.EcalGainDriver">
+       		<inputHitsCollectionName>EcalUncalHits</inputHitsCollectionName>
+            <outputHitsCollectionName>EcalGainHits</outputHitsCollectionName>
+        </driver>
+        <driver name="EcalTimeCorrection" type="org.hps.recon.ecal.EcalTimeCorrectionDriver">
+       		<inputHitsCollectionName>EcalGainHits</inputHitsCollectionName>
+            <outputHitsCollectionName>EcalCorrectedHits</outputHitsCollectionName>
+        </driver>  
         <driver name="EcalClustererGTP" type="org.hps.recon.ecal.cluster.GTPClusterDriver">
             <!--
             Hit Time Coincidence:         +/-16 ns

Modified: java/branches/converter-div/steering-files/src/main/resources/org/hps/steering/readout/PhysicsRun2016TrigSingles1.lcsim
 =============================================================================
--- java/branches/converter-div/steering-files/src/main/resources/org/hps/steering/readout/PhysicsRun2016TrigSingles1.lcsim	(original)
+++ java/branches/converter-div/steering-files/src/main/resources/org/hps/steering/readout/PhysicsRun2016TrigSingles1.lcsim	Fri Oct 21 12:33:41 2016
@@ -11,6 +11,8 @@
         <!--  Readout Simulation -->
         <driver name="EcalReadout"/>
         <driver name="EcalConverter"/>
+        <driver name="EcalGains"/>
+        <driver name="EcalTimeCorrection"/>
         <driver name="EcalClustererGTP"/>
         <driver name="SinglesTrigger1"/>
         <driver name="SimpleSVTReadout" />
@@ -41,8 +43,16 @@
         </driver>
         <driver name="EcalConverter" type="org.hps.recon.ecal.EcalRawConverterDriver">
             <rawCollectionName>EcalRawHits</rawCollectionName>
-            <ecalCollectionName>EcalCorrectedHits</ecalCollectionName>
+            <ecalCollectionName>EcalUncalHits</ecalCollectionName>
+        </driver>
+        <driver name="EcalGains" type="org.hps.recon.ecal.EcalGainDriver">
+       		<inputHitsCollectionName>EcalUncalHits</inputHitsCollectionName>
+            <outputHitsCollectionName>EcalGainHits</outputHitsCollectionName>
         </driver>   
+        <driver name="EcalTimeCorrection" type="org.hps.recon.ecal.EcalTimeCorrectionDriver">
+       		<inputHitsCollectionName>EcalGainHits</inputHitsCollectionName>
+            <outputHitsCollectionName>EcalCorrectedHits</outputHitsCollectionName>
+        </driver> 
         <driver name="EcalClustererGTP" type="org.hps.recon.ecal.cluster.GTPClusterDriver">
             <!--
             Hit Time Coincidence:         +/-16 ns

Modified: java/branches/converter-div/steering-files/src/main/resources/org/hps/steering/readout/TestRunReadoutToEvio.lcsim
 =============================================================================
--- java/branches/converter-div/steering-files/src/main/resources/org/hps/steering/readout/TestRunReadoutToEvio.lcsim	(original)
+++ java/branches/converter-div/steering-files/src/main/resources/org/hps/steering/readout/TestRunReadoutToEvio.lcsim	Fri Oct 21 12:33:41 2016
@@ -8,6 +8,8 @@
         <driver name="BadChannelFilter" />
         <driver name="EcalReadout"/>
         <driver name="EcalConverter"/>
+        <driver name="EcalGains"/>
+        <driver name="EcalTimeCorrection"/>
         <driver name="EcalTriggerFilter"/>
         <driver name="EcalClusterer"/>
         <driver name="EcalTrigger"/>
@@ -37,13 +39,22 @@
         </driver>
         <driver name="EcalConverter" type="org.hps.recon.ecal.EcalConverterDriver">
             <rawCollectionName>EcalRawHits</rawCollectionName>
-            <ecalCollectionName>EcalCorrectedHits</ecalCollectionName>
+            <ecalCollectionName>EcalUncalHits</ecalCollectionName>
             <scale>1</scale>
-        </driver>   
+        </driver> 
+        <driver name="EcalGains" type="org.hps.recon.ecal.EcalGainDriver">
+       		<inputHitsCollectionName>EcalUncalHits</inputHitsCollectionName> 
+            <outputHitsCollectionName>EcalGainHits</outputHitsCollectionName>
+        </driver>
+        <driver name="EcalTimeCorrection" type="org.hps.recon.ecal.EcalTimeCorrectionDriver">
+       		<inputHitsCollectionName>EcalGainHits</inputHitsCollectionName>
+            <outputHitsCollectionName>EcalCorrectedHits</outputHitsCollectionName>
+        </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.cluster.ClusterDriver">
             <clustererName>CTPClusterer</clustererName>
             <!-- addEMin clusterWindow -->

Modified: java/branches/converter-div/steering-files/src/main/resources/org/hps/steering/readout/TestRunReadoutToLcio.lcsim
 =============================================================================
--- java/branches/converter-div/steering-files/src/main/resources/org/hps/steering/readout/TestRunReadoutToLcio.lcsim	(original)
+++ java/branches/converter-div/steering-files/src/main/resources/org/hps/steering/readout/TestRunReadoutToLcio.lcsim	Fri Oct 21 12:33:41 2016
@@ -7,6 +7,8 @@
         <driver name="BadChannelFilter" />
         <driver name="EcalReadout" />
         <driver name="EcalConverter" />
+        <driver name="EcalGains"/>
+        <driver name="EcalTimeCorrection"/>
         <driver name="EcalTriggerFilter" />
         <driver name="EcalClusterer" />
         <driver name="EcalTrigger" />
@@ -36,9 +38,17 @@
         </driver>
         <driver name="EcalConverter" type="org.hps.recon.ecal.EcalConverterDriver">
             <rawCollectionName>EcalRawHits</rawCollectionName>
-            <ecalCollectionName>EcalCorrectedHits</ecalCollectionName>
+            <ecalCollectionName>EcalUncalHits</ecalCollectionName>
             <scale>1</scale>
         </driver>
+        <driver name="EcalGains" type="org.hps.recon.ecal.EcalGainDriver">
+       		<inputHitsCollectionName>EcalUncalHits</inputHitsCollectionName> 
+            <outputHitsCollectionName>EcalGainHits</outputHitsCollectionName>
+        </driver>
+        <driver name="EcalTimeCorrection" type="org.hps.recon.ecal.EcalTimeCorrectionDriver">
+       		<inputHitsCollectionName>EcalGainHits</inputHitsCollectionName>
+            <outputHitsCollectionName>EcalCorrectedHits</outputHitsCollectionName>
+        </driver>   
         <driver name="EcalTriggerFilter" type="org.hps.recon.ecal.EcalTriggerFilterDriver">
             <inputCollection>EcalCorrectedHits</inputCollection>
             <outputCollection>EcalFilteredHits</outputCollection>

Modified: java/branches/converter-div/steering-files/src/main/resources/org/hps/steering/readout/TestRunReadoutToLcio2014.lcsim
 =============================================================================
--- java/branches/converter-div/steering-files/src/main/resources/org/hps/steering/readout/TestRunReadoutToLcio2014.lcsim	(original)
+++ java/branches/converter-div/steering-files/src/main/resources/org/hps/steering/readout/TestRunReadoutToLcio2014.lcsim	Fri Oct 21 12:33:41 2016
@@ -10,6 +10,8 @@
         <driver name="BadChannelFilter" />
         <driver name="EcalReadout" />
         <driver name="EcalConverter" />
+        <driver name="EcalGains"/>
+        <driver name="EcalTimeCorrection"/>
         <driver name="EcalTriggerFilter" />
         <driver name="EcalClusterer" />
         <driver name="EcalTrigger" />
@@ -46,9 +48,17 @@
         </driver>
         <driver name="EcalConverter" type="org.hps.recon.ecal.EcalConverterDriver">
             <rawCollectionName>EcalRawHits</rawCollectionName>
-            <ecalCollectionName>EcalCorrectedHits</ecalCollectionName>
+            <ecalCollectionName>EcalUncalHits</ecalCollectionName>
             <scale>1</scale>
         </driver>
+        <driver name="EcalGains" type="org.hps.recon.ecal.EcalGainDriver">
+       		<inputHitsCollectionName>EcalUncalHits</inputHitsCollectionName> 
+            <outputHitsCollectionName>EcalGainHits</outputHitsCollectionName>
+        </driver>
+        <driver name="EcalTimeCorrection" type="org.hps.recon.ecal.EcalTimeCorrectionDriver">
+       		<inputHitsCollectionName>EcalGainHits</inputHitsCollectionName>
+            <outputHitsCollectionName>EcalCorrectedHits</outputHitsCollectionName>
+        </driver>   
         <driver name="EcalTriggerFilter" type="org.hps.recon.ecal.EcalTriggerFilterDriver">
             <inputCollection>EcalCorrectedHits</inputCollection>
             <outputCollection>EcalFilteredHits</outputCollection>

Modified: java/branches/converter-div/steering-files/src/main/resources/org/hps/steering/recon/EngineeringRun2014EcalRecon.lcsim
 =============================================================================
--- java/branches/converter-div/steering-files/src/main/resources/org/hps/steering/recon/EngineeringRun2014EcalRecon.lcsim	(original)
+++ java/branches/converter-div/steering-files/src/main/resources/org/hps/steering/recon/EngineeringRun2014EcalRecon.lcsim	Fri Oct 21 12:33:41 2016
@@ -8,6 +8,8 @@
         <!--<driver name="EventMarkerDriver" />-->
         <driver name="EcalRunningPedestal"/>
         <driver name="EcalRawConverter" />
+        <driver name="EcalGains"/>
+        <driver name="EcalTimeCorrection"/>
         <driver name="ReconClusterer" />
         <driver name="GTPOnlineClusterer" />
         <driver name="LCIOWriter" />
@@ -22,12 +24,21 @@
             <maxLookbackEvents>50</maxLookbackEvents>
         </driver>
         <driver name="EcalRawConverter" type="org.hps.recon.ecal.EcalRawConverterDriver">
-            <ecalCollectionName>EcalCalHits</ecalCollectionName>
-            <use2014Gain>false</use2014Gain>
+            <ecalCollectionName>EcalUncalHits</ecalCollectionName>
             <useTimestamps>false</useTimestamps>
             <useTruthTime>false</useTruthTime>
             <useRunningPedestal>false</useRunningPedestal>
         </driver>       
+        <driver name="EcalGains" type="org.hps.recon.ecal.EcalGainDriver">
+       		<inputHitsCollectionName>EcalUncalHits</inputHitsCollectionName> 
+            <use2014Gain>false</use2014Gain>
+            <outputHitsCollectionName>EcalGainHits</outputHitsCollectionName>
+        </driver>
+        <driver name="EcalTimeCorrection" type="org.hps.recon.ecal.EcalTimeCorrectionDriver">
+       		<inputHitsCollectionName>EcalGainHits</inputHitsCollectionName>
+            <useTimeWalkCorrection>true</useTimeWalkCorrection>
+            <outputHitsCollectionName>EcalCorrectedHits</outputHitsCollectionName>
+        </driver> 
         <driver name="ReconClusterer" type="org.hps.recon.ecal.cluster.ReconClusterDriver">
             <logLevel>WARNING</logLevel>
             <outputClusterCollectionName>EcalClusters</outputClusterCollectionName>

Modified: java/branches/converter-div/steering-files/src/main/resources/org/hps/steering/recon/EngineeringRun2014EcalReconMC.lcsim
 =============================================================================
--- java/branches/converter-div/steering-files/src/main/resources/org/hps/steering/recon/EngineeringRun2014EcalReconMC.lcsim	(original)
+++ java/branches/converter-div/steering-files/src/main/resources/org/hps/steering/recon/EngineeringRun2014EcalReconMC.lcsim	Fri Oct 21 12:33:41 2016
@@ -20,6 +20,8 @@
         <driver name="EcalRunningPedestal"/>
         <driver name="RfFitter"/>
         <driver name="EcalRawConverter" />
+        <driver name="EcalGains"/>
+        <driver name="EcalTimeCorrection"/>
         <driver name="ReconClusterer" />
         <driver name="GTPOnlineClusterer" />
         <driver name="LCIOWriter" />
@@ -41,11 +43,21 @@
             <maxLookbackEvents>50</maxLookbackEvents>
         </driver>
         <driver name="EcalRawConverter" type="org.hps.recon.ecal.EcalRawConverterDriver">
-            <ecalCollectionName>EcalCalHits</ecalCollectionName>
+            <ecalCollectionName>EcalUncalHits</ecalCollectionName>
             <use2014Gain>false</use2014Gain>
             <useTimestamps>false</useTimestamps>
             <useTruthTime>false</useTruthTime>
             <useRunningPedestal>false</useRunningPedestal>
+        </driver>       
+        <driver name="EcalGains" type="org.hps.recon.ecal.EcalGainDriver">
+       		<inputHitsCollectionName>EcalUncalHits</inputHitsCollectionName> 
+            <use2014Gain>false</use2014Gain>
+            <outputHitsCollectionName>EcalGainHits</outputHitsCollectionName>
+        </driver>
+        <driver name="EcalTimeCorrection" type="org.hps.recon.ecal.EcalTimeCorrectionDriver">
+       		<inputHitsCollectionName>EcalGainHits</inputHitsCollectionName>
+            <useTimeWalkCorrection>true</useTimeWalkCorrection>
+            <outputHitsCollectionName>EcalCalHits</outputHitsCollectionName>
         </driver>       
         <driver name="ReconClusterer" type="org.hps.recon.ecal.cluster.ReconClusterDriver">
             <logLevel>WARNING</logLevel>

Modified: java/branches/converter-div/steering-files/src/main/resources/org/hps/steering/recon/EngineeringRun2014EcalRecon_Pass1.lcsim
 =============================================================================
--- java/branches/converter-div/steering-files/src/main/resources/org/hps/steering/recon/EngineeringRun2014EcalRecon_Pass1.lcsim	(original)
+++ java/branches/converter-div/steering-files/src/main/resources/org/hps/steering/recon/EngineeringRun2014EcalRecon_Pass1.lcsim	Fri Oct 21 12:33:41 2016
@@ -19,6 +19,8 @@
         <!--<driver name="EventMarkerDriver" />-->
         <driver name="EcalRunningPedestal"/>
         <driver name="EcalRawConverter" />
+        <driver name="EcalGains"/>
+        <driver name="EcalTimeCorrection"/>
         <driver name="ReconClusterer" />
         <driver name="GTPOnlineClusterer" />
         <driver name="LCIOWriter" />
@@ -33,12 +35,20 @@
             <maxLookbackEvents>50</maxLookbackEvents>
         </driver>
         <driver name="EcalRawConverter" type="org.hps.recon.ecal.EcalRawConverterDriver">
-            <ecalCollectionName>EcalCalHits</ecalCollectionName>
-            <use2014Gain>false</use2014Gain>
+            <ecalCollectionName>EcalUncalHits</ecalCollectionName>
             <useTimestamps>false</useTimestamps>
             <useTruthTime>false</useTruthTime>
             <useRunningPedestal>true</useRunningPedestal>
+        </driver>   
+        <driver name="EcalGains" type="org.hps.recon.ecal.EcalGainDriver">
+       		<inputHitsCollectionName>EcalUncalHits</inputHitsCollectionName> 
+            <use2014Gain>false</use2014Gain>
+            <outputHitsCollectionName>EcalGainHits</outputHitsCollectionName>
+        </driver>
+        <driver name="EcalTimeCorrection" type="org.hps.recon.ecal.EcalTimeCorrectionDriver">
+       		<inputHitsCollectionName>EcalGainHits</inputHitsCollectionName>
             <useTimeWalkCorrection>true</useTimeWalkCorrection>
+            <outputHitsCollectionName>EcalCalHits</outputHitsCollectionName>
         </driver>       
         <driver name="ReconClusterer" type="org.hps.recon.ecal.cluster.ReconClusterDriver">
             <logLevel>WARNING</logLevel>

Modified: java/branches/converter-div/steering-files/src/main/resources/org/hps/steering/recon/EngineeringRun2015EcalRecon.lcsim
 =============================================================================
--- java/branches/converter-div/steering-files/src/main/resources/org/hps/steering/recon/EngineeringRun2015EcalRecon.lcsim	(original)
+++ java/branches/converter-div/steering-files/src/main/resources/org/hps/steering/recon/EngineeringRun2015EcalRecon.lcsim	Fri Oct 21 12:33:41 2016
@@ -19,6 +19,8 @@
         <!--<driver name="EventMarkerDriver" />-->
         <driver name="EcalRunningPedestal"/>
         <driver name="EcalRawConverter" />
+        <driver name="EcalGains"/>
+        <driver name="EcalTimeCorrection"/>
         <driver name="ReconClusterer" />
         <driver name="GTPOnlineClusterer" />
         <driver name="LCIOWriter" />
@@ -35,11 +37,10 @@
         </driver>
         <driver name="EcalRawConverter" type="org.hps.recon.ecal.EcalRawConverterDriver">
             <ecalCollectionName>EcalCalHits</ecalCollectionName>
-            <use2014Gain>false</use2014Gain>
+            
             <useTimestamps>false</useTimestamps>
             <useTruthTime>false</useTruthTime>
             <useRunningPedestal>true</useRunningPedestal>
-            <useTimeWalkCorrection>true</useTimeWalkCorrection>
             <emulateFirmware>true</emulateFirmware>
             <emulateMode7>false</emulateMode7>
             <leadingEdgeThreshold>12</leadingEdgeThreshold>
@@ -47,7 +48,17 @@
             <nsb>20</nsb>
             <windowSamples>50</windowSamples>
             <nPeak>3</nPeak>
-        </driver>       
+        </driver>
+        <driver name="EcalGains" type="org.hps.recon.ecal.EcalGainDriver">
+       		<inputHitsCollectionName>EcalUncalHits</inputHitsCollectionName>
+            <use2014Gain>false</use2014Gain>
+            <outputHitsCollectionName>EcalGainHits</outputHitsCollectionName>
+        </driver>
+        <driver name="EcalTimeCorrection" type="org.hps.recon.ecal.EcalTimeCorrectionDriver">
+       		<inputHitsCollectionName>EcalGainHits</inputHitsCollectionName>
+            <useTimeWalkCorrection>true</useTimeWalkCorrection>
+            <outputHitsCollectionName>EcalCalHits</outputHitsCollectionName>
+        </driver>         
         <driver name="ReconClusterer" type="org.hps.recon.ecal.cluster.ReconClusterDriver">
             <logLevel>WARNING</logLevel>
             <outputClusterCollectionName>EcalClusters</outputClusterCollectionName>

Modified: java/branches/converter-div/steering-files/src/main/resources/org/hps/steering/recon/EngineeringRun2015FullRecon.lcsim
 =============================================================================
--- java/branches/converter-div/steering-files/src/main/resources/org/hps/steering/recon/EngineeringRun2015FullRecon.lcsim	(original)
+++ java/branches/converter-div/steering-files/src/main/resources/org/hps/steering/recon/EngineeringRun2015FullRecon.lcsim	Fri Oct 21 12:33:41 2016
@@ -13,6 +13,8 @@
         <!-- Ecal reconstruction drivers -->        
         <driver name="EcalRunningPedestal"/>
         <driver name="EcalRawConverter" />
+        <driver name="EcalGains"/>
+        <driver name="EcalTimeCorrection"/>
         <driver name="ReconClusterer" />
         <driver name="CopyCluster" />
         <driver name="EventMarkerDriver"/>
@@ -71,8 +73,16 @@
             <logLevel>CONFIG</logLevel>
         </driver>
         <driver name="EcalRawConverter" type="org.hps.recon.ecal.EcalRawConverterDriver">
-            <ecalCollectionName>EcalCalHits</ecalCollectionName>
-        </driver>             
+        	<ecalCollectionName>EcalUncalHits</ecalCollectionName>
+        </driver>  
+        <driver name="EcalGains" type="org.hps.recon.ecal.EcalGainDriver">
+       		<inputHitsCollectionName>EcalUncalHits</inputHitsCollectionName>
+            <outputHitsCollectionName>EcalGainHits</outputHitsCollectionName>
+        </driver>
+        <driver name="EcalTimeCorrection" type="org.hps.recon.ecal.EcalTimeCorrectionDriver">
+       		<inputHitsCollectionName>EcalGainHits</inputHitsCollectionName>
+            <outputHitsCollectionName>EcalCalHits</outputHitsCollectionName>
+        </driver>          
         <driver name="ReconClusterer" type="org.hps.recon.ecal.cluster.ReconClusterDriver">
             <logLevel>WARNING</logLevel>
             <outputClusterCollectionName>EcalClusters</outputClusterCollectionName>

Modified: java/branches/converter-div/steering-files/src/main/resources/org/hps/steering/recon/EngineeringRun2015FullReconMC.lcsim
 =============================================================================
--- java/branches/converter-div/steering-files/src/main/resources/org/hps/steering/recon/EngineeringRun2015FullReconMC.lcsim	(original)
+++ java/branches/converter-div/steering-files/src/main/resources/org/hps/steering/recon/EngineeringRun2015FullReconMC.lcsim	Fri Oct 21 12:33:41 2016
@@ -12,8 +12,11 @@
         <driver name="ConditionsDriver"/>
         <driver name="EventMarkerDriver"/>
         <driver name="RfFitter"/>
-        <!-- Ecal reconstruction drivers -->        
+        <!-- Ecal reconstruction drivers -->    
+        
         <driver name="EcalRawConverter" />
+        <driver name="EcalGains"/>
+        <driver name="EcalTimeCorrection"/>
         <driver name="ReconClusterer" />
         <driver name="GTPOnlineClusterer" />
         <driver name="CopyCluster" />
@@ -122,10 +125,20 @@
         </driver>       
         <driver name="MergeTrackCollections" type="org.hps.recon.tracking.MergeTrackCollections" />
         <driver name="GBLRefitterDriver" type="org.hps.recon.tracking.gbl.GBLRefitterDriver"/>
+        
+        
         <driver name="EcalRawConverter" type="org.hps.recon.ecal.EcalRawConverterDriver">
-            <ecalCollectionName>EcalCalHits</ecalCollectionName>
+        	<ecalCollectionName>EcalUncalHits</ecalCollectionName>
             <fixShapeParameter>true</fixShapeParameter>
             <globalFixedPulseWidth>2.4</globalFixedPulseWidth>
+        </driver>  
+        <driver name="EcalGains" type="org.hps.recon.ecal.EcalGainDriver">
+       		<inputHitsCollectionName>EcalUncalHits</inputHitsCollectionName>
+            <outputHitsCollectionName>EcalGainHits</outputHitsCollectionName>
+        </driver>
+        <driver name="EcalTimeCorrection" type="org.hps.recon.ecal.EcalTimeCorrectionDriver">
+       		<inputHitsCollectionName>EcalGainHits</inputHitsCollectionName>
+            <outputHitsCollectionName>EcalCalHits</outputHitsCollectionName>
         </driver>       
         <driver name="ReconClusterer" type="org.hps.recon.ecal.cluster.ReconClusterDriver">
             <logLevel>WARNING</logLevel>

Modified: java/branches/converter-div/steering-files/src/main/resources/org/hps/steering/recon/EngineeringRun2015HitRecon.lcsim
 =============================================================================
--- java/branches/converter-div/steering-files/src/main/resources/org/hps/steering/recon/EngineeringRun2015HitRecon.lcsim	(original)
+++ java/branches/converter-div/steering-files/src/main/resources/org/hps/steering/recon/EngineeringRun2015HitRecon.lcsim	Fri Oct 21 12:33:41 2016
@@ -12,7 +12,10 @@
         <driver name="HelicalTrackHitDriver"/>
         <!--<driver name="TrackerReconDriver"/>-->
         <driver name="EcalRunningPedestal"/>
+        
         <driver name="EcalRawConverter" />
+        <driver name="EcalGains"/>
+        <driver name="EcalTimeCorrection"/>
         <driver name="ReconClusterer" />
         <driver name="GTPOnlineClusterer" />
         <!--<driver name="ReconParticle" />-->  
@@ -66,7 +69,7 @@
             <minLookbackEvents>10</minLookbackEvents>
             <maxLookbackEvents>50</maxLookbackEvents>
         </driver>
-        <driver name="EcalRawConverter" type="org.hps.recon.ecal.EcalRawConverterDriver">
+        <!-- <driver name="EcalRawConverter" type="org.hps.recon.ecal.EcalRawConverterDriver">
             <ecalCollectionName>EcalCalHits</ecalCollectionName>
             <use2014Gain>false</use2014Gain>
             <useTimestamps>false</useTimestamps>
@@ -80,7 +83,35 @@
             <nsb>20</nsb>
             <windowSamples>50</windowSamples>
             <nPeak>3</nPeak>
-        </driver>       
+        </driver>-->
+        
+        <driver name="EcalRawConverter" type="org.hps.recon.ecal.EcalRawConverterDriver">
+        	<ecalCollectionName>EcalUncalHits</ecalCollectionName>
+            <!-- <fixShapeParameter>true</fixShapeParameter>
+            <globalFixedPulseWidth>2.4</globalFixedPulseWidth> -->
+            
+            <useTimestamps>false</useTimestamps>
+            <useTruthTime>false</useTruthTime>
+            <useRunningPedestal>true</useRunningPedestal>
+            
+            <emulateFirmware>true</emulateFirmware>
+            <emulateMode7>true</emulateMode7>
+            <leadingEdgeThreshold>12</leadingEdgeThreshold>
+            <nsa>100</nsa>
+            <nsb>20</nsb>
+            <windowSamples>50</windowSamples>
+            <nPeak>3</nPeak>
+        </driver>  
+        <driver name="EcalGains" type="org.hps.recon.ecal.EcalGainDriver">
+       		<inputHitsCollectionName>EcalUncalHits</inputHitsCollectionName>
+            <use2014Gain>false</use2014Gain>
+            <outputHitsCollectionName>EcalGainHits</outputHitsCollectionName>
+        </driver>
+        <driver name="EcalTimeCorrection" type="org.hps.recon.ecal.EcalTimeCorrectionDriver">
+       		<inputHitsCollectionName>EcalGainHits</inputHitsCollectionName>
+            <outputHitsCollectionName>EcalCalHits</outputHitsCollectionName>
+        </driver>  
+               
         <driver name="ReconClusterer" type="org.hps.recon.ecal.cluster.ReconClusterDriver">
             <logLevel>WARNING</logLevel>
             <outputClusterCollectionName>EcalClusters</outputClusterCollectionName>

Modified: java/branches/converter-div/steering-files/src/main/resources/org/hps/steering/recon/HPS2014OfflineTruthRecon.lcsim
 =============================================================================
--- java/branches/converter-div/steering-files/src/main/resources/org/hps/steering/recon/HPS2014OfflineTruthRecon.lcsim	(original)
+++ java/branches/converter-div/steering-files/src/main/resources/org/hps/steering/recon/HPS2014OfflineTruthRecon.lcsim	Fri Oct 21 12:33:41 2016
@@ -14,6 +14,8 @@
         <driver name="HelicalTrackHitDriver"/>
         <driver name="TrackerReconDriver"/>
         <driver name="EcalRawConverter" />
+        <driver name="EcalGains"/>
+        <driver name="EcalTimeCorrection"/>
         <driver name="EcalClusterer" />
         <driver name="ReconParticle" />
         <driver name="TrackDataDriver" />        
@@ -61,11 +63,19 @@
         </driver>
 
         <driver name="EcalRawConverter" type="org.hps.recon.ecal.EcalRawConverterDriver">
-            <ecalCollectionName>EcalCalHits</ecalCollectionName>
+            <ecalCollectionName>EcalUncalHits</ecalCollectionName>
             <use2014Gain>true</use2014Gain>
             <useTimestamps>false</useTimestamps>
             <useTruthTime>true</useTruthTime>
         </driver>
+        <driver name="EcalGains" type="org.hps.recon.ecal.EcalGainDriver">
+       		<inputHitsCollectionName>EcalUncalHits</inputHitsCollectionName> 
+            <outputHitsCollectionName>EcalGainHits</outputHitsCollectionName>
+        </driver>
+        <driver name="EcalTimeCorrection" type="org.hps.recon.ecal.EcalTimeCorrectionDriver">
+       		<inputHitsCollectionName>EcalGainHits</inputHitsCollectionName>
+            <outputHitsCollectionName>EcalCalHits</outputHitsCollectionName>
+        </driver>   
         <driver name="EcalClusterer" type="org.hps.recon.ecal.cluster.ReconClusterDriver">
             <useTimeCut>true</useTimeCut>
         </driver>

Modified: java/branches/converter-div/steering-files/src/main/resources/org/hps/steering/recon/PhysicsRun2016FullRecon.lcsim
 =============================================================================
--- java/branches/converter-div/steering-files/src/main/resources/org/hps/steering/recon/PhysicsRun2016FullRecon.lcsim	(original)
+++ java/branches/converter-div/steering-files/src/main/resources/org/hps/steering/recon/PhysicsRun2016FullRecon.lcsim	Fri Oct 21 12:33:41 2016
@@ -13,6 +13,7 @@
         <!-- Ecal reconstruction drivers -->        
         <driver name="EcalRunningPedestal"/>
         <driver name="EcalRawConverter" />
+        <driver name="EcalGains"/>
         <driver name="EcalTimeCorrection"/>
         <driver name="ReconClusterer" />
         <driver name="CopyCluster" />
@@ -71,11 +72,20 @@
         <driver name="EcalRunningPedestal" type="org.hps.recon.ecal.EcalRunningPedestalDriver">
             <logLevel>CONFIG</logLevel>
         </driver>
-        <driver name="EcalRawConverter" type="org.hps.recon.ecal.EcalRawConverter2Driver">
-        </driver> 
-        <driver name="EcalTimeCorrection" type="org.hps.recon.ecal.EcalTimeCorrectionDriver"/> 
+        <driver name="EcalRawConverter" type="org.hps.recon.ecal.EcalRawConverterDriver">
+        	<ecalCollectionName>EcalUncalHits</ecalCollectionName>
+        </driver>  
+        <driver name="EcalGains" type="org.hps.recon.ecal.EcalGainDriver">
+       		<inputHitsCollectionName>EcalUncalHits</inputHitsCollectionName>
+            <outputHitsCollectionName>EcalGainHits</outputHitsCollectionName>
+        </driver>
+        <driver name="EcalTimeCorrection" type="org.hps.recon.ecal.EcalTimeCorrectionDriver">
+       		<inputHitsCollectionName>EcalGainHits</inputHitsCollectionName>
+            <outputHitsCollectionName>EcalCalHits</outputHitsCollectionName>
+        </driver>
         <driver name="ReconClusterer" type="org.hps.recon.ecal.cluster.ReconClusterDriver">
             <logLevel>WARNING</logLevel>
+            <inputHitCollectionName>EcalCalHits</inputHitCollectionName>
             <outputClusterCollectionName>EcalClusters</outputClusterCollectionName>
         </driver> 
         <driver name="CopyCluster" type="org.hps.recon.ecal.cluster.CopyClusterCollectionDriver">
Top of Message | Previous Page | Permalink
Search Archives

Advanced Options
Options

		Log In
		Get Password

		Search Archives

		Subscribe or Unsubscribe