Print

Print


Author: [log in to unmask]
Date: Mon Apr 13 17:03:03 2015
New Revision: 2680

Log:
Steering files!  Added <detectorName> setter for conditions drivers (so that it picks up the given run number).  Some other minor changes/additions. 

Added:
    java/trunk/steering-files/src/main/resources/org/hps/steering/monitoring/TrackingAndReconMonitoring.lcsim
      - copied, changed from r2626, java/trunk/steering-files/src/main/resources/org/hps/steering/users/mgraham/AlignmentMonitorTest.lcsim
    java/trunk/steering-files/src/main/resources/org/hps/steering/recon/EngineeringRun2014EcalReconMC.lcsim
      - copied, changed from r2679, java/trunk/steering-files/src/main/resources/org/hps/steering/recon/EngineeringRun2014EcalRecon.lcsim
    java/trunk/steering-files/src/main/resources/org/hps/steering/users/mgraham/DQMECalOnly.lcsim
      - copied, changed from r2626, java/trunk/steering-files/src/main/resources/org/hps/steering/users/mgraham/DataQualityMonitorOnRecon.lcsim
    java/trunk/steering-files/src/main/resources/org/hps/steering/users/mgraham/KylesTriggerStudy.lcsim
      - copied, changed from r2664, java/trunk/steering-files/src/main/resources/org/hps/steering/monitoring/SVTMonitoring.lcsim
Modified:
    java/trunk/steering-files/src/main/resources/org/hps/steering/readout/EngineeringRun2014PresTrigPairs0.lcsim
    java/trunk/steering-files/src/main/resources/org/hps/steering/readout/EngineeringRun2014PresTrigPairs1.lcsim
    java/trunk/steering-files/src/main/resources/org/hps/steering/readout/EngineeringRun2014PresTrigSingles0.lcsim
    java/trunk/steering-files/src/main/resources/org/hps/steering/readout/EngineeringRun2014PresTrigSingles1.lcsim
    java/trunk/steering-files/src/main/resources/org/hps/steering/readout/EngineeringRun2014PrescaledTriggers.lcsim
    java/trunk/steering-files/src/main/resources/org/hps/steering/readout/HPS2014ReadoutNoPileup.lcsim
    java/trunk/steering-files/src/main/resources/org/hps/steering/recon/EngineeringRun2014EcalRecon.lcsim
    java/trunk/steering-files/src/main/resources/org/hps/steering/recon/HPS2014OfflineNoPileupRecon.lcsim
    java/trunk/steering-files/src/main/resources/org/hps/steering/users/mgraham/AlignmentMonitorTest.lcsim

Copied: java/trunk/steering-files/src/main/resources/org/hps/steering/monitoring/TrackingAndReconMonitoring.lcsim (from r2626, java/trunk/steering-files/src/main/resources/org/hps/steering/users/mgraham/AlignmentMonitorTest.lcsim)
 =============================================================================
--- java/trunk/steering-files/src/main/resources/org/hps/steering/users/mgraham/AlignmentMonitorTest.lcsim	(original)
+++ java/trunk/steering-files/src/main/resources/org/hps/steering/monitoring/TrackingAndReconMonitoring.lcsim	Mon Apr 13 17:03:03 2015
@@ -1,50 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<lcsim xmlns:xs="http://www.w3.org/2001/XMLSchema-instance" xs:noNamespaceSchemaLocation="http://www.lcsim.org/schemas/lcsim/1.0/lcsim.xsd">
 <!-- 
-  Steering file for testing Alignment Monitoring classes
+  Steering file for tracking and v0 reconstruction monitoring 
   @author Matt Graham <[log in to unmask]>
 -->
-<lcsim xmlns:xs="http://www.w3.org/2001/XMLSchema-instance" xs:noNamespaceSchemaLocation="http://www.lcsim.org/schemas/lcsim/1.0/lcsim.xsd">
     <execute>
-        <driver name="EventMarkerDriver" />
-<!--      <driver name="TrackerDigiDriver"/> -->
+       <driver name="EventMarkerDriver" />
 <!--  the 3 drivers below are for reading out 6-sample ADC data -->
       <driver name="RawTrackerHitSensorSetup" /> 
-        <driver name="RawTrackerHitFitterDriver" /> 
-       <driver name="TrackerHitDriver" />  
-        <driver name="HelicalTrackHitDriver" />
-         <driver name="TrackerL1to3ReconDriver"/> 
-        <driver name="TrackerL4to6ReconDriver"/> 
-         <driver name="FullTrackerReconDriver"/> 
-           <driver name="TrackDataDriver"/>   
- <!--      <driver name="EcalRawConverter" /> 
-        <driver name="EcalClusterer" />
-       <driver name="ReconParticle" /> -->
+      <driver name="RawTrackerHitFitterDriver" /> 
+      <driver name="TrackerHitDriver" />  
+      <driver name="HelicalTrackHitDriver" />
+<!--  SVT opening angle alignment -->
+       <driver name="TrackerL1to3ReconDriver"/> 
+       <driver name="TrackerL4to6ReconDriver"/> 
+       <driver name="SVTAlignment"/> 
+<!--  regular tracking and recon -->
+       <driver name="FullTrackerReconDriver"/> 
+       <driver name="TrackDataDriver"/>   
+       <driver name="EcalRawConverter" /> 
+       <driver name="EcalClusterer" />
+       <driver name="ReconParticle" /> 
 <!-- Online Monitoring Drivers -->
-        <driver name="TrackingMonitoring" />
-        <driver name="TrackingResiduals"/>  
-        <driver name="TrackTime"/>  
-<!--        <driver name="V0Monitoring"/>   -->
-        <driver name="SVTAlignment"/> 
-<!-- DQM Monitoring Drivers -->
-
-<!--        <driver name="TrackingDQM" />
-        <driver name="TrackingResidualsDQM"/>   -->
-<!--        <driver name="FinalStateDQM"/>  
-        <driver name="V0DQM"/>  -->
-        <driver name="AidaSaveDriver"/> 
-        <driver name="CleanupDriver" />
+       <driver name="TrackingMonitoring" />
+       <driver name="TrackingResiduals"/>  
+       <driver name="TrackTime"/>  
+       <driver name="V0Monitoring"/>   
+       <driver name="CleanupDriver" />
     </execute>
     <drivers>
-        <driver name="ConditionsDriver" type="org.hps.conditions.ConditionsDriver" />
          <driver name="EventMarkerDriver" type="org.lcsim.job.EventMarkerDriver">
             <eventInterval>10</eventInterval>
         </driver>
-  <driver name="TrackerDigiDriver" type="org.hps.recon.tracking.SimpleTrackerDigiDriver">
-            <!-- <dropBadChannels>true</dropBadChannels> -->
-            <rawTrackerHitOutputCollectionName>SVTRawTrackerHits</rawTrackerHitOutputCollectionName>
-            <debug>false</debug>
-        </driver>
         <driver name="RawTrackerHitSensorSetup" type="org.lcsim.recon.tracking.digitization.sisim.config.RawTrackerHitSensorSetup" />
-        <driver name="BadChannelFilter" type="org.hps.recon.tracking.SVTBadChannelFilterDriver" />
         <driver name="RawTrackerHitFitterDriver" type="org.hps.recon.tracking.RawTrackerHitFitterDriver">
             <fitAlgorithm>Analytic</fitAlgorithm>
             <useTimestamps>false</useTimestamps>
@@ -72,21 +60,24 @@
         <trackCollectionName>L4to6Tracks</trackCollectionName>
             <strategyResource>/org/hps/recon/tracking/strategies/HPS-Full-L4-6.xml</strategyResource>
         </driver>
-
         <driver name="FullTrackerReconDriver" type="org.hps.recon.tracking.TrackerReconDriver">
             <debug>false</debug>
             <trackCollectionName>MatchedTracks</trackCollectionName>
             <strategyResource>/org/hps/recon/tracking/strategies/HPS-Full.xml</strategyResource>
         </driver>
-
         <driver name="TrackDataDriver" type="org.hps.recon.tracking.TrackDataDriver">
         </driver>
-        <driver name="EcalRawConverter" type="org.hps.recon.ecal.EcalRawConverterDriver">
-            <ecalCollectionName>EcalCalHits</ecalCollectionName>
+         <driver name="EcalRawConverter" type="org.hps.recon.ecal.EcalRawConverterDriver">
+              <ecalCollectionName>EcalCalHits</ecalCollectionName>
+            <use2014Gain>false</use2014Gain>
+            <useTimestamps>false</useTimestamps>
+            <useTruthTime>false</useTruthTime>               
+           <debug>false</debug>
         </driver>
-        <driver name="EcalClusterer" type="org.hps.recon.ecal.cluster.ClusterDriver">
-            <clustererName>LegacyClusterer</clustererName>
-        </driver>
+         <driver name="EcalClusterer" type="org.hps.recon.ecal.cluster.ReconClusterDriver">              
+               <useTimeCut>true</useTimeCut>
+               <logLevel>ALL</logLevel>
+        </driver>     
         <driver name="ReconParticle" type="org.hps.recon.particle.HpsReconParticleDriver">
             <debug>false</debug>
         </driver>   
@@ -105,21 +96,6 @@
         <driver name="TrackTime" type="org.hps.monitoring.drivers.trackrecon.TrackTimePlots">                
         </driver>
 
-        <driver name="TrackingDQM" type="org.hps.analysis.dataquality.TrackingMonitoring">         
-            <overwriteDB>false</overwriteDB>
-        </driver>
-      <driver name="TrackingResidualsDQM" type="org.hps.analysis.dataquality.TrackingResiduals">         
-            <overwriteDB>false</overwriteDB>
-        </driver>
- <driver name="FinalStateDQM" type="org.hps.analysis.dataquality.FinalStateMonitoring">         
-            <overwriteDB>false</overwriteDB>
-        </driver>
-        <driver name="V0DQM" type="org.hps.analysis.dataquality.V0Monitoring">         
-            <overwriteDB>false</overwriteDB>
-        </driver>
-     <driver name="AidaSaveDriver" type="org.lcsim.job.AidaSaveDriver">
-                 <outputFileName>./Test-DQM-Tracking-Recon.root</outputFileName>
-        </driver>  
         <driver name="CleanupDriver" type="org.lcsim.recon.tracking.digitization.sisim.config.ReadoutCleanupDriver" />       
     </drivers>
 </lcsim>

Modified: java/trunk/steering-files/src/main/resources/org/hps/steering/readout/EngineeringRun2014PresTrigPairs0.lcsim
 =============================================================================
--- java/trunk/steering-files/src/main/resources/org/hps/steering/readout/EngineeringRun2014PresTrigPairs0.lcsim	(original)
+++ java/trunk/steering-files/src/main/resources/org/hps/steering/readout/EngineeringRun2014PresTrigPairs0.lcsim	Mon Apr 13 17:03:03 2015
@@ -24,6 +24,8 @@
             <eventInterval>1000</eventInterval>
         </driver>        
     <driver name="ConditionsDriver" type="org.hps.conditions.ConditionsDriver">
+    <detectorName>
+ <detectorName>HPS-ECalCommissioning-v3-fieldmap</detectorName>
      <runNumber>3422</runNumber>
      <freeze>true</freeze>
     </driver>

Modified: java/trunk/steering-files/src/main/resources/org/hps/steering/readout/EngineeringRun2014PresTrigPairs1.lcsim
 =============================================================================
--- java/trunk/steering-files/src/main/resources/org/hps/steering/readout/EngineeringRun2014PresTrigPairs1.lcsim	(original)
+++ java/trunk/steering-files/src/main/resources/org/hps/steering/readout/EngineeringRun2014PresTrigPairs1.lcsim	Mon Apr 13 17:03:03 2015
@@ -24,6 +24,7 @@
             <eventInterval>1000</eventInterval>
         </driver>        
     <driver name="ConditionsDriver" type="org.hps.conditions.ConditionsDriver">
+     <detectorName>HPS-ECalCommissioning-v3-fieldmap</detectorName>
      <runNumber>3422</runNumber>
      <freeze>true</freeze>
     </driver>

Modified: java/trunk/steering-files/src/main/resources/org/hps/steering/readout/EngineeringRun2014PresTrigSingles0.lcsim
 =============================================================================
--- java/trunk/steering-files/src/main/resources/org/hps/steering/readout/EngineeringRun2014PresTrigSingles0.lcsim	(original)
+++ java/trunk/steering-files/src/main/resources/org/hps/steering/readout/EngineeringRun2014PresTrigSingles0.lcsim	Mon Apr 13 17:03:03 2015
@@ -24,6 +24,7 @@
             <eventInterval>1000</eventInterval>
         </driver>        
     <driver name="ConditionsDriver" type="org.hps.conditions.ConditionsDriver">
+     <detectorName>HPS-ECalCommissioning-v3-fieldmap</detectorName>
      <runNumber>3422</runNumber>
      <freeze>true</freeze>
     </driver>

Modified: java/trunk/steering-files/src/main/resources/org/hps/steering/readout/EngineeringRun2014PresTrigSingles1.lcsim
 =============================================================================
--- java/trunk/steering-files/src/main/resources/org/hps/steering/readout/EngineeringRun2014PresTrigSingles1.lcsim	(original)
+++ java/trunk/steering-files/src/main/resources/org/hps/steering/readout/EngineeringRun2014PresTrigSingles1.lcsim	Mon Apr 13 17:03:03 2015
@@ -24,6 +24,7 @@
             <eventInterval>1000</eventInterval>
         </driver>        
     <driver name="ConditionsDriver" type="org.hps.conditions.ConditionsDriver">
+     <detectorName>HPS-ECalCommissioning-v3-fieldmap</detectorName>
      <runNumber>3422</runNumber>
      <freeze>true</freeze>
     </driver>

Modified: java/trunk/steering-files/src/main/resources/org/hps/steering/readout/EngineeringRun2014PrescaledTriggers.lcsim
 =============================================================================
--- java/trunk/steering-files/src/main/resources/org/hps/steering/readout/EngineeringRun2014PrescaledTriggers.lcsim	(original)
+++ java/trunk/steering-files/src/main/resources/org/hps/steering/readout/EngineeringRun2014PrescaledTriggers.lcsim	Mon Apr 13 17:03:03 2015
@@ -29,6 +29,7 @@
         </driver>        
     <driver name="ConditionsDriver" type="org.hps.conditions.ConditionsDriver">
      <runNumber>3422</runNumber>
+     <detectorName>HPS-ECalCommissioning-v3-fieldmap</detectorName>
      <freeze>true</freeze>
     </driver>
         <driver name="TestRunReconToLcio" type="org.hps.evio.TestRunTriggeredReconToLcio">

Modified: java/trunk/steering-files/src/main/resources/org/hps/steering/readout/HPS2014ReadoutNoPileup.lcsim
 =============================================================================
--- java/trunk/steering-files/src/main/resources/org/hps/steering/readout/HPS2014ReadoutNoPileup.lcsim	(original)
+++ java/trunk/steering-files/src/main/resources/org/hps/steering/readout/HPS2014ReadoutNoPileup.lcsim	Mon Apr 13 17:03:03 2015
@@ -10,15 +10,25 @@
     </control>    
     <execute>
         <driver name="EventMarkerDriver"/>
+        <driver name="ConditionsDriver"/>
         <driver name="EcalEdepToTriggerConverterDriver"/>
         <driver name="EcalReadoutConverterDriver"/>
         <driver name="EcalTriggerClusterer"/>
         <driver name="SimpleSVTReadout"/> 
         <driver name="EcalTrigger"/>
-        <driver name="ClockDriver"/>        
+        <driver name="ClockDriver"/>
+        <driver name="AidaSaveDriver"/>        
         <driver name="CleanupDriver"/>
     </execute>    
     <drivers>
+
+
+
+   <driver name="ConditionsDriver" type="org.hps.conditions.ConditionsDriver">
+     <runNumber>3422</runNumber>
+      <detectorName>HPS-EngRun2015-Nominal-v0</detectorName>
+     <freeze>true</freeze> 
+    </driver>
         <driver name="EventMarkerDriver" type="org.lcsim.job.EventMarkerDriver">
             <eventInterval>1000</eventInterval>
         </driver>
@@ -28,9 +38,10 @@
             <truncateScale>1</truncateScale>
             <constantGain>0.15</constantGain>
         </driver>
-        <driver name="EcalReadoutConverterDriver" type="org.hps.recon.ecal.EcalRawConverterDriver">
+        <driver name="EcalReadoutConverterDriver" type="org.hps.recon.ecal.EcalRawConverterDriver">                              
+            <use2014Gain>false</use2014Gain> 
             <runBackwards>true</runBackwards>
-            <rawCollectionName>EcalReadoutHits</rawCollectionName>
+            <rawCollectionName>EcalReadoutHits</rawCollectionName>           
             <ecalCollectionName>EcalReadoutAnalogHits</ecalCollectionName>
         </driver>
         <driver name="EcalTriggerClusterer" type="org.hps.recon.ecal.cluster.GTPClusterDriver">
@@ -48,6 +59,11 @@
         <driver name="SimpleSVTReadout" type="org.hps.readout.svt.SimpleSvtReadout">
             <noPileup>true</noPileup>
         </driver>
+
+   <driver name="AidaSaveDriver"
+                type="org.lcsim.job.AidaSaveDriver">
+            <outputFileName>${outputFile}_triggerPlots.root</outputFileName>
+        </driver>
         <driver name="ClockDriver" type="org.hps.readout.ecal.ClockDriver"/>
         <driver name="CleanupDriver" type="org.lcsim.recon.tracking.digitization.sisim.config.ReadoutCleanupDriver"/>
     </drivers>

Modified: java/trunk/steering-files/src/main/resources/org/hps/steering/recon/EngineeringRun2014EcalRecon.lcsim
 =============================================================================
--- java/trunk/steering-files/src/main/resources/org/hps/steering/recon/EngineeringRun2014EcalRecon.lcsim	(original)
+++ java/trunk/steering-files/src/main/resources/org/hps/steering/recon/EngineeringRun2014EcalRecon.lcsim	Mon Apr 13 17:03:03 2015
@@ -1,17 +1,6 @@
 <!-- 
-    Offline reconstruction for 2014 engineering run (ECal only) data.
-
-    Changes made by JM:
-            
-    -Replaced clustering Drivers with new recon.ecal.cluster classes.    
-    -Commented out the legacy clusterer. 
-    -Configured ReconClusterDriver to not write the rejected hit collection.
-    -Changed output cluster collection names.
-     
-     NAB: (Feb 11, 2015) Added EcalRunningPedestalDriver
-     
+    Offline reconstruction for 2014 engineering run (ECal only) MC. 
     @author Matt Graham <[log in to unmask]> 
-    @author Jeremy McCormick<[log in to unmask]>
 -->
 <lcsim xmlns:xs="http://www.w3.org/2001/XMLSchema-instance"
     xs:noNamespaceSchemaLocation="http://www.lcsim.org/schemas/lcsim/1.0/lcsim.xsd">

Copied: java/trunk/steering-files/src/main/resources/org/hps/steering/recon/EngineeringRun2014EcalReconMC.lcsim (from r2679, java/trunk/steering-files/src/main/resources/org/hps/steering/recon/EngineeringRun2014EcalRecon.lcsim)
 =============================================================================
--- java/trunk/steering-files/src/main/resources/org/hps/steering/recon/EngineeringRun2014EcalRecon.lcsim	(original)
+++ java/trunk/steering-files/src/main/resources/org/hps/steering/recon/EngineeringRun2014EcalReconMC.lcsim	Mon Apr 13 17:03:03 2015
@@ -26,8 +26,13 @@
     </execute>
     <drivers>
         <driver name="EventMarkerDriver" type="org.lcsim.job.EventMarkerDriver">
-            <eventInterval>1</eventInterval>
+            <eventInterval>100</eventInterval>
         </driver>
+     <driver name="ConditionsDriver" type="org.hps.conditions.ConditionsDriver">
+       <detectorName>HPS-ECalCommissioning-v3-fieldmap</detectorName>
+       <runNumber>3422</runNumber>
+        <freeze>true</freeze>
+    </driver>
         <driver name="EcalRunningPedestal" type="org.hps.recon.ecal.EcalRunningPedestalDriver">
             <minLookbackEvents>10</minLookbackEvents>
             <maxLookbackEvents>50</maxLookbackEvents>

Modified: java/trunk/steering-files/src/main/resources/org/hps/steering/recon/HPS2014OfflineNoPileupRecon.lcsim
 =============================================================================
--- java/trunk/steering-files/src/main/resources/org/hps/steering/recon/HPS2014OfflineNoPileupRecon.lcsim	(original)
+++ java/trunk/steering-files/src/main/resources/org/hps/steering/recon/HPS2014OfflineNoPileupRecon.lcsim	Mon Apr 13 17:03:03 2015
@@ -7,12 +7,13 @@
        xs:noNamespaceSchemaLocation="http://www.lcsim.org/schemas/lcsim/1.0/lcsim.xsd">
     <execute>
         <driver name="EventMarkerDriver"/>       
+        <driver name="ConditionsDriver"/>
         <driver name="RawTrackerHitSensorSetup"/>
         <driver name="RawTrackerHitFitterDriver" />
         <driver name="TrackerHitDriver"/>
         <driver name="HelicalTrackHitDriver"/>
         <driver name="TrackerReconDriver"/>
-        <driver name="EcalRawConverter" />
+        <driver name="EcalRawConverter" /> 
         <driver name="EcalClusterer" />
         <driver name="ReconParticle" /> 
         <driver name="TrackDataDriver" />               
@@ -21,6 +22,13 @@
         <driver name="CleanupDriver"/>
     </execute>    
     <drivers>    
+
+    
+        <driver name="ConditionsDriver" type="org.hps.conditions.ConditionsDriver">
+            <detectorName>HPS-EngRun2015-Nominal-v0</detectorName>
+            <runNumber>3422</runNumber>
+            <freeze>true</freeze>
+        </driver>
         <driver name="EventMarkerDriver" type="org.lcsim.job.EventMarkerDriver">
             <eventInterval>1000</eventInterval>
         </driver>        
@@ -47,14 +55,15 @@
             <isMC>false</isMC>
             <gblFileName></gblFileName>
         </driver>
-        <driver name="EcalRawConverter" type="org.hps.recon.ecal.EcalRawConverterDriver">
+
+       <driver name="EcalRawConverter" type="org.hps.recon.ecal.EcalRawConverterDriver">
             <ecalCollectionName>EcalCalHits</ecalCollectionName>
-            <use2014Gain>true</use2014Gain>
-            <useTimestamps>true</useTimestamps>
+            <use2014Gain>false</use2014Gain>
+            <useTimestamps>false</useTimestamps>
             <useTruthTime>false</useTruthTime>
-        </driver>
+        </driver> 
         <driver name="EcalClusterer" type="org.hps.recon.ecal.cluster.ReconClusterDriver">
-            <useTimeCut>true</useTimeCut>
+            <useTimeCut>false</useTimeCut>
         </driver>
         <driver name="ReconParticle" type="org.hps.recon.particle.HpsReconParticleDriver">          
         </driver>

Modified: java/trunk/steering-files/src/main/resources/org/hps/steering/users/mgraham/AlignmentMonitorTest.lcsim
 =============================================================================
--- java/trunk/steering-files/src/main/resources/org/hps/steering/users/mgraham/AlignmentMonitorTest.lcsim	(original)
+++ java/trunk/steering-files/src/main/resources/org/hps/steering/users/mgraham/AlignmentMonitorTest.lcsim	Mon Apr 13 17:03:03 2015
@@ -15,17 +15,16 @@
         <driver name="TrackerL4to6ReconDriver"/> 
          <driver name="FullTrackerReconDriver"/> 
            <driver name="TrackDataDriver"/>   
- <!--      <driver name="EcalRawConverter" /> 
+       <driver name="EcalRawConverter" /> 
         <driver name="EcalClusterer" />
-       <driver name="ReconParticle" /> -->
+       <driver name="ReconParticle" /> 
 <!-- Online Monitoring Drivers -->
         <driver name="TrackingMonitoring" />
         <driver name="TrackingResiduals"/>  
         <driver name="TrackTime"/>  
-<!--        <driver name="V0Monitoring"/>   -->
+        <driver name="V0Monitoring"/>   
         <driver name="SVTAlignment"/> 
 <!-- DQM Monitoring Drivers -->
-
 <!--        <driver name="TrackingDQM" />
         <driver name="TrackingResidualsDQM"/>   -->
 <!--        <driver name="FinalStateDQM"/>  
@@ -81,12 +80,18 @@
 
         <driver name="TrackDataDriver" type="org.hps.recon.tracking.TrackDataDriver">
         </driver>
-        <driver name="EcalRawConverter" type="org.hps.recon.ecal.EcalRawConverterDriver">
-            <ecalCollectionName>EcalCalHits</ecalCollectionName>
+
+         <driver name="EcalRawConverter" type="org.hps.recon.ecal.EcalRawConverterDriver">
+              <ecalCollectionName>EcalCalHits</ecalCollectionName>
+            <use2014Gain>false</use2014Gain>
+            <useTimestamps>false</useTimestamps>
+            <useTruthTime>false</useTruthTime>               
+           <debug>false</debug>
         </driver>
-        <driver name="EcalClusterer" type="org.hps.recon.ecal.cluster.ClusterDriver">
-            <clustererName>LegacyClusterer</clustererName>
-        </driver>
+         <driver name="EcalClusterer" type="org.hps.recon.ecal.cluster.ReconClusterDriver">              
+               <useTimeCut>true</useTimeCut>
+               <logLevel>ALL</logLevel>
+        </driver>     
         <driver name="ReconParticle" type="org.hps.recon.particle.HpsReconParticleDriver">
             <debug>false</debug>
         </driver>   

Copied: java/trunk/steering-files/src/main/resources/org/hps/steering/users/mgraham/DQMECalOnly.lcsim (from r2626, java/trunk/steering-files/src/main/resources/org/hps/steering/users/mgraham/DataQualityMonitorOnRecon.lcsim)
 =============================================================================
--- java/trunk/steering-files/src/main/resources/org/hps/steering/users/mgraham/DataQualityMonitorOnRecon.lcsim	(original)
+++ java/trunk/steering-files/src/main/resources/org/hps/steering/users/mgraham/DQMECalOnly.lcsim	Mon Apr 13 17:03:03 2015
@@ -4,107 +4,19 @@
 <lcsim xmlns:xs="http://www.w3.org/2001/XMLSchema-instance" xs:noNamespaceSchemaLocation="http://www.lcsim.org/schemas/lcsim/1.0/lcsim.xsd">
     <execute>
         <driver name="EventMarkerDriver" />
-        <!--
-        This is broken so commenting out.  JM 
-        <driver name="DQMDatabaseDriver" />
-         -->
-        <driver name="RawTrackerHitSensorSetup" />
-        <driver name="BadChannelFilter" />
-        <!-- <driver name="RawTrackerHitFitterDriver" /> -->
-        <!-- <driver name="TrackerHitDriver"/> -->
-        <!-- <driver name="HelicalTrackHitDriver"/> -->
-        <!-- <driver name="TrackerReconDriver"/> -->
-        <!-- <driver name="TrackDataDriver"/> -->
-        <!-- <driver name="EcalRawConverter" /> -->
-        <!-- <driver name="EcalClusterer" /> -->
-        <!-- <driver name="ReconParticle" /> -->
-        <driver name="SVTMonitoring" />
-        <driver name="SVTHitMCEfficiency" />
-        <driver name="TrackingMonitoring" />
-        <driver name="TrackingResiduals" />
-        <driver name="TrackMCEfficiency" />
-        <driver name="FinalStateMonitoring" />
-        <driver name="V0Monitoring" />
+        <driver name="EcalMonitoring" />
         <driver name="AidaSaveDriver" />
-        <driver name="CleanupDriver" />
     </execute>
     <drivers>
-        <!-- <driver name="DQMDatabaseDriver" type="org.hps.analysis.dataquality.DQMDatabaseDriver" /> -->
-        <driver name="EventMarkerDriver" type="org.lcsim.job.EventMarkerDriver">
-            <eventInterval>1</eventInterval>
-        </driver>
-        <driver name="RawTrackerHitSensorSetup" type="org.lcsim.recon.tracking.digitization.sisim.config.RawTrackerHitSensorSetup" />
-        <driver name="BadChannelFilter" type="org.hps.recon.tracking.SVTBadChannelFilterDriver" />
-        <driver name="RawTrackerHitFitterDriver" type="org.hps.recon.tracking.RawTrackerHitFitterDriver">
-            <fitAlgorithm>Analytic</fitAlgorithm>
-            <useTimestamps>false</useTimestamps>
-            <correctT0Shift>false</correctT0Shift>
-            <useTruthTime>true</useTruthTime>
-            <subtractTOF>true</subtractTOF>
-        </driver>
-        <driver name="TrackerHitDriver" type="org.hps.recon.tracking.DataTrackerHitDriver">
-            <debug>false</debug>
-        </driver>
-        <driver name="HelicalTrackHitDriver" type="org.hps.recon.tracking.HelicalTrackHitDriver">
-            <debug>false</debug>
-            <clusterTimeCut>16.0</clusterTimeCut>
-            <maxSeperation>20.0</maxSeperation>
-            <tolerance>1.0</tolerance>
-        </driver>
-        <driver name="TrackerReconDriver" type="org.hps.recon.tracking.TrackerReconDriver">
-            <debug>false</debug>
-            <strategyResource>/org/hps/recon/tracking/strategies/HPS-Full.xml</strategyResource>
-        </driver>
-        <driver name="TrackDataDriver" type="org.hps.recon.tracking.TrackDataDriver">
-        </driver>
-        <driver name="EcalRawConverter" type="org.hps.recon.ecal.EcalRawConverterDriver">
-            <ecalCollectionName>EcalCalHits</ecalCollectionName>
-        </driver>
-        <driver name="EcalClusterer" type="org.hps.recon.ecal.cluster.ClusterDriver">
-            <clustererName>LegacyClusterer</clustererName>
-        </driver>
-        <driver name="ReconParticle" type="org.hps.recon.particle.HpsReconParticleDriver">
-            <debug>false</debug>
-        </driver>
-        <driver name="LCIOWriter" type="org.lcsim.util.loop.LCIODriver">
-            <outputFilePath>${outputFile}.slcio</outputFilePath>
-        </driver>
+   <driver name="EventMarkerDriver" type="org.lcsim.job.EventMarkerDriver">
+            <eventInterval>1000</eventInterval>
+        </driver>    
         <driver name="AidaSaveDriver" type="org.lcsim.job.AidaSaveDriver">
             <outputFileName>./conditions_test_plots.root</outputFileName>
         </driver>
-        <driver name="SVTMonitoring" type="org.hps.analysis.dataquality.SvtMonitoring">
-            <runNumber>${runNumber}</runNumber>
+          <driver name="EcalMonitoring" type="org.hps.analysis.dataquality.EcalMonitoring">
+            <clusterCollectionName>EcalClusters</clusterCollectionName>
             <overwriteDB>false</overwriteDB>
-            <printDQMStrings>true</printDQMStrings>
-        </driver>
-        <driver name="TrackingMonitoring" type="org.hps.analysis.dataquality.TrackingMonitoring">
-            <runNumber>${runNumber}</runNumber>
-            <overwriteDB>false</overwriteDB>
-            <printDQMStrings>true</printDQMStrings>
-        </driver>
-        <driver name="TrackingResiduals" type="org.hps.analysis.dataquality.TrackingResiduals">
-            <runNumber>${runNumber}</runNumber>
-            <overwriteDB>false</overwriteDB>
-            <printDQMStrings>true</printDQMStrings>
-        </driver>
-        <driver name="FinalStateMonitoring" type="org.hps.analysis.dataquality.FinalStateMonitoring">
-            <runNumber>${runNumber}</runNumber>
-            <overwriteDB>false</overwriteDB>
-            <printDQMStrings>true</printDQMStrings>
-        </driver>
-        <driver name="TrackMCEfficiency" type="org.hps.analysis.dataquality.TrackMCEfficiency">
-            <overwriteDB>false</overwriteDB>
-            <printDQMStrings>true</printDQMStrings>
-        </driver>
-        <driver name="SVTHitMCEfficiency" type="org.hps.analysis.dataquality.SVTHitMCEfficiency">
-            <overwriteDB>false</overwriteDB>
-            <printDQMStrings>true</printDQMStrings>
-        </driver>
-        <driver name="V0Monitoring" type="org.hps.analysis.dataquality.V0Monitoring">
-            <runNumber>${runNumber}</runNumber>
-            <printDQMStrings>true</printDQMStrings>
-            <overwriteDB>false</overwriteDB>
-        </driver>
-        <driver name="CleanupDriver" type="org.lcsim.recon.tracking.digitization.sisim.config.ReadoutCleanupDriver" />
+        </driver> 
     </drivers>
 </lcsim>

Copied: java/trunk/steering-files/src/main/resources/org/hps/steering/users/mgraham/KylesTriggerStudy.lcsim (from r2664, java/trunk/steering-files/src/main/resources/org/hps/steering/monitoring/SVTMonitoring.lcsim)
 =============================================================================
--- java/trunk/steering-files/src/main/resources/org/hps/steering/monitoring/SVTMonitoring.lcsim	(original)
+++ java/trunk/steering-files/src/main/resources/org/hps/steering/users/mgraham/KylesTriggerStudy.lcsim	Mon Apr 13 17:03:03 2015
@@ -1,80 +1,95 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <lcsim xmlns:xs="http://www.w3.org/2001/XMLSchema-instance" xs:noNamespaceSchemaLocation="http://www.lcsim.org/schemas/lcsim/1.0/lcsim.xsd">
+ <control>
+        <printInputFiles>false</printInputFiles>
+        <printDriversDetailed>false</printDriversDetailed>
+    </control>
+    
     <execute>
-        <driver name="EventMarkerDriver" />
-        <driver name="RawTrackerHitSensorSetup" />
-        <driver name="SVTPulsePlots" />
-        <driver name="RawTrackerHitFitterDriver" />
-        <driver name="SVTPulseFitPlots" />
-<!--        <driver name="SVTMonitoringPlots"/>-->
-        <driver name="TrackerHitDriver" />
-        <driver name="SVTHitRecoPlots" />
-        <driver name="HelicalTrackHitDriver" />
-        <driver name="TrackerReconDriver" />
-<!--        <driver name="SVTSimpleEventDisplay"/>-->
-<!--        <driver name="TrackTimePlots"/>-->
-        <driver name="EcalRawConverter" />
-        <driver name="EcalClusterer" />
-        <driver name="TrackingReconstructionPlots" />
-        <driver name="CleanupDriver" />
-        <driver name="AidaSaveDriver" />
+        <driver name="ConditionsDriver"/>
+        <driver name="EventMarkerDriver"/>          
+        <driver name="EcalReadout"/>
+        <driver name="EcalConverter"/>
+        <driver name="EcalClustererGTP"/>
+        <driver name="PairTrigger0"/>
+         <driver name="TestRunReconToLcio"/>
+        <driver name="AidaSaveDriver"/>
+        <driver name="ClockDriver"/>
     </execute>
+    
     <drivers>
         <driver name="EventMarkerDriver" type="org.lcsim.job.EventMarkerDriver">
-            <eventInterval>1</eventInterval>
+            <eventInterval>1000</eventInterval>
         </driver>
-        <driver name="RawTrackerHitSensorSetup" type="org.lcsim.recon.tracking.digitization.sisim.config.RawTrackerHitSensorSetup" />
-        <driver name="EcalRawConverter" type="org.hps.recon.ecal.EcalRawConverterDriver">
-            <ecalCollectionName>EcalCalHits</ecalCollectionName>
-            <use2014Gain>false</use2014Gain>
+       
+        <driver name="ConditionsDriver" type="org.hps.conditions.ConditionsDriver">
+            <detectorName>HPS-EngRun2015-Nominal-v0</detectorName>
+            <runNumber>3422</runNumber>
+            <freeze>true</freeze>
         </driver>
-        <driver name="EcalClusterer" type="org.hps.recon.ecal.cluster.GTPOnlineClusterDriver">
-            <verbose>false</verbose>
-            <logLevel>WARNING</logLevel>
-            <windowAfter>2</windowAfter>
-            <windowBefore>2</windowBefore>
-            <seedEnergyThreshold>0.100</seedEnergyThreshold>
-            <inputHitCollectionName>EcalCalHits</inputHitCollectionName>
-            <outputClusterCollectionName>EcalClusters</outputClusterCollectionName>
+        
+        <driver name="TestRunReconToLcio" type="org.hps.evio.TestRunTriggeredReconToLcio">
+            <outputFile>${outputFile}.slcio</outputFile>
+            <rejectBackground>true</rejectBackground>
         </driver>
-        <driver name="RawTrackerHitFitterDriver" type="org.hps.recon.tracking.RawTrackerHitFitterDriver">
-            <fitAlgorithm>Analytic</fitAlgorithm>
-            <correctT0Shift>true</correctT0Shift>
+        
+        <driver name="EcalReadout" type="org.hps.readout.ecal.FADCEcalReadoutDriver">
+            <coincidenceWindow>1</coincidenceWindow>
+            <ecalName>Ecal</ecalName>
+            <ecalCollectionName>EcalHits</ecalCollectionName>
+            <ecalRawCollectionName>EcalRawHits</ecalRawCollectionName>
+            <addNoise>true</addNoise>  
+              <use2014Gain>false</use2014Gain>   
+            <numSamplesAfter>25</numSamplesAfter>
+            <numSamplesBefore>5</numSamplesBefore>
+            <readoutThreshold>12</readoutThreshold>
+            <triggerThreshold>12</triggerThreshold>   
+              <logLevel>0</logLevel>      
         </driver>
-        <driver name="TrackerHitDriver" type="org.hps.recon.tracking.DataTrackerHitDriver" />
-        <driver name="HelicalTrackHitDriver" type="org.hps.recon.tracking.HelicalTrackHitDriver">
-            <debug>false</debug>
-            <maxSeperation>20.0</maxSeperation>
-            <tolerance>1.0</tolerance>
+        
+        <driver name="EcalConverter" type="org.hps.recon.ecal.EcalRawConverterDriver">
+            <rawCollectionName>EcalRawHits</rawCollectionName>
+            <ecalCollectionName>EcalCorrectedHits</ecalCollectionName>
+            <applyBadCrystalMap>false</applyBadCrystalMap>
+            <use2014Gain>false</use2014Gain>      
+            <debug>true</debug>
         </driver>
-        <driver name="TrackerReconDriver" type="org.hps.recon.tracking.TrackerReconDriver">
-            <debug>false</debug>
-            <strategyResource>/org/hps/recon/tracking/strategies/HPS-Test-4pt1.xml</strategyResource>
+        
+        <driver name="EcalClustererGTP" type="org.hps.recon.ecal.cluster.GTPClusterDriver">
+            <inputHitCollectionName>EcalCorrectedHits</inputHitCollectionName>
+            <clusterWindow>3</clusterWindow>
+            <seedEnergyThreshold>0.000</seedEnergyThreshold>             
         </driver>
-        <driver name="TrackingReconstructionPlots" type="org.hps.monitoring.drivers.svt.TrackingReconstructionPlots">
-<!--            <outputPlots>HPSTestRunTrackingPlots.aida</outputPlots>-->
+        
+        <driver name="PairTrigger0" type="org.hps.readout.ecal.FADCPrimaryTriggerDriver">
+            <clusterCollectionName>EcalClusters</clusterCollectionName>
+            <deadTime>32</deadTime>
+            <minHitCount>2</minHitCount>
+            <pairCoincidence>4</pairCoincidence>
+            <clusterEnergyHigh>2.5</clusterEnergyHigh>
+            <clusterEnergyLow>0.2</clusterEnergyLow>
+            <energySumHigh>2.0</energySumHigh>
+            <energySumLow>0.0</energySumLow>
+            <energyDifferenceHigh>1.2</energyDifferenceHigh>
+            <coplanarityHigh>90</coplanarityHigh>
+            <seedEnergyLow>0.1</seedEnergyLow>
+            <energySlopeParamF>0.0055</energySlopeParamF>
+            <energySlopeLow>0.4</energySlopeLow>
+            <prescale>1</prescale>
+            <outputFileName>${outputFile}.triggers.pairs0</outputFileName>
+            <logLevel>0</logLevel>
         </driver>
-        <driver name="SVTSimpleEventDisplay" type="org.hps.monitoring.drivers.svt.SVTSimpleEventDisplay">
-            <inputCollection>SVTRawTrackerHits</inputCollection>
-            <singleEvent>false</singleEvent>
+        
+        <driver name="AidaSaveDriver"
+                type="org.lcsim.job.AidaSaveDriver">
+            <outputFileName>${outputFile}_triggerPlots.root</outputFileName>
         </driver>
-        <driver name="SVTMonitoringPlots" type="org.hps.monitoring.drivers.svt.SVTMonitoringPlots">
-        </driver>
-        <driver name="SVTPulseFitPlots" type="org.hps.monitoring.drivers.svt.SVTPulseFitPlots">
-            <fittedTrackerHitCollectionName>SVTFittedRawTrackerHits</fittedTrackerHitCollectionName>
-        </driver>
-        <driver name="SVTPulsePlots" type="org.hps.monitoring.drivers.svt.SVTHitPulsePlots">
-            <rawTrackerHitCollectionName>SVTRawTrackerHits</rawTrackerHitCollectionName>
-        </driver>
-        <driver name="SVTHitRecoPlots" type="org.hps.monitoring.drivers.svt.SVTHitReconstructionPlots">
-            <fittedTrackerHitCollectionName>SVTFittedRawTrackerHits</fittedTrackerHitCollectionName>
-        </driver>
-        <driver name="TrackTimePlots" type="org.hps.monitoring.drivers.svt.TrackTimePlots" />
+        
+         
+        <driver name="ClockDriver" type="org.hps.readout.ecal.ClockDriver"/>
+        
         <driver name="CleanupDriver" type="org.lcsim.recon.tracking.digitization.sisim.config.ReadoutCleanupDriver">
             <collectionNames>TrackerHits</collectionNames>
         </driver>
-        <driver name="AidaSaveDriver" type="org.lcsim.job.AidaSaveDriver">
-            <outputFileName>svtmon_plots2</outputFileName>
-        </driver>
     </drivers>
 </lcsim>