Author: [log in to unmask]
Date: Tue Jul 7 06:59:04 2015
New Revision: 3233
Log:
implementing channel time-offsets in EcalRawConverter
Modified:
java/branches/HPSJAVA-ECALGAINCALIB/ecal-recon/src/main/java/org/hps/recon/ecal/EcalRawConverter.java
Modified: java/branches/HPSJAVA-ECALGAINCALIB/ecal-recon/src/main/java/org/hps/recon/ecal/EcalRawConverter.java
=============================================================================
--- java/branches/HPSJAVA-ECALGAINCALIB/ecal-recon/src/main/java/org/hps/recon/ecal/EcalRawConverter.java (original)
+++ java/branches/HPSJAVA-ECALGAINCALIB/ecal-recon/src/main/java/org/hps/recon/ecal/EcalRawConverter.java Tue Jul 7 06:59:04 2015
@@ -62,12 +62,11 @@
gainFileGains.clear();
System.out.println("Reading ECal Gains from: "+gainFileName);
File file = new File(gainFileName);
- String content=null;
try {
FileReader reader = new FileReader(file);
char[] chars = new char[(int) file.length()];
reader.read(chars);
- content = new String(chars);
+ String content = new String(chars);
reader.close();
String lines[]=content.split("\n");
int nlines = 0;
@@ -539,7 +538,8 @@
if (!mode7 && useTimeWalkCorrection) {
time = EcalTimeWalk.correctTimeWalk(time,energy);
}
-
+
+ time -= findChannel(cellID).getTimeShift().getTimeShift();
newHits.add(CalorimeterHitUtilities.create(energy,time,cellID));
}
@@ -561,6 +561,7 @@
if (useTimeWalkCorrection) {
time = EcalTimeWalk.correctTimeWalk(time,rawEnergy);
}
+ time -= findChannel(hit.getCellID()).getTimeShift().getTimeShift();
return CalorimeterHitUtilities.create(rawEnergy, time + timeOffset, id);
}
@@ -573,6 +574,7 @@
double pedestal = getPulsePedestal(event,id,windowSamples,(int)time/nsPerSample);
double adcSum = hit.getAmplitude() - pedestal;
double rawEnergy = adcToEnergy(adcSum, id);
+ time -= findChannel(id).getTimeShift().getTimeShift();
return CalorimeterHitUtilities.create(rawEnergy, time + timeOffset, id);
}
@@ -592,6 +594,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;
}
|