Author: [log in to unmask]
Date: Fri Apr 24 16:43:05 2015
New Revision: 2811
Log:
add a work-in-progress steering file for complete SVT+ECal recon
Added:
java/trunk/steering-files/src/main/resources/org/hps/steering/recon/EngineeringRun2015FullRecon.lcsim
- copied, changed from r2802, java/trunk/steering-files/src/main/resources/org/hps/steering/recon/HPS2014OfflineRecon.lcsim
Modified:
java/trunk/tracking/src/main/java/org/hps/recon/tracking/RawTrackerHitFitterDriver.java
Copied: java/trunk/steering-files/src/main/resources/org/hps/steering/recon/EngineeringRun2015FullRecon.lcsim (from r2802, java/trunk/steering-files/src/main/resources/org/hps/steering/recon/HPS2014OfflineRecon.lcsim)
=============================================================================
--- java/trunk/steering-files/src/main/resources/org/hps/steering/recon/HPS2014OfflineRecon.lcsim (original)
+++ java/trunk/steering-files/src/main/resources/org/hps/steering/recon/EngineeringRun2015FullRecon.lcsim Fri Apr 24 16:43:05 2015
@@ -5,29 +5,39 @@
<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="EventMarkerDriver"/>
<driver name="RawTrackerHitFitterDriver" />
<driver name="TrackerHitDriver"/>
<driver name="HelicalTrackHitDriver"/>
<driver name="TrackerReconDriver"/>
+ <driver name="EcalRunningPedestal"/>
<driver name="EcalRawConverter" />
- <driver name="EcalClusterer" />
+ <driver name="ReconClusterer" />
+ <driver name="GTPOnlineClusterer" />
<driver name="ReconParticle" />
<driver name="TrackDataDriver" />
<!--<driver name="GBLDriver"/>-->
<driver name="LCIOWriter"/>
+
+ <!--<driver name="SVTMonitoring"/>-->
+ <!--<driver name="TrackingMonitoring"/>-->
+ <driver name="AidaSaveDriver"/>
+
<driver name="CleanupDriver"/>
</execute>
<drivers>
<driver name="EventMarkerDriver" type="org.lcsim.job.EventMarkerDriver">
- <eventInterval>1000</eventInterval>
- </driver>
+ <eventInterval>100</eventInterval>
+ </driver>
<driver name="RawTrackerHitFitterDriver" type="org.hps.recon.tracking.RawTrackerHitFitterDriver">
<fitAlgorithm>Pileup</fitAlgorithm>
<useTimestamps>false</useTimestamps>
<correctT0Shift>false</correctT0Shift>
<useTruthTime>false</useTruthTime>
<subtractTOF>true</subtractTOF>
+ <subtractTriggerTime>true</subtractTriggerTime>
+ <correctChanT0>true</correctChanT0>
+ <timeOffset>51.0</timeOffset>
<debug>false</debug>
</driver>
<driver name="TrackerHitDriver" type="org.hps.recon.tracking.DataTrackerHitDriver">
@@ -35,13 +45,13 @@
</driver>
<driver name="HelicalTrackHitDriver" type="org.hps.recon.tracking.HelicalTrackHitDriver">
<debug>false</debug>
- <!--<clusterTimeCut>12.0</clusterTimeCut>-->
+ <clusterTimeCut>12.0</clusterTimeCut>
<maxDt>16.0</maxDt>
<maxSeperation>20.0</maxSeperation>
<tolerance>1.0</tolerance>
</driver>
<driver name="TrackerReconDriver" type="org.hps.recon.tracking.TrackerReconDriver">
- <strategyResource>HPS-Full.xml</strategyResource>
+ <strategyResource>HPS-Full-Loose.xml</strategyResource>
<debug>false</debug>
<rmsTimeCut>8.0</rmsTimeCut>
</driver>
@@ -50,15 +60,44 @@
<isMC>false</isMC>
<gblFileName></gblFileName>
</driver>
+ <driver name="EcalRunningPedestal" type="org.hps.recon.ecal.EcalRunningPedestalDriver">
+ <logLevel>CONFIG</logLevel>
+ <minLookbackEvents>10</minLookbackEvents>
+ <maxLookbackEvents>50</maxLookbackEvents>
+ </driver>
<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>
+ <useRunningPedestal>true</useRunningPedestal>
+ <useTimeWalkCorrection>true</useTimeWalkCorrection>
+ <emulateFirmware>true</emulateFirmware>
+ <emulateMode7>false</emulateMode7>
+ <leadingEdgeThreshold>12</leadingEdgeThreshold>
+ <nsa>100</nsa>
+ <nsb>20</nsb>
+ <windowSamples>50</windowSamples>
+ <nPeak>3</nPeak>
+ </driver>
+ <driver name="ReconClusterer" type="org.hps.recon.ecal.cluster.ReconClusterDriver">
+ <logLevel>WARNING</logLevel>
+ <outputClusterCollectionName>EcalClusters</outputClusterCollectionName>
+ <hitEnergyThreshold>0.01</hitEnergyThreshold>
+ <seedEnergyThreshold>0.100</seedEnergyThreshold>
+ <clusterEnergyThreshold>0.200</clusterEnergyThreshold>
+ <minTime>0.0</minTime>
+ <timeWindow>25.0</timeWindow>
+ <useTimeCut>true</useTimeCut>
+ <writeRejectedHitCollection>false</writeRejectedHitCollection>
</driver>
- <driver name="EcalClusterer" type="org.hps.recon.ecal.cluster.ReconClusterDriver">
- <useTimeCut>true</useTimeCut>
- </driver>
+ <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>
<driver name="ReconParticle" type="org.hps.recon.particle.HpsReconParticleDriver">
</driver>
<driver name="TrackDataDriver" type="org.hps.recon.tracking.TrackDataDriver" />
@@ -66,5 +105,15 @@
<outputFilePath>${outputFile}.slcio</outputFilePath>
</driver>
<driver name="CleanupDriver" type="org.lcsim.recon.tracking.digitization.sisim.config.ReadoutCleanupDriver"/>
+ <driver name="AidaSaveDriver" type="org.lcsim.job.AidaSaveDriver">
+ <outputFileName>${outputFile}.root</outputFileName>
+ </driver>
+ <driver name="TrackingMonitoring" type="org.hps.analysis.dataquality.TrackingMonitoring">
+ <overwriteDB>false</overwriteDB>
+ </driver>
+ <driver name="SVTMonitoring" type="org.hps.analysis.dataquality.SvtMonitoring">
+ <overwriteDB>false</overwriteDB>
+ </driver>
+
</drivers>
</lcsim>
Modified: java/trunk/tracking/src/main/java/org/hps/recon/tracking/RawTrackerHitFitterDriver.java
=============================================================================
--- java/trunk/tracking/src/main/java/org/hps/recon/tracking/RawTrackerHitFitterDriver.java (original)
+++ java/trunk/tracking/src/main/java/org/hps/recon/tracking/RawTrackerHitFitterDriver.java Fri Apr 24 16:43:05 2015
@@ -29,6 +29,7 @@
private String fittedHitCollectionName = "SVTFittedRawTrackerHits";
private int genericObjectFlags = 1 << LCIOConstants.GOBIT_FIXED;
private int relationFlags = 0;
+ private double timeOffset = 0.0;
private boolean correctT0Shift = false;
private boolean useTimestamps = false;
private boolean useTruthTime = false;
@@ -48,6 +49,10 @@
public void setDebug(boolean debug) {
this.debug = debug;
+ }
+
+ public void setTimeOffset(double timeOffset) {
+ this.timeOffset = timeOffset;
}
public void setCorrectT0Shift(boolean correctT0Shift) {
@@ -139,6 +144,8 @@
//===> ChannelConstants constants = HPSSVTCalibrationConstants.getChannelConstants((SiSensor) hit.getDetectorElement(), strip);
//for (ShapeFitParameters fit : _shaper.fitShape(hit, constants)) {
for (ShapeFitParameters fit : fitter.fitShape(hit, shape)) {
+ fit.setT0(fit.getT0() - timeOffset);
+
if (subtractTriggerTime) {
fit.setT0(fit.getT0() - (((event.getTimeStamp() + 4 * triggerPhaseOffset) % 24) - 12));
}
|