From 2cc4014d5042e9a2734bffebc4ffe3f5e067d202 Mon Sep 17 00:00:00 2001 From: gconesab Date: Mon, 19 May 2008 12:24:45 +0000 Subject: [PATCH] Corrected compilation warnings --- PWG4/AliAnaBaseClass.cxx | 10 ++++-- PWG4/AliAnaBaseClass.h | 2 +- PWG4/AliCaloPID.cxx | 4 ++- PWG4/AliCaloTrackMCReader.cxx | 52 +++++++++++++++---------------- PWG4/AliCaloTrackMCReader.h | 4 +-- PWG4/AliCaloTrackReader.h | 2 +- PWG4/AliNeutralMesonSelection.cxx | 5 +-- PWG4/AliNeutralMesonSelection.h | 2 +- 8 files changed, 44 insertions(+), 37 deletions(-) diff --git a/PWG4/AliAnaBaseClass.cxx b/PWG4/AliAnaBaseClass.cxx index d3295836938..1532e1603b0 100644 --- a/PWG4/AliAnaBaseClass.cxx +++ b/PWG4/AliAnaBaseClass.cxx @@ -50,8 +50,8 @@ ClassImp(AliAnaBaseClass) //_______________________________________________ AliAnaBaseClass::AliAnaBaseClass() : TObject(), fDataMC(0), fDebug(0), fCheckFidCut(0), - fCheckCaloPID(0), fRecalculateCaloPID(0), fReader(0x0), - fAODBranch(0x0), fAODCaloClusters(0x0), fAODCaloCells(0x0), + fCheckCaloPID(0), fRecalculateCaloPID(0), fMinPt(0), fMaxPt(0), + fReader(0x0), fAODBranch(0x0), fAODCaloClusters(0x0), fAODCaloCells(0x0), fCaloPID(0x0), fFidCut(0x0), fIC(0x0),fNMS(0x0) { //Default Ctor @@ -69,7 +69,8 @@ ClassImp(AliAnaBaseClass) AliAnaBaseClass::AliAnaBaseClass(const AliAnaBaseClass & abc) : TObject(), fDataMC(abc.fDataMC), fDebug(abc.fDebug), fCheckFidCut(abc.fCheckFidCut), fCheckCaloPID(abc. fCheckCaloPID), - fRecalculateCaloPID(abc.fRecalculateCaloPID),fReader(abc.fReader), + fRecalculateCaloPID(abc.fRecalculateCaloPID), + fMinPt(abc.fMinPt), fMaxPt(abc.fMaxPt), fReader(abc.fReader), fAODBranch(new TClonesArray(*abc.fAODBranch)), fAODCaloClusters(new TClonesArray(*abc.fAODCaloClusters)), fAODCaloCells(new AliAODCaloCells(*abc.fAODCaloCells)), @@ -99,6 +100,9 @@ AliAnaBaseClass & AliAnaBaseClass::operator = (const AliAnaBaseClass & abc) fAODCaloClusters = new TClonesArray(*abc.fAODCaloClusters) ; fAODCaloCells = new AliAODCaloCells(*abc.fAODCaloCells) ; + fMinPt = abc.fMinPt; + fMaxPt = abc.fMaxPt; + fCaloPID = abc.fCaloPID; fFidCut = abc.fFidCut; fIC = abc.fIC; diff --git a/PWG4/AliAnaBaseClass.h b/PWG4/AliAnaBaseClass.h index c0a4bdafa7d..0dc44641aa2 100644 --- a/PWG4/AliAnaBaseClass.h +++ b/PWG4/AliAnaBaseClass.h @@ -54,7 +54,7 @@ class AliAnaBaseClass : public TObject { virtual TList * GetCreateOutputObjects(){ return (new TList) ;} - virtual void Print(const Option_t * opt) const {;} + virtual void Print(const Option_t * ) const {;} virtual void MakeAnalysisFillAOD() {;} diff --git a/PWG4/AliCaloPID.cxx b/PWG4/AliCaloPID.cxx index ba80b5a71e6..412ec9de155 100644 --- a/PWG4/AliCaloPID.cxx +++ b/PWG4/AliCaloPID.cxx @@ -250,7 +250,9 @@ Int_t AliCaloPID::GetPdg(const TString calo, const TLorentzVector mom, const Dou const Double_t l1, const Double_t disp, const Double_t tof, const Double_t distCPV) const { //Recalculated PID with all parameters - + AliDebug(2,Form("Calorimeter %s, E %3.2f, l0 %3.2f, l1 %3.2f, disp %3.2f, tof %3.2f, distCPV %3.2f", + calo.Data(),mom.E(),l0,l1,disp,tof,distCPV)); + if(calo == "EMCAL") { if(l0 < 0.25) return kPhoton ; else return kNeutralHadron ; diff --git a/PWG4/AliCaloTrackMCReader.cxx b/PWG4/AliCaloTrackMCReader.cxx index 59148a7a11b..80625556881 100644 --- a/PWG4/AliCaloTrackMCReader.cxx +++ b/PWG4/AliCaloTrackMCReader.cxx @@ -144,12 +144,12 @@ void AliCaloTrackMCReader::InitParameters() } //____________________________________________________________________________ -void AliCaloTrackMCReader::FillCalorimeters(const Int_t iParticle, TParticle* particle, TLorentzVector momentum, +void AliCaloTrackMCReader::FillCalorimeters(const Int_t iParticle, TParticle* particle, TLorentzVector momentum, Int_t &indexPHOS, Int_t &indexEMCAL){ //Fill AODCaloClusters or TParticles lists of PHOS or EMCAL //In PHOS - if(fFidutialCut->IsInFidutialCut(momentum,"PHOS") && momentum.Pt() > fPHOSPtMin){ + if(fFillPHOS && fFidutialCut->IsInFidutialCut(momentum,"PHOS") && momentum.Pt() > fPHOSPtMin){ if(fClonesArrayType == kTParticle) new((*fAODPHOS)[indexPHOS++]) TParticle(*particle) ; else{ @@ -163,7 +163,7 @@ void AliCaloTrackMCReader::FillCalorimeters(const Int_t iParticle, TParticle* p } } //In EMCAL - else if(fFidutialCut->IsInFidutialCut(momentum,"EMCAL") && momentum.Pt() > fEMCALPtMin){ + else if(fFillEMCAL && fFidutialCut->IsInFidutialCut(momentum,"EMCAL") && momentum.Pt() > fEMCALPtMin){ //cout<<"Reader : E "<Momentum(momentum); //---------- Charged particles ---------------------- if((charge != 0) && (momentum.Pt() > fCTSPtMin) && (fFidutialCut->IsInFidutialCut(momentum,"CTS"))){ - //Particles in CTS acceptance - if(fDebug > 3 && momentum.Pt() > 0.2)printf("Fill MC CTS :: Selected tracks E %3.2f, pt %3.2f, phi %3.2f, eta %3.2f\n", - momentum.E(),momentum.Pt(),momentum.Phi()*TMath::RadToDeg(),momentum.Eta()); - - if(fClonesArrayType == kTParticle) new((*fAODCTS)[indexCh++]) TParticle(*particle) ; - else{ - x[0] = particle->Vx(); x[1] = particle->Vy(); x[2] = particle->Vz(); - p[0] = particle->Px(); p[1] = particle->Py(); p[2] = particle->Pz(); - AliAODTrack *aodTrack = new((*fAODCTS)[indexCh++]) - AliAODTrack(0, iParticle, p, kTRUE, x, kFALSE,NULL, 0, 0, - NULL, - 0x0,//primary, - kFALSE, // No fit performed + if(fFillCTS){ + //Particles in CTS acceptance + if(fDebug > 3 && momentum.Pt() > 0.2)printf("Fill MC CTS :: Selected tracks E %3.2f, pt %3.2f, phi %3.2f, eta %3.2f\n", + momentum.E(),momentum.Pt(),momentum.Phi()*TMath::RadToDeg(),momentum.Eta()); + + if(fClonesArrayType == kTParticle) new((*fAODCTS)[indexCh++]) TParticle(*particle) ; + else{ + x[0] = particle->Vx(); x[1] = particle->Vy(); x[2] = particle->Vz(); + p[0] = particle->Px(); p[1] = particle->Py(); p[2] = particle->Pz(); + AliAODTrack *aodTrack = new((*fAODCTS)[indexCh++]) + AliAODTrack(0, iParticle, p, kTRUE, x, kFALSE,NULL, 0, 0, + NULL, + 0x0,//primary, kFALSE, // No fit performed - AliAODTrack::kPrimary, - 0); - SetTrackChargeAndPID(pdg, aodTrack); + kFALSE, // No fit performed + AliAODTrack::kPrimary, + 0); + SetTrackChargeAndPID(pdg, aodTrack); + } } - //Keep some charged particles in calorimeters lists - if(KeepChargedParticles(pdg)) FillCalorimeters(iParticle, particle, momentum, indexPHOS, indexEMCAL); + if((fFillPHOS || fFillEMCAL) && KeepChargedParticles(pdg)) FillCalorimeters(iParticle, particle, momentum, indexPHOS, indexEMCAL); }//Charged //-------------Neutral particles ---------------------- - else if(charge == 0){ - + else if(charge == 0 && (fFillPHOS || fFillEMCAL)){ //Skip neutrinos or other neutral particles if(SkipNeutralParticles(pdg) || particle->IsPrimary()) continue ; // protection added (MG) @@ -264,8 +264,8 @@ void AliCaloTrackMCReader::FillInputEvent(Bool_t bCTS, Bool_t bEMCAL, Bool_t bPH TParticle * pPhoton2 = new TParticle(22,1,iParticle,0,0,0,lvGamma2.Px(),lvGamma2.Py(), lvGamma2.Pz(),lvGamma2.E(),0,0,0,0); //Fill particle/calocluster arrays - FillCalorimeters(iParticle,pPhoton1,lvGamma1, indexEMCAL,indexPHOS); - FillCalorimeters(iParticle,pPhoton2,lvGamma2, indexEMCAL,indexPHOS); + FillCalorimeters(iParticle,pPhoton1,lvGamma1, indexPHOS, indexEMCAL); + FillCalorimeters(iParticle,pPhoton2,lvGamma2, indexPHOS, indexEMCAL); }//pt cut }//pi0 else FillCalorimeters(iParticle,particle, momentum, indexPHOS, indexEMCAL); //Add the rest diff --git a/PWG4/AliCaloTrackMCReader.h b/PWG4/AliCaloTrackMCReader.h index 50a95c57611..b43e27bdeb2 100644 --- a/PWG4/AliCaloTrackMCReader.h +++ b/PWG4/AliCaloTrackMCReader.h @@ -65,7 +65,7 @@ class AliCaloTrackMCReader : public AliCaloTrackReader { void GetVertex(Double_t v[3]); - void FillInputEvent(Bool_t bCTS, Bool_t bEMCAL, Bool_t bPHOS); + void FillInputEvent(); void SetInputEvent(TObject* esd, TObject* aod, TObject* mc); void SetCaloClusterPID(const Int_t pdgCode, AliAODCaloCluster *calo); @@ -74,7 +74,7 @@ class AliCaloTrackMCReader : public AliCaloTrackReader { private: void MakePi0Decay(TLorentzVector &p0, TLorentzVector &p1, TLorentzVector &p2);//, Double_t &angle); - void FillCalorimeters(const Int_t iParticle, TParticle* particle, TLorentzVector momentum, + void FillCalorimeters(const Int_t iParticle, TParticle* particle, TLorentzVector momentum, Int_t &indexPHOS, Int_t &indexEMCAL); private: diff --git a/PWG4/AliCaloTrackReader.h b/PWG4/AliCaloTrackReader.h index 6c8e5ba3854..f340ad7fe91 100644 --- a/PWG4/AliCaloTrackReader.h +++ b/PWG4/AliCaloTrackReader.h @@ -112,7 +112,7 @@ public: virtual AliHeader* GetHeader() const ; virtual AliGenEventHeader* GetGenEventHeader() const ; - virtual void GetVertex(Double_t v[3]) {;} + virtual void GetVertex(Double_t * ) {;} virtual AliESDEvent* GetESD() const {return fESD;} virtual AliAODEvent* GetAOD() const {return fAOD;} virtual AliMCEvent* GetMC() const {return fMC;} diff --git a/PWG4/AliNeutralMesonSelection.cxx b/PWG4/AliNeutralMesonSelection.cxx index 20065cbcb88..ebf3f357e6f 100644 --- a/PWG4/AliNeutralMesonSelection.cxx +++ b/PWG4/AliNeutralMesonSelection.cxx @@ -52,8 +52,9 @@ ClassImp(AliNeutralMesonSelection) AliNeutralMesonSelection::AliNeutralMesonSelection() : TObject(), fM(0), fInvMassMaxCut(0.), fInvMassMinCut(0.), - fAngleMaxParam(), fhAnglePairNoCut(0), - fhAnglePairOpeningAngleCut(0), fhAnglePairAllCut(0), + fAngleMaxParam(), fKeepNeutralMesonHistos(0), + fhAnglePairNoCut(0), fhAnglePairOpeningAngleCut(0), + fhAnglePairAllCut(0), fhInvMassPairNoCut(0), fhInvMassPairOpeningAngleCut(0), fhInvMassPairAllCut(0) { diff --git a/PWG4/AliNeutralMesonSelection.h b/PWG4/AliNeutralMesonSelection.h index dde3462e911..8269311da1d 100644 --- a/PWG4/AliNeutralMesonSelection.h +++ b/PWG4/AliNeutralMesonSelection.h @@ -70,7 +70,7 @@ class AliNeutralMesonSelection : public TObject { Double_t fInvMassMaxCut ; // Invariant Mass cut maximum Double_t fInvMassMinCut ; // Invariant Masscut minimun TArrayD fAngleMaxParam ; //Max opening angle selection parameters - Double_t fMinPt; // Minimum pt + Bool_t fKeepNeutralMesonHistos ; // Keep neutral meson selection histograms //Histograms -- 2.43.0