Update task for He and TRD analysis

diff --git a/PWGLF/SPECTRA/Nuclei/masses/AddTaskNuclei.C b/PWGLF/SPECTRA/Nuclei/masses/AddTaskNuclei.C
index ac80b63277016a6555b69ed5b058a228c520e3ee..966675e6e86e7f83f15da9b03a699238f7864a25 100644 (file)
--- a/PWGLF/SPECTRA/Nuclei/masses/AddTaskNuclei.C
+++ b/PWGLF/SPECTRA/Nuclei/masses/AddTaskNuclei.C
@@ -1,4 +1,4 @@
-AliAnalysisTaskSE *AddTaskNuclei(Bool_t kAOD=kFALSE,Bool_t kMC=kFALSE,Float_t fCentralityMin=0.0,Float_t fCentralityMax=100.0,Int_t filterBit=16,Int_t nTPCminCluster=0,Float_t DCAzCut=100.0,Float_t DCAxyCut=0.1,Bool_t bTPCcut=kTRUE,Float_t fNsigmaTpcCut=2.0,Bool_t bSignalCheck=kTRUE, Int_t nAnaMomType=1, Double_t AbsEtaMin=0.0, Double_t AbsEtaMax=0.1){
+AliAnalysisTaskSE *AddTaskNuclei(Bool_t kAOD=kFALSE,Bool_t kMC=kFALSE,Float_t fCentralityMin=0.0,Float_t fCentralityMax=100.0,Int_t filterBit=16,Int_t nTPCminCluster=0,Float_t DCAzCut=100.0,Float_t DCAxyCut=0.1,Bool_t bTPCcut=kTRUE,Float_t fNsigmaTpcCut=2.0,Bool_t bSignalCheck=kTRUE, Int_t nAnaMomType=1, Double_t AbsEtaMin=0.0, Double_t AbsEtaMax=0.8, Bool_t kTRDana=kFALSE, Int_t iTRD=1){
 
   //get the current analysis manager
   AliAnalysisManager *mgr = AliAnalysisManager::GetAnalysisManager();
@@ -41,6 +41,7 @@ AliAnalysisTaskSE *AddTaskNuclei(Bool_t kAOD=kFALSE,Bool_t kMC=kFALSE,Float_t fC
   task->SetisSignalCheck(bSignalCheck);
   task->SetMomBin(nAnaMomType);
   task->SetAbsEtaLimit(fEtaLimits);
+  task->SetTRDanalysis(kTRDana,iTRD);
 
   mgr->AddTask(task);
 
@@ -49,7 +50,7 @@ AliAnalysisTaskSE *AddTaskNuclei(Bool_t kAOD=kFALSE,Bool_t kMC=kFALSE,Float_t fC
   
   //sprintf(name,"cchain1%02i%02i",kCentrality[0],kCentrality[1]);
 
-  sprintf(name,"cchain1%02i%02i_FilterBit=%02i_NminTPCclusters=%03i_DCAzCUT=%.1f_DCAxyCUT=%.2f_kTPCcut=%i_NsigTPCcut=%1.0f_bSignCheck=%i_iMomType=%01i_EtaMin=%.1f_EtaMax=%.1f",kCentrality[0],kCentrality[1],filterBit,nTPCminCluster,DCAzCut,DCAxyCut,bTPCcut,fNsigmaTpcCut,bSignalCheck,nAnaMomType,fEtaLimits[0],fEtaLimits[1]);
+  sprintf(name,"cchain1%02i%02i_FilterBit=%02i_NminTPCclusters=%03i_DCAzCUT=%.1f_DCAxyCUT=%.2f_kTPCcut=%i_NsigTPCcut=%1.0f_bSignCheck=%i_iMomType=%01i_EtaMin=%.1f_EtaMax=%.1f_kTRDana=%i_iTRD=%01i",kCentrality[0],kCentrality[1],filterBit,nTPCminCluster,DCAzCut,DCAxyCut,bTPCcut,fNsigmaTpcCut,bSignalCheck,nAnaMomType,fEtaLimits[0],fEtaLimits[1],kTRDana,iTRD);
   
   AliAnalysisDataContainer *cinput = mgr->CreateContainer(name,TChain::Class(),AliAnalysisManager::kInputContainer);
   mgr->ConnectInput(task,0,mgr->GetCommonInputContainer());
@@ -58,11 +59,11 @@ AliAnalysisTaskSE *AddTaskNuclei(Bool_t kAOD=kFALSE,Bool_t kMC=kFALSE,Float_t fC
   
   //sprintf(name,"Results_CC%02i%02i",kCentrality[0],kCentrality[1]);
   
-  sprintf(name,"ResultsBmm_CC%02i%02i_FilterBit=%02i_NminTPCclusters=%03i_DCAzCUT=%.1f_DCAxyCUT=%.2f_kTPCcut=%i_NsigTPCcut=%1.0f_bSignCheck=%i_iMomType=%01i_EtaMin=%.1f_EtaMax=%.1f",kCentrality[0],kCentrality[1],filterBit,nTPCminCluster,DCAzCut,DCAxyCut,bTPCcut,fNsigmaTpcCut,bSignalCheck,nAnaMomType,fEtaLimits[0],fEtaLimits[1]);
+  sprintf(name,"ResultsBmm_CC%02i%02i_FilterBit=%02i_NminTPCclusters=%03i_DCAzCUT=%.1f_DCAxyCUT=%.2f_kTPCcut=%i_NsigTPCcut=%1.0f_bSignCheck=%i_iMomType=%01i_EtaMin=%.1f_EtaMax=%.1f_kTRDana=%i_iTRD=%01i",kCentrality[0],kCentrality[1],filterBit,nTPCminCluster,DCAzCut,DCAxyCut,bTPCcut,fNsigmaTpcCut,bSignalCheck,nAnaMomType,fEtaLimits[0],fEtaLimits[1],kTRDana,iTRD);
   AliAnalysisDataContainer *cOutputL= mgr->CreateContainer(name,TList::Class(), AliAnalysisManager::kOutputContainer, AliAnalysisManager::GetCommonFileName());
   mgr->ConnectOutput(task, 1, cOutputL);
 
-  sprintf(name,"ResultsBpp_%02i%02i_FilterBit=%02i_NminTPCclusters=%03i_DCAzCUT=%.1f_DCAxyCUT=%.2f_kTPCcut=%i_NsigTPCcut=%1.0f_bSignCheck=%i_iMomType=%01i_EtaMin=%.1f_EtaMax=%.1f",kCentrality[0],kCentrality[1],filterBit,nTPCminCluster,DCAzCut,DCAxyCut,bTPCcut,fNsigmaTpcCut,bSignalCheck,nAnaMomType,fEtaLimits[0],fEtaLimits[1]);
+  sprintf(name,"ResultsBpp_%02i%02i_FilterBit=%02i_NminTPCclusters=%03i_DCAzCUT=%.1f_DCAxyCUT=%.2f_kTPCcut=%i_NsigTPCcut=%1.0f_bSignCheck=%i_iMomType=%01i_EtaMin=%.1f_EtaMax=%.1f_kTRDana=%i_iTRD=%01i",kCentrality[0],kCentrality[1],filterBit,nTPCminCluster,DCAzCut,DCAxyCut,bTPCcut,fNsigmaTpcCut,bSignalCheck,nAnaMomType,fEtaLimits[0],fEtaLimits[1],kTRDana,iTRD);
   AliAnalysisDataContainer *cOutputL2= mgr->CreateContainer(name,TList::Class(), AliAnalysisManager::kOutputContainer, AliAnalysisManager::GetCommonFileName());
   mgr->ConnectOutput(task, 2, cOutputL2);
 

diff --git a/PWGLF/SPECTRA/Nuclei/masses/AliAnalysisNucleiMass.cxx b/PWGLF/SPECTRA/Nuclei/masses/AliAnalysisNucleiMass.cxx
index 465198173d97db9364dc9d1f3c0557f7e47bf9c9..dd835178e3d944bf513d00bdb6da1c7ee7db455d 100644 (file)
--- a/PWGLF/SPECTRA/Nuclei/masses/AliAnalysisNucleiMass.cxx
+++ b/PWGLF/SPECTRA/Nuclei/masses/AliAnalysisNucleiMass.cxx
@@ -124,12 +124,27 @@ void AliAnalysisNucleiMass::UserCreateOutputObjects()
 
     hZvertex[iB] = new TH1F("hZvertex","Vertex distribution of selected events; z vertex (cm)",240,-30,30);
 
-    hEtaDistribution[iB] = new TH1F("hEtaDistribution","Eta distribution of the tracks; |#eta|",11,-0.1,1.0);
-    
+    hEtaDistribution[iB][0] = new TH1F("hEtaDistribution_BeforeTRDcut","Eta distribution of the tracks_BeforeTRDcut(if there is); |#eta|",11,-0.1,1.0);
+    hEtaDistribution[iB][1] = new TH1F("hEtaDistribution_TrackAnalyzed","Eta distribution of the tracks_TrackAnalyzed; |#eta|",11,-0.1,1.0);
+
     hTOFSignalPion[iB] = new TH1F("hTOFSignalPion","TOF signal 0.9<p_{T}<1.0; t-t_{exp}^{#pi} (ps)",1500,-1500,1500);
 
     hNminTPCcl[iB] = new TH1F("hNminTPCcl","hNminTPCcl",300,0,300);
    
+    hPhi[iB][0] = new TH1F("hPhi_NoTRDCut","hPhi_NoTRDCut;#phi (rad.)",90,0,6.3);//each TRD supermodule is divided for 5 (DeltaPhi(TRD)=0.35 theoretical)
+    hPhi[iB][1] = new TH1F("hPhi_kTRDin","hPhi_kTRDin;#phi (rad.)",90,0,6.3); 
+    hPhi[iB][2] = new TH1F("hPhi_kTRDout","hPhi_kTRDout;#phi (rad.)",90,0,6.3); 
+    hPhi[iB][3] = new TH1F("hPhi_kTRDin&out","hPhi_kTRDin&out;#phi (rad.)",90,0,6.3); 
+    hPhi[iB][4] = new TH1F("hPhi_NoTRD","hPhi_NoTRD;#phi (rad.)",90,0,6.3); 
+    hPhi[iB][5] = new TH1F("hPhi_TrackAnalyzed","hPhi_TrackAnalyzed;#phi (rad.)",90,0,6.3);
+
+    fEtaPhi[iB][0] = new TH2F("fEtaPhi_NoTRDCut","fEtaPhi_NoTRDCut;|#eta|;#phi (rad.)",10,0.0,1.0,90,0,6.3);
+    fEtaPhi[iB][1] = new TH2F("fEtaPhi_kTRDin","fEtaPhi_kTRDin;|#eta|;#phi (rad.)",10,0.0,1.0,90,0,6.3); 
+    fEtaPhi[iB][2] = new TH2F("fEtaPhi_kTRDout","fEtaPhi_kTRDout;|#eta|;#phi (rad.)",10,0.0,1.0,90,0,6.3); 
+    fEtaPhi[iB][3] = new TH2F("fEtaPhi_kTRDin&out","fEtaPhi_kTRDin&out;|#eta|;#phi (rad.)",10,0.0,1.0,90,0,6.3); 
+    fEtaPhi[iB][4] = new TH2F("fEtaPhi_NoTRD","fEtaPhi_NoTRD;|#eta|;#phi (rad.)",10,0.0,1.0,90,0,6.3); 
+    fEtaPhi[iB][5] = new TH2F("fEtaPhi_TrackAnalyzed","fEtaPhi_TrackAnalyzed;|#eta|;#phi (rad.)",10,0.0,1.0,90,0,6.3);
+
     char namePart[9][30];
     char namePart_par_TPC[9][40];
     char namePart_title_TPC[9][120];
@@ -361,6 +376,30 @@ void AliAnalysisNucleiMass::UserCreateOutputObjects()
 
     }
 
+    Char_t namefEtaSpecies[18][300];
+    Char_t titlefEtaSpecies[18][300];
+    
+    for(Int_t iS=0;iS<18;iS++) {
+      sprintf(namefEtaSpecies[iS],"fEtaSpecies_kTOF_%s",name[iS]);
+      sprintf(titlefEtaSpecies[iS],"fEtaSpecies_kTOF_%s;|#eta|;p_{T} GeV/c",name[iS]);
+    }
+    
+    for(Int_t iS=0;iS<18;iS++) {
+      fEtaSpecies[iB][iS] = new TH2F(namefEtaSpecies[iS],titlefEtaSpecies[iS],10,0,1,200,0,10);
+    }
+
+    Char_t namefPhiSpecies[18][300];
+    Char_t titlefPhiSpecies[18][300];
+    
+    for(Int_t iS=0;iS<18;iS++) {
+      sprintf(namefPhiSpecies[iS],"fPhiSpecies_kTOF_%s",name[iS]);
+      sprintf(titlefPhiSpecies[iS],"fPhiSpecies_kTOF_%s;#phi (rad.);p_{T} GeV/c",name[iS]);
+    }
+    
+    for(Int_t iS=0;iS<18;iS++) {
+      fPhiSpecies[iB][iS] = new TH2F(namefPhiSpecies[iS],titlefPhiSpecies[iS],90,0,6.3,200,0,10);
+    }
+
     Float_t binPt[nbin+1];
     for(Int_t i=0;i<nbin+1;i++) {
       binPt[i]=0.4+0.1*i;
@@ -506,9 +545,14 @@ void AliAnalysisNucleiMass::UserCreateOutputObjects()
     fList1[iB]->Add(hNeventSelected[iB]);
     fList1[iB]->Add(hNevent[iB]);
     fList1[iB]->Add(hZvertex[iB]);
-    fList1[iB]->Add(hEtaDistribution[iB]);
     fList1[iB]->Add(hNminTPCcl[iB]);
     fList1[iB]->Add(hTOFSignalPion[iB]);
+    for(Int_t i=0;i<2;i++)fList1[iB]->Add(hEtaDistribution[iB][i]);
+    for(Int_t i=0;i<6;i++) fList1[iB]->Add(hPhi[iB][i]);
+    for(Int_t i=0;i<6;i++) fList1[iB]->Add(fEtaPhi[iB][i]);
+    for(Int_t iS=0;iS<18;iS++) fList1[iB]->Add(fEtaSpecies[iB][iS]);
+    for(Int_t iS=0;iS<18;iS++) fList1[iB]->Add(fPhiSpecies[iB][iS]);
+
     for(Int_t iS=0;iS<18;iS++) fList1[iB]->Add(fNsigmaTPCvsP_kTOFtrue[iB][iS]);
     
     for(Int_t i=0;i<3;i++) fList1[iB]->Add(fdEdxVSp[iB][i]);
@@ -709,7 +753,50 @@ void AliAnalysisNucleiMass::UserExec(Option_t *)
        if ((track->Pt() < 0.2) || !trkFlag || !kTPC){
          continue;
        }       
+       
+       Float_t phi= track->Phi();
+       hPhi[iBconf][0]->Fill(phi);
+       fEtaPhi[iBconf][0]->Fill(etaAbs,phi);
+
+       Int_t iTRDtemp=1;
+       if(kTRDana) {//TRD analysis
+         if((track->GetStatus() & AliVTrack::kTRDin) && (track->GetStatus() & AliVTrack::kTRDout)) {
+           iTRDtemp=4;//YES TRD
+         }
+         else if (!(track->GetStatus() & AliVTrack::kTRDin) && !(track->GetStatus() & AliVTrack::kTRDout)){
+           iTRDtemp=2;//NO TRD
+         }
+       }
+       else {//NO TRD analysis
+         iTRDtemp=1;
+       }
+       
+       if(track->GetStatus() & AliVTrack::kTRDin) {
+         hPhi[iBconf][1]->Fill(phi);
+         fEtaPhi[iBconf][1]->Fill(etaAbs,phi);
+       }
+       
+       if(track->GetStatus() & AliVTrack::kTRDout) {
+         hPhi[iBconf][2]->Fill(phi);
+         fEtaPhi[iBconf][2]->Fill(etaAbs,phi);
+       }
+       if((track->GetStatus() & AliVTrack::kTRDin) && (track->GetStatus() & AliVTrack::kTRDout)) {
+           //YES TRD
+           hPhi[iBconf][3]->Fill(phi);
+           fEtaPhi[iBconf][3]->Fill(etaAbs,phi);
+       }
+       else if (!(track->GetStatus() & AliVTrack::kTRDin) && !(track->GetStatus() & AliVTrack::kTRDout)){
+           //NO TRD
+           hPhi[iBconf][4]->Fill(phi);
+           fEtaPhi[iBconf][4]->Fill(etaAbs,phi);
+       }       
+
+       hEtaDistribution[iBconf][0]->Fill(etaAbs);
 
+       if(!(iTRDtemp & iTRD)) {
+         continue;
+       }
+       
        hNminTPCcl[iBconf]->Fill(NTpcCls);
 
        Double_t b[2] = {-99., -99.};
@@ -731,7 +818,10 @@ void AliAnalysisNucleiMass::UserExec(Option_t *)
        Float_t DCAxy = b[0];
        Float_t DCAz = b[1];
        
-       hEtaDistribution[iBconf]->Fill(etaAbs);
+       hEtaDistribution[iBconf][1]->Fill(etaAbs);
+
+       hPhi[iBconf][5]->Fill(phi);
+       fEtaPhi[iBconf][5]->Fill(etaAbs,phi);
 
        if(TMath::Abs(DCAz)>DCAzCUT)//CUT ON DCAz
          continue;
@@ -910,6 +1000,8 @@ void AliAnalysisNucleiMass::UserExec(Option_t *)
          for(Int_t iS=0;iS<9;iS++) {
            if(FlagPid & stdFlagPid[iS] || !kTPCcut) {
              if(charge>0) {
+               fEtaSpecies[iBconf][iS]->Fill(etaAbs,pt);
+               fPhiSpecies[iBconf][iS]->Fill(phi,pt);
                fM2vsP[iBconf][iS]->Fill(M2,p);
                if(TMath::Abs(DCAxy)<DCAxyCUT) {
                  fM2vsP_DCAxyCut[iBconf][iS]->Fill(M2,p);
@@ -962,6 +1054,8 @@ void AliAnalysisNucleiMass::UserExec(Option_t *)
              }
              else {//if(charge<0)
                fM2vsP[iBconf][iS+9]->Fill(M2,p);
+               fEtaSpecies[iBconf][iS+9]->Fill(etaAbs,pt);
+               fPhiSpecies[iBconf][iS+9]->Fill(phi,pt);
                if(TMath::Abs(DCAxy)<DCAxyCUT) {
                  fM2vsP_DCAxyCut[iBconf][iS+9]->Fill(M2,p);
                }

diff --git a/PWGLF/SPECTRA/Nuclei/masses/AliAnalysisNucleiMass.h b/PWGLF/SPECTRA/Nuclei/masses/AliAnalysisNucleiMass.h
index db4f20ca15604f32d6a60bf68dfa0a778a33a395..8e5fc7aab9853486cbae2e4ed588739ef2bc75e5 100644 (file)
--- a/PWGLF/SPECTRA/Nuclei/masses/AliAnalysisNucleiMass.h
+++ b/PWGLF/SPECTRA/Nuclei/masses/AliAnalysisNucleiMass.h
@@ -43,7 +43,7 @@ class AliAnalysisNucleiMass : public AliAnalysisTaskSE {
   void SetisSignalCheck(Bool_t IsSignalCheck) {isSignalCheck=IsSignalCheck;}
   void SetMomBin(Int_t iMomBin) {MomType=iMomBin;}
   void SetAbsEtaLimit(Double_t *etaLimit) {EtaLimit[0]=etaLimit[0];EtaLimit[1]=etaLimit[1];}
-  
+  void SetTRDanalysis(Bool_t kTrdAnalysis=kFALSE, Int_t iTrd=1) {kTRDana=kTrdAnalysis;iTRD=iTrd;}
 
  private:
   AliAnalysisNucleiMass(const AliAnalysisNucleiMass &old); 
@@ -60,7 +60,11 @@ class AliAnalysisNucleiMass : public AliAnalysisTaskSE {
   Double_t EtaLimit[2];                 // Eta windows in analysis
 
   Int_t MomType;                    // type of momentum bins in analysis (7 are all ON): (Flag: 001(1)->pT 010(2)->p 100(3)->pTPC)
-
+ 
+  Bool_t kTRDana;                    //TRD analysis: 0->No 1->Yes
+  
+  Int_t iTRD;                        //TRD: 2->No TRD, 4->Yes TRD, 1->indifferent
+ 
   Bool_t fMC;                       // if MC
 
   Float_t fCentrality[2];           // centrality bin (min and max)
@@ -99,7 +103,15 @@ class AliAnalysisNucleiMass : public AliAnalysisTaskSE {
   
   TH1F *hZvertex[2];                   //! z-vertex distribution
 
-  TH1F *hEtaDistribution[2];              //! Eta distribution of the tracks
+  TH1F *hEtaDistribution[2][2];          //! Eta distribution of the tracks
+
+  TH2F *fEtaSpecies[2][18];           //! Eta distribution of the each particle identified by the TPC
+  
+  TH1F *hPhi[2][6];                   //! Phi particle distribution
+
+  TH2F *fEtaPhi[2][6];                 //! Phi vs Eta particle distribution
+
+  TH2F *fPhiSpecies[2][18];          //! Phi vs Eta particle distribution identified by the TPC
 
   TH2F *fdEdxVSp[2][3];                //! dedx vs p plots