Corrected compilation warnings

diff --git a/PWG4/AliAnaBaseClass.cxx b/PWG4/AliAnaBaseClass.cxx
index d32958369385ee2c0025bda5c02b877578b79711..1532e1603b03127a5857941c673a70040e4ae956 100644 (file)
--- 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 c0a4bdafa7dffcf83548137bb5d0e3fcdca111c8..0dc44641aa249c234bd62a8f57ee68e6fd578eec 100644 (file)
--- 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 ba80b5a71e632adb80326ca19c210cc75eb15b97..412ec9de1556e489508c63149a2eed615dd6fa89 100644 (file)
--- 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 59148a7a11b139caeeb2eb80ae95e746f3c69284..80625556881fbde47a497f5faf3e4886fbb4fd32 100644 (file)
--- 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.E()<<" ; Phi"<<momentum.Phi()<< " ; Eta "<<momentum.Eta()<<endl;
     if(fClonesArrayType == kTParticle) new((*fAODEMCAL)[indexEMCAL++])       TParticle(*particle) ;
     else{
@@ -178,7 +178,7 @@ void  AliCaloTrackMCReader::FillCalorimeters(const Int_t iParticle, TParticle* p
 }
 
 //____________________________________________________________________________
-void AliCaloTrackMCReader::FillInputEvent(Bool_t bCTS, Bool_t bEMCAL, Bool_t bPHOS)
+void AliCaloTrackMCReader::FillInputEvent()
 {
   //Create list of particles from EMCAL, PHOS and CTS. 
 
@@ -216,33 +216,33 @@ void AliCaloTrackMCReader::FillInputEvent(Bool_t bCTS, Bool_t bEMCAL, Bool_t bPH
       particle->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 50a95c5761115e3d7ba34d68e27130dc674c24e7..b43e27bdeb24322510db49c1c928f51faabce26f 100644 (file)
--- 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 6c8e5ba38541f87dd3ebde57798eaaa4e67c3f7d..f340ad7fe912e8f4ce4389801a3d4103e2f49671 100644 (file)
--- 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 20065cbcb88c824efe1ef70e95f6340967c90591..ebf3f357e6fbc583776b63c127dd872a4b8039d5 100644 (file)
--- 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 dde3462e9113d306f13e8aa611443fc949155065..8269311da1da757482a9202601f450d07d46d6df 100644 (file)
--- 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