Author: [log in to unmask]
Date: Sat Mar 7 15:41:03 2015
New Revision: 2356
Log:
I made two changes to these drivers. EcalRawConverterDriver: I just remove an old comment. Eval RawConverter: in the sumADC function, called when we convert from MODE1 to energy, the return value was a short. a short is too small! We need an int. I am sure I already did this modification, but now is back to short... please do not change it again.
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/EcalRawConverterDriver.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 Sat Mar 7 15:41:03 2015
@@ -154,10 +154,10 @@
/*
* This should probably be deprecated. It just integrates the entire window.
*/
- public short sumADC(RawTrackerHit hit) {
+ public int sumADC(RawTrackerHit hit) {
EcalChannelConstants channelData = findChannel(hit.getCellID());
double pedestal = channelData.getCalibration().getPedestal();
- short sum = 0;
+ int sum = 0;
short samples[] = hit.getADCValues();
for (int isample = 0; isample < samples.length; ++isample) {
sum += (samples[isample] - pedestal);
Modified: java/trunk/ecal-recon/src/main/java/org/hps/recon/ecal/EcalRawConverterDriver.java
=============================================================================
--- java/trunk/ecal-recon/src/main/java/org/hps/recon/ecal/EcalRawConverterDriver.java (original)
+++ java/trunk/ecal-recon/src/main/java/org/hps/recon/ecal/EcalRawConverterDriver.java Sat Mar 7 15:41:03 2015
@@ -244,7 +244,7 @@
/*
* This is for FADC pulse mode data (Mode-3 or Mode-7):
*/
- if (event.hasCollection(RawCalorimeterHit.class, rawCollectionName)) { //A.C. this is the case of the RAW pulse hits
+ if (event.hasCollection(RawCalorimeterHit.class, rawCollectionName)) {
/*
* This is for FADC Mode-7 data:
