Analysis task EpRatio added to aliroot build system

diff --git a/PWGGA/CMakelibPWGGAPHOSTasks.pkg b/PWGGA/CMakelibPWGGAPHOSTasks.pkg
index a3b9503e340b40020232d28aa2d15b8152854fbb..4a4a6ee2823cdadb314fbf19ac8f0d93d077154a 100644 (file)
--- a/PWGGA/CMakelibPWGGAPHOSTasks.pkg
+++ b/PWGGA/CMakelibPWGGAPHOSTasks.pkg
@@ -37,6 +37,7 @@ set ( SRCS
  PHOSTasks/PHOS_embedding/AliPHOSEmbedding.cxx
  PHOSTasks/PHOS_embedding/AliAnalysisTaskPi0Efficiency.cxx
  PHOSTasks/PHOS_embedding/AliAnalysisTaskPi0DiffEfficiency.cxx
+ PHOSTasks/PHOS_EpRatio/AliAnalysisTaskEpRatio.cxx
  PHOSTasks/PHOS_PbPbQA/AliAnalysisTaskPHOSPbPbQA.cxx
  PHOSTasks/PHOS_TriggerQA/AliAnalysisTaskPHOSTriggerQA.cxx
  PHOSTasks/CaloCellQA/AliCaloCellsQA.cxx

diff --git a/PWGGA/PHOSTasks/PHOS_EpRatio/AliAnalysisTaskEpRatio.cxx b/PWGGA/PHOSTasks/PHOS_EpRatio/AliAnalysisTaskEpRatio.cxx
index 6eec6f5f2a53ee41c27907d0e1b11f605476712d..4ba8758061716174bf7c7ea6a8479edb6d34dfc7 100644 (file)
--- a/PWGGA/PHOSTasks/PHOS_EpRatio/AliAnalysisTaskEpRatio.cxx
+++ b/PWGGA/PHOSTasks/PHOS_EpRatio/AliAnalysisTaskEpRatio.cxx
@@ -1,3 +1,18 @@
+/**************************************************************************
+ * Copyright(c) 1998-1999, ALICE Experiment at CERN, All rights reserved. *
+ *                                                                        *
+ * Author: The ALICE Off-line Project.                                    *
+ * Contributors are mentioned in the code where appropriate.              *
+ *                                                                        *
+ * Permission to use, copy, modify and distribute this software and its   *
+ * documentation strictly for non-commercial purposes is hereby granted   *
+ * without fee, provided that the above copyright notice appears in all   *
+ * copies and that both the copyright notice and this permission notice   *
+ * appear in the supporting documentation. The authors make no claims     *
+ * about the suitability of this software for any purpose. It is          *
+ * provided "as is" without express or implied warranty.                  *
+ **************************************************************************/
+
 #include "TObjArray.h"
 #include "TF1.h"
 #include "TH1F.h"
@@ -5,6 +20,8 @@
 #include "TH2I.h"
 #include "TH3F.h"
 #include "TParticle.h"
+#include "TList.h"
+#include "THashList.h"
 
 #include "AliAnalysisTaskSE.h"
 #include "AliAnalysisTaskEpRatio.h"
@@ -34,9 +51,12 @@
 #include "AliPHOSCalibData.h"
 #include "AliOADBContainer.h"
 
-// E/p analysis task.
+// Analysis task to fill histograms with E/p ratios for electrons, positrons, muons
+// and hadrons (pions, kaons..), where E is an energy of PHOS cluster
+// and p is the momentum of it's matched track.
+
 // Authors: Boris Polishchuk,Tsubasa Okubo
-// Date   : 28.05.2009
+// Date   : 04.07.2013
 
 ClassImp(AliAnalysisTaskEpRatio)
 //________________________________________________________________________
@@ -59,7 +79,7 @@ void AliAnalysisTaskEpRatio::UserCreateOutputObjects()
   if(fOutputContainer != NULL){
     delete fOutputContainer;
   }
-  fOutputContainer = new TList();
+  fOutputContainer = new THashList();
   fOutputContainer->SetOwner();
   
   fOutputContainer->Add( new TH1F("h_CellMultEvent","PHOS Cell Multiplicity per Event",200,0,200) );
@@ -413,28 +433,10 @@ void AliAnalysisTaskEpRatio::FillHistogram(const char * key,Double_t x,Double_t
   AliError(Form("Calling FillHistogram with 2 parameters for histo <%s> of type %s",key,tmp->IsA()->GetName())) ;
 }
 
-//_____________________________________________________________________________
-void AliAnalysisTaskEpRatio::FillHistogram(const char * key,Double_t x,Double_t y, Double_t z) const{
-  //Fills 1D histograms with key
-  TObject * tmp = fOutputContainer->FindObject(key) ;
-  if(!tmp){
-    AliInfo(Form("can not find histogram <%s> ",key)) ;
-    return ;
-  }
-  if(tmp->IsA() == TClass::GetClass("TH2F")){
-    ((TH2F*)tmp)->Fill(x,y,z) ;
-    return ;
-  }
-  if(tmp->IsA() == TClass::GetClass("TH3F")){
-    ((TH3F*)tmp)->Fill(x,y,z) ;
-    return ;
-  }
-}
-
 //_____________________________________________________________________________
 void AliAnalysisTaskEpRatio::SetGeometry()
 {
-  //Init geometry
+  //Init geometry.
   
   if(!fPHOSGeo){
     

diff --git a/PWGGA/PHOSTasks/PHOS_EpRatio/AliAnalysisTaskEpRatio.h b/PWGGA/PHOSTasks/PHOS_EpRatio/AliAnalysisTaskEpRatio.h
index 035f9f5695dd6334bb6f493f47e297b4cedc5ba9..edfb398b8ebfb589356b9fb040c3cdeb2312000a 100644 (file)
--- a/PWGGA/PHOSTasks/PHOS_EpRatio/AliAnalysisTaskEpRatio.h
+++ b/PWGGA/PHOSTasks/PHOS_EpRatio/AliAnalysisTaskEpRatio.h
@@ -4,17 +4,10 @@
 // E/p analysis task.
 // Authors: Boris Polishchuk, Tsubasa Okubo
 
-class TObjArray;
-class TH1F;
-class TH2I;
-class TH2F;
-class TH3F;
 class AliPHOSGeometry;
 class AliAnalysisTaskSE;
 class AliPIDResponse;
 
-
-#include "TH2I.h"
 #include "AliAnalysisTaskSE.h"
 
 class AliAnalysisTaskEpRatio : public AliAnalysisTaskSE {
@@ -33,16 +26,15 @@ private:
   void SetGeometry();
   void FillHistogram(const char * key,Double_t x) const ; //Fill 1D histogram witn name key
   void FillHistogram(const char * key,Double_t x, Double_t y) const ; //Fill 2D histogram witn name key
-  void FillHistogram(const char * key,Double_t x, Double_t y, Double_t z) const ; //Fill 3D histogram witn name key
- 
+  
 private:
 
   Int_t fRunNumber;
-  TList * fOutputContainer;       //final histogram container
-  AliPHOSGeometry  *fPHOSGeo;  // PHOS geometry
+  TList * fOutputContainer;     // final histogram container
+  AliPHOSGeometry  *fPHOSGeo;   // PHOS geometry
   AliPIDResponse *fPIDResponse; // PID Response
 
-  ClassDef(AliAnalysisTaskEpRatio, 2); // PHOS analysis task
+  ClassDef(AliAnalysisTaskEpRatio, 1); // PHOS analysis task
 };
 
 #endif

diff --git a/PWGGA/PWGGAPHOSTasksLinkDef.h b/PWGGA/PWGGAPHOSTasksLinkDef.h
index dc8d377976b21f0b82b6664d1a42dc20a67abd43..d4190b79d0fba553824657648311cce7067d7e6a 100644 (file)
--- a/PWGGA/PWGGAPHOSTasksLinkDef.h
+++ b/PWGGA/PWGGAPHOSTasksLinkDef.h
@@ -14,6 +14,9 @@
 #pragma link C++ class AliAnalysisTaskPi0FlowMCHijing+;
 #pragma link C++ class AliPHOSTenderTask+;
 
+//PHOS_EpRatio
+#pragma link C++ class AliAnalysisTaskEpRatio+;
+
 //PHOS_PbPb_MC
 #pragma link C++ class AliPHOSHijingEfficiency+;