Skip to content
Snippets Groups Projects
Commit 2128409a authored by Jure Bericic's avatar Jure Bericic Committed by Stephen A. Wood
Browse files

Fixes in THcRawAdcHit:

 - corrected the number of samples used for peak integral to 9.
   This number will eventually have to be read from prestart event.
 - added explicit casts from Int_t to Double_t in several methods
parent 63a381af
No related branches found
No related tags found
No related merge requests found
...@@ -16,7 +16,7 @@ It supports rich data from flash 250 ADC modules. ...@@ -16,7 +16,7 @@ It supports rich data from flash 250 ADC modules.
THcRawAdcHit::THcRawAdcHit() : THcRawAdcHit::THcRawAdcHit() :
TObject(), TObject(),
fNPedestalSamples(4), fNPeakSamples(10), fNPedestalSamples(4), fNPeakSamples(9),
fPeakPedestalRatio(1.0*fNPeakSamples/fNPedestalSamples), fPeakPedestalRatio(1.0*fNPeakSamples/fNPedestalSamples),
fAdc(), fAdcTime(), fAdcPedestal(), fAdcPulse(), fAdcSample(), fAdc(), fAdcTime(), fAdcPedestal(), fAdcPulse(), fAdcSample(),
fHasMulti(kFALSE), fNPulses(0), fNSamples(0) fHasMulti(kFALSE), fNPulses(0), fNSamples(0)
...@@ -269,17 +269,17 @@ Int_t THcRawAdcHit::GetPulseTimeRaw(UInt_t iPulse) { ...@@ -269,17 +269,17 @@ Int_t THcRawAdcHit::GetPulseTimeRaw(UInt_t iPulse) {
Double_t THcRawAdcHit::GetPed() { Double_t THcRawAdcHit::GetPed() {
return 1.0 * fAdcPedestal[0]/fNPedestalSamples; return static_cast<Double_t>(fAdcPedestal[0])/static_cast<Double_t>(fNPedestalSamples);
} }
Double_t THcRawAdcHit::GetPulseInt(UInt_t iPulse) { Double_t THcRawAdcHit::GetPulseInt(UInt_t iPulse) {
return fAdc[iPulse] - fAdcPedestal[0] * fPeakPedestalRatio; return static_cast<Double_t>(fAdc[iPulse]) - static_cast<Double_t>(fAdcPedestal[0])*fPeakPedestalRatio;
} }
Double_t THcRawAdcHit::GetPulseAmp(UInt_t iPulse) { Double_t THcRawAdcHit::GetPulseAmp(UInt_t iPulse) {
return fAdcPulse[iPulse] - 1.0 * fAdcPedestal[0]/fNPedestalSamples; return static_cast<Double_t>(fAdcPulse[iPulse]) - static_cast<Double_t>(fAdcPedestal[0])/static_cast<Double_t>(fNPedestalSamples);
} }
...@@ -295,7 +295,7 @@ Int_t THcRawAdcHit::GetSampleIntRaw() { ...@@ -295,7 +295,7 @@ Int_t THcRawAdcHit::GetSampleIntRaw() {
Double_t THcRawAdcHit::GetSampleInt() { Double_t THcRawAdcHit::GetSampleInt() {
return GetSampleIntRaw() - GetPed()*fNSamples; return static_cast<Double_t>(GetSampleIntRaw()) - GetPed()*static_cast<Double_t>(fNSamples);
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment