Skip to content
Snippets Groups Projects
Commit 129ff9d6 authored by Stephen A. Wood's avatar Stephen A. Wood
Browse files

Fix some compiler warnings

parent aee3ffec
No related branches found
No related tags found
No related merge requests found
......@@ -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) {
......
......@@ -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);
......
......@@ -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
......
......@@ -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.
......
......@@ -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
......
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