Changing multiplicity dependent cuts to centrality dependent cuts

diff --git a/PWGLF/totEt/AliAnalysisEt.cxx b/PWGLF/totEt/AliAnalysisEt.cxx
index fd17f3f4fa6f1a4bb8498561a48cc5836debd0df..f7f1be8c55728ceb391696c1e155ab80e4abe3c3 100644 (file)
--- a/PWGLF/totEt/AliAnalysisEt.cxx
+++ b/PWGLF/totEt/AliAnalysisEt.cxx
@@ -701,12 +701,12 @@ Int_t AliAnalysisEt::ReadCorrections(TString filename)
  return -1; 
 }
 
-Double_t AliAnalysisEt::CorrectForReconstructionEfficiency(const AliESDCaloCluster& cluster, Int_t mult)
+Double_t AliAnalysisEt::CorrectForReconstructionEfficiency(const AliESDCaloCluster& cluster, Int_t cent)
 {
   Float_t pos[3];
   cluster.GetPosition(pos);
   TVector3 cp(pos);
-  Double_t corrEnergy = fReCorrections->CorrectedEnergy(cluster.E(), mult);
+  Double_t corrEnergy = fReCorrections->CorrectedEnergy(cluster.E(), cent);
   
   //std::cout << "Original energy: " << cluster.E() << ", corrected energy: " << corrEnergy << std::endl;
   return TMath::Sin(cp.Theta())*corrEnergy;

diff --git a/PWGLF/totEt/AliAnalysisEt.h b/PWGLF/totEt/AliAnalysisEt.h
index 399b8a44e88529963c5da80e222600e279ad9613..99d60074969edf6b2ae093007b894bc436287ce0 100644 (file)
--- a/PWGLF/totEt/AliAnalysisEt.h
+++ b/PWGLF/totEt/AliAnalysisEt.h
@@ -136,7 +136,7 @@ protected:
     //AliAnalysisEtCuts *fCuts; // keeper of basic cuts
     
     // Return corrected cluster E_T
-    Double_t CorrectForReconstructionEfficiency(const AliESDCaloCluster &cluster,Int_t mult = 0);
+    Double_t CorrectForReconstructionEfficiency(const AliESDCaloCluster &cluster,Int_t cent = 0);
     
     // Track matching (hadrdonic contamination) corrections
     AliAnalysisEtTrackMatchCorrections *fTmCorrections;

diff --git a/PWGLF/totEt/AliAnalysisEtRecEffCorrection.cxx b/PWGLF/totEt/AliAnalysisEtRecEffCorrection.cxx
index fe1737dfe0c946640af07a60fcfb526160249909..58d1fdea9c7919c936694ad9cca8eb6eb9f3b488 100644 (file)
--- a/PWGLF/totEt/AliAnalysisEtRecEffCorrection.cxx
+++ b/PWGLF/totEt/AliAnalysisEtRecEffCorrection.cxx
@@ -60,19 +60,19 @@ Double_t AliAnalysisEtRecEffCorrection::CorrectedEnergy(Double_t energy)
   return fEnergyCorrection->Eval(energy);
   
 }
-Double_t AliAnalysisEtRecEffCorrection::CorrectedEnergy(Double_t energy, int mult)
+Double_t AliAnalysisEtRecEffCorrection::CorrectedEnergy(Double_t energy, int cent)
 {
   if(fRecoEff){
-    Double_t eff = ReconstructionEfficiency(energy, mult);
+    Double_t eff = ReconstructionEfficiency(energy, cent);
     if(eff>1e-5) return 1.0/eff*energy;
   }
   return 1.0;
   
 }
 
-Double_t AliAnalysisEtRecEffCorrection::ReconstructionEfficiency(float energy, int mult) const {
+Double_t AliAnalysisEtRecEffCorrection::ReconstructionEfficiency(float energy, int cent) const {
   Double_t eff = 1.0;
-  if(fRecoEff) eff =  fRecoEff->GetBinContent(fRecoEff->GetXaxis()->FindBin(energy),fRecoEff->GetXaxis()->FindBin(mult));
+  if(fRecoEff) eff =  fRecoEff->GetBinContent(fRecoEff->GetXaxis()->FindBin(energy),fRecoEff->GetXaxis()->FindBin(cent));
   //cout <<"eff "<<eff<<endl;
   return eff;
 }

diff --git a/PWGLF/totEt/AliAnalysisEtRecEffCorrection.h b/PWGLF/totEt/AliAnalysisEtRecEffCorrection.h
index f0bb17901c2333d2995d8120e9c7d2fdf965f16f..62dfa8782ab92ccab264f3adabe10580fec14590 100644 (file)
--- a/PWGLF/totEt/AliAnalysisEtRecEffCorrection.h
+++ b/PWGLF/totEt/AliAnalysisEtRecEffCorrection.h
@@ -47,7 +47,7 @@ public:
     TH2F ReconstructionEfficiency() const {
       return *fRecoEff;
     }
-    Double_t ReconstructionEfficiency(float energy, int mult) const;
+    Double_t ReconstructionEfficiency(float energy, int cent) const;
 
     Double_t MaxEnergy() const {
         return fMaxEnergy;
@@ -69,7 +69,7 @@ public:
 
 
     Double_t CorrectedEnergy(Double_t energy); // Calculate corrected cluster E_T 
-    Double_t CorrectedEnergy(Double_t energy, int mult); // Calculate corrected cluster E_T 
+    Double_t CorrectedEnergy(Double_t energy, int cent); // Calculate corrected cluster E_T 
     
 private:
 

diff --git a/PWGLF/totEt/AliAnalysisEtReconstructedEmcal.cxx b/PWGLF/totEt/AliAnalysisEtReconstructedEmcal.cxx
index a10d93e6a0e52e92a6b9bff8b0217807daf482f3..939d2f750e1c2d44aaa53dc58e40956866e14999 100644 (file)
--- a/PWGLF/totEt/AliAnalysisEtReconstructedEmcal.cxx
+++ b/PWGLF/totEt/AliAnalysisEtReconstructedEmcal.cxx
@@ -53,9 +53,9 @@ void AliAnalysisEtReconstructedEmcal::CreateHistograms()
 }
 
 
-Double_t AliAnalysisEtReconstructedEmcal::GetCorrectionModification(const AliESDCaloCluster& cluster,Int_t nonLinCorr, Int_t effCorr, Int_t mult){//nonLinCorr 0 = nominal 1 = high -1 = low, effCorr  0 = nominal 1 = high -1 = low
+Double_t AliAnalysisEtReconstructedEmcal::GetCorrectionModification(const AliESDCaloCluster& cluster,Int_t nonLinCorr, Int_t effCorr, Int_t cent){//nonLinCorr 0 = nominal 1 = high -1 = low, effCorr  0 = nominal 1 = high -1 = low
   Double_t factor = 1.0;
-  Double_t E = fReCorrections->CorrectedEnergy(cluster.E(),mult);
+  Double_t E = fReCorrections->CorrectedEnergy(cluster.E(),cent);
   if(nonLinCorr!=0){
     Double_t p0 = 9.90780e-01;
     Double_t p1 = 1.61503e-01;

diff --git a/PWGLF/totEt/AliAnalysisEtReconstructedEmcal.h b/PWGLF/totEt/AliAnalysisEtReconstructedEmcal.h
index 7591951eb071ed8c7e047cbe7d9017c0b30392bf..1512d60c3a1104b239b17320bdee13460cfa128d 100644 (file)
--- a/PWGLF/totEt/AliAnalysisEtReconstructedEmcal.h
+++ b/PWGLF/totEt/AliAnalysisEtReconstructedEmcal.h
@@ -27,7 +27,7 @@ public:
       virtual bool TrackHitsCalorimeter(AliVParticle *track, Double_t magField);
 
 
-      virtual Double_t GetCorrectionModification(const AliESDCaloCluster& cluster,Int_t nonLinCorr, Int_t effCorr, Int_t mult);//nonLinCorr 0 = nominal 1 = high -1 = low, effCorr  0 = nominal 1 = high -1 = low
+      virtual Double_t GetCorrectionModification(const AliESDCaloCluster& cluster,Int_t nonLinCorr, Int_t effCorr, Int_t cent);//nonLinCorr 0 = nominal 1 = high -1 = low, effCorr  0 = nominal 1 = high -1 = low
  private:
 
       ClassDef(AliAnalysisEtReconstructedEmcal, 1);

diff --git a/PWGLF/totEt/AliAnalysisEtReconstructedPhos.cxx b/PWGLF/totEt/AliAnalysisEtReconstructedPhos.cxx
index d9f1b206a4718ed0567392f6e3dc4f25195f755b..33d34967f6d26a9298b8d1b3a8b6bcf36c8172b6 100644 (file)
--- a/PWGLF/totEt/AliAnalysisEtReconstructedPhos.cxx
+++ b/PWGLF/totEt/AliAnalysisEtReconstructedPhos.cxx
@@ -103,7 +103,7 @@ void AliAnalysisEtReconstructedPhos::CreateHistograms()
   AliAnalysisEtReconstructed::CreateHistograms();
 }
 
-Double_t AliAnalysisEtReconstructedPhos::GetCorrectionModification(const AliESDCaloCluster& cluster,Int_t nonLinCorr, Int_t effCorr, Int_t mult){//nonLinCorr 0 = nominal 1 = high -1 = low, effCorr  0 = nominal 1 = high -1 = low
+Double_t AliAnalysisEtReconstructedPhos::GetCorrectionModification(const AliESDCaloCluster& cluster,Int_t nonLinCorr, Int_t effCorr, Int_t cent){//nonLinCorr 0 = nominal 1 = high -1 = low, effCorr  0 = nominal 1 = high -1 = low
   Double_t factor = 1.0;
   if(nonLinCorr!=0){
     if(nonLinCorr==1){//high bound on nonlinearity
@@ -120,7 +120,7 @@ Double_t AliAnalysisEtReconstructedPhos::GetCorrectionModification(const AliESDC
     else{//low bound
       factor *=0.995;
     }
-    if(mult<0){//this condition will never be met but it will stop a compiler warning that results in Coverity sending me an email about once every two weeks.
+    if(cent<0){//this condition will never be met but it will stop a compiler warning that results in Coverity sending me an email about once every two weeks.
       Double_t E = cluster.E();
       factor = 1.0*E;
     }

diff --git a/PWGLF/totEt/AliAnalysisEtReconstructedPhos.h b/PWGLF/totEt/AliAnalysisEtReconstructedPhos.h
index 7c62b9a823479254ed64ad187ab6c98c18494c4b..b4e6725540cf0667865f68d862a2ef145502149a 100644 (file)
--- a/PWGLF/totEt/AliAnalysisEtReconstructedPhos.h
+++ b/PWGLF/totEt/AliAnalysisEtReconstructedPhos.h
@@ -55,7 +55,7 @@ protected:
     virtual bool TrackHitsCalorimeter(AliVParticle *track, Double_t magField);
 
 
-    virtual Double_t GetCorrectionModification(const AliESDCaloCluster& cluster,Int_t nonLinCorr, Int_t effCorr, Int_t mult);//nonLinCorr 0 = nominal 1 = high -1 = low, effCorr  0 = nominal 1 = high -1 = low
+    virtual Double_t GetCorrectionModification(const AliESDCaloCluster& cluster,Int_t nonLinCorr, Int_t effCorr, Int_t cent);//nonLinCorr 0 = nominal 1 = high -1 = low, effCorr  0 = nominal 1 = high -1 = low
     
 private:
 

diff --git a/PWGLF/totEt/AliAnalysisEtSelector.h b/PWGLF/totEt/AliAnalysisEtSelector.h
index 2dc2f399caad3d7bbf784e2919897605abf1d2b5..f88e43382463b6910985ffa2ae4a024589e92608 100644 (file)
--- a/PWGLF/totEt/AliAnalysisEtSelector.h
+++ b/PWGLF/totEt/AliAnalysisEtSelector.h
@@ -73,6 +73,9 @@ public:
     // Cut on geometrical acceptance 
     virtual Bool_t CutGeometricalAcceptance(const AliVTrack &/*part*/) const { return true; }
     
+    // Cut on geometrical acceptance 
+    virtual Bool_t CutGeometricalAcceptance(const AliESDCaloCluster &/*part*/) const { return true; }
+    
     // From secondary vertex?
     virtual Bool_t FromSecondaryInteraction(const TParticle& part, AliStack& stack) const;
     

diff --git a/PWGLF/totEt/AliAnalysisEtSelectorEmcal.cxx b/PWGLF/totEt/AliAnalysisEtSelectorEmcal.cxx
index 65d9d25ce09207dd437ee672fa075e33c6d9d7b7..eb1fb7ff51a0640a12356d7ff7f0dd05d6fbcdcd 100644 (file)
--- a/PWGLF/totEt/AliAnalysisEtSelectorEmcal.cxx
+++ b/PWGLF/totEt/AliAnalysisEtSelectorEmcal.cxx
@@ -118,6 +118,16 @@ Bool_t AliAnalysisEtSelectorEmcal::CutGeometricalAcceptance(const AliVTrack& par
            && part.Phi() > fCuts->GetGeometryEmcalPhiAccMinCut()*TMath::Pi()/180.;
 }
 
+Bool_t AliAnalysisEtSelectorEmcal::CutGeometricalAcceptance(const AliESDCaloCluster& cluster) const
+{
+  Float_t pos[3];
+  cluster.GetPosition(pos);
+  TVector3 cp(pos);
+  return TMath::Abs(cp.Eta()) < fCuts->GetGeometryEmcalEtaAccCut()
+    && cp.Phi() < fCuts->GetGeometryEmcalPhiAccMaxCut()*TMath::Pi()/180.
+    && cp.Phi() > fCuts->GetGeometryEmcalPhiAccMinCut()*TMath::Pi()/180.;
+}
+
 
 Double_t
 AliAnalysisEtSelectorEmcal::CalcTrackClusterDistance(const Float_t clsPos[3],Int_t *trkMatchId) const

diff --git a/PWGLF/totEt/AliAnalysisEtSelectorEmcal.h b/PWGLF/totEt/AliAnalysisEtSelectorEmcal.h
index bbd0b18a5b5fc725d09a2552391702f6a9c74db0..b0d0b1793a9f1c944d82339a12dd96c34317fad1 100644 (file)
--- a/PWGLF/totEt/AliAnalysisEtSelectorEmcal.h
+++ b/PWGLF/totEt/AliAnalysisEtSelectorEmcal.h
@@ -28,7 +28,8 @@ public:
     virtual Bool_t PassDistanceToBadChannelCut(const AliESDCaloCluster& cluster) const;
     virtual Bool_t PassTrackMatchingCut(const AliESDCaloCluster& cluster) const;
     virtual Bool_t CutGeometricalAcceptance(const TParticle& part) const;    
-    virtual Bool_t CutGeometricalAcceptance(const AliVTrack& part) const;    
+    virtual Bool_t CutGeometricalAcceptance(const AliVTrack& part) const;        
+    virtual Bool_t CutGeometricalAcceptance(const AliESDCaloCluster& cluster) const;    
     virtual void Init();
     virtual Int_t Init(const AliESDEvent *ev);
     

diff --git a/PWGLF/totEt/AliAnalysisEtSelectorPhos.cxx b/PWGLF/totEt/AliAnalysisEtSelectorPhos.cxx
index cf0b905aab069fd36c0e2da2fa76442d7be2b273..4e0edca10b181d03264b070ccfec59192a3dd58a 100644 (file)
--- a/PWGLF/totEt/AliAnalysisEtSelectorPhos.cxx
+++ b/PWGLF/totEt/AliAnalysisEtSelectorPhos.cxx
@@ -322,3 +322,13 @@ Bool_t AliAnalysisEtSelectorPhos::CutGeometricalAcceptance(const AliVTrack& trac
            track.Phi() < fCuts->GetGeometryPhosPhiAccMinCut()*TMath::Pi()/180.;
 }
 
+
+Bool_t AliAnalysisEtSelectorPhos::CutGeometricalAcceptance(const AliESDCaloCluster& cluster) const
+{
+  Float_t pos[3];
+  cluster.GetPosition(pos);
+  TVector3 cp(pos);
+  return TMath::Abs(cp.Eta()) < fCuts->GetGeometryEmcalEtaAccCut()
+    && cp.Phi() < fCuts->GetGeometryEmcalPhiAccMaxCut()*TMath::Pi()/180.
+    && cp.Phi() > fCuts->GetGeometryEmcalPhiAccMinCut()*TMath::Pi()/180.;
+}

diff --git a/PWGLF/totEt/AliAnalysisEtSelectorPhos.h b/PWGLF/totEt/AliAnalysisEtSelectorPhos.h
index 645600462d2bffd436377e46451f807efff62f56..de66f6fa27162046025fc03256c1463303824dd4 100644 (file)
--- a/PWGLF/totEt/AliAnalysisEtSelectorPhos.h
+++ b/PWGLF/totEt/AliAnalysisEtSelectorPhos.h
@@ -30,6 +30,7 @@ public:
     virtual Bool_t PassTrackMatchingCut(const AliESDCaloCluster& cluster) const;
     virtual Bool_t CutGeometricalAcceptance(const TParticle& part) const;    
     virtual Bool_t CutGeometricalAcceptance(const AliVTrack& part) const;    
+    virtual Bool_t CutGeometricalAcceptance(const AliESDCaloCluster& cluster) const;    
     virtual void Init() {}
     virtual Int_t Init(const AliESDEvent *ev);
 

diff --git a/PWGLF/totEt/AliAnalysisEtTrackMatchCorrections.cxx b/PWGLF/totEt/AliAnalysisEtTrackMatchCorrections.cxx
index 56c63a1bd2667d78468b61108030bf86db47eb54..4501d55ce69a901afbbd60f988d4a9b850013dc3 100644 (file)
--- a/PWGLF/totEt/AliAnalysisEtTrackMatchCorrections.cxx
+++ b/PWGLF/totEt/AliAnalysisEtTrackMatchCorrections.cxx
@@ -71,9 +71,9 @@ AliAnalysisEtTrackMatchCorrections& AliAnalysisEtTrackMatchCorrections::operator
     return *this;
 }
 
-Double_t AliAnalysisEtTrackMatchCorrections::TrackMatchingEfficiency(Float_t pT, Int_t mult) const{
+Double_t AliAnalysisEtTrackMatchCorrections::TrackMatchingEfficiency(Float_t pT, Int_t cent) const{
   Double_t eff = 1.0;
-  if(fRecoEff) eff =  fRecoEff->GetBinContent(fRecoEff->GetXaxis()->FindBin(pT),fRecoEff->GetXaxis()->FindBin(mult));
+  if(fRecoEff) eff =  fRecoEff->GetBinContent(fRecoEff->GetXaxis()->FindBin(pT),fRecoEff->GetXaxis()->FindBin(cent));
   //cout <<"eff "<<eff<<endl;
   if(eff>1e-5){return eff;}
   else{return 1.0;}

diff --git a/PWGLF/totEt/AliAnalysisEtTrackMatchCorrections.h b/PWGLF/totEt/AliAnalysisEtTrackMatchCorrections.h
index 95cd46237ee912dd226826a76a79f32968e23e79..d4e8bb5952fc5d9ff755853021762f16ae19f656 100644 (file)
--- a/PWGLF/totEt/AliAnalysisEtTrackMatchCorrections.h
+++ b/PWGLF/totEt/AliAnalysisEtTrackMatchCorrections.h
@@ -64,7 +64,7 @@ public:
         return fSecondaryContr->Eval(mult)*fMeanSecondary;
     }
 
-    Double_t TrackMatchingEfficiency(Float_t pT, Int_t mult) const;
+    Double_t TrackMatchingEfficiency(Float_t pT, Int_t cent) const;
 
 
 // Setters