o First Version of TRDnSigma implementation (Xianguo) o still requires some catching...

[u/mrichter/AliRoot.git] / PWGLF / totEt / AliAnalysisHadEtReconstructed.cxx

diff --git a/PWGLF/totEt/AliAnalysisHadEtReconstructed.cxx b/PWGLF/totEt/AliAnalysisHadEtReconstructed.cxx
index 22753397de39f1ab849a1c53cd10888c9e44c4cc..bb5ded2174b09840c61289915a51f1d01b05ac1a 100644 (file)
--- a/PWGLF/totEt/AliAnalysisHadEtReconstructed.cxx
+++ b/PWGLF/totEt/AliAnalysisHadEtReconstructed.cxx
@@ -115,11 +115,18 @@ Int_t AliAnalysisHadEtReconstructed::AnalyseEvent(AliVEvent* ev, Int_t eventtype
   }
   fCentBin= -1;
   fGoodEvent = kTRUE;//for p+p collisions if we made it this far we have a good event
-  if(fDataSet==20100){//If this is Pb+Pb
+  if(fDataSet==20100||fDataSet==2011){//If this is Pb+Pb or pPb
     AliCentrality *centrality = realEvent->GetCentrality();
     if(fNCentBins<21) fCentBin= centrality->GetCentralityClass10(fCentralityMethod);
     else{ fCentBin= centrality->GetCentralityClass5(fCentralityMethod);}
-    if(fCentBin ==-1) fGoodEvent = kFALSE;//but for Pb+Pb events we don't want to count events where we did not find a centrality
+    if(fCentBin ==-1){
+      if(fDataSet==2013){
+       fCentBin = 19;//For pPb we don't want to throw these events out but there is no CB 19
+      }
+      else{
+       fGoodEvent = kFALSE;//but for Pb+Pb events we don't want to count events where we did not find a centrality
+      }
+    }
   }
   //for PID
   AliESDpid *pID = new AliESDpid();
@@ -229,7 +236,7 @@ Int_t AliAnalysisHadEtReconstructed::AnalyseEvent(AliVEvent* ev, Int_t eventtype
            corrNotID = fCorrections->GetNotIDConstCorrectionITS();
            corrNoID = fCorrections->GetNotIDConstCorrectionITSNoID();
          }
-         if(fDataSet==20100){
+         if(fDataSet==20100||fDataSet==2011){
            FillHisto2D("fbkgdVsCentralityBin",fCentBin,corrBkgd,1.0);
            FillHisto2D("fnotIDVsCentralityBin",fCentBin,corrNotID,1.0);
            FillHisto2D("fpTcutVsCentralityBin",fCentBin,fCorrections->GetpTCutCorrectionTPC(),1.0);
@@ -250,7 +257,7 @@ Int_t AliAnalysisHadEtReconstructed::AnalyseEvent(AliVEvent* ev, Int_t eventtype
            et = Et(track->P(),track->Theta(),fgPiPlusCode,track->Charge());
            if(cutset==0){corrEff = fCorrections->GetTPCEfficiencyCorrectionPion(track->Pt(),fCentBin);}
            etpartialcorrected = et*corrBkgd*corrEff*corrNotID;
-           if(corrEff>0.0&&fDataSet==20100)FillHisto2D("feffPionVsCentralityBin",fCentBin,1.0/corrEff,1.0);
+           if(corrEff>0.0&&(fDataSet==20100||fDataSet==2011))FillHisto2D("feffPionVsCentralityBin",fCentBin,1.0/corrEff,1.0);
            if(track->Charge()>0.0){
              FillHisto2D(Form("EtDataRaw%sPiPlus",cutName->Data()),track->Pt(),track->Eta(),et);
              FillHisto2D(Form("EtDataCorrected%sPiPlus",cutName->Data()),track->Pt(),track->Eta(),etpartialcorrected);
@@ -265,7 +272,7 @@ Int_t AliAnalysisHadEtReconstructed::AnalyseEvent(AliVEvent* ev, Int_t eventtype
            et = Et(track->P(),track->Theta(),fgKPlusCode,track->Charge());
            if(cutset==0){corrEff = fCorrections->GetTPCEfficiencyCorrectionKaon(track->Pt(),fCentBin);}
            etpartialcorrected = et*corrBkgd*corrEff*corrNotID;
-           if(corrEff>0.0&&fDataSet==20100)FillHisto2D("feffKaonVsCentralityBin",fCentBin,1.0/corrEff,1.0);
+           if(corrEff>0.0&&(fDataSet==20100||fDataSet==2011))FillHisto2D("feffKaonVsCentralityBin",fCentBin,1.0/corrEff,1.0);
              
            if(track->Charge()>0.0){
              FillHisto2D(Form("EtDataRaw%sKPlus",cutName->Data()),track->Pt(),track->Eta(),et);
@@ -281,7 +288,7 @@ Int_t AliAnalysisHadEtReconstructed::AnalyseEvent(AliVEvent* ev, Int_t eventtype
            et = Et(track->P(),track->Theta(),fgProtonCode,track->Charge());
            if(cutset==0){corrEff = fCorrections->GetTPCEfficiencyCorrectionProton(track->Pt(),fCentBin);}
            etpartialcorrected = et*corrBkgd*corrEff*corrNotID;
-           if(corrEff>0.0&&fDataSet==20100)FillHisto2D("feffProtonVsCentralityBin",fCentBin,1.0/corrEff,1.0);
+           if(corrEff>0.0&&(fDataSet==20100||fDataSet==2011))FillHisto2D("feffProtonVsCentralityBin",fCentBin,1.0/corrEff,1.0);
              
            if(track->Charge()>0.0){
              FillHisto2D(Form("EtDataRaw%sProton",cutName->Data()),track->Pt(),track->Eta(),et);
@@ -301,7 +308,7 @@ Int_t AliAnalysisHadEtReconstructed::AnalyseEvent(AliVEvent* ev, Int_t eventtype
            et = Et(track->P(),track->Theta(),fgPiPlusCode,track->Charge());
            Float_t etProton = Et(track->P(),track->Theta(),fgProtonCode,track->Charge());
            Float_t etKaon = Et(track->P(),track->Theta(),fgKPlusCode,track->Charge());
-           if(corrEff>0.0&&fDataSet==20100)FillHisto2D("feffHadronVsCentralityBin",fCentBin,1.0/corrEff,1.0);
+           if(corrEff>0.0&&(fDataSet==20100||fDataSet==2011))FillHisto2D("feffHadronVsCentralityBin",fCentBin,1.0/corrEff,1.0);
            etpartialcorrected = et*corrBkgd*corrEffNoID*corrNotID;
            etpartialcorrectedPion = et*corrBkgd*corrEffNoID;
            etpartialcorrectedProton = etProton*corrBkgd*corrEffNoID;
@@ -325,7 +332,7 @@ Int_t AliAnalysisHadEtReconstructed::AnalyseEvent(AliVEvent* ev, Int_t eventtype
   Int_t nondiff = 0;//(Int_t) AliPWG0Helper::kND;
   Int_t doublediff = 0;//(Int_t) AliPWG0Helper::kDD;
   Int_t singlediff = 0;//(Int_t) AliPWG0Helper::kSD;
-  if(fDataSet!=20100){
+  if(fDataSet!=20100 && fDataSet!=2011){
     nondiff = (Int_t) AliPWG0Helper::kND;
     doublediff = (Int_t) AliPWG0Helper::kDD;
     singlediff = (Int_t) AliPWG0Helper::kSD;
@@ -343,6 +350,12 @@ Int_t AliAnalysisHadEtReconstructed::AnalyseEvent(AliVEvent* ev, Int_t eventtype
     FillHisto1D("RecoHadEtFullAcceptanceITSNoPIDND",GetCorrectedHadEtFullAcceptanceITSNoPID(),1.0);
     FillHisto1D("RecoPiKPEtFullAcceptanceITSNoPIDND",GetCorrectedPiKPEtFullAcceptanceITSNoPID(),1.0);
     FillHisto1D("RecoTotEtFullAcceptanceITSNoPIDND",GetCorrectedTotEtFullAcceptanceITSNoPID(),1.0);
+
+    FillHisto1D("RecoRawEtFullAcceptanceTPCND",GetRawEtFullAcceptanceTPC(),1.0);
+    FillHisto1D("RecoRawEtFullAcceptanceTPCNoPIDND",GetRawEtFullAcceptanceTPCNoPID(),1.0);
+    FillHisto1D("RecoRawEtFullAcceptanceITSND",GetRawEtFullAcceptanceITS(),1.0);
+    FillHisto1D("RecoRawEtFullAcceptanceITSNoPIDND",GetRawEtFullAcceptanceITSNoPID(),1.0);
+
   }
   if(eventtype == doublediff){
     FillHisto1D("RecoHadEtFullAcceptanceTPCDD",GetCorrectedHadEtFullAcceptanceTPC(),1.0);
@@ -357,6 +370,10 @@ Int_t AliAnalysisHadEtReconstructed::AnalyseEvent(AliVEvent* ev, Int_t eventtype
     FillHisto1D("RecoHadEtFullAcceptanceITSNoPIDDD",GetCorrectedHadEtFullAcceptanceITSNoPID(),1.0);
     FillHisto1D("RecoPiKPEtFullAcceptanceITSNoPIDDD",GetCorrectedPiKPEtFullAcceptanceITSNoPID(),1.0);
     FillHisto1D("RecoTotEtFullAcceptanceITSNoPIDDD",GetCorrectedTotEtFullAcceptanceITSNoPID(),1.0);
+    FillHisto1D("RecoRawEtFullAcceptanceTPCDD",GetRawEtFullAcceptanceTPC(),1.0);
+    FillHisto1D("RecoRawEtFullAcceptanceTPCNoPIDDD",GetRawEtFullAcceptanceTPCNoPID(),1.0);
+    FillHisto1D("RecoRawEtFullAcceptanceITSDD",GetRawEtFullAcceptanceITS(),1.0);
+    FillHisto1D("RecoRawEtFullAcceptanceITSNoPIDDD",GetRawEtFullAcceptanceITSNoPID(),1.0);//ND
   }
   if(eventtype == singlediff){
     FillHisto1D("RecoPiKPEtFullAcceptanceTPCSD",GetCorrectedPiKPEtFullAcceptanceTPC(),1.0);
@@ -371,6 +388,10 @@ Int_t AliAnalysisHadEtReconstructed::AnalyseEvent(AliVEvent* ev, Int_t eventtype
     FillHisto1D("RecoHadEtFullAcceptanceITSNoPIDSD",GetCorrectedHadEtFullAcceptanceITSNoPID(),1.0);
     FillHisto1D("RecoPiKPEtFullAcceptanceITSNoPIDSD",GetCorrectedPiKPEtFullAcceptanceITSNoPID(),1.0);
     FillHisto1D("RecoTotEtFullAcceptanceITSNoPIDSD",GetCorrectedTotEtFullAcceptanceITSNoPID(),1.0);
+    FillHisto1D("RecoRawEtFullAcceptanceTPCSD",GetRawEtFullAcceptanceTPC(),1.0);
+    FillHisto1D("RecoRawEtFullAcceptanceTPCNoPIDSD",GetRawEtFullAcceptanceTPCNoPID(),1.0);
+    FillHisto1D("RecoRawEtFullAcceptanceITSSD",GetRawEtFullAcceptanceITS(),1.0);
+    FillHisto1D("RecoRawEtFullAcceptanceITSNoPIDSD",GetRawEtFullAcceptanceITSNoPID(),1.0);
   }
   if(fGoodEvent){
     FillHisto1D("RecoPiKPEtFullAcceptanceTPC",GetCorrectedPiKPEtFullAcceptanceTPC(),1.0);
@@ -691,8 +712,15 @@ void AliAnalysisHadEtReconstructed::CreateHistograms(){//Creating histograms and
   Float_t minEt = 0.0;
   Float_t maxEt = 100.0;
   Float_t minEtPiKP = 0.0;
-  Float_t maxEtPiKP = 50.0;
-  if(fDataSet==20100) maxEt=4000.0;
+  Float_t maxEtPiKP = 100.0;
+  if(fDataSet==20100||fDataSet==2011){
+    maxEt=4000.0;
+    maxEtPiKP = 2500;
+  }
+  if(fDataSet==2013){
+    maxEt=100.0;
+    maxEtPiKP = 100.0;
+  }
   Int_t nbinsEt = 200;
   char histoname[200];
   char histotitle[200];
@@ -784,7 +812,7 @@ void AliAnalysisHadEtReconstructed::CreateHistograms(){//Creating histograms and
            CreateHisto1D(histoname,histotitle,xtitle,ytitle->Data(),nbinsEt*2,minEtPiKP,maxEtPiKP);//et
 
          }
-         if(fDataSet==20100 && type ==0 &&pid==1){//If this is Pb+Pb and full acceptance with pid
+         if((fDataSet==20100||fDataSet==2011) && type ==0 &&pid==1){//If this is Pb+Pb and full acceptance with pid
            Int_t width = 5;
            if(fNCentBins<21) width = 10;
            for(Int_t i=0;i<fNCentBins;i++){
@@ -806,7 +834,7 @@ void AliAnalysisHadEtReconstructed::CreateHistograms(){//Creating histograms and
   CreateHisto1D("RecoHadEtFullAcceptanceITSAssumingKaon","Reconstructing E_{T}^{had} with full acceptance for p_{T}>0.10 GeV/c assuming kaons","Reconstructed E_{T}^{had}","dN_{eve}/dE_{T}^{had}",nbinsEt*2,minEt,maxEt);
 
   //Cross checks that corrections are applied correctly
-  if(fDataSet==20100){
+  if(fDataSet==20100 || fDataSet==2011){
     CreateHisto2D("fbkgdVsCentralityBin","f_{bkgd} vs centrality bin","centrality bin","f_{bkgd}",21,-1.5,19.5,200,0.7,1.05);//
     CreateHisto2D("feffPionVsCentralityBin","Pion efficiency vs centrality bin","centrality bin","pion efficiency",21,-1.5,19.5,200,0,1.2);//
     CreateHisto2D("feffHadronVsCentralityBin","Hadron efficiency vs centrality bin","centrality bin","hadron efficiency",21,-1.5,19.5,200,0,1.2);//