set magnetic field if not set

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

diff --git a/PWGGA/GammaConv/AliAnaConvCorrPion.cxx b/PWGGA/GammaConv/AliAnaConvCorrPion.cxx
index ac95e005d9435fbd9fe451a915760d2aab577303..4003bf51e571a89236ecc96508f9498cf2124362 100644 (file)
--- a/PWGGA/GammaConv/AliAnaConvCorrPion.cxx
+++ b/PWGGA/GammaConv/AliAnaConvCorrPion.cxx
@@ -19,10 +19,12 @@
 
 
 
-#include "TH2F.h"
+#include "TH2D.h"
 #include "AliAnaConvCorrPion.h"
+//#include "AliAODTrack.h"
 #include "AliAODConversionParticle.h"
-#include <iostream>
+
+
 
 
 using namespace std;
@@ -31,7 +33,9 @@ ClassImp(AliAnaConvCorrPion)
 //________________________________________________________________________________
 AliAnaConvCorrPion::AliAnaConvCorrPion() :
 AliAnaConvCorrBase("pion_hadron_corr", "Pion dPhi"),
-  fAxisM()
+//hTriggerPtvsMass(NULL),
+  hTriggerPtvsMass(NULL),
+  fAxisM()  
 {
   //consctructor
   InitMassAxis();
@@ -39,6 +43,8 @@ AliAnaConvCorrBase("pion_hadron_corr", "Pion dPhi"),
 //________________________________________________________________________________
 AliAnaConvCorrPion::AliAnaConvCorrPion(TString name, TString title = "Pion Corr") :
   AliAnaConvCorrBase(name, title),
+  //hTriggerPtvsMass(NULL),
+  hTriggerPtvsMass(NULL),
   fAxisM()
 {
   //consctructor
@@ -53,12 +59,10 @@ AliAnaConvCorrPion::~AliAnaConvCorrPion() {
 
 //________________________________________________________________________________
 void AliAnaConvCorrPion::InitMassAxis() {
-  //Init mass axis
-  
   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, 5);
+  GetAxisList().AddAt(&fAxisM, 6);
   GetTrackAxisList().AddAt(&fAxisM, 5);
   GetTrigAxisList().AddAt(&fAxisM, 4);
 }
@@ -67,20 +71,15 @@ void AliAnaConvCorrPion::InitMassAxis() {
 void AliAnaConvCorrPion::CreateHistograms() {
   //Create histograms
   CreateBaseHistograms();
-
-  for(Int_t i = 0; i < 3; i++) {
-       TH2F * hpthist = new TH2F(Form("%s_iso_%d_ptVsmass", fName.Data(), i), 
-                                                         Form("%s_iso_%d_ptVsmass", fName.Data(), i), 
-                                                         400, 0, .400,
-                                                         GetAxistPt().GetNbins(), GetAxistPt().GetXbins()->GetArray());
-       GetHistograms()->Add(hpthist);
-  }
+ 
+  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
-  TH2F *hpt = dynamic_cast<TH2F*>(GetHistograms()->FindObject(Form("%s_iso_%d_ptVsmass", fName.Data(), leading)));
-  if(hpt) hpt->Fill(particle->M(), particle->Pt());
+void AliAnaConvCorrPion::FillTriggerCounters(const AliAODConversionParticle * particle) {
+  hTriggerPtvsMass->Fill(particle->M(), particle->Pt());
 }
+