Updates in the spectra task (Marek)

diff --git a/PWG2/SPECTRA/AliAnalysisChargedHadronSpectraITSTruncatedMeanTask.cxx b/PWG2/SPECTRA/AliAnalysisChargedHadronSpectraITSTruncatedMeanTask.cxx
index d587629d5487d1c7a5ae42946a542ff6ae26030d..7a3d261d1c06286be6513ed8772576c59ee5126a 100644 (file)
--- a/PWG2/SPECTRA/AliAnalysisChargedHadronSpectraITSTruncatedMeanTask.cxx
+++ b/PWG2/SPECTRA/AliAnalysisChargedHadronSpectraITSTruncatedMeanTask.cxx
@@ -52,7 +52,6 @@ fHistMydEPpositive(0),fHistMydETPCinPpositive(0),fHistMydETPCinPglobalpositive(0
 fHistMydEPnegative(0),fHistMydETPCinPnegative(0),fHistMydETPCinPglobalnegative(0),
 fHistL3dEP(0),fHistL4dEP(0),fHistL5dEP(0),fHistL6dEP(0),fHistL3dETPCinP(0),
  fHistL4dETPCinP(0),fHistL5dETPCinP(0),fHistL6dETPCinP(0),fHistwhichhasmin(0),fHistMysignalminusESD(0),
-fHistminsignalforPionP(0),fHistminsignalforKaonP(0),fHistminsignalforProtonP(0),
 fHistminsignalifPionP(0),fHistminsignalifKaonP(0),fHistminsignalifProtonP(0),fHistminsignalifAntiPionP(0),fHistminsignalifAntiKaonP(0),fHistminsignalifAntiProtonP(0),
 fDCAXYZforcleanPions(0),fDCAXYZforcleanAntiPions(0),fDCAXYZforcleanProtons(0),fDCAXYZforcleanAntiProtons(0),
 fDCAXYZOpenforcleanPions(0),fDCAXYZOpenforcleanAntiPions(0),fDCAXYZOpenforcleanProtons(0),fDCAXYZOpenforcleanAntiProtons(0),
@@ -89,7 +88,7 @@ fElectronsource(0),fAntiElectronsource(0),
 fMuonsource(0),fAntiMuonsource(0),
 fPionNTPCClusters(0),fAntiPionNTPCClusters(0),fKaonNTPCClusters(0),fAntiKaonNTPCClusters(0),fProtonNTPCClusters(0),fAntiProtonNTPCClusters(0),
 fPionchi2(0),fAntiPionchi2(0),fKaonchi2(0),fAntiKaonchi2(0),fProtonchi2(0),fAntiProtonchi2(0),
-fTracksCutmonitoring(0),fParticlesCutmonitoring(0),fVertexshift(0),fPtESDminusPtMCvPtESDafterallcuts(0),fPtESDminusPtMCvPtESDafterTPCcuts(0),
+fTracksCutmonitoring(0),fParticlesCutmonitoring(0),fVertexshift(0),fPtESDminusPtMCvPtESDafterallcuts(0),fPtESDminusPtMCvPtESDafterTPCcuts(0),fMulESDMulMCVz(0),
 fTPCPIDCUT(0), fESDpid(0),fPrimaryElectronsMother(0),
 flist(0)
 {
@@ -279,12 +278,6 @@ void AliAnalysisChargedHadronSpectraITSTruncatedMeanTask::UserCreateOutputObject
        fHistMysignalminusESD=new TH1F("HistMysignalminus","HistMysignalminus;my-ESD;N",100,-0.2,0.2);
        flist->Add(fHistMysignalminusESD);
        
-       fHistminsignalforPionP=new TH2F("HistminsignalforPionP",";P[GeV/c];dE[in 300#mum]",kPtBins,binsPtDummy,ny,starty,ny*jump+starty);
-       flist->Add(fHistminsignalforPionP);
-       fHistminsignalforKaonP=new TH2F("HistminsignalforKaonP",";P[GeV/c];dE[in 300#mum]",kPtBins,binsPtDummy,ny,starty,ny*jump+starty);
-       flist->Add(fHistminsignalforKaonP);
-       fHistminsignalforProtonP=new TH2F("HistminsignalforProtonP",";P[GeV/c];dE[in 300#mum]",kPtBins,binsPtDummy,ny,starty,ny*jump+starty);
-       flist->Add(fHistminsignalforProtonP);
         
        fHistminsignalifPionP=new TH2F("HistminsignalifPionP",";Pt[GeV/c];log(dE_real)-log(dE_fit)",kPtBins,binsPtDummy,ny,-4,4);
        flist->Add(fHistminsignalifPionP);
@@ -730,6 +723,10 @@ void AliAnalysisChargedHadronSpectraITSTruncatedMeanTask::UserCreateOutputObject
        fPtESDminusPtMCvPtESDafterTPCcuts->GetZaxis()->SetBinLabel(10,"antipionfake");
        fPtESDminusPtMCvPtESDafterTPCcuts->GetZaxis()->SetBinLabel(11,"antikaonfake");
        fPtESDminusPtMCvPtESDafterTPCcuts->GetZaxis()->SetBinLabel(12,"antiprotonfake");
+       
+       
+       fMulESDMulMCVz=new TH3F("fMulESDMulMCVz",";NtracksESD;NparticlesMC;Vrt_z ",50,0,50,100,0,100,20,-10,10);
+       flist->Add(fMulESDMulMCVz);
        PostData(1,  flist);
        Printf("end of CreateOutputObjects with MC");
 }
@@ -774,7 +771,7 @@ void AliAnalysisChargedHadronSpectraITSTruncatedMeanTask::UserExec(Option_t *)
        if(fMC)
        {
                AliMCEvent* mcEvent  = (AliMCEvent*) MCEvent();
-               Printf("MC particles: %d", mcEvent->GetNumberOfTracks());
+               //Printf("MC particles: %d", mcEvent->GetNumberOfTracks());
                stack = mcEvent->Stack();
                mcXvertex=mcEvent->GetPrimaryVertex()->GetX();
                mcYvertex=mcEvent->GetPrimaryVertex()->GetY();
@@ -788,11 +785,11 @@ void AliAnalysisChargedHadronSpectraITSTruncatedMeanTask::UserExec(Option_t *)
          UInt_t isSelected = 0;
         if(((AliInputEventHandler*)(AliAnalysisManager::GetAnalysisManager()->GetInputEventHandler())))
                isSelected=((AliInputEventHandler*)(AliAnalysisManager::GetAnalysisManager()->GetInputEventHandler()))->IsEventSelected();
-       Printf("Mask_selection %u %u", isSelected,AliVEvent::kMB);  
+       //Printf("Mask_selection %u %u", isSelected,AliVEvent::kMB);  
         if(!(isSelected&AliVEvent::kMB))
         {
                 isphysevent=0;
-                Printf("No phys event.........\n");
+               // Printf("No phys event.........\n");
        }       
        else
        {
@@ -823,7 +820,7 @@ void AliAnalysisChargedHadronSpectraITSTruncatedMeanTask::UserExec(Option_t *)
                        vertex = fESD->GetPrimaryVertexSPD();
                        if(vertex->GetNContributors()<1) 
                        {
-                               Printf("No good  Vertex.........\n");
+                               //Printf("No good  Vertex.........\n");
                                isgoodvertex=0;
                        }
                        else
@@ -845,7 +842,7 @@ void AliAnalysisChargedHadronSpectraITSTruncatedMeanTask::UserExec(Option_t *)
                {       
                        if(TMath::Abs(vertex ->GetZ())>10.0)
                        {
-                               Printf("No good  Z of Vertex.........\n");
+                               //Printf("No good  Z of Vertex.........\n");
                                isvxerteinZ=0;
                        }
                        else
@@ -858,8 +855,16 @@ void AliAnalysisChargedHadronSpectraITSTruncatedMeanTask::UserExec(Option_t *)
                if(TMath::Abs(vertex->GetX()-mcXvertex)>0.015||TMath::Abs(vertex->GetY()-mcYvertex)>0.015||TMath::Abs(vertex->GetZ()-mcZvertex)>0.15)
                        isvxerteinZ=0;  
        }  
+       Int_t fMCmult=0;
        if(stack)//Looping over MC information of all events
        {
+               Float_t minpt=0.0;
+               Float_t maxpt=0.0;
+               Float_t mineta=0.0;
+               Float_t maxeta=0.0;
+               
+               fCutsMul->GetPtRange(minpt,maxpt);
+               fCutsMul->GetEtaRange(mineta,maxeta);
                fHistStats->Fill(8);
                if(TMath::Abs(mcZvertex)<10.0)
                        fHistStats->Fill(9);
@@ -871,13 +876,16 @@ void AliAnalysisChargedHadronSpectraITSTruncatedMeanTask::UserExec(Option_t *)
                        if(!particleMC)
                                continue;
                        Int_t pdgcodeMC = particleMC->GetPdgCode();
+                       if(!(pdgcodeMC==211||pdgcodeMC==-211||pdgcodeMC==321||pdgcodeMC==-321||pdgcodeMC==2212||pdgcodeMC==-2212))      
+                               continue;
+                       if(particleMC->Pt()>minpt&&particleMC->Pt()<maxpt&&particleMC->Eta()>mineta&&particleMC->Eta()<maxeta)
+                               fMCmult++;      
                        if (TMath::Abs(particleMC->Y())>fYCut)
                                continue;
                        if (particleMC->Pt()>2.0)
                                continue;
                        //Printf("%d aa",imc);                  
-                       if(!(pdgcodeMC==211||pdgcodeMC==-211||pdgcodeMC==321||pdgcodeMC==-321||pdgcodeMC==2212||pdgcodeMC==-2212))      
-                               continue;
+                       
                        if(pdgcodeMC==211)      
                                fHistminsignalifPionPMCPrimaryBeforeEventCuts->Fill(particleMC->Pt());
                        if(pdgcodeMC==-211)     
@@ -954,9 +962,9 @@ void AliAnalysisChargedHadronSpectraITSTruncatedMeanTask::UserExec(Option_t *)
        
        if(!(isphysevent&&isgoodvertex&&isvxerteinZ))
        {
-               Printf("No Good event.........\n");
+               //Printf("No Good event.........\n");
                PostData(1,  flist);
-               Printf("end of Exec");
+               //Printf("end of Exec");
                return;
        }
        
@@ -966,16 +974,19 @@ void AliAnalysisChargedHadronSpectraITSTruncatedMeanTask::UserExec(Option_t *)
        fHistXYVertexAfterCut->Fill(vertex ->GetX(),vertex ->GetY()); 
        
        if(fMC)
-               fVertexshift->Fill(vertex->GetX()-mcXvertex,vertex->GetY()-mcYvertex,vertex->GetZ()-mcZvertex); 
+       {
+               fVertexshift->Fill(vertex->GetX()-mcXvertex,vertex->GetY()-mcYvertex,vertex->GetZ()-mcZvertex);
+               fMulESDMulMCVz->Fill(refmultiplicity,fMCmult,vertex->GetZ());
+       }               
        if(fCuts==0)
        {
-               Printf("No CUTS Defined.........\n");
+               //Printf("No CUTS Defined.........\n");
                PostData(1,  flist);
-               Printf("end of Exec");
+               //Printf("end of Exec");
                return;
        }
        
-       Printf("There are %d tracks in this event", fESD->GetNumberOfTracks());
+       //Printf("There are %d tracks in this event", fESD->GetNumberOfTracks());
         Int_t nTracks=fESD->GetNumberOfTracks();
        
        Int_t mynumberoftracks=0;
@@ -1698,8 +1709,8 @@ void AliAnalysisChargedHadronSpectraITSTruncatedMeanTask::UserExec(Option_t *)
        // Post output data.
        Printf("Done..........\n");
        PostData(1,  flist);
-       Printf("....................Done!\n");
-       Printf("end of Exec");
+       //Printf("....................Done!\n");
+       //Printf("end of Exec");
 }      
 
 //________________________________________________________________________
@@ -1857,3 +1868,18 @@ void AliAnalysisChargedHadronSpectraITSTruncatedMeanTask::SetCentralityCut(Float
                fUpCentrality=up;
        }
 }
+//_____________________________________________________________________________________________________________
+void AliAnalysisChargedHadronSpectraITSTruncatedMeanTask::SetMultiplicityCut(Int_t low, Int_t up)
+{
+       //mulyiplicty cut setter
+       if((!(up>low))&&low>=0&&up>=0)
+       { 
+               fLowMultiplicity=-1;
+               fUpMultiplicity=-1;
+       }
+       else
+       {
+               fLowMultiplicity=low;
+               fUpMultiplicity=up;
+       }       
+}      
\ No newline at end of file

diff --git a/PWG2/SPECTRA/AliAnalysisChargedHadronSpectraITSTruncatedMeanTask.h b/PWG2/SPECTRA/AliAnalysisChargedHadronSpectraITSTruncatedMeanTask.h
index fc4c4c65c0c1aa1f5d2f6bec227a89a95fbf9db2..a5a68213012e6cab0bf2d8aeeaac003f0cccde74 100644 (file)
--- a/PWG2/SPECTRA/AliAnalysisChargedHadronSpectraITSTruncatedMeanTask.h
+++ b/PWG2/SPECTRA/AliAnalysisChargedHadronSpectraITSTruncatedMeanTask.h
@@ -40,7 +40,7 @@ class AliAnalysisChargedHadronSpectraITSTruncatedMeanTask : public AliAnalysisTa
    fESDpid->GetTPCResponse().SetBetheBlochParameters(2.15898e+00/50.,1.75295e+01,3.40030e-09,1.96178e+00,3.91720e+00);}\r
   void SetAliESDtrackCuts(AliESDtrackCuts* const cuts ){fCuts=cuts;/*flist->Add(fCuts);*/}\r
   void SetFunctionParam(Double_t* const par);\r
-   void SetMultiplicityCut(Int_t low, Int_t up){fLowMultiplicity=low;fUpMultiplicity=up;}\r
+   void SetMultiplicityCut(Int_t low, Int_t up);\r
   void SetCorrectSDD(){fCorrectSDD=kTRUE;}\r
    void SetCorrectSSD(){fCorrectSSD=kTRUE;}\r
   void SetYcut(Float_t value){fYCut=TMath::Abs(value);}\r
@@ -138,10 +138,7 @@ TH2F* fHistL6dETPCinP;//SSD2
 \r
 TH2F* fHistwhichhasmin;// ITS  layer with minimal charged\r
 TH1F* fHistMysignalminusESD;// My signal minus ESD\r
-//dE for n-sigma method\r
-TH2F* fHistminsignalforPionP; //pions\r
-TH2F* fHistminsignalforKaonP;//kaons\r
-TH2F* fHistminsignalforProtonP;//protons\r
+\r
 \r
 //log dE-logdEfit as function of  global p at p.v. for\r
 TH2F* fHistminsignalifPionP;//pions\r
@@ -389,6 +386,8 @@ TH3F* fVertexshift; //shift of the vertex due to reconstruction
 TH3F* fPtESDminusPtMCvPtESDafterallcuts;//ptESD -ptMC v ptESD after all cuts \r
 TH3F* fPtESDminusPtMCvPtESDafterTPCcuts;//ptESD - ptMC v ptESD after TPC cuts (refit,chi2,nclus);\r
 \r
+TH3F* fMulESDMulMCVz;//Multiplicty ESD Multiplicty MC Vrt Z \r
+\r
 \r
 \r
 //TPC pid objects \r

diff --git a/PWG2/SPECTRA/macros/AddTaskChargedHadronSpectraITSTruncatedMean.C b/PWG2/SPECTRA/macros/AddTaskChargedHadronSpectraITSTruncatedMean.C
index a5721692ac4c785f9379ab5181ac8cdbb11f85ca..3451b2600cdb736d76fb858929d179d53d926250 100644 (file)
--- a/PWG2/SPECTRA/macros/AddTaskChargedHadronSpectraITSTruncatedMean.C
+++ b/PWG2/SPECTRA/macros/AddTaskChargedHadronSpectraITSTruncatedMean.C
@@ -1,5 +1,5 @@
- AliAnalysisChargedHadronSpectraITSTruncatedMeanTask* AddTaskChargedHadronSpectraITSTruncatedMean(Float_t lowcut=-1.0,Float_t upcut=-1.0,Int_t mc=0)\r
- {\r
+ AliAnalysisChargedHadronSpectraITSTruncatedMeanTask* AddTaskChargedHadronSpectraITSTruncatedMean(Int_t lowcut=-1,Int_t upcut=-1,Int_t mc=0)\r
+{\r
        AliAnalysisManager *mgr = AliAnalysisManager::GetAnalysisManager();\r
        if (!mgr) \r
        {\r
@@ -23,14 +23,64 @@
        }\r
        TString outputFileName = AliAnalysisManager::GetCommonFileName();\r
        outputFileName += ":PWG2SpectraITSTPC";\r
-       \r
-       gROOT->LoadMacro("./config_ChargedHadronSpectraITSTruncatedMeanTask.C");\r
+       gROOT->LoadMacro("./configChargedHadronSpectraITSTruncatedMeanTask.C");\r
        AliAnalysisChargedHadronSpectraITSTruncatedMeanTask* task = GetAliAnalysisChargedHadronSpectraITSTruncatedMeanTask(mc);\r
+       mgr->AddTask(task);\r
+       Int_t upint=0;\r
+       Int_t lowint=0;\r
+       \r
+       \r
        task->SetMultiplicityCut(lowcut,upcut);\r
-       AliAnalysisDataContainer *cinput = mgr->GetCommonInputContainer();\r
-       AliAnalysisDataContainer *coutput = mgr->CreateContainer("output", TList::Class(),AliAnalysisManager::kOutputContainer,outputFileName);\r
+       \r
+       AliAnalysisDataContainer *cinput = mgr->GetCommonInputContainer();      \r
+       AliAnalysisDataContainer *coutput = mgr->CreateContainer(Form("outputlow%dup%dHI0",lowcut,upcut),TList::Class(),AliAnalysisManager::kOutputContainer,outputFileName);\r
        mgr->ConnectInput(task, 0, cinput);\r
        mgr->ConnectOutput(task, 1, coutput);\r
+       \r
+       return task;\r
+  }\r
+\r
+AliAnalysisChargedHadronSpectraITSTruncatedMeanTask* AddTaskChargedHadronSpectraITSTruncatedMean(Float_t lowcut=0.0,Float_t upcut=100.0,Int_t mc=0, Int_t hi=1)\r
+{\r
+       AliAnalysisManager *mgr = AliAnalysisManager::GetAnalysisManager();\r
+       if (!mgr) \r
+       {\r
+               ::Error("AddTaskITSsaTracks", "No analysis manager to connect to.");\r
+               return NULL;\r
+       }   \r
+  \r
+  // Check the analysis type using the event handlers connected to the analysis manager.\r
+  //==============================================================================\r
+       if (!mgr->GetInputEventHandler()) \r
+       {\r
+               ::Error("AddTaskITSsaTracks", "This task requires an input event handler");\r
+               return NULL;\r
+       }   \r
+  \r
+       TString type = mgr->GetInputEventHandler()->GetDataType(); // can be "ESD" or "AOD"\r
+       if(type.Contains("AOD"))\r
+       {\r
+               ::Error("AddTaskITSsaTracks", "This task requires to run on ESD");\r
+               return NULL;\r
+       }\r
+       TString outputFileName = AliAnalysisManager::GetCommonFileName();\r
+       outputFileName += ":PWG2SpectraITSTPC";\r
+       gROOT->LoadMacro("./configChargedHadronSpectraITSTruncatedMeanTask.C");\r
+       AliAnalysisChargedHadronSpectraITSTruncatedMeanTask* task = GetAliAnalysisChargedHadronSpectraITSTruncatedMeanTask(mc);\r
        mgr->AddTask(task);\r
+       Int_t upint=0;\r
+       Int_t lowint=0;\r
+       \r
+       upint=(Int_t)upcut;\r
+       lowint=(Int_t)lowcut;\r
+       \r
+       task->SetCentralityCut(lowcut,upcut);\r
+       task->SetHImode();\r
+       \r
+       AliAnalysisDataContainer *cinput = mgr->GetCommonInputContainer();      \r
+       AliAnalysisDataContainer *coutput = mgr->CreateContainer(Form("outputlow%dup%dHI1",lowint,upint),TList::Class(),AliAnalysisManager::kOutputContainer,outputFileName);\r
+       mgr->ConnectInput(task, 0, cinput);\r
+       mgr->ConnectOutput(task, 1, coutput);\r
+       \r
        return task;\r
   }
\ No newline at end of file

diff --git a/PWG2/SPECTRA/macros/config_ChargedHadronSpectraITSTruncatedMeanTask.C b/PWG2/SPECTRA/macros/configChargedHadronSpectraITSTruncatedMeanTask.C
similarity index 91%
rename from PWG2/SPECTRA/macros/config_ChargedHadronSpectraITSTruncatedMeanTask.C
rename to PWG2/SPECTRA/macros/configChargedHadronSpectraITSTruncatedMeanTask.C
index c8ab3b9274af5477c734185df048d4e1ee08e863..9c51ff00874303f3efc4d8e5cd96e68fe8963538 100644 (file)
--- a/PWG2/SPECTRA/macros/config_ChargedHadronSpectraITSTruncatedMeanTask.C
+++ b/PWG2/SPECTRA/macros/configChargedHadronSpectraITSTruncatedMeanTask.C
@@ -1,7 +1,7 @@
 AliAnalysisChargedHadronSpectraITSTruncatedMeanTask* GetAliAnalysisChargedHadronSpectraITSTruncatedMeanTask(int usemc=0)\r
 {\r
        \r
-       AliAnalysisChargedHadronSpectraITSTruncatedMeanTask* task1 = new AliAnalysisChargedHadronSpectraITSTruncatedMeanTask("test1");\r
+       AliAnalysisChargedHadronSpectraITSTruncatedMeanTask* task1 = new AliAnalysisChargedHadronSpectraITSTruncatedMeanTask("AliAnalysisChargedHadronSpectraITSTruncatedMeanTask");\r
        AliESDtrackCuts*  cuts1 = new AliESDtrackCuts("cuts1","cuts1");\r
        cuts1->SetRequireTPCRefit(kTRUE); // but only for pass4 or later, pass2 without requiring refit !!!!\r
        cuts1->SetRequireITSRefit(kTRUE);\r