From 129ff9d6a0d8741cee5879041cc2317eb9c3c435 Mon Sep 17 00:00:00 2001
From: "Stephen A. Wood" <saw@jlab.org>
Date: Tue, 18 Apr 2017 17:08:41 -0400
Subject: [PATCH] Fix some compiler warnings
---
src/THcDetectorMap.cxx | 4 ++--
src/THcDriftChamberPlane.cxx | 2 +-
src/THcShower.cxx | 28 ++++++++++++++--------------
src/THcShowerArray.cxx | 4 ++--
src/THcShowerPlane.cxx | 5 +----
5 files changed, 20 insertions(+), 23 deletions(-)
diff --git a/src/THcDetectorMap.cxx b/src/THcDetectorMap.cxx
index 9b83623..8b3551c 100644
--- a/src/THcDetectorMap.cxx
+++ b/src/THcDetectorMap.cxx
@@ -324,8 +324,8 @@ void THcDetectorMap::Load(const char *fname)
if((pos=line.find_first_of("=")) != string::npos) { // Setting parameter
strcpy(varname, (line.substr(0,pos)).c_str());
- Int_t valuestartpos = pos+1;
- Int_t commapos = line.find_first_of(",");
+ size_t valuestartpos = pos+1;
+ size_t commapos = line.find_first_of(",");
Int_t value;
Int_t value2 = -1;
if(commapos != string::npos) {
diff --git a/src/THcDriftChamberPlane.cxx b/src/THcDriftChamberPlane.cxx
index a25ea12..28c4ddf 100644
--- a/src/THcDriftChamberPlane.cxx
+++ b/src/THcDriftChamberPlane.cxx
@@ -135,7 +135,7 @@ Int_t THcDriftChamberPlane::ReadDatabase( const TDatime& date )
if (fUsingTzeroPerWire==1) {
fTzeroWire = new Double_t [fNWires];
DBRequest list3[]={
- {Form("tzero%s",GetName()),fTzeroWire,kDouble,fNWires},
+ {Form("tzero%s",GetName()),fTzeroWire,kDouble,(UInt_t) fNWires},
{0}
};
gHcParms->LoadParmValues((DBRequest*)&list3,prefix);
diff --git a/src/THcShower.cxx b/src/THcShower.cxx
index 60fc502..20d8ef6 100644
--- a/src/THcShower.cxx
+++ b/src/THcShower.cxx
@@ -4,7 +4,7 @@
Shower counter class, describing a generic segmented shower detector. //
*/
-
+
#include "THcShower.h"
#include "THcHallCSpectrometer.h"
#include "THaEvData.h"
@@ -348,7 +348,7 @@ Int_t THcShower::ReadDatabase( const TDatime& date )
//Pedestal limits from hcal.param.
fShPosPedLimit = new Int_t [fNTotBlocks];
fShNegPedLimit = new Int_t [fNTotBlocks];
- for (UInt_t i;i<fNTotBlocks;i++) {
+ for (UInt_t i=0; i<fNTotBlocks; i++) {
fShPosPedLimit[i]=0.;
fShNegPedLimit[i]=0.;
}
@@ -1080,19 +1080,19 @@ Int_t THcShower::FineProcess( TClonesArray& tracks )
for (Int_t itrk=0; itrk<Ntracks; itrk++) {
THaTrack* theTrack = static_cast<THaTrack*>( tracks[itrk] );
if (theTrack->GetIndex()==0) {
- fEtrack=theTrack->GetEnergy();
- fEtrackNorm=fEtrack/theTrack->GetP();
+ fEtrack=theTrack->GetEnergy();
+ fEtrackNorm=fEtrack/theTrack->GetP();
- Double_t Xtr = -100.;
- Double_t Ytr = -100.;
- fNclustTrack = MatchCluster(theTrack, Xtr, Ytr);
- fXTrack=Xtr;
- if (fNclustTrack>=0) {
- THcShowerCluster* cluster = *(fClusterList->begin()+fNclustTrack);
- Double_t dx = TMath::Abs( clX(cluster) - Xtr );
- fXclustTrack=clX(cluster);
- //cout << fNclustTrack << " " << Xtr << " " << clX(cluster) << " " << dx << " " << Ytr << " " << fEtrack<< endl;
- }
+ Double_t Xtr = -100.;
+ Double_t Ytr = -100.;
+ fNclustTrack = MatchCluster(theTrack, Xtr, Ytr);
+ fXTrack=Xtr;
+ if (fNclustTrack>=0) {
+ THcShowerCluster* cluster = *(fClusterList->begin()+fNclustTrack);
+ // Double_t dx = TMath::Abs( clX(cluster) - Xtr );
+ fXclustTrack=clX(cluster);
+ //cout << fNclustTrack << " " << Xtr << " " << clX(cluster) << " " << dx << " " << Ytr << " " << fEtrack<< endl;
+ }
}
} //over tracks
diff --git a/src/THcShowerArray.cxx b/src/THcShowerArray.cxx
index 6473d6f..e063222 100644
--- a/src/THcShowerArray.cxx
+++ b/src/THcShowerArray.cxx
@@ -747,8 +747,8 @@ Int_t THcShowerArray::ProcessHits(TClonesArray* rawhits, Int_t nexthit)
{
// Extract the data for this layer from hit list.
- THcShower* fParent;
- fParent = (THcShower*) GetParent();
+ //THcShower* fParent;
+ //fParent = (THcShower*) GetParent();
// Initialize variables.
diff --git a/src/THcShowerPlane.cxx b/src/THcShowerPlane.cxx
index 2553ee1..53b1c82 100644
--- a/src/THcShowerPlane.cxx
+++ b/src/THcShowerPlane.cxx
@@ -367,9 +367,6 @@ Int_t THcShowerPlane::ProcessHits(TClonesArray* rawhits, Int_t nexthit)
// Assumes that the hit list is sorted by layer, so we stop when the
// plane doesn't agree and return the index for the next hit.
- THcShower* fParent;
- fParent = (THcShower*) GetParent();
-
// Initialize variables.
fPosADCHits->Clear();
@@ -505,7 +502,7 @@ Int_t THcShowerPlane::CoarseProcessHits()
Int_t nspar = 0;
- for (UInt_t i=0; i<fParent->GetNBlocks(fLayerNum-1); i++) {
+ for (Int_t i=0; i<fNelem; i++) {
if (GetAposP(i) > 0 || GetAnegP(i) >0) { //hit
cout << " counter = " << i
--
GitLab