diff --git a/digi/src/main/java/org/hps/digi/SvtDigitizationWithPulserDataMergingReadoutDriver.java b/digi/src/main/java/org/hps/digi/SvtDigitizationWithPulserDataMergingReadoutDriver.java index a6e3c572a..41a69282e 100755 --- a/digi/src/main/java/org/hps/digi/SvtDigitizationWithPulserDataMergingReadoutDriver.java +++ b/digi/src/main/java/org/hps/digi/SvtDigitizationWithPulserDataMergingReadoutDriver.java @@ -58,6 +58,7 @@ public class SvtDigitizationWithPulserDataMergingReadoutDriver extends ReadoutDr private double readoutOffset = 0.0; private double readoutLatency = 280.0; private double pileupCutoff = 300.0; + private double simHitTimeOffset=0.0; private String readout = "TrackerHits"; private double timeOffset = 30.0; private boolean noPileup = false; @@ -194,6 +195,16 @@ public void setDropBadChannels(boolean dropBadChannels) { public void setReadoutLatency(double readoutLatency) { this.readoutLatency = readoutLatency; } + + + /** + * Set the time offset for the SimTrackerHit + * inside the APV25 window + * @param simHitTimeOffset - The offset to use + */ + public void setSimHitTimeOffset(double simHitTimeOffset) { + this.simHitTimeOffset = simHitTimeOffset; + } /** * Sets whether to use manually defined timing conditions, or if @@ -473,7 +484,7 @@ private List doSiSimulation() { // SimTrackerHit. double time = 0.0; for(SimTrackerHit hit : simHits) { - time += hit.getTime(); + time += hit.getTime()+simHitTimeOffset; } time /= simHits.size(); time += ReadoutDataManager.getCurrentTime(); @@ -628,6 +639,7 @@ protected Collection> getOnTriggerData(double triggerTime) List truthHits = new ArrayList(); List trueHitRelations = new ArrayList(); // Calculate time of first sample + double firstSample = Math.floor(((triggerTime + 256) - readoutLatency - readoutOffset) / HPSSVTConstants.SAMPLING_INTERVAL) * HPSSVTConstants.SAMPLING_INTERVAL + readoutOffset; diff --git a/ecal-recon/src/main/java/org/hps/recon/ecal/EcalTimeCorrectionDriver.java b/ecal-recon/src/main/java/org/hps/recon/ecal/EcalTimeCorrectionDriver.java index bc4b147e0..25f44eed6 100644 --- a/ecal-recon/src/main/java/org/hps/recon/ecal/EcalTimeCorrectionDriver.java +++ b/ecal-recon/src/main/java/org/hps/recon/ecal/EcalTimeCorrectionDriver.java @@ -30,6 +30,7 @@ public class EcalTimeCorrectionDriver extends Driver { private boolean mode3 = false; private boolean useFit = true; private boolean useTimeWalkCondition = true; + private double additionalShift = 0.0; private EcalConditions ecalConditions = null; @@ -41,6 +42,10 @@ public void setUseFit(boolean useFit) { this.useFit = useFit; } + public void setAdditionalShift(double additionalShift) { + this.additionalShift = additionalShift; + } + public void setUseTimeWalkCondition(boolean useTimeWalkCondition) { this.useTimeWalkCondition = useTimeWalkCondition; } @@ -110,6 +115,7 @@ public void process(EventHeader event) { // Apply overall time offset time -= findChannel(hit.getCellID()).getTimeShift().getTimeShift(); + time += additionalShift; newHits.add(CalorimeterHitUtilities.create(energy, time, hit.getCellID())); } diff --git a/steering-files/src/main/resources/org/hps/steering/readout/PhysicsRun2021TrigSinglesWithPulserDataMerging.lcsim b/steering-files/src/main/resources/org/hps/steering/readout/PhysicsRun2021TrigSinglesWithPulserDataMerging.lcsim index c5942bcf4..e43a7883a 100644 --- a/steering-files/src/main/resources/org/hps/steering/readout/PhysicsRun2021TrigSinglesWithPulserDataMerging.lcsim +++ b/steering-files/src/main/resources/org/hps/steering/readout/PhysicsRun2021TrigSinglesWithPulserDataMerging.lcsim @@ -427,6 +427,7 @@ PulserDataSVTRawTrackerHits false true + -10 true diff --git a/steering-files/src/main/resources/org/hps/steering/recon/PhysicsRun2021MCRecon_KF_WithSpacing_pass3.lcsim b/steering-files/src/main/resources/org/hps/steering/recon/PhysicsRun2021MCRecon_KF_WithSpacing_pass3.lcsim index 137a1d612..d079056db 100644 --- a/steering-files/src/main/resources/org/hps/steering/recon/PhysicsRun2021MCRecon_KF_WithSpacing_pass3.lcsim +++ b/steering-files/src/main/resources/org/hps/steering/recon/PhysicsRun2021MCRecon_KF_WithSpacing_pass3.lcsim @@ -32,7 +32,9 @@ - + + 13.3 + WARNING EcalClusters @@ -49,49 +51,49 @@ true - true + true HodoscopeReadoutHits - 8 - CONFIG + 8 + CONFIG true - SVTRawTrackerHits + SVTRawTrackerHits - .5 - 1 - Pileup - Migrad - - true - - - 120 - - true - - true - - false - - true - - false - - false - true - false + .5 + 1 + Pileup + Migrad + + true + + + 165 + + true + + true + + false + + true + + false + + false + true + false - 24.0 + 24.0 3.0 false 400