diff --git a/src/THcDC.cxx b/src/THcDC.cxx index e24162d8b06458034bb3031e01b7b7a174c55c89..b963890ebb176face292160a7d3c0365db578d38 100644 --- a/src/THcDC.cxx +++ b/src/THcDC.cxx @@ -81,7 +81,6 @@ void THcDC::Setup(const char* name, const char* description) static const char* const here = "Setup"; char prefix[2]; - char parname[100]; THaApparatus *app = GetApparatus(); if(app) { @@ -233,7 +232,6 @@ Int_t THcDC::ReadDatabase( const TDatime& date ) // static const char* const here = "ReadDatabase()"; char prefix[2]; - char parname[100]; // Read data from database // Pull values from the THcParmList instead of reading a database @@ -494,7 +492,6 @@ Int_t THcDC::CoarseTrack( TClonesArray& tracks ) THcDCTrack *tr = static_cast<THcDCTrack*>( fDCTracks->At(itrack)); theTrack->Set(tr->GetX(), tr->GetY(), tr->GetXP(), tr->GetYP()); theTrack->SetFlag((UInt_t) 0); - Int_t nhits=tr->GetNHits(); // Need to look at how engine does chi2 and track selection. Reduced? theTrack->SetChi2(tr->GetChisq(),tr->GetNFree()); // CalcFocalPlaneCoords. Aren't our tracks already in focal plane coords diff --git a/src/THcDCLookupTTDConv.h b/src/THcDCLookupTTDConv.h index 95623b17f52500fd170fb69b5ef965d26e971c1e..e1bbea121d91a039e4b477ceabc0c75895bc438e 100644 --- a/src/THcDCLookupTTDConv.h +++ b/src/THcDCLookupTTDConv.h @@ -24,9 +24,9 @@ public: protected: Double_t fT0; + Double_t fMaxDriftDistance; Double_t fBinSize; Int_t fNumBins; - Double_t fMaxDriftDistance; Double_t* fTable; ClassDef(THcDCLookupTTDConv,0) // VDC Analytic TTD Conv class diff --git a/src/THcDriftChamberPlane.cxx b/src/THcDriftChamberPlane.cxx index 72946486771a2561c3487df9d6db2ac4163b975e..fb97cc90c8482fc01b34d92112b05c1df9c80a50 100644 --- a/src/THcDriftChamberPlane.cxx +++ b/src/THcDriftChamberPlane.cxx @@ -85,7 +85,6 @@ Int_t THcDriftChamberPlane::ReadDatabase( const TDatime& date ) static const char* const here = "ReadDatabase()"; char prefix[2]; - char parname[100]; Int_t NumDriftMapBins; Double_t DriftMapFirstBin; Double_t DriftMapBinSize; @@ -203,8 +202,7 @@ Int_t THcDriftChamberPlane::ReadDatabase( const TDatime& date ) for (int i=0; i<nWires; i++) { Double_t pos = fPitch*( (fWireOrder==0?(i+1):fNWires-i) - fCentralWire) - fCenter; - THcDCWire* wire = new((*fWires)[i]) - THcDCWire( i+1, pos , 0.0, fTTDConv); + new((*fWires)[i]) THcDCWire( i+1, pos , 0.0, fTTDConv); //if( something < 0 ) wire->SetFlag(1); } diff --git a/src/THcHodoscope.cxx b/src/THcHodoscope.cxx index 4a7f365f3cb78d3258b051d56060fe427bcde181..7b75dbe86a8b25711be4677f511cb91f59ee58bc 100644 --- a/src/THcHodoscope.cxx +++ b/src/THcHodoscope.cxx @@ -58,9 +58,9 @@ THcHodoscope::THcHodoscope( ) : void THcHodoscope::Setup(const char* name, const char* description) { - static const char* const here = "Setup()"; - static const char* const message = - "Must construct %s detector with valid name! Object construction failed."; + // static const char* const here = "Setup()"; + // static const char* const message = + // "Must construct %s detector with valid name! Object construction failed."; cout << "In THcHodoscope::Setup()" << endl; // Base class constructor failed? @@ -316,7 +316,7 @@ Int_t THcHodoscope::ReadDatabase( const TDatime& date ) prefix[1]='\0'; strcpy(parname,prefix); strcat(parname,"scin_"); - Int_t plen=strlen(parname); + // Int_t plen=strlen(parname); cout << " readdatabse hodo fnplanes = " << fNPlanes << endl; fNPaddle = new Int_t [fNPlanes]; // fSpacing = new Double_t [fNPlanes]; diff --git a/src/THcParmList.cxx b/src/THcParmList.cxx index 4edf5e2be0bcf9b22de0df86e14011fac99af2ec..dd41698d5977b3077ad1145c498a4c17560d83e6 100644 --- a/src/THcParmList.cxx +++ b/src/THcParmList.cxx @@ -61,7 +61,6 @@ void THcParmList::Load( const char* fname, Int_t RunNumber ) } string line; - Int_t nlines_read = 0, nparameters_read = 0; char varname[100]; Int_t InRunRange; Int_t currentindex = 0; diff --git a/src/THcScintillatorPlane.cxx b/src/THcScintillatorPlane.cxx index 6595540b5371e11414e1b3a713e0194211f108c6..c326fe0a179917e068f8cb951033a06e8d383211 100644 --- a/src/THcScintillatorPlane.cxx +++ b/src/THcScintillatorPlane.cxx @@ -147,7 +147,6 @@ Int_t THcScintillatorPlane::ReadDatabase( const TDatime& date ) strcpy(parname,prefix); strcat(parname,"scin_"); strcat(parname,GetName()); - Int_t plen=strlen(parname); strcat(parname,"_nr"); fNelem = *(Int_t *)gHcParms->Find(parname)->GetValuePointer(); // diff --git a/src/THcShower.cxx b/src/THcShower.cxx index f57f2e40a6739d8e7c0a35c112e80c406082171d..5dec1873d82efd31b45e5edd37b2188b58d6a09b 100644 --- a/src/THcShower.cxx +++ b/src/THcShower.cxx @@ -643,7 +643,7 @@ Int_t THcShower::CoarseProcess( TClonesArray& tracks) if (fdbg_clusters_cal) { cout << "Total hits: " << fNhits << endl; - for (UInt_t i=0; i!=fNhits; i++) { + for (Int_t i=0; i!=fNhits; i++) { cout << "unclustered hit " << i << ": "; (*(HitList.begin()+i))->show(); } @@ -659,7 +659,7 @@ Int_t THcShower::CoarseProcess( TClonesArray& tracks) fNclust = (*ClusterList).NbClusters(); if (fdbg_clusters_cal) cout << "Cluster_list size: " << fNclust << endl; - for (UInt_t i=0; i!=fNclust; i++) { + for (Int_t i=0; i!=fNclust; i++) { THcShowerCluster* cluster = (*ClusterList).ListedCluster(i); @@ -687,7 +687,7 @@ Int_t THcShower::CoarseProcess( TClonesArray& tracks) THcShowerCluster* MaxCluster = (*ClusterList).ListedCluster(0); fE = (*MaxCluster).clE(); - for (UInt_t i=1; i<fNclust; i++) { + for (Int_t i=1; i<fNclust; i++) { THcShowerCluster* cluster = (*ClusterList).ListedCluster(i); diff --git a/src/THcShowerPlane.cxx b/src/THcShowerPlane.cxx index 509ff3ad9831417f0c15ca69a93cdedace866705..edafce1319d3be9132c90a425e770bd996f3713a 100644 --- a/src/THcShowerPlane.cxx +++ b/src/THcShowerPlane.cxx @@ -92,7 +92,7 @@ Int_t THcShowerPlane::ReadDatabase( const TDatime& date ) // See what file it looks for - static const char* const here = "ReadDatabase()"; + // static const char* const here = "ReadDatabase()"; char prefix[2]; char parname[100]; @@ -102,7 +102,6 @@ Int_t THcShowerPlane::ReadDatabase( const TDatime& date ) strcpy(parname,prefix); strcat(parname,"cal_"); strcat(parname,GetName()); - Int_t plen=strlen(parname); strcat(parname,"_nr"); cout << " Getting value of SHOWER!!!" << parname << endl;