From e8abac219ad85ca2d04c3a2bb7ecc311f8dd8c82 Mon Sep 17 00:00:00 2001
From: Kayla Craycraft <klcraycraft@gmail.com>
Date: Tue, 3 Oct 2017 15:35:20 -0400
Subject: [PATCH] Naive ideas about adding BCM current.
---
src/THcScalerEvtHandler.cxx | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/src/THcScalerEvtHandler.cxx b/src/THcScalerEvtHandler.cxx
index f8c309f..ff40f1f 100644
--- a/src/THcScalerEvtHandler.cxx
+++ b/src/THcScalerEvtHandler.cxx
@@ -65,6 +65,7 @@ using namespace Decoder;
static const UInt_t ICOUNT = 1;
static const UInt_t IRATE = 2;
+static const UInt_t ICURRENT = 3;
static const UInt_t MAXCHAN = 32;
static const UInt_t defaultDT = 4;
@@ -317,11 +318,16 @@ Int_t THcScalerEvtHandler::AnalyzeBuffer(UInt_t* rdata)
dvars[ivar] = scalers[isca]->GetRate(ichan);
dvarsFirst[ivar] = dvars[ivar];
}
+ // if(scalerloc[ivar]->ikind == ICURRENT){
+ // dvars[ivar] = scalers[isca]->GetCurrent(ichan);
+ //dvarsFirst[ivar] = dvars[ivar];
+ //}
if (fDebugFile) *fDebugFile << " dvarsFirst "<<scalerloc[ivar]->ikind<<" "<<dvarsFirst[ivar]<<endl;
} else {
if (scalerloc[ivar]->ikind == ICOUNT) dvarsFirst[ivar] = scalers[isca]->GetData(ichan);
if (scalerloc[ivar]->ikind == IRATE) dvarsFirst[ivar] = scalers[isca]->GetRate(ichan);
+ //if (scalerloc[ivar]->ikind == ICURRENT) dvarsFirst[ivar] = scalers[isca]->GetCurrent(ichan);
if (fDebugFile) *fDebugFile << " dvarsFirst "<<scalerloc[ivar]->ikind<<" "<<dvarsFirst[ivar]<<endl;
}
} else {
@@ -334,7 +340,8 @@ Int_t THcScalerEvtHandler::AnalyzeBuffer(UInt_t* rdata)
(ichan < MAXCHAN)) {
if (scalerloc[ivar]->ikind == ICOUNT) dvars[ivar] = scalers[isca]->GetData(ichan)-dvarsFirst[ivar];
if (scalerloc[ivar]->ikind == IRATE) dvars[ivar] = scalers[isca]->GetRate(ichan);
- if (fDebugFile) *fDebugFile << " dvars "<<scalerloc[ivar]->ikind<<" "<<dvars[ivar]<<endl;
+ //if (scalerloc[ivar]->ikind == ICURRENT) dvars[ivar] = scalers[isca]->GetCurrent(ichan);
+ if (fDebugFile) *fDebugFile << " dvars "<<scalerloc[ivar]->ikind<<" "<<dvars[ivar]<<endl;
} else {
cout << "THcScalerEvtHandler:: ERROR:: incorrect index "<<ivar<<" "<<isca<<" "<<ichan<<endl;
}
--
GitLab