Update in DPhi class: Prabhat and Debojit

diff --git a/PWGCF/Correlations/DPhi/AliAnalysisTaskDptDptCorrelations.cxx b/PWGCF/Correlations/DPhi/AliAnalysisTaskDptDptCorrelations.cxx
index e11f8d0d2ce3a51be2e6d5f235efdb885bcaa8b3..02c3a790a645bdf69262ad737a96d9c954447d19 100644 (file)
--- a/PWGCF/Correlations/DPhi/AliAnalysisTaskDptDptCorrelations.cxx
+++ b/PWGCF/Correlations/DPhi/AliAnalysisTaskDptDptCorrelations.cxx
@@ -1028,7 +1028,7 @@ void  AliAnalysisTaskDptDptCorrelations::UserExec(Option_t */*option*/)
   //double b[2];
   //double bCov[3];
   const  AliAODVertex* vertex;
-  int    nClus;
+  //int    nClus;
   bool   bitOK;
   
   AliAnalysisManager* manager = AliAnalysisManager::GetAnalysisManager();
@@ -1122,7 +1122,9 @@ void  AliAnalysisTaskDptDptCorrelations::UserExec(Option_t */*option*/)
        }
       
       
-      if ( centrality < _centralityMin ||  centrality > _centralityMax )
+      if ( centrality < _centralityMin ||  
+          centrality > _centralityMax ||
+          fabs(v0Centr-trkCentr)>5.0)         //only for PbPb centrality
        {
          return;
        }

diff --git a/PWGCF/Correlations/DPhi/TriggerPID/AliTwoParticlePIDCorr.cxx b/PWGCF/Correlations/DPhi/TriggerPID/AliTwoParticlePIDCorr.cxx
index 4c30f13695ad826b57dff3b44720018f02a58b4f..c7f13f713c4f75d8d76135d35bd8c63ae8ea934a 100644 (file)
--- a/PWGCF/Correlations/DPhi/TriggerPID/AliTwoParticlePIDCorr.cxx
+++ b/PWGCF/Correlations/DPhi/TriggerPID/AliTwoParticlePIDCorr.cxx
@@ -156,6 +156,7 @@ AliTwoParticlePIDCorr::AliTwoParticlePIDCorr() // All data members should be ini
  fPriHistShare(0),
   fhistcentrality(0),
  fhistImpactParm(0),
+ fhistImpactParmvsMult(0),
   fEventCounter(0),
   fEtaSpectrasso(0),
   fphiSpectraasso(0),
@@ -433,6 +434,7 @@ AliTwoParticlePIDCorr::AliTwoParticlePIDCorr(const char *name) // All data membe
    fPriHistShare(0),
   fhistcentrality(0),
    fhistImpactParm(0),
+   fhistImpactParmvsMult(0),
   fEventCounter(0),
   fEtaSpectrasso(0),
   fphiSpectraasso(0),
@@ -751,7 +753,7 @@ fOutput->Add(fEtaSpectrasso);
 fphiSpectraasso=new TH2F("fphiSpectraasso","fphiSpectraasso",72,0,2*TMath::Pi(),100,0.,20.);
 fOutput->Add(fphiSpectraasso);
 
- if(fSampleType=="pPb" || fSampleType=="PbPb" || fPPVsMultUtils==kTRUE || fCentralityMethod == "MC_b"){ fCentralityCorrelation = new TH2D("fCentralityCorrelation", ";centrality;multiplicity", 101, 0, 101, 20000, 0,40000);
+ if(fSampleType=="pPb" || fSampleType=="PbPb" || fPPVsMultUtils==kTRUE || fCentralityMethod == "MC_b"){ fCentralityCorrelation = new TH2D("fCentralityCorrelation", ";centrality_ImpactParam;multiplicity", 101, 0, 101, 20000, 0,40000);
       fOutput->Add(fCentralityCorrelation);
  }
 
@@ -778,8 +780,10 @@ fhistcentrality=new TH1F("fhistcentrality","centrality",220,-5,105);
 fOutput->Add(fhistcentrality);
  }
  if(fCentralityMethod=="MC_b"){
-fhistImpactParm=new TH1F("fhistImpactParm","Impact_Parameter",300,0,30);
+fhistImpactParm=new TH1F("fhistImpactParm","Impact_Parameter",300,0,300);
 fOutput->Add(fhistImpactParm);
+fhistImpactParmvsMult=new TH2F("fhistImpactParmvsMult","Impact_Parameter_vs_Multiplicity",300,0,300,50001,-0.5,50000.5);
+fOutput->Add(fhistImpactParmvsMult);
  }
 
  TString gmultName[4] = {"V0A_MANUAL","V0C_MANUAL","V0M_MANUAL","TRACKS_MANUAL"};
@@ -2428,19 +2432,6 @@ fTrackHistEfficiency[5]->Fill(allrecomatchedpid,2);//for allreco matched
  }
  }
 
- //now start the particle identification process:)
-
-Float_t dEdx = PIDtrack->GetTPCsignal();
- fHistoTPCdEdx->Fill(track->Pt(), dEdx);
-
- if(HasTOFPID(PIDtrack))
-{
-Double_t beta = GetBeta(PIDtrack);
-fHistoTOFbeta->Fill(track->Pt(), beta);
- }
-
-//do track identification(nsigma method)
-  particletypeMC=GetParticle(PIDtrack,fFIllPIDQAHistos);//******************************problem is here
 switch(TMath::Abs(pdgCode)){
   case 2212:
     if(fFIllPIDQAHistos){
@@ -2472,6 +2463,24 @@ switch(TMath::Abs(pdgCode)){
   }
 
 
+ //now start the particle identification process:)
+
+Float_t dEdx = PIDtrack->GetTPCsignal();
+ fHistoTPCdEdx->Fill(track->Pt(), dEdx);
+
+ if(HasTOFPID(PIDtrack))
+{
+Double_t beta = GetBeta(PIDtrack);
+fHistoTOFbeta->Fill(track->Pt(), beta);
+ }
+
+ //remove the tracks which don't have proper TOF response-otherwise the misIDentification rate values will be wrong
+if(fRequestTOFPID && track->Pt()>fPtTOFPIDmin && (!HasTOFPID(PIDtrack)) ) continue;
+ 
+
+//do track identification(nsigma method)
+  particletypeMC=GetParticle(PIDtrack,fFIllPIDQAHistos);//******************************problem is here
+
 //2-d TPCTOF map(for each Pt interval)
   if(HasTOFPID(PIDtrack)){
  fTPCTOFPion3d->Fill(track->Pt(),fnsigmas[SpPion][NSigmaTOF],fnsigmas[SpPion][NSigmaTPC]);
@@ -2533,9 +2542,7 @@ if (((AliAODMCParticle*)recomatched)->IsPhysicalPrimary())  fTrackHistEfficiency
  }
    }
 
- //remove the tracks which don't have proper TOF response-otherwise the misIDentification rate values will be wrong(do it after the efficiency filling is complete)
-if(fRequestTOFPID && track->Pt()>fPtTOFPIDmin && (!HasTOFPID(PIDtrack)) ) continue;
- 
+
  //for misidentification fraction calculation(do it with tuneonPID)
  if(particletypeMC==SpPion )
    {
@@ -2869,7 +2876,9 @@ if (fSampleType=="pp_2_76" || fCentralityMethod.EndsWith("_MANUAL") || (fSampleT
   fHistoTOFbeta->Fill(track->Pt(), beta);
  }
   
-
+ //remove the tracks which don't have proper TOF response-otherwise the misIDentification rate values will be wrong(in MC)
+if(fRequestTOFPID && track->Pt()>fPtTOFPIDmin && (!HasTOFPID(PIDtrack)) ) continue;
+ 
 //track identification(using nsigma method)
      particletype=GetParticle(PIDtrack,fFIllPIDQAHistos);//*******************************change may be required(It should return only pion,kaon, proton and Spundefined; NOT unidentifed***************be careful)
 
@@ -4733,7 +4742,7 @@ Double_t AliTwoParticlePIDCorr::GetRefMultiOrCentrality(AliVEvent *mainevent, Bo
 
 if(fCentralityMethod=="V0M" || fCentralityMethod=="V0A" || fCentralityMethod=="V0C" || fCentralityMethod=="CL1" || fCentralityMethod=="ZNA" || fCentralityMethod=="V0AEq" || fCentralityMethod=="V0CEq" || fCentralityMethod=="V0MEq")//for PbPb, pPb, pp7TeV(still to be introduced)//data or RecoMC and also for TRUTH
     {
-          
+               
 if(fSampleType=="pp_7" && fPPVsMultUtils)
    {//for pp 7 TeV case only using Alianalysisutils class
        if(fAnalysisUtils) cent_v0 = fAnalysisUtils->GetMultiplicityPercentile((AliVEvent*)event,fCentralityMethod);
@@ -4745,8 +4754,9 @@ if(fSampleType=="pp_7" && fPPVsMultUtils)
   fHistCentStats->Fill(4.,fAnalysisUtils->GetMultiplicityPercentile((AliVEvent*)event,"V0CEq"));//only available for LHC10d at present (Quantile info)
   fHistCentStats->Fill(5.,fAnalysisUtils->GetMultiplicityPercentile((AliVEvent*)event,"V0MEq"));//only available for LHC10d at present (Quantile info)
       }
+      
           
-else if(fSampleType=="pPb" || fSampleType=="PbPb")
+ else if(fSampleType=="pPb" || fSampleType=="PbPb")
   {
   AliCentrality *centralityObj=0;
   AliAODHeader *header = (AliAODHeader*) event->GetHeader();
@@ -4930,6 +4940,7 @@ else if(fAnalysisType == "MC"){
  if (fCentralityMethod == "MC_b"){
        cent_v0=gImpactParameter;
        fhistImpactParm->Fill(gImpactParameter);
+       fhistImpactParmvsMult->Fill(gImpactParameter,gRefMultiplicityTPC_Truth);
  }
 
  else if(fCentralityMethod == "TRACKS_MANUAL")   cent_v0=gRefMultiplicityTPC_Truth;

diff --git a/PWGCF/Correlations/DPhi/TriggerPID/AliTwoParticlePIDCorr.h b/PWGCF/Correlations/DPhi/TriggerPID/AliTwoParticlePIDCorr.h
index 78b6cbc1b1760423e14d5051916a7ec8da6406c3..2d2ec352bf505051506c99f668b5662f6be993ca 100644 (file)
--- a/PWGCF/Correlations/DPhi/TriggerPID/AliTwoParticlePIDCorr.h
+++ b/PWGCF/Correlations/DPhi/TriggerPID/AliTwoParticlePIDCorr.h
@@ -357,6 +357,7 @@ fFracTPCcls=FracSharedTPCcls;//0.4
     TH1F *fPriHistShare;//!
     TH1F *fhistcentrality;//!
     TH1F *fhistImpactParm;//!
+    TH2F *fhistImpactParmvsMult;//!
     TH1F *fEventCounter; //!
     TH2F *fEtaSpectrasso;//!
     TH2F *fphiSpectraasso;//!