Author: [log in to unmask]
Date: Tue May 5 13:55:00 2015
New Revision: 2904
Log:
update production MC trigger and a bunch of private changes
Added:
java/trunk/steering-files/src/main/resources/org/hps/steering/users/mgraham/PlotsOnRecon.lcsim
- copied, changed from r2892, java/trunk/steering-files/src/main/resources/org/hps/steering/users/mgraham/TrackingAndReconMonitoring.lcsim
Modified:
java/trunk/steering-files/src/main/resources/org/hps/steering/readout/EngineeringRun2015TrigPairs1.lcsim
java/trunk/steering-files/src/main/resources/org/hps/steering/users/mgraham/AlignmentStudies.lcsim
java/trunk/steering-files/src/main/resources/org/hps/steering/users/mgraham/ReadoutAndTrackingAndReconMonitoring.lcsim
java/trunk/steering-files/src/main/resources/org/hps/steering/users/mgraham/TestReadoutEngRun2015.lcsim
java/trunk/steering-files/src/main/resources/org/hps/steering/users/mgraham/TrackingAndReconMonitoring.lcsim
Modified: java/trunk/steering-files/src/main/resources/org/hps/steering/readout/EngineeringRun2015TrigPairs1.lcsim
=============================================================================
--- java/trunk/steering-files/src/main/resources/org/hps/steering/readout/EngineeringRun2015TrigPairs1.lcsim (original)
+++ java/trunk/steering-files/src/main/resources/org/hps/steering/readout/EngineeringRun2015TrigPairs1.lcsim Tue May 5 13:55:00 2015
@@ -1,38 +1,35 @@
-<!--
- Full 2014 prescales and trigger cuts for runs 3430-3446. Loose pairs trigger.
--->
-<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>
+<?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 readout for the EngRun 2015 MC
+ @author Matt Graham <[log in to unmask]>
+ -->
+ <control>
+ <printInputFiles>true</printInputFiles>
+ <printDriversDetailed>true</printDriversDetailed>
</control>
- <execute>
- <driver name="ConditionsDriver"/>
- <driver name="EventMarkerDriver"/>
+ <execute>
+ <driver name="ConditionsDriver"/>
+ <driver name="EventMarkerDriver" />
+<!-- Readout Simulation -->
<driver name="EcalReadout"/>
<driver name="EcalConverter"/>
<driver name="EcalClustererGTP"/>
<driver name="PairTrigger1"/>
<driver name="SimpleSVTReadout" />
- <driver name="TestRunReconToLcio"/>
- <driver name="AidaSaveDriver"/>
- <driver name="ClockDriver"/>
- <driver name="CleanupDriver"/>
- </execute>
+ <driver name="TestRunReconToLcio"/>
+ <driver name="AidaSaveDriver"/>
+ <driver name="ClockDriver"/>
+ <driver name="CleanupDriver" />
+ </execute>
<drivers>
<driver name="EventMarkerDriver" type="org.lcsim.job.EventMarkerDriver">
<eventInterval>1000</eventInterval>
- </driver>
- <driver name="ConditionsDriver" type="org.hps.conditions.ConditionsDriver">
- <detectorName>${detector}</detectorName>
- <runNumber>${run}</runNumber>
- <freeze>true</freeze>
- </driver>
- <driver name="TestRunReconToLcio" type="org.hps.evio.TestRunTriggeredReconToLcio">
- <outputFile>${outputFile}.slcio</outputFile>
- <rejectBackground>false</rejectBackground>
- <writeSvtData>true</writeSvtData>
+ </driver>
+ <driver name="ConditionsDriver" type="org.hps.conditions.ConditionsDriver">
+ <detectorName>${detector}</detectorName>
+ <runNumber>${run}</runNumber>
+ <freeze>true</freeze>
</driver>
<driver name="EcalReadout" type="org.hps.readout.ecal.FADCEcalReadoutDriver">
<coincidenceWindow>1</coincidenceWindow>
@@ -48,7 +45,6 @@
</driver>
<driver name="EcalConverter" type="org.hps.recon.ecal.EcalRawConverterDriver">
<rawCollectionName>EcalRawHits</rawCollectionName>
- <!--rawCollectionName>EcalCalHits</rawCollectionName-->
<ecalCollectionName>EcalCorrectedHits</ecalCollectionName>
<applyBadCrystalMap>false</applyBadCrystalMap>
<nsa>100</nsa>
@@ -57,21 +53,22 @@
</driver>
<driver name="EcalClustererGTP" type="org.hps.recon.ecal.cluster.GTPClusterDriver">
<inputHitCollectionName>EcalCorrectedHits</inputHitCollectionName>
- <outputClusterCollectionName>EcalClusters</outputClusterCollectionName>
+ <outputClusterCollectionName>EcalClustersGTP</outputClusterCollectionName>
<clusterWindow>1</clusterWindow>
+ <logLevel>SEVERE</logLevel>
</driver>
<driver name="PairTrigger1" type="org.hps.readout.ecal.FADCPrimaryTriggerDriver">
<!--
- Hit Count: 2
- Seed Energy: 50 MeV
- Cluster Energy: 60 MeV (Low) and 630 MeV (High)
- Energy Sum: 200 MeV (Low) and 860 MeV (High)
- Energy Difference: 540 MeV
- Energy Slope: 600 MeV (with F = 5.5 MeV/mm)
- Coplanarity: 30 Degrees
- Time Coincidence: 16 ms
- -->
- <clusterCollectionName>EcalClusters</clusterCollectionName>
+ Hit Count: 2
+ Seed Energy: 50 MeV
+ Cluster Energy: 60 MeV (Low) and 630 MeV (High)
+ Energy Sum: 200 MeV (Low) and 860 MeV (High)
+ Energy Difference: 540 MeV
+ Energy Slope: 600 MeV (with F = 5.5 MeV/mm)
+ Coplanarity: 30 Degrees
+ Time Coincidence: 16 ms
+ -->
+ <clusterCollectionName>EcalClustersGTP</clusterCollectionName>
<deadTime>32</deadTime>
<minHitCount>2</minHitCount>
<pairCoincidence>4</pairCoincidence>
@@ -89,12 +86,17 @@
<!--<verbose>true</verbose>-->
</driver>
<driver name="SimpleSVTReadout" type="org.hps.readout.svt.SimpleSvtReadout" />
- <driver name="AidaSaveDriver"
- type="org.lcsim.job.AidaSaveDriver">
- <outputFileName>${outputFile}_triggerPlots</outputFileName>
+ <driver name="RawTrackerHitSensorSetup" type="org.lcsim.recon.tracking.digitization.sisim.config.RawTrackerHitSensorSetup" />
+
+ <driver name="AidaSaveDriver" type="org.lcsim.job.AidaSaveDriver">
+ <outputFileName>./${outputFile}.root</outputFileName>
</driver>
<driver name="ClockDriver" type="org.hps.readout.ecal.ClockDriver"/>
- <driver name="CleanupDriver" type="org.lcsim.recon.tracking.digitization.sisim.config.ReadoutCleanupDriver">
- </driver>
+ <driver name="CleanupDriver" type="org.lcsim.recon.tracking.digitization.sisim.config.ReadoutCleanupDriver" />
+ <driver name="TestRunReconToLcio" type="org.hps.evio.TestRunTriggeredReconToLcio">
+ <outputFile>${outputFile}.slcio</outputFile>
+ <rejectBackground>false</rejectBackground>
+ <writeSvtData>true</writeSvtData>
+ </driver>
</drivers>
-</lcsim>
+</lcsim>
Modified: java/trunk/steering-files/src/main/resources/org/hps/steering/users/mgraham/AlignmentStudies.lcsim
=============================================================================
--- java/trunk/steering-files/src/main/resources/org/hps/steering/users/mgraham/AlignmentStudies.lcsim (original)
+++ java/trunk/steering-files/src/main/resources/org/hps/steering/users/mgraham/AlignmentStudies.lcsim Tue May 5 13:55:00 2015
@@ -10,7 +10,7 @@
<driver name="RawTrackerHitFitterDriver" />
<driver name="TrackerHitDriver"/>
<driver name="HelicalTrackHitDriver"/>
- <!-- <driver name="FullTrackerReconDriver"/>
+ <!-- <driver name="FullTrackerReconDriver"/>
<driver name="EcalRunningPedestal"/>
<driver name="EcalRawConverter" />
<driver name="ReconClusterer" />
@@ -20,11 +20,12 @@
<driver name="TrackerL4to6ReconDriver"/>
<driver name="SVTAlignment"/>
<!-- Online Monitoring Drivers -->
- <!-- <driver name="TrackingMonitoring" />
- <driver name="TrackingResiduals"/>
+ <driver name="TrackingMonitoringL1to3" />
+ <driver name="TrackingMonitoringL4to6" />
+ <!-- <driver name="TrackingResiduals"/>
<driver name="TrackTime"/>
<driver name="V0Monitoring"/> -->
-<!-- <driver name="TrackingMonitoringDQM" />
+ <!-- <driver name="TrackingMonitoringDQM" />
<driver name="TrackingMonitoringPairs0DQM" />
<driver name="TrackingMonitoringPairs1DQM" />
<driver name="TrackingResidualsDQM"/>
@@ -36,7 +37,7 @@
<driver name="V0DQMPairs1"/>
<driver name="PositronDebug"/>-->
<driver name="AidaSaveDriver"/>
- <driver name="LCIOWriter"/>
+ <!-- <driver name="LCIOWriter"/> -->
<driver name="CleanupDriver" />
</execute>
<drivers>
@@ -70,7 +71,7 @@
<driver name="TrackerL4to6ReconDriver" type="org.hps.recon.tracking.TrackerReconDriver">
<debug>false</debug>
<includeMS>false</includeMS>
- <useHPSMaterialManager>false</useHPSMaterialManager>
+ <useHPSMaterialManager>false</useHPSMaterialManager>
<trackCollectionName>L4to6Tracks</trackCollectionName>
<strategyResource>/org/hps/recon/tracking/strategies/HPS-Full-L4-6.xml</strategyResource>
</driver>
@@ -157,8 +158,19 @@
<writeRejectedHitCollection>false</writeRejectedHitCollection>
</driver>
<!-- End of EngineeringRun2015FullRecon from Sho -->
-
-
+ <driver name="TrackingMonitoringL1to3" type="org.hps.analysis.dataquality.TrackingMonitoring">
+ <overwriteDB>false</overwriteDB>
+ <printDQMStrings>false</printDQMStrings>
+ <trackCollectionName>L1to3Tracks</trackCollectionName>
+ </driver>
+
+ <driver name="TrackingMonitoringL4to6" type="org.hps.analysis.dataquality.TrackingMonitoring">
+ <overwriteDB>false</overwriteDB>
+ <printDQMStrings>false</printDQMStrings>
+ <trackCollectionName>L4to6Tracks</trackCollectionName>
+ </driver>
+
+
<driver name="TrackingMonitoring" type="org.hps.monitoring.drivers.trackrecon.TrackingReconPlots">
</driver>
<driver name="TrackingResiduals" type="org.hps.monitoring.drivers.trackrecon.TrackResiduals">
Copied: java/trunk/steering-files/src/main/resources/org/hps/steering/users/mgraham/PlotsOnRecon.lcsim (from r2892, java/trunk/steering-files/src/main/resources/org/hps/steering/users/mgraham/TrackingAndReconMonitoring.lcsim)
=============================================================================
--- java/trunk/steering-files/src/main/resources/org/hps/steering/users/mgraham/TrackingAndReconMonitoring.lcsim (original)
+++ java/trunk/steering-files/src/main/resources/org/hps/steering/users/mgraham/PlotsOnRecon.lcsim Tue May 5 13:55:00 2015
@@ -6,18 +6,7 @@
-->
<execute>
<driver name="EventMarkerDriver" />
- <!-- Standard Reconstruction -->
- <driver name="RawTrackerHitFitterDriver" />
- <driver name="TrackerHitDriver"/>
- <driver name="HelicalTrackHitDriver"/>
- <driver name="FullTrackerReconDriver"/>
- <driver name="EcalRunningPedestal"/>
- <driver name="EcalRawConverter" />
- <driver name="ReconClusterer" />
- <driver name="ReconParticle" />
- <!-- SVT opening angle alignment -->
- <driver name="TrackerL1to3ReconDriver"/>
- <driver name="TrackerL4to6ReconDriver"/>
+ <!-- Standard Reconstruction -->
<driver name="SVTAlignment"/>
<!-- Online Monitoring Drivers -->
<!-- <driver name="TrackingMonitoring" />
@@ -34,9 +23,8 @@
<driver name="V0DQM"/>
<driver name="V0DQMPairs0"/>
<driver name="V0DQMPairs1"/>
-<!-- <driver name="PositronDebug"/>-->
- <driver name="AidaSaveDriver"/>
-<!-- <driver name="LCIOWriter"/> -->
+ <!-- <driver name="PositronDebug"/>-->
+ <driver name="AidaSaveDriver"/>
<driver name="CleanupDriver" />
</execute>
<drivers>
@@ -70,7 +58,7 @@
<driver name="TrackerL4to6ReconDriver" type="org.hps.recon.tracking.TrackerReconDriver">
<debug>false</debug>
<includeMS>false</includeMS>
- <useHPSMaterialManager>false</useHPSMaterialManager>
+ <useHPSMaterialManager>false</useHPSMaterialManager>
<trackCollectionName>L4to6Tracks</trackCollectionName>
<strategyResource>/org/hps/recon/tracking/strategies/HPS-Full-L4-6.xml</strategyResource>
</driver>
@@ -237,5 +225,14 @@
<outputFilePath>${outputFile}.slcio</outputFilePath>
</driver>
<driver name="CleanupDriver" type="org.lcsim.recon.tracking.digitization.sisim.config.ReadoutCleanupDriver" />
+
+ <driver name="GTPOnlineClusterer" type="org.hps.recon.ecal.cluster.ClusterDriver">
+ <logLevel>WARNING</logLevel>
+ <clustererName>GTPOnlineClusterer</clustererName>
+ <outputClusterCollectionName>EcalClustersGTP</outputClusterCollectionName>
+ <!-- seedMinEnergy -->
+ <cuts>0.100</cuts>
+ </driver>
+
</drivers>
</lcsim>
Modified: java/trunk/steering-files/src/main/resources/org/hps/steering/users/mgraham/ReadoutAndTrackingAndReconMonitoring.lcsim
=============================================================================
--- java/trunk/steering-files/src/main/resources/org/hps/steering/users/mgraham/ReadoutAndTrackingAndReconMonitoring.lcsim (original)
+++ java/trunk/steering-files/src/main/resources/org/hps/steering/users/mgraham/ReadoutAndTrackingAndReconMonitoring.lcsim Tue May 5 13:55:00 2015
@@ -5,16 +5,18 @@
@author Matt Graham <[log in to unmask]>
-->
<execute>
+
<driver name="ConditionsDriver"/>
<driver name="EventMarkerDriver" />
+<!-- Readout Simulation -->
<driver name="EcalReadout"/>
<driver name="EcalConverter"/>
<driver name="EcalClustererGTP"/>
<driver name="PairTrigger1"/>
<driver name="SimpleSVTReadout" />
- <driver name="TestRunReconToLcio"/>
+ <driver name="TestRunReconToLcio"/>
<!-- Standard Reconstruction -->
-<!-- <driver name="RawTrackerHitFitterDriver" />
+ <!-- <driver name="RawTrackerHitFitterDriver" />
<driver name="TrackerHitDriver"/>
<driver name="HelicalTrackHitDriver"/>
<driver name="FullTrackerReconDriver"/>
@@ -22,7 +24,6 @@
<driver name="EcalRawConverter" />
<driver name="ReconClusterer" />
<driver name="ReconParticle" /> -->
-
<!-- SVT opening angle alignment -->
<!-- <driver name="TrackerL1to3ReconDriver"/>
<driver name="TrackerL4to6ReconDriver"/>
@@ -32,11 +33,11 @@
<driver name="TrackingResiduals"/>
<driver name="TrackTime"/>
<driver name="V0Monitoring"/> -->
- <!-- <driver name="TrackingMonitoringDQM" /> -->
+ <!-- <driver name="TrackingMonitoringDQM" />
+ <driver name="TrackingResidualsDQM"/>
+ <driver name="FinalStateDQM"/> -->
<!-- <driver name="TrackingMonitoringPairs0DQM" />
<driver name="TrackingMonitoringPairs1DQM" /> -->
- <!-- <driver name="TrackingResidualsDQM"/>
- <driver name="FinalStateDQM"/> -->
<!-- <driver name="FinalStateDQMPairs0"/>
<driver name="FinalStateDQMPairs1"/>
<driver name="V0DQM"/>
@@ -44,8 +45,8 @@
<driver name="V0DQMPairs1"/> -->
<!-- <driver name="PositronDebug"/>-->
<driver name="AidaSaveDriver"/>
- <driver name="ClockDriver"/>
-<!-- <driver name="LCIOWriter"/> -->
+ <driver name="ClockDriver"/>
+ <!-- <driver name="LCIOWriter"/> -->
<driver name="CleanupDriver" />
</execute>
<drivers>
@@ -71,7 +72,6 @@
</driver>
<driver name="EcalConverter" type="org.hps.recon.ecal.EcalRawConverterDriver">
<rawCollectionName>EcalRawHits</rawCollectionName>
- <!--rawCollectionName>EcalCalHits</rawCollectionName-->
<ecalCollectionName>EcalCorrectedHits</ecalCollectionName>
<applyBadCrystalMap>false</applyBadCrystalMap>
<nsa>100</nsa>
@@ -80,7 +80,7 @@
</driver>
<driver name="EcalClustererGTP" type="org.hps.recon.ecal.cluster.GTPClusterDriver">
<inputHitCollectionName>EcalCorrectedHits</inputHitCollectionName>
- <outputClusterCollectionName>EcalClusters</outputClusterCollectionName>
+ <outputClusterCollectionName>EcalClustersGTP</outputClusterCollectionName>
<clusterWindow>1</clusterWindow>
</driver>
<driver name="PairTrigger1" type="org.hps.readout.ecal.FADCPrimaryTriggerDriver">
@@ -94,7 +94,7 @@
Coplanarity: 30 Degrees
Time Coincidence: 16 ms
-->
- <clusterCollectionName>EcalClusters</clusterCollectionName>
+ <clusterCollectionName>EcalClustersGTP</clusterCollectionName>
<deadTime>32</deadTime>
<minHitCount>2</minHitCount>
<pairCoincidence>4</pairCoincidence>
@@ -103,7 +103,7 @@
<energySumHigh>0.86</energySumHigh>
<energySumLow>0.2</energySumLow>
<energyDifferenceHigh>0.54</energyDifferenceHigh>
- <coplanarityHigh>40</coplanarityHigh>
+ <coplanarityHigh>30</coplanarityHigh>
<seedEnergyLow>0.05</seedEnergyLow>
<energySlopeParamF>0.0055</energySlopeParamF>
<energySlopeLow>0.6</energySlopeLow>
@@ -200,7 +200,10 @@
<maxLookbackEvents>50</maxLookbackEvents>
</driver>
<driver name="EcalRawConverter" type="org.hps.recon.ecal.EcalRawConverterDriver">
- <ecalCollectionName>EcalCalHits</ecalCollectionName>
+ <rawCollectionName>EcalRawHits</rawCollectionName>
+ <!--rawCollectionName>EcalCalHits</rawCollectionName-->
+ <ecalCollectionName>EcalCorrectedHits</ecalCollectionName>
+ <!-- <ecalCollectionName>EcalCalHits</ecalCollectionName> -->
<use2014Gain>false</use2014Gain>
<useTimestamps>false</useTimestamps>
<useTruthTime>false</useTruthTime>
Modified: java/trunk/steering-files/src/main/resources/org/hps/steering/users/mgraham/TestReadoutEngRun2015.lcsim
=============================================================================
--- java/trunk/steering-files/src/main/resources/org/hps/steering/users/mgraham/TestReadoutEngRun2015.lcsim (original)
+++ java/trunk/steering-files/src/main/resources/org/hps/steering/users/mgraham/TestReadoutEngRun2015.lcsim Tue May 5 13:55:00 2015
@@ -3,9 +3,12 @@
<!--
Steering file to test readout for the EngRun 2015 MC
@author Matt Graham <[log in to unmask]>
- -->
- <execute>
-
+ -->
+ <control>
+ <printInputFiles>true</printInputFiles>
+ <printDriversDetailed>true</printDriversDetailed>
+ </control>
+ <execute>
<driver name="ConditionsDriver"/>
<driver name="EventMarkerDriver" />
<!-- Readout Simulation -->
@@ -52,6 +55,7 @@
<inputHitCollectionName>EcalCorrectedHits</inputHitCollectionName>
<outputClusterCollectionName>EcalClustersGTP</outputClusterCollectionName>
<clusterWindow>1</clusterWindow>
+ <level>OFF</level>
</driver>
<driver name="PairTrigger1" type="org.hps.readout.ecal.FADCPrimaryTriggerDriver">
<!--
@@ -73,7 +77,7 @@
<energySumHigh>0.86</energySumHigh>
<energySumLow>0.2</energySumLow>
<energyDifferenceHigh>0.54</energyDifferenceHigh>
- <coplanarityHigh>40</coplanarityHigh>
+ <coplanarityHigh>30</coplanarityHigh>
<seedEnergyLow>0.05</seedEnergyLow>
<energySlopeParamF>0.0055</energySlopeParamF>
<energySlopeLow>0.6</energySlopeLow>
Modified: java/trunk/steering-files/src/main/resources/org/hps/steering/users/mgraham/TrackingAndReconMonitoring.lcsim
=============================================================================
--- java/trunk/steering-files/src/main/resources/org/hps/steering/users/mgraham/TrackingAndReconMonitoring.lcsim (original)
+++ java/trunk/steering-files/src/main/resources/org/hps/steering/users/mgraham/TrackingAndReconMonitoring.lcsim Tue May 5 13:55:00 2015
@@ -15,6 +15,7 @@
<driver name="EcalRawConverter" />
<driver name="ReconClusterer" />
<driver name="ReconParticle" />
+ <driver name="GTPOnlineClusterer" />
<!-- SVT opening angle alignment -->
<driver name="TrackerL1to3ReconDriver"/>
<driver name="TrackerL4to6ReconDriver"/>
@@ -34,9 +35,9 @@
<driver name="V0DQM"/>
<driver name="V0DQMPairs0"/>
<driver name="V0DQMPairs1"/>
-<!-- <driver name="PositronDebug"/>-->
+ <!-- <driver name="PositronDebug"/>-->
<driver name="AidaSaveDriver"/>
-<!-- <driver name="LCIOWriter"/> -->
+ <driver name="LCIOWriter"/>
<driver name="CleanupDriver" />
</execute>
<drivers>
@@ -70,7 +71,7 @@
<driver name="TrackerL4to6ReconDriver" type="org.hps.recon.tracking.TrackerReconDriver">
<debug>false</debug>
<includeMS>false</includeMS>
- <useHPSMaterialManager>false</useHPSMaterialManager>
+ <useHPSMaterialManager>false</useHPSMaterialManager>
<trackCollectionName>L4to6Tracks</trackCollectionName>
<strategyResource>/org/hps/recon/tracking/strategies/HPS-Full-L4-6.xml</strategyResource>
</driver>
@@ -237,5 +238,14 @@
<outputFilePath>${outputFile}.slcio</outputFilePath>
</driver>
<driver name="CleanupDriver" type="org.lcsim.recon.tracking.digitization.sisim.config.ReadoutCleanupDriver" />
+
+ <driver name="GTPOnlineClusterer" type="org.hps.recon.ecal.cluster.ClusterDriver">
+ <logLevel>WARNING</logLevel>
+ <clustererName>GTPOnlineClusterer</clustererName>
+ <outputClusterCollectionName>EcalClustersGTP</outputClusterCollectionName>
+ <!-- seedMinEnergy -->
+ <cuts>0.100</cuts>
+ </driver>
+
</drivers>
</lcsim>
