From e04a61b02abaf4f47b978319b20886ae1a515ecf Mon Sep 17 00:00:00 2001
From: hallc-online <hallc-online@jlab.org>
Date: Thu, 16 Mar 2017 16:46:14 -0400
Subject: [PATCH] Modified HcTrigDet::Init , Decode and ReadDatabase In
HcTrigDet::Init moved InitHitList after gHcDetectorMap->FillMap so that the
refindex can be filled for the trigger TDC modules In ReadDatabase add
parameters fTdcOffset and fTdcChanperNS In Decode set fTdcTime[cnt] =
rawTdcHit.GetTime()*fTdcChanperNS-fTdcOffset Ths makes the time into a
positive number wiht units of ns Need to add the parameter to either
thms.param or tshms.param or it will use defaults of 0.1 and 300. Need to
eventually get the fTdcChanperNS from event 125.
---
src/THcTrigDet.cxx | 11 ++++++++---
src/THcTrigDet.h | 3 +++
2 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/src/THcTrigDet.cxx b/src/THcTrigDet.cxx
index 71769cb..245eefd 100644
--- a/src/THcTrigDet.cxx
+++ b/src/THcTrigDet.cxx
@@ -164,8 +164,6 @@ THaAnalysisObject::EStatus THcTrigDet::Init(const TDatime& date) {
return fStatus;
}
- // Initialize hitlist part of the class.
- InitHitList(fDetMap, "THcTrigRawHit", 100);
// Fill in detector map.
string EngineDID = string(GetApparatus()->GetName()).substr(0, 1) + GetName();
@@ -175,6 +173,9 @@ THaAnalysisObject::EStatus THcTrigDet::Init(const TDatime& date) {
Error(Here(here), "Error filling detectormap for %s.", EngineDID.c_str());
return kInitError;
}
+ // Initialize hitlist part of the class.
+ printf(" Init trig det hitlist\n");
+ InitHitList(fDetMap, "THcTrigRawHit", 100);
fStatus = kOK;
return fStatus;
@@ -231,7 +232,7 @@ Int_t THcTrigDet::Decode(const THaEvData& evData) {
THcRawTdcHit rawTdcHit = hit->GetRawTdcHit();
fTdcTimeRaw[cnt] = rawTdcHit.GetTimeRaw();
- fTdcTime[cnt] = rawTdcHit.GetTime();
+ fTdcTime[cnt] = rawTdcHit.GetTime()*fTdcChanperNS-fTdcOffset;
fTdcMultiplicity[cnt] = rawTdcHit.GetNHits();
}
@@ -264,8 +265,12 @@ Int_t THcTrigDet::ReadDatabase(const TDatime& date) {
{"_numTdc", &fNumTdc, kInt}, // Number of TDC channels.
{"_adcNames", &adcNames, kString}, // Names of ADC channels.
{"_tdcNames", &tdcNames, kString}, // Names of TDC channels.
+ {"_tdcoffset", &fTdcOffset, kDouble,0,1}, // Offset of tdc channels
+ {"_tdcchanperns", &fTdcChanperNS, kDouble,0,1}, // Convert channesl to ns
{0}
};
+ fTdcChanperNS=0.1;
+ fTdcOffset=300.;
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 b527c4e..7ebe0c9 100644
--- a/src/THcTrigDet.h
+++ b/src/THcTrigDet.h
@@ -36,6 +36,9 @@ class THcTrigDet : public THaDetector, public THcHitList {
Int_t fNumAdc;
Int_t fNumTdc;
+ Double_t fTdcOffset;
+ Double_t fTdcChanperNS;
+
std::vector<std::string> fAdcNames;
std::vector<std::string> fTdcNames;
--
GitLab