Set histogram names based on macro input

only get histograms from filters if they are created

diff --git a/PWGGA/GammaConv/AliAnalysisTaskdPhi.cxx b/PWGGA/GammaConv/AliAnalysisTaskdPhi.cxx
index 17aa4a3cca191a8257d606701ba25b58d6c026dd..b88cad3958125ee99187749b4d71ad289b51e2cd 100644 (file)
--- a/PWGGA/GammaConv/AliAnalysisTaskdPhi.cxx
+++ b/PWGGA/GammaConv/AliAnalysisTaskdPhi.cxx
@@ -243,32 +243,32 @@ void AliAnalysisTaskdPhi::UserCreateOutputObjects() {
   for(Int_t igf = 0; igf < fV0Filters[0].GetEntriesFast(); igf ++){
     AliConversionCuts * f = dynamic_cast<AliConversionCuts*>(fV0Filters[0].At(igf));
     if(f) {
-      f->InitCutHistograms(Form("V0Filter_%d", -(igf+1)), kFALSE);
-      fHistograms->Add(f->GetCutHistograms());
+      TList * histograms = f->GetCutHistograms();
+      if(histograms) fHistograms->Add(f->GetCutHistograms());
     }
   }
 
   for(Int_t igf = 0; igf < fV0Filters[1].GetEntriesFast(); igf ++){
     AliConversionCuts * f = dynamic_cast<AliConversionCuts*>(fV0Filters[1].At(igf));
     if(f) {
-      f->InitCutHistograms(Form("V0Filter_%d", igf+1), kFALSE);
-      fHistograms->Add(f->GetCutHistograms());
+      TList * histograms = f->GetCutHistograms();
+      if(histograms) fHistograms->Add(f->GetCutHistograms());
     }
   }
 
   for(Int_t igf = 0; igf < fMesonFilters[0].GetEntriesFast(); igf ++){
     AliConversionMesonCuts * f = dynamic_cast<AliConversionMesonCuts*>(fMesonFilters[0].At(igf));
     if(f) {
-      f->InitCutHistograms(Form("PionFilter_%d", -(igf+1)), kFALSE);
-      fHistograms->Add(f->GetCutHistograms());
+      TList * histograms = f->GetCutHistograms();
+      if(histograms) fHistograms->Add(f->GetCutHistograms());
     }
   }
 
   for(Int_t igf = 0; igf < fMesonFilters[1].GetEntriesFast(); igf ++){
     AliConversionMesonCuts * f = dynamic_cast<AliConversionMesonCuts*>(fMesonFilters[1].At(igf));
     if(f) {
-      f->InitCutHistograms(Form("PionFilter_%d", igf+1), kFALSE);
-      fHistograms->Add(f->GetCutHistograms());
+      TList * histograms = f->GetCutHistograms();
+      if(histograms) fHistograms->Add(f->GetCutHistograms());
     }
   }
 
@@ -558,15 +558,12 @@ void AliAnalysisTaskdPhi::UserExec(Option_t *) {
 
 
   Double_t centrality = 0.0;
-  Double_t eventPlane = 0.0;
   Double_t vertexz = fInputEvent->GetPrimaryVertex()->GetZ();
   if(isAOD) {
     AliAODHeader * header = static_cast<AliAODHeader*>(fInputEvent->GetHeader());
     centrality = header->GetCentrality();
-    eventPlane = header->GetEventplane();
   } else {
     centrality = static_cast<AliESDEvent*>(fInputEvent)->GetCentrality()->GetCentralityPercentile("V0M");
-    eventPlane = fInputEvent->GetEventplane()->GetEventplane("Q");
   }
   
   
@@ -577,7 +574,6 @@ void AliAnalysisTaskdPhi::UserExec(Option_t *) {
   if(DebugLevel () > 4) {
     cout << "centrality: " << centrality <<  " " << GetBin(fAxisCent, centrality) << endl;
     cout << "vertexz: " << vertexz <<  " " << GetBin(fAxisZ, vertexz) << endl;
-    cout << "eventPlane: " << eventPlane <<  " " << endl;
   }
   
   

diff --git a/PWGGA/GammaConv/AliConversionTrackCuts.cxx b/PWGGA/GammaConv/AliConversionTrackCuts.cxx
index 47a6ef5136535ead03d880d344411cb67bca5bd6..4568e580109a445dad850f34e0202fc892e6f922 100644 (file)
--- a/PWGGA/GammaConv/AliConversionTrackCuts.cxx
+++ b/PWGGA/GammaConv/AliConversionTrackCuts.cxx
@@ -359,7 +359,7 @@ TList * AliConversionTrackCuts::CreateHistograms() {
   fHistograms->SetOwner(kTRUE);
   fHistograms->SetName("trackCuts");
 
-  fhPhi = new TH2F("phi", "phi", 5, -0.5, 4.5, 32, 0, TMath::TwoPi());
+  fhPhi = new TH2F(Form("phi_%s", GetName()), Form("phi_%s", GetTitle()), 5, -0.5, 4.5, 32, 0, TMath::TwoPi());
   // TAxis * xax = fhPhi->GetXaxis();
   // for(Int_t i = 0; i < kNCuts; i++){
   //   xax->SetBinLabel(xax->FindFixBin(i), fgkCutNames[i]);
@@ -367,7 +367,7 @@ TList * AliConversionTrackCuts::CreateHistograms() {
   fHistograms->Add(fhPhi);
   
 
-  fhEtaPhi = new TH2F("etahpi", "etaphi", 36, -0.9, 0.9, 32, 0, TMath::TwoPi());
+  fhEtaPhi = new TH2F(Form("etaphi_%s",GetName()), Form("etaphi_%s", GetTitle()), 36, -0.9, 0.9, 32, 0, TMath::TwoPi());
   fHistograms->Add(fhEtaPhi);
 
   // fhPt = new TH2F("pt", "pt", kNCuts+2, kPreCut -0.5, kNCuts + 0.5, 
@@ -381,13 +381,13 @@ TList * AliConversionTrackCuts::CreateHistograms() {
   //  fhPhiPt = new TH2F("phipt", "phipt", 100, 0, 100, 64, 0, TMath::TwoPi());
   //fHistograms->Add(fhPhiPt);
 
-  fhdcaxyPt = new TH2F("dcaxypt", "dcaxypt", 20, 0, 20, 50, -2.5, 2.5);
+  fhdcaxyPt = new TH2F(Form("dcaxypt_%s", GetName()),  Form("dcaxypt_%s", GetTitle()), 20, 0, 20, 50, -2.5, 2.5);
   fHistograms->Add(fhdcaxyPt);
 
-  fhdcazPt = new TH2F("dcazpt", "dcazpt", 20, 0, 20, 70, -3.5, 3.5);
+  fhdcazPt = new TH2F(Form("dcazpt_%s", GetName()),  Form("dcazpt_%s", GetTitle()), 20, 0, 20, 70, -3.5, 3.5);
   fHistograms->Add(fhdcazPt);
 
-  fhdca = new TH2F("dca", "dca", 70, -3.5, 3.5, 50, -2.5, 2.5);
+  fhdca = new TH2F(Form("dca_%s", GetName()),  Form("dca_%s", GetTitle()), 70, -3.5, 3.5, 50, -2.5, 2.5);
   fhdca->SetXTitle("dca z");
   fhdca->SetYTitle("dca xy");