bug fix in Event Cuts and update of Add task macro

diff --git a/PWGLF/SPECTRA/PiKaPr/TestAOD/AddTaskSpectraBoth.C b/PWGLF/SPECTRA/PiKaPr/TestAOD/AddTaskSpectraBoth.C
index 511866b48bdb74e250a77684cdb55be5f7caeb3f..ea6295dcfa9ec3356fb2b63cd7ebaf15c86c698e 100644 (file)
--- a/PWGLF/SPECTRA/PiKaPr/TestAOD/AddTaskSpectraBoth.C
+++ b/PWGLF/SPECTRA/PiKaPr/TestAOD/AddTaskSpectraBoth.C
@@ -80,7 +80,7 @@ AliAnalysisTaskSpectraBoth* AddTaskSpectraBoth(Bool_t mc=kFALSE,
   if(mc==1)evcuts->SetIsMC(kTRUE);
   evcuts->PrintCuts();
   
-  AliAnalysisTaskSpectraBoth *task = new AliAnalysisTaskSpectraBoth(Form("TaskBothSpectraCent%.0fto%.0f_QVec%.1fto%.1f_Eta%.1fto%.1f_%.1fSigmaPID_TrBit%d%s",  
+  AliAnalysisTaskSpectraBoth *task = new AliAnalysisTaskSpectraBoth(Form("TaskBothSpectraCent%.3fto%.3f_QVec%.1fto%.1f_Eta%.1fto%.1f_%.1fSigmaPID_TrBit%d%s",  
                                                                       CentCutMin,
                                                                       CentCutMax,
                                                                       QvecCutMin,
@@ -99,9 +99,9 @@ AliAnalysisTaskSpectraBoth* AddTaskSpectraBoth(Bool_t mc=kFALSE,
   TString outputFileName = AliAnalysisManager::GetCommonFileName();
   
   TString typeofdata=mc?"MC":"Data";
-  outputFileName += Form(":OutputBothSpectraTask_%s_Cent%.0fto%.0f_QVec%.1fto%.1f_Eta%.1fto%.1f_%.1fSigmaPID_TrBit%d%s",typeofdata.Data(),evcuts->GetCentralityMin(),evcuts->GetCentralityMax(),evcuts->GetQVectorCutMin(), evcuts->GetQVectorCutMax(),trcuts->GetEtaMin(),trcuts->GetEtaMax(),pid->GetNSigmaCut(),trcuts->GetTrackType(),opt.Data());
+  outputFileName += Form(":OutputBothSpectraTask_%s_Cent%.3fto%.3f_QVec%.1fto%.1f_Eta%.1fto%.1f_%.1fSigmaPID_TrBit%d%s",typeofdata.Data(),evcuts->GetCentralityMin(),evcuts->GetCentralityMax(),evcuts->GetQVectorCutMin(), evcuts->GetQVectorCutMax(),trcuts->GetEtaMin(),trcuts->GetEtaMax(),pid->GetNSigmaCut(),trcuts->GetTrackType(),opt.Data());
   
-  TString tmpstring= Form("OutputBothSpectraTask_%s_Cent%.0fto%.0f_QVec%.1fto%.1f_Eta%.1fto%.1f_%.1fSigmaPID_TrBit%d%s",typeofdata.Data(),evcuts->GetCentralityMin(),evcuts->GetCentralityMax(),evcuts->GetQVectorCutMin(), evcuts->GetQVectorCutMax(),trcuts->GetEtaMin(),trcuts->GetEtaMax(),pid->GetNSigmaCut(),trcuts->GetTrackType(),opt.Data());
+  TString tmpstring= Form("OutputBothSpectraTask_%s_Cent%.3fto%.3f_QVec%.1fto%.1f_Eta%.1fto%.1f_%.1fSigmaPID_TrBit%d%s",typeofdata.Data(),evcuts->GetCentralityMin(),evcuts->GetCentralityMax(),evcuts->GetQVectorCutMin(), evcuts->GetQVectorCutMax(),trcuts->GetEtaMin(),trcuts->GetEtaMax(),pid->GetNSigmaCut(),trcuts->GetTrackType(),opt.Data());
   
   cout<<"outputFileName:  "<<outputFileName<<endl;
   AliAnalysisDataContainer *cinput = mgr->GetCommonInputContainer();      

diff --git a/PWGLF/SPECTRA/PiKaPr/TestAOD/AliSpectraBothEventCuts.cxx b/PWGLF/SPECTRA/PiKaPr/TestAOD/AliSpectraBothEventCuts.cxx
index d68e95804b64817fc77209b7b4217a44e802b3db..46641e958d8ce826a08abdd66dd4a8da00592b4c 100644 (file)
--- a/PWGLF/SPECTRA/PiKaPr/TestAOD/AliSpectraBothEventCuts.cxx
+++ b/PWGLF/SPECTRA/PiKaPr/TestAOD/AliSpectraBothEventCuts.cxx
@@ -246,7 +246,6 @@ Bool_t AliSpectraBothEventCuts::IsSelected(AliVEvent * aod,AliSpectraBothTrackCu
                fHistoVtxAftSelwithoutZvertexCutusingMCz->Fill(mcZ);    
        if (vertex->GetZ() > fVertexCutMin && vertex->GetZ() < fVertexCutMax)
        {
-               fHistoCuts->Fill(kAcceptedEvents);
                fIsSelected=kTRUE;
                fHistoVtxAftSel->Fill(vertex->GetZ());
        }
@@ -259,6 +258,8 @@ Bool_t AliSpectraBothEventCuts::IsSelected(AliVEvent * aod,AliSpectraBothTrackCu
   {
        if( CheckCentralityCut() && CheckMultiplicityCut() && CheckQVectorCut())
                fIsSelected=kTRUE;
+       else
+               fIsSelected=kFALSE;     
   }    
 
 
@@ -283,7 +284,10 @@ Bool_t AliSpectraBothEventCuts::IsSelected(AliVEvent * aod,AliSpectraBothTrackCu
        }
   }
   if(fIsSelected)
-       fHistoNChAftSel->Fill(Nch);
+  {    
+       fHistoNChAftSel->Fill(Nch);
+       fHistoCuts->Fill(kAcceptedEvents);
+  }    
   return fIsSelected;
 }
 
@@ -348,7 +352,7 @@ Bool_t AliSpectraBothEventCuts::CheckCentralityCut()
                cent=ApplyCentralityPatchAOD049();
   }    
   fHistoCentrality->Fill(0.5,cent);    
-  if ( (cent <= fCentralityCutMax)  &&  (cent >= fCentralityCutMin) )  
+  if ( (cent < fCentralityCutMax)  &&  (cent >= fCentralityCutMin) )  
   {
         fHistoCentrality->Fill(1.5,cent);      
        return kTRUE;