add few histograms to CaloQA task, activate filling of histos in Analysis QA task

diff --git a/PWGGA/CaloTrackCorrelations/AliAnaCalorimeterQA.cxx b/PWGGA/CaloTrackCorrelations/AliAnaCalorimeterQA.cxx
index 30bb4efbb1f6fcab6348b9c2e2ae44a91bbd623b..4d401e348e06956d5ec391739d6493247bc75ceb 100755 (executable)
--- a/PWGGA/CaloTrackCorrelations/AliAnaCalorimeterQA.cxx
+++ b/PWGGA/CaloTrackCorrelations/AliAnaCalorimeterQA.cxx
@@ -127,7 +127,10 @@ fhCaloV0MCorrNClusters(0),             fhCaloV0MCorrEClusters(0),
 fhCaloV0MCorrNCells(0),                fhCaloV0MCorrECells(0),
 fhCaloTrackMCorrNClusters(0),          fhCaloTrackMCorrEClusters(0), 
 fhCaloTrackMCorrNCells(0),             fhCaloTrackMCorrECells(0),
-
+fhCaloCenNClusters(0),                 fhCaloCenEClusters(0),
+fhCaloCenNCells(0),                    fhCaloCenECells(0),
+fhCaloEvPNClusters(0),                 fhCaloEvPEClusters(0),
+fhCaloEvPNCells(0),                    fhCaloEvPECells(0),
 //Super-Module dependent histgrams
 fhEMod(0),                             fhAmpMod(0),                            fhTimeMod(0),  
 fhNClustersMod(0),                     fhNCellsMod(0),
@@ -160,7 +163,10 @@ fhMCEle1EOverP(0),                     fhMCEle1dR(0),                          f
 fhMCChHad1EOverP(0),                   fhMCChHad1dR(0),                        fhMCChHad2MatchdEdx(0),
 fhMCNeutral1EOverP(0),                 fhMCNeutral1dR(0),                      fhMCNeutral2MatchdEdx(0), fh1EOverPR02(0),       
 fhMCEle1EOverPR02(0),                  fhMCChHad1EOverPR02(0),                 fhMCNeutral1EOverPR02(0),
-fh1EleEOverP(0), fhMCEle1EleEOverP(0), fhMCChHad1EleEOverP(0), fhMCNeutral1EleEOverP(0)
+fh1EleEOverP(0),                       fhMCEle1EleEOverP(0),
+fhMCChHad1EleEOverP(0),                fhMCNeutral1EleEOverP(0),
+fhTrackMatchedDEta(0),                 fhTrackMatchedDPhi(0),                  fhTrackMatchedDEtaDPhi(0),
+fhTrackMatchedDEtaPos(0),              fhTrackMatchedDPhiPos(0),               fhTrackMatchedDEtaDPhiPos(0)
 {
   //Default Ctor
   
@@ -1348,16 +1354,33 @@ void AliAnaCalorimeterQA::ClusterMatchedWithTrackHistograms(AliVCluster *clus, T
   Double_t dedx  = track->GetTPCsignal();
   Int_t    nITS  = track->GetNcls(0);
   Int_t    nTPC  = track->GetNcls(1);
+  Bool_t positive = kFALSE;
+  if(track) positive = (track->Charge()>0);
   
   // Residuals
   Float_t deta  = clus->GetTrackDz();
   Float_t dphi  = clus->GetTrackDx();
   Double_t  dR  = TMath::Sqrt(dphi*dphi + deta*deta);
   
-  Double_t eOverP = e/tmom;
+  if(TMath::Abs(dphi) < 999)
+  {
+    fhTrackMatchedDEta->Fill(e,deta);
+    fhTrackMatchedDPhi->Fill(e,dphi);
+    if(e > 0.5) fhTrackMatchedDEtaDPhi->Fill(deta,dphi);
+    
+    if(track && positive)
+    {
+      
+      fhTrackMatchedDEtaPos->Fill(e,deta);
+      fhTrackMatchedDPhiPos->Fill(e,dphi);
+      if(e > 0.5) fhTrackMatchedDEtaDPhiPos->Fill(deta,dphi);
+    }
+  }
   
+  Double_t eOverP = e/tmom;
   fh1EOverP->Fill(tpt, eOverP);
-  if(dR < 0.02){
+  if(dR < 0.02)
+  {
     fh1EOverPR02->Fill(tpt,eOverP);
     if(dedx > 60 && dedx < 100) fh1EleEOverP->Fill(tpt,eOverP);
   }
@@ -1374,9 +1397,10 @@ void AliAnaCalorimeterQA::ClusterMatchedWithTrackHistograms(AliVCluster *clus, T
       fhMCEle1EOverP->Fill(tpt,eOverP);
       fhMCEle1dR->Fill(dR);
       fhMCEle2MatchdEdx->Fill(tmom,dedx);              
-      if(dR < 0.02){
-       fhMCEle1EOverPR02->Fill(tpt,eOverP);
-       if(dedx > 60 && dedx < 100) fhMCEle1EleEOverP->Fill(tpt,eOverP);
+      if(dR < 0.02)
+      {
+        fhMCEle1EOverPR02->Fill(tpt,eOverP);
+        if(dedx > 60 && dedx < 100) fhMCEle1EleEOverP->Fill(tpt,eOverP);
       }
     }
     else if(charge!=0)
@@ -1384,9 +1408,10 @@ void AliAnaCalorimeterQA::ClusterMatchedWithTrackHistograms(AliVCluster *clus, T
       fhMCChHad1EOverP->Fill(tpt,eOverP);
       fhMCChHad1dR->Fill(dR);
       fhMCChHad2MatchdEdx->Fill(tmom,dedx);    
-      if(dR < 0.02){
-       fhMCChHad1EOverPR02->Fill(tpt,eOverP);
-       if(dedx > 60 && dedx < 100) fhMCChHad1EleEOverP->Fill(tpt,eOverP);
+      if(dR < 0.02)
+      {
+        fhMCChHad1EOverPR02->Fill(tpt,eOverP);
+        if(dedx > 60 && dedx < 100) fhMCChHad1EleEOverP->Fill(tpt,eOverP);
       }
     }
     else if(charge == 0)
@@ -1394,9 +1419,10 @@ void AliAnaCalorimeterQA::ClusterMatchedWithTrackHistograms(AliVCluster *clus, T
       fhMCNeutral1EOverP->Fill(tpt,eOverP);
       fhMCNeutral1dR->Fill(dR);
       fhMCNeutral2MatchdEdx->Fill(tmom,dedx);  
-      if(dR < 0.02){
-       fhMCNeutral1EOverPR02->Fill(tpt,eOverP);
-       if(dedx > 60 && dedx < 100) fhMCNeutral1EleEOverP->Fill(tpt,eOverP);
+      if(dR < 0.02)
+      {
+        fhMCNeutral1EOverPR02->Fill(tpt,eOverP);
+        if(dedx > 60 && dedx < 100) fhMCNeutral1EleEOverP->Fill(tpt,eOverP);
       }
     }
   }//DataMC
@@ -1421,6 +1447,9 @@ void AliAnaCalorimeterQA::Correlate()
   Int_t nclEMCAL = caloClustersEMCAL->GetEntriesFast();
   Int_t nclPHOS  = caloClustersPHOS ->GetEntriesFast();
   
+  Float_t cen = GetEventCentrality();
+  Float_t ep  = GetEventPlaneAngle();
+
   Float_t sumClusterEnergyEMCAL = 0;
   Float_t sumClusterEnergyPHOS  = 0;
   Int_t iclus = 0;
@@ -1429,7 +1458,6 @@ void AliAnaCalorimeterQA::Correlate()
   for(iclus = 0 ; iclus <  caloClustersPHOS->GetEntriesFast(); iclus++) 
     sumClusterEnergyPHOS += ((AliVCluster*)caloClustersPHOS->At(iclus))->E();
   
-  
   //Cells
   
   AliVCaloCells * cellsEMCAL = GetEMCALCells();
@@ -1456,7 +1484,8 @@ void AliAnaCalorimeterQA::Correlate()
   Int_t v0S = GetV0Signal(0)+GetV0Signal(1);
   Int_t v0M = GetV0Multiplicity(0)+GetV0Multiplicity(1);
   Int_t trM = GetTrackMultiplicity();
-  if(fCalorimeter=="PHOS"){
+  if(fCalorimeter=="PHOS")
+  {
     fhCaloV0MCorrNClusters   ->Fill(v0M,nclPHOS);
     fhCaloV0MCorrEClusters   ->Fill(v0M,sumClusterEnergyPHOS);
     fhCaloV0MCorrNCells      ->Fill(v0M,ncellsPHOS);
@@ -1471,8 +1500,19 @@ void AliAnaCalorimeterQA::Correlate()
     fhCaloTrackMCorrEClusters->Fill(trM,sumClusterEnergyPHOS);    
     fhCaloTrackMCorrNCells   ->Fill(trM,ncellsPHOS);
     fhCaloTrackMCorrECells   ->Fill(trM,sumCellEnergyPHOS);
+    
+    fhCaloCenNClusters       ->Fill(cen,nclPHOS);
+    fhCaloCenEClusters       ->Fill(cen,sumClusterEnergyPHOS);
+    fhCaloCenNCells          ->Fill(cen,ncellsPHOS);
+    fhCaloCenECells          ->Fill(cen,sumCellEnergyPHOS);
+    
+    fhCaloEvPNClusters       ->Fill(ep ,nclPHOS);
+    fhCaloEvPEClusters       ->Fill(ep ,sumClusterEnergyPHOS);
+    fhCaloEvPNCells          ->Fill(ep ,ncellsPHOS);
+    fhCaloEvPECells          ->Fill(ep ,sumCellEnergyPHOS);
   }
-  else{
+  else
+  {
     fhCaloV0MCorrNClusters   ->Fill(v0M,nclEMCAL);
     fhCaloV0MCorrEClusters   ->Fill(v0M,sumClusterEnergyEMCAL);
     fhCaloV0MCorrNCells      ->Fill(v0M,ncellsEMCAL);
@@ -1487,6 +1527,16 @@ void AliAnaCalorimeterQA::Correlate()
     fhCaloTrackMCorrEClusters->Fill(trM,sumClusterEnergyEMCAL);    
     fhCaloTrackMCorrNCells   ->Fill(trM,ncellsEMCAL);
     fhCaloTrackMCorrECells   ->Fill(trM,sumCellEnergyEMCAL);
+    
+    fhCaloCenNClusters       ->Fill(cen,nclEMCAL);
+    fhCaloCenEClusters       ->Fill(cen,sumClusterEnergyEMCAL);
+    fhCaloCenNCells          ->Fill(cen,ncellsEMCAL);
+    fhCaloCenECells          ->Fill(cen,sumCellEnergyEMCAL);
+    
+    fhCaloEvPNClusters       ->Fill(ep ,nclEMCAL);
+    fhCaloEvPEClusters       ->Fill(ep ,sumClusterEnergyEMCAL);
+    fhCaloEvPNCells          ->Fill(ep ,ncellsEMCAL);
+    fhCaloEvPECells          ->Fill(ep ,sumCellEnergyEMCAL);
   }
   
   if(GetDebug() > 0 )
@@ -1497,6 +1547,7 @@ void AliAnaCalorimeterQA::Correlate()
     printf("\t PHOS : N cells %d, N clusters  %d, summed E cells %f, summed E clusters %f \n",
            ncellsPHOS,nclPHOS,sumCellEnergyPHOS,sumClusterEnergyPHOS);
     printf("\t V0 : Signal %d, Multiplicity  %d, Track Multiplicity %d \n", v0S,v0M,trM);
+    printf("\t centrality : %f, Event plane angle %f \n", cen,ep);
   }
   
 }
@@ -2079,9 +2130,53 @@ TList * AliAnaCalorimeterQA::GetCreateOutputObjects()
   //Track Matching
   if(fFillAllTMHisto)
   {
+    Int_t   nresetabins = GetHistogramRanges()->GetHistoTrackResidualEtaBins();
+    Float_t resetamax   = GetHistogramRanges()->GetHistoTrackResidualEtaMax();
+    Float_t resetamin   = GetHistogramRanges()->GetHistoTrackResidualEtaMin();
+    Int_t   nresphibins = GetHistogramRanges()->GetHistoTrackResidualPhiBins();
+    Float_t resphimax   = GetHistogramRanges()->GetHistoTrackResidualPhiMax();
+    Float_t resphimin   = GetHistogramRanges()->GetHistoTrackResidualPhiMin();
+    
+    fhTrackMatchedDEta  = new TH2F("hTrackMatchedDEta","d#eta of cluster-track vs cluster energy",
+                                   nptbins,ptmin,ptmax,nresetabins,resetamin,resetamax);
+    fhTrackMatchedDEta->SetYTitle("d#eta");
+    fhTrackMatchedDEta->SetXTitle("E_{cluster} (GeV)");
+    
+    fhTrackMatchedDPhi  = new TH2F("hTrackMatchedDPhi","d#phi of cluster-track vs cluster energy",
+                                   nptbins,ptmin,ptmax,nresphibins,resphimin,resphimax);
+    fhTrackMatchedDPhi->SetYTitle("d#phi (rad)");
+    fhTrackMatchedDPhi->SetXTitle("E_{cluster} (GeV)");
+    
+    fhTrackMatchedDEtaDPhi  = new TH2F("hTrackMatchedDEtaDPhi","d#eta vs d#phi of cluster-track vs cluster energy",
+                                       nresetabins,resetamin,resetamax,nresphibins,resphimin,resphimax);
+    fhTrackMatchedDEtaDPhi->SetYTitle("d#phi (rad)");
+    fhTrackMatchedDEtaDPhi->SetXTitle("d#eta");
+    
+    fhTrackMatchedDEtaPos  = new TH2F("hTrackMatchedDEtaPos","d#eta of cluster-track vs cluster energy",
+                                      nptbins,ptmin,ptmax,nresetabins,resetamin,resetamax);
+    fhTrackMatchedDEtaPos->SetYTitle("d#eta");
+    fhTrackMatchedDEtaPos->SetXTitle("E_{cluster} (GeV)");
+    
+    fhTrackMatchedDPhiPos  = new TH2F("hTrackMatchedDPhiPos","d#phi of cluster-track vs cluster energy",
+                                      nptbins,ptmin,ptmax,nresphibins,resphimin,resphimax);
+    fhTrackMatchedDPhiPos->SetYTitle("d#phi (rad)");
+    fhTrackMatchedDPhiPos->SetXTitle("E_{cluster} (GeV)");
+    
+    fhTrackMatchedDEtaDPhiPos  = new TH2F("hTrackMatchedDEtaDPhiPos","d#eta vs d#phi of cluster-track vs cluster energy",
+                                          nresetabins,resetamin,resetamax,nresphibins,resphimin,resphimax);
+    fhTrackMatchedDEtaDPhiPos->SetYTitle("d#phi (rad)");
+    fhTrackMatchedDEtaDPhiPos->SetXTitle("d#eta");
+
+    outputContainer->Add(fhTrackMatchedDEta) ;
+    outputContainer->Add(fhTrackMatchedDPhi) ;
+    outputContainer->Add(fhTrackMatchedDEtaDPhi) ;
+    outputContainer->Add(fhTrackMatchedDEtaPos) ;
+    outputContainer->Add(fhTrackMatchedDPhiPos) ;
+    outputContainer->Add(fhTrackMatchedDEtaDPhiPos) ;
+    
     if(fFillAllTH12)
     {
-      fhECharged  = new TH1F ("hECharged","E reconstructed clusters, matched with track", nptbins,ptmin,ptmax); 
+      fhECharged  = new TH1F ("hECharged","E reconstructed clusters, matched with track", nptbins,ptmin,ptmax);
       fhECharged->SetXTitle("E (GeV)");
       outputContainer->Add(fhECharged);
       
@@ -2358,7 +2453,7 @@ TList * AliAnaCalorimeterQA::GetCreateOutputObjects()
     fhCaloCorrNClusters->SetYTitle("number of clusters in PHOS");
     outputContainer->Add(fhCaloCorrNClusters);
     
-    fhCaloCorrEClusters  = new TH2F ("hCaloCorrEClusters","summed energy of clusters in EMCAL vs PHOS", nptbins,ptmin,ptmax,nptbins,ptmin,ptmax); 
+    fhCaloCorrEClusters  = new TH2F ("hCaloCorrEClusters","summed energy of clusters in EMCAL vs PHOS", nptbins,ptmin,ptmax*2,nptbins,ptmin,ptmax*2);
     fhCaloCorrEClusters->SetXTitle("#Sigma E of clusters in EMCAL (GeV)");
     fhCaloCorrEClusters->SetYTitle("#Sigma E of clusters in PHOS (GeV)");
     outputContainer->Add(fhCaloCorrEClusters);
@@ -2368,7 +2463,7 @@ TList * AliAnaCalorimeterQA::GetCreateOutputObjects()
     fhCaloCorrNCells->SetYTitle("number of Cells in PHOS");
     outputContainer->Add(fhCaloCorrNCells);
     
-    fhCaloCorrECells  = new TH2F ("hCaloCorrECells","summed energy of Cells in EMCAL vs PHOS", nptbins*2,ptmin,ptmax*2,nptbins*2,ptmin,ptmax*2); 
+    fhCaloCorrECells  = new TH2F ("hCaloCorrECells","summed energy of Cells in EMCAL vs PHOS", nptbins*2,ptmin,ptmax*4,nptbins*2,ptmin,ptmax*4);
     fhCaloCorrECells->SetXTitle("#Sigma E of Cells in EMCAL (GeV)");
     fhCaloCorrECells->SetYTitle("#Sigma E of Cells in PHOS (GeV)");
     outputContainer->Add(fhCaloCorrECells);
@@ -2379,7 +2474,7 @@ TList * AliAnaCalorimeterQA::GetCreateOutputObjects()
     fhCaloV0SCorrNClusters->SetYTitle(Form("number of clusters in %s",fCalorimeter.Data()));
     outputContainer->Add(fhCaloV0SCorrNClusters);
     
-    fhCaloV0SCorrEClusters  = new TH2F ("hCaloV0SEClusters",Form("summed energy of clusters in %s vs V0 signal",fCalorimeter.Data()), nv0sbins,nv0smin,nv0smax,nptbins,ptmin,ptmax); 
+    fhCaloV0SCorrEClusters  = new TH2F ("hCaloV0SEClusters",Form("summed energy of clusters in %s vs V0 signal",fCalorimeter.Data()), nv0sbins,nv0smin,nv0smax,nptbins,ptmin,ptmax*2);
     fhCaloV0SCorrEClusters->SetXTitle("V0 signal");
     fhCaloV0SCorrEClusters->SetYTitle(Form("#Sigma E of clusters in %s (GeV)",fCalorimeter.Data()));
     outputContainer->Add(fhCaloV0SCorrEClusters);
@@ -2389,7 +2484,7 @@ TList * AliAnaCalorimeterQA::GetCreateOutputObjects()
     fhCaloV0SCorrNCells->SetYTitle(Form("number of Cells in %s",fCalorimeter.Data()));
     outputContainer->Add(fhCaloV0SCorrNCells);
     
-    fhCaloV0SCorrECells  = new TH2F ("hCaloV0SECells",Form("summed energy of Cells in %s vs V0 signal",fCalorimeter.Data()), nv0sbins,nv0smin,nv0smax,nptbins,ptmin,ptmax); 
+    fhCaloV0SCorrECells  = new TH2F ("hCaloV0SECells",Form("summed energy of Cells in %s vs V0 signal",fCalorimeter.Data()), nv0sbins,nv0smin,nv0smax,nptbins,ptmin,ptmax*2);
     fhCaloV0SCorrECells->SetXTitle("V0 signal");
     fhCaloV0SCorrECells->SetYTitle(Form("#Sigma E of Cells in %s (GeV)",fCalorimeter.Data()));
     outputContainer->Add(fhCaloV0SCorrECells);    
@@ -2400,7 +2495,7 @@ TList * AliAnaCalorimeterQA::GetCreateOutputObjects()
     fhCaloV0MCorrNClusters->SetYTitle(Form("number of clusters in %s",fCalorimeter.Data()));
     outputContainer->Add(fhCaloV0MCorrNClusters);
     
-    fhCaloV0MCorrEClusters  = new TH2F ("hCaloV0MEClusters",Form("summed energy of clusters in %s vs V0 signal",fCalorimeter.Data()), nv0mbins,nv0mmin,nv0mmax,nptbins,ptmin,ptmax); 
+    fhCaloV0MCorrEClusters  = new TH2F ("hCaloV0MEClusters",Form("summed energy of clusters in %s vs V0 signal",fCalorimeter.Data()), nv0mbins,nv0mmin,nv0mmax,nptbins,ptmin,ptmax*2);
     fhCaloV0MCorrEClusters->SetXTitle("V0 signal");
     fhCaloV0MCorrEClusters->SetYTitle(Form("#Sigma E of clusters in %s (GeV)",fCalorimeter.Data()));
     outputContainer->Add(fhCaloV0MCorrEClusters);
@@ -2410,7 +2505,7 @@ TList * AliAnaCalorimeterQA::GetCreateOutputObjects()
     fhCaloV0MCorrNCells->SetYTitle(Form("number of Cells in %s",fCalorimeter.Data()));
     outputContainer->Add(fhCaloV0MCorrNCells);
     
-    fhCaloV0MCorrECells  = new TH2F ("hCaloV0MECells",Form("summed energy of Cells in %s vs V0 signal",fCalorimeter.Data()), nv0mbins,nv0mmin,nv0mmax,nptbins,ptmin,ptmax); 
+    fhCaloV0MCorrECells  = new TH2F ("hCaloV0MECells",Form("summed energy of Cells in %s vs V0 signal",fCalorimeter.Data()), nv0mbins,nv0mmin,nv0mmax,nptbins,ptmin,ptmax*2);
     fhCaloV0MCorrECells->SetXTitle("V0 signal");
     fhCaloV0MCorrECells->SetYTitle(Form("#Sigma E of Cells in %s (GeV)",fCalorimeter.Data()));
     outputContainer->Add(fhCaloV0MCorrECells);    
@@ -2421,7 +2516,7 @@ TList * AliAnaCalorimeterQA::GetCreateOutputObjects()
     fhCaloTrackMCorrNClusters->SetYTitle(Form("number of clusters in %s",fCalorimeter.Data()));
     outputContainer->Add(fhCaloTrackMCorrNClusters);
     
-    fhCaloTrackMCorrEClusters  = new TH2F ("hCaloTrackMEClusters",Form("summed energy of clusters in %s vs # tracks",fCalorimeter.Data()), ntrmbins,ntrmmin,ntrmmax,nptbins,ptmin,ptmax); 
+    fhCaloTrackMCorrEClusters  = new TH2F ("hCaloTrackMEClusters",Form("summed energy of clusters in %s vs # tracks",fCalorimeter.Data()), ntrmbins,ntrmmin,ntrmmax,nptbins,ptmin,ptmax*2);
     fhCaloTrackMCorrEClusters->SetXTitle("# tracks");
     fhCaloTrackMCorrEClusters->SetYTitle(Form("#Sigma E of clusters in %s (GeV)",fCalorimeter.Data()));
     outputContainer->Add(fhCaloTrackMCorrEClusters);
@@ -2431,11 +2526,51 @@ TList * AliAnaCalorimeterQA::GetCreateOutputObjects()
     fhCaloTrackMCorrNCells->SetYTitle(Form("number of Cells in %s",fCalorimeter.Data()));
     outputContainer->Add(fhCaloTrackMCorrNCells);
     
-    fhCaloTrackMCorrECells  = new TH2F ("hCaloTrackMECells",Form("summed energy of Cells in %s vs # tracks",fCalorimeter.Data()), ntrmbins,ntrmmin,ntrmmax,nptbins,ptmin,ptmax); 
+    fhCaloTrackMCorrECells  = new TH2F ("hCaloTrackMECells",Form("summed energy of Cells in %s vs # tracks",fCalorimeter.Data()), ntrmbins,ntrmmin,ntrmmax,nptbins,ptmin,ptmax*2);
     fhCaloTrackMCorrECells->SetXTitle("# tracks");
     fhCaloTrackMCorrECells->SetYTitle(Form("#Sigma E of Cells in %s (GeV)",fCalorimeter.Data()));
     outputContainer->Add(fhCaloTrackMCorrECells);    
     
+    fhCaloCenNClusters  = new TH2F ("hCaloCenNClusters","# clusters in calorimeter vs centrality",100,0,100,nclbins,nclmin,nclmax);
+    fhCaloCenNClusters->SetYTitle("number of clusters in calorimeter");
+    fhCaloCenNClusters->SetXTitle("Centrality");
+    outputContainer->Add(fhCaloCenNClusters);
+    
+    fhCaloCenEClusters  = new TH2F ("hCaloCenEClusters","summed energy of clusters in calorimeter vs centrality",100,0,100,nptbins,ptmin,ptmax*2);
+    fhCaloCenEClusters->SetYTitle("#Sigma E of clusters in calorimeter (GeV)");
+    fhCaloCenEClusters->SetXTitle("Centrality");
+    outputContainer->Add(fhCaloCenEClusters);
+    
+    fhCaloCenNCells  = new TH2F ("hCaloCenNCells","# Cells in calorimeter vs centrality",100,0,100,ncebins,ncemin,ncemax);
+    fhCaloCenNCells->SetYTitle("number of Cells in calorimeter");
+    fhCaloCenNCells->SetXTitle("Centrality");
+    outputContainer->Add(fhCaloCenNCells);
+    
+    fhCaloCenECells  = new TH2F ("hCaloCenECells","summed energy of Cells in calorimeter vs centrality",100,0,100,nptbins*2,ptmin,ptmax*4);
+    fhCaloCenECells->SetYTitle("#Sigma E of Cells in calorimeter (GeV)");
+    fhCaloCenECells->SetXTitle("Centrality");
+    outputContainer->Add(fhCaloCenECells);
+
+    fhCaloEvPNClusters  = new TH2F ("hCaloEvPNClusters","# clusters in calorimeter vs event plane angle",100,0,TMath::Pi(),nclbins,nclmin,nclmax);
+    fhCaloEvPNClusters->SetYTitle("number of clusters in calorimeter");
+    fhCaloEvPNClusters->SetXTitle("Event plane angle (rad)");
+    outputContainer->Add(fhCaloEvPNClusters);
+    
+    fhCaloEvPEClusters  = new TH2F ("hCaloEvPEClusters","summed energy of clusters in calorimeter vs  event plane angle",100,0,TMath::Pi(),nptbins,ptmin,ptmax*2);
+    fhCaloEvPEClusters->SetYTitle("#Sigma E of clusters in calorimeter (GeV)");
+    fhCaloEvPEClusters->SetXTitle("Event plane angle (rad)");
+    outputContainer->Add(fhCaloEvPEClusters);
+    
+    fhCaloEvPNCells  = new TH2F ("hCaloEvPNCells","# Cells in calorimeter vs  event plane angle",100,0,TMath::Pi(),ncebins,ncemin,ncemax);
+    fhCaloEvPNCells->SetYTitle("number of Cells in calorimeter");
+    fhCaloEvPNCells->SetXTitle("Event plane angle (rad)");
+    outputContainer->Add(fhCaloEvPNCells);
+    
+    fhCaloEvPECells  = new TH2F ("hCaloEvPECells","summed energy of Cells in calorimeter vs  event plane angle",100,0,TMath::Pi(),nptbins*2,ptmin,ptmax*4);
+    fhCaloEvPECells->SetYTitle("#Sigma E of Cells in calorimeter (GeV)");
+    fhCaloEvPECells->SetXTitle("Event plane angle (rad)");
+    outputContainer->Add(fhCaloEvPECells);
+    
     
   }//correlate calorimeters
   

diff --git a/PWGGA/CaloTrackCorrelations/AliAnaCalorimeterQA.h b/PWGGA/CaloTrackCorrelations/AliAnaCalorimeterQA.h
index 922590047b417eb9053ea19ede905ddedcfe65e5..024d3df188047e29ba0987d495bcbc52d49f4aad 100755 (executable)
--- a/PWGGA/CaloTrackCorrelations/AliAnaCalorimeterQA.h
+++ b/PWGGA/CaloTrackCorrelations/AliAnaCalorimeterQA.h
@@ -315,6 +315,18 @@ public:
   TH2F *   fhCaloTrackMCorrNCells;            //! Calo vs V0 Track Multiplicity, number of cells
   TH2F *   fhCaloTrackMCorrECells;            //! Calo vs V0 Track Multipliticy,  total measured cell energy
   
+  // Centrality
+  TH2F *   fhCaloCenNClusters;               //! Calo vs centrality, number of clusters
+  TH2F *   fhCaloCenEClusters;               //! Calo vs centrality, total measured cluster energy
+  TH2F *   fhCaloCenNCells;                  //! Calo vs centrality, number of cells
+  TH2F *   fhCaloCenECells;                  //! Calo vs centrality,  total measured cell energy
+
+  // Event plane
+  TH2F *   fhCaloEvPNClusters;               //! Calo vs event plane angle, number of clusters
+  TH2F *   fhCaloEvPEClusters;               //! Calo vs event plane angle, total measured cluster energy
+  TH2F *   fhCaloEvPNCells;                  //! Calo vs event plane angle, number of cells
+  TH2F *   fhCaloEvPECells;                  //! Calo vs event plane angle,  total measured cell energy
+  
   //Module histograms
   TH2F *   fhEMod  ;                          //! cluster E distribution for different module, Reco
   TH2F *   fhAmpMod ;                         //! cell amplitude distribution for different module, Reco
@@ -405,11 +417,18 @@ public:
   TH2F *   fhMCChHad1EleEOverP;               //! p/E for track-cluster matches, dR < 0.2, 60 < dEdx < 100, MC charged hadrons
   TH2F *   fhMCNeutral1EleEOverP;             //! p/E for track-cluster matches, dR < 0.2, 60 < dEdx < 100, MC neutral
 
-       
+  TH2F *   fhTrackMatchedDEta    ;            //! Eta distance between track and cluster vs cluster E, after and before photon cuts
+  TH2F *   fhTrackMatchedDPhi    ;            //! Phi distance between track and cluster vs cluster E, after and before photon cuts
+  TH2F *   fhTrackMatchedDEtaDPhi;            //! Eta vs Phi distance between track and cluster, E cluster > 0.5 GeV, after and before
+  
+  TH2F *   fhTrackMatchedDEtaPos;             //! Eta distance between track and cluster vs cluster E, after and before photon cuts
+  TH2F *   fhTrackMatchedDPhiPos;             //! Phi distance between track and cluster vs cluster E, after and before photon cuts
+  TH2F *   fhTrackMatchedDEtaDPhiPos;         //! Eta vs Phi distance between track and cluster, E cluster > 0.5 GeV, after and before
+
   AliAnaCalorimeterQA & operator = (const AliAnaCalorimeterQA & qa) ;//cpy assignment
   AliAnaCalorimeterQA(              const AliAnaCalorimeterQA & qa) ; // cpy ctor
   
-  ClassDef(AliAnaCalorimeterQA,26)
+  ClassDef(AliAnaCalorimeterQA,27)
 } ;
 
 

diff --git a/PWGGA/CaloTrackCorrelations/macros/QA/AddTaskPi0IMGammaCorrQA.C b/PWGGA/CaloTrackCorrelations/macros/QA/AddTaskPi0IMGammaCorrQA.C
index 16ac27c099bd5c25b20f5ef270fa24a51811f761..5482a513bb226ab9993c36f28f9d4f2848114046 100644 (file)
--- a/PWGGA/CaloTrackCorrelations/macros/QA/AddTaskPi0IMGammaCorrQA.C
+++ b/PWGGA/CaloTrackCorrelations/macros/QA/AddTaskPi0IMGammaCorrQA.C
@@ -212,8 +212,8 @@ AliCaloTrackReader * ConfigureReader(TString inputDataType,
   reader->SwitchOnEMCALCells();
   reader->SwitchOnEMCAL();
 
-  reader->SwitchOffPHOSCells();
-  reader->SwitchOffPHOS();
+  reader->SwitchOnPHOSCells();
+  reader->SwitchOnPHOS();
   
   //-----------------
   // Event selection
@@ -416,7 +416,7 @@ AliAnaPi0* ConfigurePi0Analysis(TString calorimeter, TString collision,
   }
 
   ana->SwitchOffMultipleCutAnalysis();
-  if(!qaan)ana->SwitchOnSMCombinations();
+  ana->SwitchOnSMCombinations();
   ana->SwitchOffFillAngleHisto();
   ana->SwitchOffFillOriginHisto();
 
@@ -558,7 +558,7 @@ AliAnaCalorimeterQA* ConfigureQAAnalysis(TString calorimeter,  Bool_t simulation
   ana->SetCalorimeter(calorimeter);
   
   ana->SetTimeCut(-1e10,1e10); // Open time cut
-  ana->SwitchOffCorrelation();
+  ana->SwitchOnCorrelation();
   ana->SwitchOffStudyBadClusters() ;
   ana->SwitchOffFiducialCut();
   ana->SwitchOffFillAllTH3Histogram();
@@ -567,8 +567,8 @@ AliAnaCalorimeterQA* ConfigureQAAnalysis(TString calorimeter,  Bool_t simulation
   ana->SwitchOffStudyBadClusters();
   ana->SwitchOffStudyClustersAsymmetry();
   ana->SwitchOffStudyWeight();
-  ana->SwitchOffFillAllTrackMatchingHistogram();
-  ana->SwitchOffFillAllCellTimeHisto() ;
+  ana->SwitchOnFillAllTrackMatchingHistogram();
+  ana->SwitchOnFillAllCellTimeHisto() ;
   
   if(calorimeter=="EMCAL")
   {
@@ -656,6 +656,7 @@ void SetHistoRangeAndNBins (AliHistogramRanges* histoRanges,
   histoRanges->SetHistoRatioRangeAndNBins(0.,2.,100);
   histoRanges->SetHistoVertexDistRangeAndNBins(0.,500.,500);
   histoRanges->SetHistoNClusterCellRangeAndNBins(0,50,50);
+  histoRanges->SetHistoNClustersRangeAndNBins(0,100,100);
   histoRanges->SetHistoZRangeAndNBins(-400,400,200);
   histoRanges->SetHistoRRangeAndNBins(400,450,25);
   histoRanges->SetHistoV0SignalRangeAndNBins(0,5000,500);