diff --git a/src/THcTrigDet.cxx b/src/THcTrigDet.cxx index 2762712952846f17b597f913c0481398a3b79d77..455367a350f0f5e9be2f73f283c53272af4d5211 100644 --- a/src/THcTrigDet.cxx +++ b/src/THcTrigDet.cxx @@ -223,7 +223,7 @@ Int_t THcTrigDet::Decode(const THaEvData& evData) { fAdcPulseIntRaw[cnt] = rawAdcHit.GetPulseIntRaw(); fAdcPulseAmpRaw[cnt] = rawAdcHit.GetPulseAmpRaw(); fAdcPulseTimeRaw[cnt] = rawAdcHit.GetPulseTimeRaw(); - fAdcPulseTime[cnt] = rawAdcHit.GetPulseTime(); + fAdcPulseTime[cnt] = rawAdcHit.GetPulseTime()+fAdcTdcOffset; fAdcPed[cnt] = rawAdcHit.GetPed(); fAdcPulseInt[cnt] = rawAdcHit.GetPulseInt(); @@ -235,7 +235,7 @@ Int_t THcTrigDet::Decode(const THaEvData& evData) { THcRawTdcHit rawTdcHit = hit->GetRawTdcHit(); fTdcTimeRaw[cnt] = rawTdcHit.GetTimeRaw(); - fTdcTime[cnt] = rawTdcHit.GetTime()*fTdcChanperNS-fTdcOffset; + fTdcTime[cnt] = rawTdcHit.GetTime()*fTdcChanperNS+fTdcOffset; fTdcMultiplicity[cnt] = rawTdcHit.GetNHits(); } @@ -269,11 +269,13 @@ Int_t THcTrigDet::ReadDatabase(const TDatime& date) { {"_adcNames", &adcNames, kString}, // Names of ADC channels. {"_tdcNames", &tdcNames, kString}, // Names of TDC channels. {"_tdcoffset", &fTdcOffset, kDouble,0,1}, // Offset of tdc channels + {"_adc_tdc_offset", &fTdcOffset, kDouble,0,1}, // Offset of Adc Pulse time (ns) {"_tdcchanperns", &fTdcChanperNS, kDouble,0,1}, // Convert channesl to ns {0} }; fTdcChanperNS=0.1; fTdcOffset=300.; + fAdcTdcOffset=200.; gHcParms->LoadParmValues(list, fKwPrefix.c_str()); // Split the names to std::vector<std::string>. diff --git a/src/THcTrigDet.h b/src/THcTrigDet.h index 6d9d548f22c7c861682e716e66d753933b3c0338..c2d4a9008c430f83a5b120dc3edf75677525afc3 100644 --- a/src/THcTrigDet.h +++ b/src/THcTrigDet.h @@ -36,6 +36,7 @@ class THcTrigDet : public THaDetector, public THcHitList { Int_t fNumAdc; Int_t fNumTdc; + Double_t fAdcTdcOffset; Double_t fTdcOffset; Double_t fTdcChanperNS;