Skip to content
Snippets Groups Projects
Commit 18036dad authored by Eric Pooser's avatar Eric Pooser Committed by Stephen A. Wood
Browse files

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
parent 3f33cefa
No related branches found
No related tags found
No related merge requests found
...@@ -111,8 +111,6 @@ THcCherenkov::~THcCherenkov() ...@@ -111,8 +111,6 @@ THcCherenkov::~THcCherenkov()
//_____________________________________________________________________________ //_____________________________________________________________________________
THaAnalysisObject::EStatus THcCherenkov::Init( const TDatime& date ) THaAnalysisObject::EStatus THcCherenkov::Init( const TDatime& date )
{ {
static const char* const here = "Init()";
cout << "THcCherenkov::Init " << GetName() << endl; cout << "THcCherenkov::Init " << GetName() << endl;
char EngineDID[] = "xCER"; char EngineDID[] = "xCER";
......
...@@ -149,15 +149,14 @@ Double_t THcFormula::DefinedValue( Int_t i ) ...@@ -149,15 +149,14 @@ Double_t THcFormula::DefinedValue( Int_t i )
// If the variable is a string, return value of its character value // If the variable is a string, return value of its character value
typedef vector<Double_t>::size_type vsiz_t; typedef vector<Double_t>::size_type vsiz_t;
typedef vector<Double_t>::iterator viter_t;
assert( i>=0 && i<(Int_t)fVarDef.size() ); assert( i>=0 && i<(Int_t)fVarDef.size() );
if( IsInvalid() ) if( IsInvalid() )
return 1.0; return 1.0;
FVarDef_t& def = fVarDef[i]; FVarDef_t& def = fVarDef[i];
switch( def.type ) { switch( (Int_t) def.type ) {
case kVariable: case kVariable:
case kString: case kString:
case kArray: case kArray:
...@@ -222,7 +221,7 @@ Double_t THcFormula::DefinedValue( Int_t i ) ...@@ -222,7 +221,7 @@ Double_t THcFormula::DefinedValue( Int_t i )
SetBit(kInvalid); SetBit(kInvalid);
return 1.0; return 1.0;
} }
Double_t y; Double_t y = 0.0;
if( code == kNumSetBits ) { if( code == kNumSetBits ) {
// Number of set bits is intended for unsigned int-type expressions // Number of set bits is intended for unsigned int-type expressions
y = func->EvalInstance(fInstance); y = func->EvalInstance(fInstance);
......
...@@ -41,7 +41,7 @@ Int_t THcRawDCHit::GetRawData(Int_t signal) { ...@@ -41,7 +41,7 @@ Int_t THcRawDCHit::GetRawData(Int_t signal) {
// Return a requested hit with reference time subtracted // Return a requested hit with reference time subtracted
Int_t THcRawDCHit::GetData(Int_t signal, UInt_t ihit) { Int_t THcRawDCHit::GetData(Int_t signal, UInt_t ihit) {
if(ihit >=0 && ihit< fNHits) { if(ihit < fNHits) {
if(fHasRef) { if(fHasRef) {
return(fTDC[ihit]-fReferenceTime); return(fTDC[ihit]-fReferenceTime);
} else { } else {
...@@ -54,7 +54,7 @@ Int_t THcRawDCHit::GetData(Int_t signal, UInt_t ihit) { ...@@ -54,7 +54,7 @@ Int_t THcRawDCHit::GetData(Int_t signal, UInt_t ihit) {
// Return a requested raw hit // Return a requested raw hit
Int_t THcRawDCHit::GetRawData(Int_t signal, UInt_t ihit) { Int_t THcRawDCHit::GetRawData(Int_t signal, UInt_t ihit) {
if(ihit >=0 && ihit< fNHits) { if(ihit < fNHits) {
return(fTDC[ihit]); return(fTDC[ihit]);
} else { } else {
return(-1); return(-1);
......
...@@ -96,11 +96,11 @@ Int_t THcRawShowerHit::GetData(Int_t signal) { ...@@ -96,11 +96,11 @@ Int_t THcRawShowerHit::GetData(Int_t signal) {
// Return a requested sample // Return a requested sample
Int_t THcRawShowerHit::GetSample(Int_t signal, UInt_t isample) { Int_t THcRawShowerHit::GetSample(Int_t signal, UInt_t isample) {
if(signal==0) { if(signal==0) {
if(isample >=0 && isample< fNPosSamples) { if(isample < fNPosSamples) {
return(fADC_pos[isample]); return(fADC_pos[isample]);
} }
} else if (signal==1) { } else if (signal==1) {
if(isample >=0 && isample< fNNegSamples) { if(isample < fNNegSamples) {
return(fADC_neg[isample]); return(fADC_neg[isample]);
} }
} }
......
...@@ -185,9 +185,9 @@ Int_t THcScalerEvtHandler::Analyze(THaEvData *evdata) ...@@ -185,9 +185,9 @@ Int_t THcScalerEvtHandler::Analyze(THaEvData *evdata)
size_t ichan = scalerloc[i]->ichan; size_t ichan = scalerloc[i]->ichan;
if (evcount==0) { if (evcount==0) {
if (fDebugFile) *fDebugFile << "Debug dvarsFirst "<<i<<" "<<ivar<<" "<<isca<<" "<<ichan<<endl; if (fDebugFile) *fDebugFile << "Debug dvarsFirst "<<i<<" "<<ivar<<" "<<isca<<" "<<ichan<<endl;
if ((ivar >= 0 && ivar < scalerloc.size()) && if ((ivar < scalerloc.size()) &&
(isca >= 0 && isca < scalers.size()) && (isca < scalers.size()) &&
(ichan >= 0 && ichan < MAXCHAN)) { (ichan < MAXCHAN)) {
if (scalerloc[ivar]->ikind == ICOUNT) dvarsFirst[ivar] = scalers[isca]->GetData(ichan); 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 == IRATE) dvarsFirst[ivar] = scalers[isca]->GetRate(ichan);
if (fDebugFile) *fDebugFile << " dvarsFirst "<<scalerloc[ivar]->ikind<<" "<<dvarsFirst[ivar]<<endl; if (fDebugFile) *fDebugFile << " dvarsFirst "<<scalerloc[ivar]->ikind<<" "<<dvarsFirst[ivar]<<endl;
...@@ -196,9 +196,9 @@ Int_t THcScalerEvtHandler::Analyze(THaEvData *evdata) ...@@ -196,9 +196,9 @@ Int_t THcScalerEvtHandler::Analyze(THaEvData *evdata)
} }
}else{ }else{
if (fDebugFile) *fDebugFile << "Debug dvars "<<i<<" "<<ivar<<" "<<isca<<" "<<ichan<<endl; if (fDebugFile) *fDebugFile << "Debug dvars "<<i<<" "<<ivar<<" "<<isca<<" "<<ichan<<endl;
if ((ivar >= 0 && ivar < scalerloc.size()) && if ((ivar < scalerloc.size()) &&
(isca >= 0 && isca < scalers.size()) && (isca < scalers.size()) &&
(ichan >= 0 && ichan < MAXCHAN)) { (ichan < MAXCHAN)) {
if (scalerloc[ivar]->ikind == ICOUNT) dvars[ivar] = scalers[isca]->GetData(ichan)-dvarsFirst[ivar]; 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 (scalerloc[ivar]->ikind == IRATE) dvars[ivar] = scalers[isca]->GetRate(ichan);
if (fDebugFile) *fDebugFile << " dvars "<<scalerloc[ivar]->ikind<<" "<<dvars[ivar]<<endl; if (fDebugFile) *fDebugFile << " dvars "<<scalerloc[ivar]->ikind<<" "<<dvars[ivar]<<endl;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment