Merge remote-tracking branch 'origin/master' into flatdev

[u/mrichter/AliRoot.git] / PWGGA / GammaConv / AliAnaConvCorrPion.cxx

diff --git a/PWGGA/GammaConv/AliAnaConvCorrPion.cxx b/PWGGA/GammaConv/AliAnaConvCorrPion.cxx
index a9765fa74b2e539cdda2ad97e5d4948ecb459217..4003bf51e571a89236ecc96508f9498cf2124362 100644 (file)
--- a/PWGGA/GammaConv/AliAnaConvCorrPion.cxx
+++ b/PWGGA/GammaConv/AliAnaConvCorrPion.cxx
@@ -22,16 +22,9 @@
 #include "TH2D.h"
 #include "AliAnaConvCorrPion.h"
 //#include "AliAODTrack.h"
-#include "TClonesArray.h"
 #include "AliAODConversionParticle.h"
-#include <AliLog.h>
 
-//#include "AliAODConversionMother.h"
-//#include "AliAODConversionPhoton.h"
-//#include "THnSparse.h"
-//#include "TH2F.h"
 
-#include <iostream>
 
 
 using namespace std;
@@ -41,7 +34,8 @@ ClassImp(AliAnaConvCorrPion)
 AliAnaConvCorrPion::AliAnaConvCorrPion() :
 AliAnaConvCorrBase("pion_hadron_corr", "Pion dPhi"),
 //hTriggerPtvsMass(NULL),
-  fAxisM()
+  hTriggerPtvsMass(NULL),
+  fAxisM()  
 {
   //consctructor
   InitMassAxis();
@@ -50,6 +44,7 @@ AliAnaConvCorrBase("pion_hadron_corr", "Pion dPhi"),
 AliAnaConvCorrPion::AliAnaConvCorrPion(TString name, TString title = "Pion Corr") :
   AliAnaConvCorrBase(name, title),
   //hTriggerPtvsMass(NULL),
+  hTriggerPtvsMass(NULL),
   fAxisM()
 {
   //consctructor
@@ -67,9 +62,9 @@ void AliAnaConvCorrPion::InitMassAxis() {
   Double_t mbins[7] = {0.1, 0.11, 0.12, 0.15, 0.16, 0.18, 0.2};
   fAxisM.Set(6, mbins);
   fAxisM.SetNameTitle("InvMass", "invariant mass");
-  GetAxisList().AddAt(&fAxisM, 4);
-  GetTrackAxisList().AddAt(&fAxisM, 3);
-  GetTrigAxisList().AddAt(&fAxisM, 2);
+  GetAxisList().AddAt(&fAxisM, 6);
+  GetTrackAxisList().AddAt(&fAxisM, 5);
+  GetTrigAxisList().AddAt(&fAxisM, 4);
 }
 
 ///________________________________________________________________________________
@@ -77,39 +72,14 @@ void AliAnaConvCorrPion::CreateHistograms() {
   //Create histograms
   CreateBaseHistograms();
  
-  hTriggerPtvsMass[0] = new TH2D(Form("hTriggerPtvsMass_all_%s", GetName()), "Pt vs Mass all pizero", 400, 0, .400, GetAxistPt().GetNbins(), GetAxistPt().GetXbins()->GetArray());
-  hTriggerPtvsMass[1] = new TH2D("hTriggerPtvsMass_leadingcone", "Pt vs Mass leading cone", 1, 0, .400, 1, 0, 100);
-  hTriggerPtvsMass[2] = new TH2D("hTriggerPtvsMass_leadingevent", "Pt vs Mass leading event", 1, 0, .400, 1, 0, 100);
-  GetHistograms()->Add(hTriggerPtvsMass[0]);
-  //GetHistograms()->Add(hTriggerPtvsMass[1]);
-  //GetHistograms()->Add(hTriggerPtvsMass[2]);
+  hTriggerPtvsMass = new TH2D(Form("hTriggerPtvsMass_all_%s", GetName()), "Pt vs Mass all pizero", 
+                             400, 0, .400, GetAxistPt().GetNbins(), GetAxistPt().GetXbins()->GetArray());
+  GetHistograms()->Add(hTriggerPtvsMass);
 }
 
 
 ///________________________________________________________________________________
-void AliAnaConvCorrPion::FillTriggerCounters(const AliAODConversionParticle * particle, Int_t leading) {
-  //Fill histograms counting triggers
-  //fHNTriggers[leading]->Fill(particle->Pt());
-  AliDebug(AliLog::kDebug + 5, Form("Fill trigger countder %f %f", particle->M(), particle->Pt()));
-  hTriggerPtvsMass[leading]->Fill(particle->M(), particle->Pt());
+void AliAnaConvCorrPion::FillTriggerCounters(const AliAODConversionParticle * particle) {
+  hTriggerPtvsMass->Fill(particle->M(), particle->Pt());
 }
 
-//________________________________________________________________________________
-// void AliAnaConvCorrPion::Process(TClonesArray * pions, TClonesArray * photons, TClonesArray * tracks) {
-
-//   for(Int_t ip = 0; ip < pions->GetEntriesFast(); ip++) {
-
-//     AliAODConversionParticle * pion = static_cast<AliAODConversionParticle*>(pions->UncheckedAt(ip));
-       
-//     Int_t tIDs[4] = {-1, -1, -1, -1};
-//     AliAODConversionParticle * photon1 = static_cast<AliAODConversionParticle*>(photons->UncheckedAt(pion->GetLabel(0)));
-//     tIDs[0] =  photon1->GetLabel(0);
-//     tIDs[1] =  photon1->GetLabel(1);
-//     AliAODConversionParticle * photon2 = static_cast<AliAODConversionParticle*>(photons->UncheckedAt(pion->GetLabel(1)));
-//     tIDs[2] =  photon2->GetLabel(0);
-//     tIDs[3] =  photon2->GetLabel(1);
-       
-//     CorrelateWithTracks(static_cast<AliAODConversionParticle*>(pion), tracks, tIDs, kFALSE);
-//   }
-// }
-