From 8529c4c1c9268f53be42758bee6060afd81e9569 Mon Sep 17 00:00:00 2001
From: cnattras <saccharomyces.cerevisae@gmail.com>
Date: Tue, 8 Jul 2014 13:09:05 -0400
Subject: [PATCH] Fixing Oysteins old cross check histograms

---
 PWGLF/totEt/AliAnalysisEt.h                | 22 +++++++++++++++++-----
 PWGLF/totEt/AliAnalysisEtReconstructed.cxx | 11 +++++++++--
 2 files changed, 26 insertions(+), 7 deletions(-)

diff --git a/PWGLF/totEt/AliAnalysisEt.h b/PWGLF/totEt/AliAnalysisEt.h
index 3cd32ed5117..784205aeca1 100644
--- a/PWGLF/totEt/AliAnalysisEt.h
+++ b/PWGLF/totEt/AliAnalysisEt.h
@@ -105,6 +105,23 @@ public:
     Double_t GetMinEtCorrection(Int_t clusterMultiplicity) {
         return fTmCorrections->GetMinEtCorrection(clusterMultiplicity);
     }
+    /** Get contribution from non-removed neutrons */
+    Double_t GetNeutronContribution(Int_t clusterMultiplicity) {
+        return fTmCorrections->GetNeutronCorrection(clusterMultiplicity);
+    }
+    /** Get contribution from non-removed hadrons */
+    Double_t GetHadronContribution(Int_t clusterMultiplicity) {
+        return fTmCorrections->GetHadronCorrection(clusterMultiplicity);
+    }
+    /** Get contribution from non-removed kaons */
+    Double_t GetKaonContribution(Int_t clusterMultiplicity) {
+        return fTmCorrections->GetKaonCorrection(clusterMultiplicity);
+    }//hadron
+    /** Get contribution from non-removed secondarys */
+    Double_t GetSecondaryContribution(Int_t clusterMultiplicity) {
+        return fTmCorrections->GetSecondaryCorrection(clusterMultiplicity);
+    }//hadron
+
 
     /** Get contribution from non-removed charged particles */
     Double_t GetChargedContribution(Int_t clusterMultiplicity) {
@@ -121,11 +138,6 @@ public:
         return fTmCorrections->GammaContr(clusterMultiplicity);
     }
 
-    /** Get contribution from secondaries */
-    Double_t GetSecondaryContribution(Int_t clusterMultiplicity) {
-        return fTmCorrections->SecondaryContr(clusterMultiplicity);
-    }
-
     void MakeSparseHistograms() {
         fMakeSparse=kTRUE;
     }
diff --git a/PWGLF/totEt/AliAnalysisEtReconstructed.cxx b/PWGLF/totEt/AliAnalysisEtReconstructed.cxx
index ff18143d002..d5933219ec8 100644
--- a/PWGLF/totEt/AliAnalysisEtReconstructed.cxx
+++ b/PWGLF/totEt/AliAnalysisEtReconstructed.cxx
@@ -553,7 +553,12 @@ Int_t AliAnalysisEtReconstructed::AnalyseEvent(AliVEvent* ev)
     fGammaEnergyAdded = GetGammaContribution(fNeutralMultiplicity);
     fHistGammaEnergyAdded->Fill(fGammaEnergyAdded, fNeutralMultiplicity);
 
-    Double_t removedEnergy = GetChargedContribution(cent) + GetNeutralContribution(cent) + GetGammaContribution(cent) + GetSecondaryContribution(cent);//fNeutralMultiplicity
+    //Double_t removedEnergy = GetChargedContribution(cent) + GetNeutralContribution(cent) + GetGammaContribution(cent) + GetSecondaryContribution(cent);//fNeutralMultiplicity
+    Double_t removedEnergy = GetHadronContribution(cent) + GetNeutronContribution(cent) + GetKaonContribution(cent) + GetSecondaryContribution(cent);//fNeutralMultiplicity
+    //cout<<" centbin "<<cent<<" removed energy ch "<< GetHadronContribution(cent)<<" n " << GetNeutronContribution(cent) <<" kaon "<< GetKaonContribution(cent)<<" secondary "<< GetSecondaryContribution(cent);//fNeutralMultiplicity
+    //cout<<" test min et "<<fTmCorrections->GetMinEtCorrection(cent);
+    //cout<<" test neutral "<<fTmCorrections->NeutralContr(cent);
+    //cout<<" test neutron "<<fTmCorrections->NeutralContr(cent);
     fHistRemovedEnergy->Fill(removedEnergy);
     
     fTotNeutralEtAcc = fTotNeutralEt;
@@ -567,7 +572,9 @@ Int_t AliAnalysisEtReconstructed::AnalyseEvent(AliVEvent* ev)
     fHistTotAllRawEtEffCorr->Fill(fTotAllRawEtEffCorr,cent);
     //cout<<"fTotAllRawEtEffCorr "<<fTotAllRawEtEffCorr<<" fTotAllRawEt "<<fTotAllRawEt<<" fTotRawEtEffCorr "<<fTotRawEtEffCorr<<"("<<fTotNeutralEt<<")"<<" fTotRawEt "<<fTotRawEt<<endl;
     //cout<<"uncorr "<<uncorrEt<<" raw "<<nominalRawEt<<" tot raw "<<fTotNeutralEt;
-    fTotNeutralEt =  (fTotNeutralEt - removedEnergy)/GetMinEtCorrection(cent);
+    //cout<<" raw "<<fTotNeutralEt<<" removed "<<removedEnergy<<" etmin "<<GetMinEtCorrection(cent)<<" final ";
+    if(GetMinEtCorrection(cent)>0) fTotNeutralEt =  (fTotNeutralEt - removedEnergy)/GetMinEtCorrection(cent);
+    //cout<<fTotNeutralEt<<endl;
     //cout<<" tot corr "<<fTotNeutralEt<<endl;
     fTotEt = fTotChargedEt + fTotNeutralEt;
 // Fill the histograms...0
-- 
2.43.5