From 088e0b8d7f1b8d1a70fc0f00c606dbdf81a5431a Mon Sep 17 00:00:00 2001 From: masera Date: Tue, 9 Sep 2003 15:42:45 +0000 Subject: [PATCH] Fixes in order to eliminate compilation warnings --- ITS/AliITSFindClustersV2.cxx | 2 +- ITS/AliITSPid.cxx | 1 + ITS/AliITSRiemannFit.cxx | 4 ++-- ITS/AliITSRiemannFit.h | 4 ++-- ITS/AliITSTrackV1.cxx | 6 +++--- ITS/AliITSTrackV1.h | 4 ++-- ITS/AliITSTrackerV1.cxx | 6 +++--- ITS/AliITSVertexerIons.cxx | 1 + ITS/AliITSVertexerTracks.cxx | 2 +- ITS/AliITStrackerV2.cxx | 4 ++-- 10 files changed, 18 insertions(+), 16 deletions(-) diff --git a/ITS/AliITSFindClustersV2.cxx b/ITS/AliITSFindClustersV2.cxx index 36c81522c3d..a89787f9164 100644 --- a/ITS/AliITSFindClustersV2.cxx +++ b/ITS/AliITSFindClustersV2.cxx @@ -268,7 +268,7 @@ void AliITSFindClustersV2::Exec(const Option_t *opt){ Char_t name[50]; if(!fInit){ - Warning("Exec","Initilization not succesfull. Aborting."); + Warning("Exec","(opt=%s) Initilization not succesfull. Aborting.\n",opt); return; } // end if !fInit diff --git a/ITS/AliITSPid.cxx b/ITS/AliITSPid.cxx index afa051eb64a..e095cd581b6 100644 --- a/ITS/AliITSPid.cxx +++ b/ITS/AliITSPid.cxx @@ -121,6 +121,7 @@ Int_t AliITSPid::wpikp(Float_t pm,Float_t q) //----------------------------------------------------------- Int_t AliITSPid::GetPcode(TClonesArray* rps,Float_t pm) { + Info("GetPcode","method not implemented - Inputs TClonesArray *%x , Float_t %f",rps,pm); return 0; } //----------------------------------------------------------- diff --git a/ITS/AliITSRiemannFit.cxx b/ITS/AliITSRiemannFit.cxx index 44ad7f0d96f..53be0002c65 100644 --- a/ITS/AliITSRiemannFit.cxx +++ b/ITS/AliITSRiemannFit.cxx @@ -180,7 +180,7 @@ void FillPoints(Point_tl **Points,Int_t &index,Float_t *xpoint, } // ----------------------------------------------------------------------- -void AliITSRiemannFit::InitPoints(Int_t evnt,Int_t ntracks,AliITS *ITS, +void AliITSRiemannFit::InitPoints(Int_t ntracks,AliITS *ITS, TTree *TR,Int_t nparticles){ ////////////////////////////////////////////////////////////////////// // Fill the class member fPointRecs with the reconstructed points @@ -676,7 +676,7 @@ Int_t FitLinear(Int_t npoints, TVector3 **input, TVector3 **errors, Double_t ome } //------------------------------------------------------------------- -Int_t AliITSRiemannFit::FitHelix(Int_t tracknumber,Int_t charge,Double_t Px,Double_t Py,Double_t Pz,Double_t& fd0, +Int_t AliITSRiemannFit::FitHelix(Int_t tracknumber,Double_t Px,Double_t Py,Double_t Pz,Double_t& fd0, Double_t& fphi,Double_t& u0, Double_t& v0, Double_t& rho,Double_t& omega, Double_t& z0, Double_t& vpar,Double_t& chisql, Double_t& fCorrLin,Double_t& fFit, Int_t first,Int_t second,Int_t third,Int_t fourth,Int_t fifth,Int_t sixth) { diff --git a/ITS/AliITSRiemannFit.h b/ITS/AliITSRiemannFit.h index beb880ea03f..22c97d66a86 100644 --- a/ITS/AliITSRiemannFit.h +++ b/ITS/AliITSRiemannFit.h @@ -42,11 +42,11 @@ class AliITSRiemannFit : public TObject{ Float_t GetdY(Int_t i) const {return this->fPointRecs[i]->fdy;} Float_t GetdZ(Int_t i) const {return this->fPointRecs[i]->fdz;} - void InitPoints(Int_t evnt,Int_t ntracks,AliITS *ITS,TTree *TR,Int_t nparticles); + void InitPoints(Int_t ntracks,AliITS *ITS,TTree *TR,Int_t nparticles); void WritePoints(void); void ReadPoints(void); static Int_t SolveCubic(Double_t a,Double_t b,Double_t c,Double_t&,Double_t&,Double_t&); - Int_t FitHelix(Int_t tracknumber,Int_t charge,Double_t Px,Double_t Py,Double_t Pz, + Int_t FitHelix(Int_t tracknumber,Double_t Px,Double_t Py,Double_t Pz, Double_t& fd0,Double_t& fphi,Double_t& u0, Double_t& v0, Double_t& rho, Double_t& omega, Double_t& z0, Double_t& vpar,Double_t& chisql,Double_t& fCorrLin,Double_t& fFit, diff --git a/ITS/AliITSTrackV1.cxx b/ITS/AliITSTrackV1.cxx index cc61a342db2..056c4f3d46b 100644 --- a/ITS/AliITSTrackV1.cxx +++ b/ITS/AliITSTrackV1.cxx @@ -623,7 +623,7 @@ void AliITSTrackV1::Correct(Double_t rk) { } -void AliITSTrackV1::AddMS(AliITSRad *rl, Double_t mass) { +void AliITSTrackV1::AddMS(Double_t mass) { //Origin A. Badala' and G.S. Pappalardo: e-mail Angela.Badala@ct.infn.it, Giuseppe.S.Pappalardo@ct.infn.it ////////// Modification of the covariance matrix to take into account multiple scattering /////////// @@ -697,7 +697,7 @@ void AliITSTrackV1::AddMS(AliITSRad *rl, Double_t mass) { fC44+=theta2*q30*q30; } -void AliITSTrackV1::PrimaryTrack(AliITSRad *rl) { +void AliITSTrackV1::PrimaryTrack() { //Origin A. Badala' and G.S. Pappalardo: e-mail Angela.Badala@ct.infn.it, Giuseppe.S.Pappalardo@ct.infn.it // calculation of part of covariance matrix for vertex constraint @@ -725,7 +725,7 @@ void AliITSTrackV1::PrimaryTrack(AliITSRad *rl) { fd2(i)=fC22; ftgl2(i)=fC33; fdtgl(i)=fC32; - AddMS(rl); + AddMS(); AddEL(-1,0); } } diff --git a/ITS/AliITSTrackV1.h b/ITS/AliITSTrackV1.h index 1ea070897bc..ae86daa510c 100644 --- a/ITS/AliITSTrackV1.h +++ b/ITS/AliITSTrackV1.h @@ -95,7 +95,7 @@ public: Double_t GetSigmaphi() const{return fC00;} // gets the phi variance Double_t GetSigmaZ() const{return fC11;} // gets the Z variance void AddEL(Double_t signdE, Bool_t flagtot, Double_t mass=0.1396); // adds the energy loss - void AddMS(AliITSRad *rl,Double_t mass=0.1396); // modify the covariance matrix to take into account the multiple scattering + void AddMS(Double_t mass=0.1396); // modify the covariance matrix to take into account the multiple scattering void Correct(Double_t rk); // correct the track to take into account the real detector geometry void SetDv(Double_t x) {fDv=x;} // sets the radial impact parameter for vertex constraint void SetZv(Double_t x) {fZv=x;} // sets longitudinal impact parameter for vertex constraint @@ -106,7 +106,7 @@ public: void Setfnoclust() {fnoclust++;} //modify fnoclust Double_t GetsigmaDv() const {return fsigmaDv;} // gets sigma for Dv extraction Double_t GetsigmaZv() const {return fsigmaZv;} // gets sigma for Zv extraction - void PrimaryTrack(AliITSRad *rl); // calculation of part of covariance matrix for vertex constraint + void PrimaryTrack(); // calculation of part of covariance matrix for vertex constraint void Setd2(TVector &x) {for(Int_t i=0; i<6; i++){fd2(i)=x(i);}} // sets the vector fd2 void Settgl2(TVector &x) {for(Int_t i=0; i<6; i++){ftgl2(i)=x(i);}} // sets the vector ftgl2 void Setdtgl(TVector &x) {for(Int_t i=0; i<6; i++){fdtgl(i)=x(i);}} // sets the vector fdtgl diff --git a/ITS/AliITSTrackerV1.cxx b/ITS/AliITSTrackerV1.cxx index 3e11b6107b5..a7cc77b2dd2 100644 --- a/ITS/AliITSTrackerV1.cxx +++ b/ITS/AliITSTrackerV1.cxx @@ -679,7 +679,7 @@ void AliITSTrackerV1::DoTracking(Int_t evNumber,Int_t minTr,Int_t maxTr, primaryTrack.SetZv(zv); primaryTrack.SetsigmaDv(sigmaDv); primaryTrack.SetsigmaZv(sigmaZv); - primaryTrack.PrimaryTrack(frl); + primaryTrack.PrimaryTrack(); TVector d2=primaryTrack.Getd2(); TVector tgl2=primaryTrack.Gettgl2(); TVector dtgl=primaryTrack.Getdtgl(); @@ -1211,7 +1211,7 @@ void AliITSTrackerV1::RecursiveTracking(TList *trackITSlist) { // cout<<" chi2pred = "<fChi2max) continue; //aggiunto il 30-7-2001 if(iriv == 0) flaghit=1; - (*newTrack).AddMS(frl); // add the multiple scattering + (*newTrack).AddMS(); // add the multiple scattering //matrix to the covariance matrix (*newTrack).AddEL(1.,0); @@ -1232,7 +1232,7 @@ void AliITSTrackerV1::RecursiveTracking(TList *trackITSlist) { AliITSTrackV1 *newTrack = new AliITSTrackV1(*trackITS); (*newTrack).Setfnoclust(); //(*newTrack).SetLayer((*trackITS).GetLayer()-1); - (*newTrack).AddMS(frl); // add the multiple scattering matrix + (*newTrack).AddMS(); // add the multiple scattering matrix // to the covariance matrix (*newTrack).AddEL(1.,0); listoftrack.AddLast(newTrack); diff --git a/ITS/AliITSVertexerIons.cxx b/ITS/AliITSVertexerIons.cxx index 54ced005a4c..c6ef3aac689 100644 --- a/ITS/AliITSVertexerIons.cxx +++ b/ITS/AliITSVertexerIons.cxx @@ -454,6 +454,7 @@ AliITSVertex* AliITSVertexerIons::FindVertexForCurrentEvent(Int_t evnumber){ delete hITSYv; Char_t name[30]; // sprintf(name,"Vertex_%d",evnumber); + if(fDebug>0)Info("FindVertexForCurrentEvent","Vertex found for event %d",evnumber); sprintf(name,"Vertex"); fCurrentVertex = new AliITSVertex(Position,Resolution,SNR,name); return fCurrentVertex; diff --git a/ITS/AliITSVertexerTracks.cxx b/ITS/AliITSVertexerTracks.cxx index 1084612429b..66f23e28960 100644 --- a/ITS/AliITSVertexerTracks.cxx +++ b/ITS/AliITSVertexerTracks.cxx @@ -210,7 +210,7 @@ AliITSVertex* AliITSVertexerTracks::FindVertexForCurrentEvent(Int_t evnumb) { TString treeName = "TreeT_ITS_"; treeName += evnumb; // TTree *trkTree=(TTree*)fInFile->Get(treeName.Data()); masera - TTree *trkTree; + TTree *trkTree=0; if(!trkTree) return fCurrentVertex; diff --git a/ITS/AliITStrackerV2.cxx b/ITS/AliITStrackerV2.cxx index 2e5bb19b9e4..6547b9a7b2c 100644 --- a/ITS/AliITStrackerV2.cxx +++ b/ITS/AliITStrackerV2.cxx @@ -398,7 +398,7 @@ Int_t AliITStrackerV2::PropagateBack(TTree *inp, TTree *out) { //-------------------------------------------------------------------- //This functions propagates reconstructed ITS tracks back //-------------------------------------------------------------------- - Error("PropagateBack","This method is not converted to NewIO yet\n"); + Error("PropagateBack","This method is not converted to NewIO yet (Args: %x , %x )\n",inp,out); return 1; /* TFile *in=(TFile*)inp; @@ -541,7 +541,7 @@ Int_t AliITStrackerV2::RefitInward(TTree *in, TTree *out) { // This functions refits ITS tracks using the // "inward propagated" TPC tracks //-------------------------------------------------------------------- - Error("RefitInward","This method is not converted to NewIO yet\n"); + Error("RefitInward","This method is not converted to NewIO yet (Args: %x , %x )\n",in,out); return 1; /* TFile *in=(TFile*)inp; -- 2.43.0