From 18036dadf309f4cdaac54673bd953899ff4801ee Mon Sep 17 00:00:00 2001
From: Eric Pooser <pooser@jlab.org>
Date: Mon, 5 Dec 2016 10:25:51 -0500
Subject: [PATCH] Fix a bunch of compiler warnings. Don't check if UInt_t's
are >=0 Remove unused/repeated variables Cast enums to Int_t in switch
statements Initialize temp variables
---
src/THcCherenkov.cxx | 2 --
src/THcFormula.cxx | 7 +++----
src/THcRawDCHit.cxx | 4 ++--
src/THcRawShowerHit.cxx | 4 ++--
src/THcScalerEvtHandler.cxx | 12 ++++++------
5 files changed, 13 insertions(+), 16 deletions(-)
diff --git a/src/THcCherenkov.cxx b/src/THcCherenkov.cxx
index 6fc3c9d..3b5fa5f 100644
--- a/src/THcCherenkov.cxx
+++ b/src/THcCherenkov.cxx
@@ -111,8 +111,6 @@ THcCherenkov::~THcCherenkov()
//_____________________________________________________________________________
THaAnalysisObject::EStatus THcCherenkov::Init( const TDatime& date )
{
- static const char* const here = "Init()";
-
cout << "THcCherenkov::Init " << GetName() << endl;
char EngineDID[] = "xCER";
diff --git a/src/THcFormula.cxx b/src/THcFormula.cxx
index 857e0cd..ddf1547 100644
--- a/src/THcFormula.cxx
+++ b/src/THcFormula.cxx
@@ -149,15 +149,14 @@ Double_t THcFormula::DefinedValue( Int_t i )
// If the variable is a string, return value of its character value
typedef vector<Double_t>::size_type vsiz_t;
- typedef vector<Double_t>::iterator viter_t;
-
+
assert( i>=0 && i<(Int_t)fVarDef.size() );
if( IsInvalid() )
return 1.0;
FVarDef_t& def = fVarDef[i];
- switch( def.type ) {
+ switch( (Int_t) def.type ) {
case kVariable:
case kString:
case kArray:
@@ -222,7 +221,7 @@ Double_t THcFormula::DefinedValue( Int_t i )
SetBit(kInvalid);
return 1.0;
}
- Double_t y;
+ Double_t y = 0.0;
if( code == kNumSetBits ) {
// Number of set bits is intended for unsigned int-type expressions
y = func->EvalInstance(fInstance);
diff --git a/src/THcRawDCHit.cxx b/src/THcRawDCHit.cxx
index b31021c..a2f39e7 100644
--- a/src/THcRawDCHit.cxx
+++ b/src/THcRawDCHit.cxx
@@ -41,7 +41,7 @@ Int_t THcRawDCHit::GetRawData(Int_t signal) {
// Return a requested hit with reference time subtracted
Int_t THcRawDCHit::GetData(Int_t signal, UInt_t ihit) {
- if(ihit >=0 && ihit< fNHits) {
+ if(ihit < fNHits) {
if(fHasRef) {
return(fTDC[ihit]-fReferenceTime);
} else {
@@ -54,7 +54,7 @@ Int_t THcRawDCHit::GetData(Int_t signal, UInt_t ihit) {
// Return a requested raw hit
Int_t THcRawDCHit::GetRawData(Int_t signal, UInt_t ihit) {
- if(ihit >=0 && ihit< fNHits) {
+ if(ihit < fNHits) {
return(fTDC[ihit]);
} else {
return(-1);
diff --git a/src/THcRawShowerHit.cxx b/src/THcRawShowerHit.cxx
index 859cc6c..2324e27 100644
--- a/src/THcRawShowerHit.cxx
+++ b/src/THcRawShowerHit.cxx
@@ -96,11 +96,11 @@ Int_t THcRawShowerHit::GetData(Int_t signal) {
// Return a requested sample
Int_t THcRawShowerHit::GetSample(Int_t signal, UInt_t isample) {
if(signal==0) {
- if(isample >=0 && isample< fNPosSamples) {
+ if(isample < fNPosSamples) {
return(fADC_pos[isample]);
}
} else if (signal==1) {
- if(isample >=0 && isample< fNNegSamples) {
+ if(isample < fNNegSamples) {
return(fADC_neg[isample]);
}
}
diff --git a/src/THcScalerEvtHandler.cxx b/src/THcScalerEvtHandler.cxx
index 5d722e5..a4adeac 100644
--- a/src/THcScalerEvtHandler.cxx
+++ b/src/THcScalerEvtHandler.cxx
@@ -185,9 +185,9 @@ Int_t THcScalerEvtHandler::Analyze(THaEvData *evdata)
size_t ichan = scalerloc[i]->ichan;
if (evcount==0) {
if (fDebugFile) *fDebugFile << "Debug dvarsFirst "<<i<<" "<<ivar<<" "<<isca<<" "<<ichan<<endl;
- if ((ivar >= 0 && ivar < scalerloc.size()) &&
- (isca >= 0 && isca < scalers.size()) &&
- (ichan >= 0 && ichan < MAXCHAN)) {
+ if ((ivar < scalerloc.size()) &&
+ (isca < scalers.size()) &&
+ (ichan < MAXCHAN)) {
if (scalerloc[ivar]->ikind == ICOUNT) dvarsFirst[ivar] = scalers[isca]->GetData(ichan);
if (scalerloc[ivar]->ikind == IRATE) dvarsFirst[ivar] = scalers[isca]->GetRate(ichan);
if (fDebugFile) *fDebugFile << " dvarsFirst "<<scalerloc[ivar]->ikind<<" "<<dvarsFirst[ivar]<<endl;
@@ -196,9 +196,9 @@ Int_t THcScalerEvtHandler::Analyze(THaEvData *evdata)
}
}else{
if (fDebugFile) *fDebugFile << "Debug dvars "<<i<<" "<<ivar<<" "<<isca<<" "<<ichan<<endl;
- if ((ivar >= 0 && ivar < scalerloc.size()) &&
- (isca >= 0 && isca < scalers.size()) &&
- (ichan >= 0 && ichan < MAXCHAN)) {
+ if ((ivar < scalerloc.size()) &&
+ (isca < scalers.size()) &&
+ (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;
--
GitLab