Changed to new naming scheme for histograms, added functionality to the analysis...

[u/mrichter/AliRoot.git] / PWG4 / GammaConv / AliGammaConversionHistograms.cxx

diff --git a/PWG4/GammaConv/AliGammaConversionHistograms.cxx b/PWG4/GammaConv/AliGammaConversionHistograms.cxx
index 2ca295fe8722cce846d40166297b7bd2d138d872..ea6377092a7231d4f9d772aeeeb1f51dc90b7b5f 100644 (file)
--- a/PWG4/GammaConv/AliGammaConversionHistograms.cxx
+++ b/PWG4/GammaConv/AliGammaConversionHistograms.cxx
@@ -88,8 +88,8 @@ AliGammaConversionHistograms & AliGammaConversionHistograms::operator = (const A
 \r
 AliGammaConversionHistograms::~AliGammaConversionHistograms() {\r
   //destructor\r
-\r
-\r
+       \r
+       \r
 }\r
 \r
 void AliGammaConversionHistograms::AddHistogram(TString histogramName, TString histogramTitle, Int_t nXBins, Double_t firstX,Double_t lastX,TString xAxisTitle, TString yAxisTitle){\r
@@ -114,7 +114,7 @@ void AliGammaConversionHistograms::FillHistogram(TString histogramName, Double_t
   //see header file for documentation\r
   TH1 *tmp = (TH1*)fHistogramMap->GetValue(histogramName.Data());\r
   if(tmp){\r
-      tmp->Fill(xValue);\r
+    tmp->Fill(xValue);\r
   }\r
 }\r
 \r
@@ -128,12 +128,12 @@ void AliGammaConversionHistograms::FillHistogram(TString histogramName, Double_t
 \r
 void AliGammaConversionHistograms::GetOutputContainer(TList *fOutputContainer){\r
   //checking if the container is alrerady created\r
-\r
+       \r
   if(fOutputContainer == NULL){\r
     //print warning\r
     return;\r
   }\r
-\r
+       \r
   if(fHistogramMap != NULL){\r
     TIter iter(fHistogramMap);\r
     TObjString *histogramName;\r
@@ -265,7 +265,7 @@ Int_t AliGammaConversionHistograms::GetPhiBin(Double_t phi) const{
 \r
 void AliGammaConversionHistograms::InitializeMappingValues(Int_t nPhiIndex, Int_t nRIndex, Int_t nBinsR, Double_t minRadius, Double_t maxRadius,Int_t nBinsPhi, Double_t minPhi, Double_t maxPhi){\r
   // Initializing the valuse for the mapping\r
-\r
+       \r
   fNPhiIndex = nPhiIndex;\r
   fNRIndex   = nRIndex;\r
   fMinRadius      = minRadius;\r
@@ -284,11 +284,11 @@ void AliGammaConversionHistograms::InitializeMappingValues(Int_t nPhiIndex, Int_
 //mapping\r
 void AliGammaConversionHistograms::AddMappingHistograms(Int_t nPhiIndex, Int_t nRIndex,Int_t nXBins, Double_t firstX, Double_t lastX, Int_t nYBins, Double_t firstY, Double_t lastY, TString xAxisTitle, TString yAxisTitle){\r
   // see header file for documentation\r
-  \r
+       \r
   for(Int_t phi =0; phi<=fNPhiIndex;phi++){\r
-\r
+               \r
     for(Int_t r =0; r<fNRIndex;r++){\r
-\r
+                       \r
       // setting axis to "" changes below\r
       xAxisTitle="";\r
       yAxisTitle="";\r
@@ -296,32 +296,32 @@ void AliGammaConversionHistograms::AddMappingHistograms(Int_t nPhiIndex, Int_t n
       if(xAxisTitle.Length() == 0){\r
        xAxisTitle.Form("Phi %02d",phi);\r
       }\r
-      \r
+                       \r
       if(yAxisTitle.Length() == 0){\r
        yAxisTitle.Form("R %02d",phi);\r
       }\r
-\r
+                       \r
       //MC\r
       TString nameMC="";\r
-      nameMC.Form("MC_EP_Mapping-Phi%02d-R%02d",phi,r);\r
+      nameMC.Form("MC_Conversion_Mapping-Phi%02d-R%02d",phi,r);\r
       TString titleMC="";\r
       titleMC.Form("Electron-Positron MC Mapping-Phi%02d-R%02d",phi,r);\r
-\r
+                       \r
       AddHistogram(nameMC, titleMC, nXBins, firstX, lastX, nYBins, firstY, lastY, xAxisTitle, yAxisTitle);\r
-\r
+                       \r
       //ESD\r
       TString nameESD="";\r
-      nameESD.Form("ESD_EP_Mapping-Phi%02d-R%02d",phi,r);\r
+      nameESD.Form("ESD_Conversion_Mapping-Phi%02d-R%02d",phi,r);\r
       TString titleESD="";\r
       titleESD.Form("Electron-Positron ESD Mapping-Phi%02d-R%02d",phi,r);\r
-\r
+                       \r
       AddHistogram(nameESD, titleESD, nXBins, firstX, lastX, nYBins, firstY, lastY, xAxisTitle, yAxisTitle);\r
     }\r
   }\r
-\r
-\r
+       \r
+       \r
   for(Int_t phi =0; phi<=nPhiIndex;phi++){ \r
-\r
+               \r
     // setting axis to "" changes below\r
     xAxisTitle="";\r
     yAxisTitle="";\r
@@ -332,27 +332,27 @@ void AliGammaConversionHistograms::AddMappingHistograms(Int_t nPhiIndex, Int_t n
     if(yAxisTitle.Length() == 0){\r
       yAxisTitle = "Counts";\r
     }\r
-    \r
+               \r
     //MC\r
     TString nameMC="";\r
-    nameMC.Form("MC_EP_Mapping-Phi%02d",phi);\r
+    nameMC.Form("MC_Conversion_Mapping-Phi%02d",phi);\r
     TString titleMC="";\r
     titleMC.Form("Electron-Positron MC Mapping-Phi%02d",phi);\r
-    \r
+               \r
     AddHistogram(nameMC, titleMC, nXBins, firstX, lastX, xAxisTitle, yAxisTitle);\r
-\r
+               \r
     //MC\r
     TString nameESD="";\r
-    nameESD.Form("ESD_EP_Mapping-Phi%02d",phi);\r
+    nameESD.Form("ESD_Conversion_Mapping-Phi%02d",phi);\r
     TString titleESD="";\r
     titleESD.Form("Electron-Positron ESD Mapping-Phi%02d",phi);\r
-    \r
+               \r
     AddHistogram(nameESD, titleESD, nXBins, firstX, lastX, xAxisTitle, yAxisTitle);\r
   }\r
-\r
-\r
+       \r
+       \r
   for(Int_t r =0; r<=nRIndex;r++){\r
-\r
+               \r
     // setting axis to "" changes below\r
     xAxisTitle="";\r
     yAxisTitle="";\r
@@ -363,33 +363,33 @@ void AliGammaConversionHistograms::AddMappingHistograms(Int_t nPhiIndex, Int_t n
     if(yAxisTitle.Length() == 0){\r
       yAxisTitle = "Counts";\r
     }\r
-    \r
+               \r
     //MC\r
     TString nameMC="";\r
-    nameMC.Form("MC_EP_Mapping-R%02d",r);\r
+    nameMC.Form("MC_Conversion_Mapping-R%02d",r);\r
     TString titleMC="";\r
     titleMC.Form("Electron-Positron MC Mapping-R%02d",r);\r
-    \r
+               \r
     AddHistogram(nameMC, titleMC, nXBins, firstX, lastX, xAxisTitle, yAxisTitle);\r
-\r
+               \r
     //ESD\r
     TString nameESD="";\r
-    nameESD.Form("ESD_EP_Mapping-R%02d",r);\r
+    nameESD.Form("ESD_Conversion_Mapping-R%02d",r);\r
     TString titleESD="";\r
     titleESD.Form("Electron-Positron ESD Mapping-R%02d",r);\r
-    \r
+               \r
     AddHistogram(nameESD, titleESD, nXBins, firstX, lastX, xAxisTitle, yAxisTitle);\r
-\r
+               \r
     //Mapping Phi in R\r
     TString nameMCPhiInR="";\r
-    nameMCPhiInR.Form("MC_EP_Mapping_Phi_R-%02d",r);\r
+    nameMCPhiInR.Form("MC_Conversion_Mapping_Phi_R-%02d",r);\r
     TString titleMCPhiInR="";\r
     titleMCPhiInR.Form("MC Mapping of Phi in R%02d",r);\r
     AddHistogram(nameMCPhiInR, titleMCPhiInR, nXBins, firstX, lastX, xAxisTitle, yAxisTitle);\r
-\r
+               \r
     //Mapping Phi in R\r
     TString nameESDPhiInR="";\r
-    nameESDPhiInR.Form("ESD_EP_Mapping_Phi_R-%02d",r);\r
+    nameESDPhiInR.Form("ESD_Conversion_Mapping_Phi_R-%02d",r);\r
     TString titleESDPhiInR="";\r
     titleESDPhiInR.Form("ESD Mapping of Phi in R%02d",r);\r
     AddHistogram(nameESDPhiInR, titleESDPhiInR, nXBins, firstX, lastX, xAxisTitle, yAxisTitle);    \r