Print

Print


Commit in java/trunk/hps-java/src/main/resources/org/lcsim/hps/steering/readout on MAIN
HPS2014ReadoutToEvio.lcsim+12-4343 -> 344
TestRunReadoutToEvio.lcsim+1-1343 -> 344
TestRunReadoutToLcio.lcsim+1-1343 -> 344
+14-6
3 modified files
update readout steering files

java/trunk/hps-java/src/main/resources/org/lcsim/hps/steering/readout
HPS2014ReadoutToEvio.lcsim 343 -> 344
--- java/trunk/hps-java/src/main/resources/org/lcsim/hps/steering/readout/HPS2014ReadoutToEvio.lcsim	2014-03-25 01:44:22 UTC (rev 343)
+++ java/trunk/hps-java/src/main/resources/org/lcsim/hps/steering/readout/HPS2014ReadoutToEvio.lcsim	2014-03-25 02:59:38 UTC (rev 344)
@@ -21,6 +21,8 @@
         <driver name="DataProcessing"/>-->
         <driver name="TestRunReconToEvio"/>
 
+        <!--<driver name="AidaSaveDriver"/>-->
+
         <driver name="ClockDriver"/>
         <driver name="CleanupDriver"/>
     </execute> 
@@ -37,7 +39,7 @@
         </driver>
 			
         <driver name="EcalReadout" type="org.lcsim.hps.readout.ecal.FADCEcalReadoutDriver">
-            <coincidenceWindow>2</coincidenceWindow>
+            <coincidenceWindow>1</coincidenceWindow>
             <ecalName>Ecal</ecalName>
             <ecalCollectionName>EcalHits</ecalCollectionName>
             <ecalRawCollectionName>EcalRawHits</ecalRawCollectionName>
@@ -51,21 +53,22 @@
         <driver name="EcalConverter" type="org.lcsim.hps.recon.ecal.EcalRawConverterDriver">
             <rawCollectionName>EcalRawHits</rawCollectionName>
             <ecalCollectionName>EcalCorrectedHits</ecalCollectionName>
-            <gain>0.15</gain>
+            <!--<gain>0.15</gain>-->
             <applyBadCrystalMap>false</applyBadCrystalMap>
             <use2014Gain>true</use2014Gain>
 <!--            <debug>true</debug>-->
         </driver>	
 
-        <driver name="EcalClusterer" type="org.lcsim.hps.recon.ecal.CTPEcalClusterer">
+        <driver name="EcalClusterer" type="org.lcsim.hps.recon.ecal.GTPEcalClusterer">
             <ecalName>Ecal</ecalName>
-            <clusterWindow>32.0</clusterWindow>
+            <clusterWindow>1</clusterWindow>
             <ecalCollectionName>EcalCorrectedHits</ecalCollectionName>
         </driver>
 
         <driver name="EcalTrigger" type="org.lcsim.hps.readout.ecal.FADCTriggerDriver">
             <clusterCollectionName>EcalClusters</clusterCollectionName>
             <deadTime>10</deadTime>
+            <pairCoincidence>2</pairCoincidence>
             <outputFileName>${outputFile}.triggers</outputFileName>
         </driver>	
         <driver name="SimpleSVTReadout" type="org.lcsim.hps.recon.tracking.SimpleSvtReadout">
@@ -87,6 +90,11 @@
             <numberOfSamplesToReadOut>6</numberOfSamplesToReadOut>
         </driver>-->
 
+<!--        <driver name="AidaSaveDriver"
+                        type="org.lcsim.job.AidaSaveDriver">
+            <outputFileName>${outputFile}_triggerPlots</outputFileName>
+        </driver>-->
+
         <driver name="ClockDriver" type="org.lcsim.hps.util.ClockDriver"/>
         <driver name="CleanupDriver" type="org.lcsim.recon.tracking.digitization.sisim.config.ReadoutCleanupDriver">
             <collectionNames>TrackerHits</collectionNames>

java/trunk/hps-java/src/main/resources/org/lcsim/hps/steering/readout
TestRunReadoutToEvio.lcsim 343 -> 344
--- java/trunk/hps-java/src/main/resources/org/lcsim/hps/steering/readout/TestRunReadoutToEvio.lcsim	2014-03-25 01:44:22 UTC (rev 343)
+++ java/trunk/hps-java/src/main/resources/org/lcsim/hps/steering/readout/TestRunReadoutToEvio.lcsim	2014-03-25 02:59:38 UTC (rev 344)
@@ -33,7 +33,7 @@
         </driver>
         <driver name="BadChannelFilter" type="org.lcsim.hps.recon.tracking.SVTBadChannelFilterDriver" /> 		
         <driver name="EcalReadout" type="org.lcsim.hps.readout.ecal.FADCEcalReadoutDriver">
-            <coincidenceWindow>2</coincidenceWindow>
+            <coincidenceWindow>8</coincidenceWindow>
             <ecalName>Ecal</ecalName>
             <ecalCollectionName>EcalHits</ecalCollectionName>
             <ecalRawCollectionName>EcalRawHits</ecalRawCollectionName>

java/trunk/hps-java/src/main/resources/org/lcsim/hps/steering/readout
TestRunReadoutToLcio.lcsim 343 -> 344
--- java/trunk/hps-java/src/main/resources/org/lcsim/hps/steering/readout/TestRunReadoutToLcio.lcsim	2014-03-25 01:44:22 UTC (rev 343)
+++ java/trunk/hps-java/src/main/resources/org/lcsim/hps/steering/readout/TestRunReadoutToLcio.lcsim	2014-03-25 02:59:38 UTC (rev 344)
@@ -37,7 +37,7 @@
         </driver>
         <driver name="BadChannelFilter" type="org.lcsim.hps.recon.tracking.SVTBadChannelFilterDriver" /> 	
         <driver name="EcalReadout" type="org.lcsim.hps.readout.ecal.FADCEcalReadoutDriver">
-            <coincidenceWindow>2</coincidenceWindow>
+            <coincidenceWindow>8</coincidenceWindow>
             <ecalCollectionName>EcalHits</ecalCollectionName>
             <ecalRawCollectionName>EcalRawHits</ecalRawCollectionName>
             <triggerThreshold>80</triggerThreshold>
SVNspam 0.1