From 210535445afa934c9e8402b32133bce4c12c7bfe Mon Sep 17 00:00:00 2001
From: "Stephen A. Wood" <saw@jlab.org>
Date: Wed, 20 Sep 2017 15:28:06 -0400
Subject: [PATCH] Don't do a == comparison with a double
---
src/THcScalerEvtHandler.cxx | 7 ++++---
src/THcScalerEvtHandler.h | 3 ++-
2 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/src/THcScalerEvtHandler.cxx b/src/THcScalerEvtHandler.cxx
index 56bd640..8bc751c 100644
--- a/src/THcScalerEvtHandler.cxx
+++ b/src/THcScalerEvtHandler.cxx
@@ -66,7 +66,7 @@ static const UInt_t MAXCHAN = 32;
static const UInt_t defaultDT = 4;
THcScalerEvtHandler::THcScalerEvtHandler(const char *name, const char* description)
- : THaEvtTypeHandler(name,description), evcount(0), ifound(0), fNormIdx(-1),
+ : THaEvtTypeHandler(name,description), evcount(0), evcountR(0.0), ifound(0), fNormIdx(-1),
dvars(0), dvarsFirst(0), fScalerTree(0), fUseFirstEvent(kFALSE),
fDelayedType(-1), fOnlyBanks(kFALSE)
{
@@ -141,7 +141,7 @@ Int_t THcScalerEvtHandler::Analyze(THaEvData *evdata)
name = "evcount";
tinfo = name + "/D";
- fScalerTree->Branch(name.Data(), &evcount, tinfo.Data(), 4000);
+ fScalerTree->Branch(name.Data(), &evcountR, tinfo.Data(), 4000);
for (size_t i = 0; i < scalerloc.size(); i++) {
name = scalerloc[i]->name;
@@ -303,7 +303,8 @@ Int_t THcScalerEvtHandler::AnalyzeBuffer(UInt_t* rdata)
}
}
- evcount = evcount + 1.0;
+ evcount = evcount + 1;
+ evcountR = evcount;
for (size_t j=0; j<scalers.size(); j++) scalers[j]->Clear("");
diff --git a/src/THcScalerEvtHandler.h b/src/THcScalerEvtHandler.h
index d64b9ab..fa9ce3f 100644
--- a/src/THcScalerEvtHandler.h
+++ b/src/THcScalerEvtHandler.h
@@ -50,7 +50,8 @@ private:
std::vector<Decoder::GenScaler*> scalers;
std::vector<HCScalerLoc*> scalerloc;
- Double_t evcount;
+ UInt_t evcount;
+ Double_t evcountR;
Int_t Nvars, ifound, fNormIdx, nscalers;
Double_t *dvars;
Double_t *dvarsFirst;
--
GitLab