Author: [log in to unmask]
Date: Wed Aug 12 13:47:36 2015
New Revision: 3366
Log:
timing offsets in modes other than pulse fitting
Modified:
java/trunk/ecal-recon/src/main/java/org/hps/recon/ecal/EcalRawConverter.java
Modified: java/trunk/ecal-recon/src/main/java/org/hps/recon/ecal/EcalRawConverter.java
=============================================================================
--- java/trunk/ecal-recon/src/main/java/org/hps/recon/ecal/EcalRawConverter.java (original)
+++ java/trunk/ecal-recon/src/main/java/org/hps/recon/ecal/EcalRawConverter.java Wed Aug 12 13:47:36 2015
@@ -529,6 +529,7 @@
if (useTimeWalkCorrection) {
time = EcalTimeWalk.correctTimeWalk(time,rawEnergy);
}
+ time -= findChannel(hit.getCellID()).getTimeShift().getTimeShift();
return CalorimeterHitUtilities.create(rawEnergy, time + timeOffset, id);
}
@@ -540,7 +541,8 @@
long id = hit.getCellID();
double pedestal = getPulsePedestal(event,id,windowSamples,(int)time/nsPerSample);
double adcSum = hit.getAmplitude() - pedestal;
- double rawEnergy = adcToEnergy(adcSum, id);
+ double rawEnergy = adcToEnergy(adcSum, id);
+ time -= findChannel(hit.getCellID()).getTimeShift().getTimeShift();
return CalorimeterHitUtilities.create(rawEnergy, time + timeOffset, id);
}
@@ -560,6 +562,7 @@
} else {
amplitude = (int) Math.round((hit.getRawEnergy() / EcalUtils.MeV) / channelData.getGain().getGain() + pedestal);
}
+ time += findChannel(id).getTimeShift().getTimeShift();
RawCalorimeterHit h = new BaseRawCalorimeterHit(id, amplitude, time);
return h;
}
|