From bdd49ee648084bf8616d041a2c4786d8fad752a4 Mon Sep 17 00:00:00 2001 From: jotwinow Date: Sun, 19 Feb 2012 13:13:29 +0000 Subject: [PATCH] - classes for pT spectra charged hadrons analysis added A PWGLF/PWGLFspectraLinkDef.h A PWGLF/CMakelibPWGLFspectra.pkg - modification related to the new AliRoot stucture M PWGLF/SPECTRA/ChargedHadrons/dNdPt/AlidNdPtTask.cxx M PWGLF/SPECTRA/ChargedHadrons/dNdPt/AlidNdPtHelper.cxx M PWGLF/SPECTRA/ChargedHadrons/dNdPt/AlidNdPtTask.h - name of the file and event number in the file streamed M PWGLF/SPECTRA/ChargedHadrons/dNdPt/AlidNdPtTrackDumpTask.h M PWGLF/SPECTRA/ChargedHadrons/dNdPt/AlidNdPtTrackDumpTask.cxx --- PWGLF/CMakelibPWGLFspectra.pkg | 52 +++++++++++++++++++ PWGLF/PWGLFspectraLinkDef.h | 19 +++++++ .../ChargedHadrons/dNdPt/AlidNdPtHelper.cxx | 6 +-- .../ChargedHadrons/dNdPt/AlidNdPtTask.cxx | 8 +-- .../ChargedHadrons/dNdPt/AlidNdPtTask.h | 2 +- .../dNdPt/AlidNdPtTrackDumpTask.cxx | 21 ++++++-- .../dNdPt/AlidNdPtTrackDumpTask.h | 2 +- 7 files changed, 97 insertions(+), 13 deletions(-) create mode 100644 PWGLF/CMakelibPWGLFspectra.pkg create mode 100644 PWGLF/PWGLFspectraLinkDef.h diff --git a/PWGLF/CMakelibPWGLFspectra.pkg b/PWGLF/CMakelibPWGLFspectra.pkg new file mode 100644 index 00000000000..2527a43cd4b --- /dev/null +++ b/PWGLF/CMakelibPWGLFspectra.pkg @@ -0,0 +1,52 @@ +# -*- mode: CMake -*- +#--------------------------------------------------------------------------------# +# Package File for PWGLFresonances # +# Author : Johny Jose (johny.jose@cern.ch) # +# Variables Defined : # +# # +# SRCS - C++ source files # +# HDRS - C++ header files # +# DHDR - ROOT Dictionary Linkdef header file # +# CSRCS - C source files # +# CHDRS - C header files # +# EINCLUDE - Include directories # +# EDEFINE - Compiler definitions # +# ELIBS - Extra libraries to link # +# ELIBSDIR - Extra library directories # +# PACKFFLAGS - Fortran compiler flags for package # +# PACKCXXFLAGS - C++ compiler flags for package # +# PACKCFLAGS - C compiler flags for package # +# PACKSOFLAGS - Shared library linking flags # +# PACKLDFLAGS - Module linker flags # +# PACKBLIBS - Libraries to link (Executables only) # +# EXPORT - Header files to be exported # +# CINTHDRS - Dictionary header files # +# CINTAUTOLINK - Set automatic dictionary generation # +# ARLIBS - Archive Libraries and objects for linking (Executables only) # +# SHLIBS - Shared Libraries and objects for linking (Executables only) # +#--------------------------------------------------------------------------------# + +set ( SRCS SPECTRA/ChargedHadrons/dNdPt/AlidNdPtAcceptanceCuts.cxx + SPECTRA/ChargedHadrons/dNdPt/AlidNdPtAnalysis.cxx + SPECTRA/ChargedHadrons/dNdPt/AlidNdPtAnalysisPbPb.cxx + SPECTRA/ChargedHadrons/dNdPt/AlidNdPtBackgroundCuts.cxx + SPECTRA/ChargedHadrons/dNdPt/AlidNdPtCorrection.cxx + SPECTRA/ChargedHadrons/dNdPt/AlidNdPtCutAnalysis.cxx + SPECTRA/ChargedHadrons/dNdPt/AlidNdPtCutAnalysisPbPb.cxx + SPECTRA/ChargedHadrons/dNdPt/AlidNdPt.cxx + SPECTRA/ChargedHadrons/dNdPt/AlidNdPtEfficiency.cxx + SPECTRA/ChargedHadrons/dNdPt/AlidNdPtEventCuts.cxx + SPECTRA/ChargedHadrons/dNdPt/AlidNdPtHelper.cxx + SPECTRA/ChargedHadrons/dNdPt/AlidNdPtTask.cxx + SPECTRA/ChargedHadrons/dNdPt/AlidNdPtTrackDumpTask.cxx + SPECTRA/ChargedHadrons/dNdPt/AliPtResolAnalysis.cxx + SPECTRA/ChargedHadrons/dNdPt/AliPtResolAnalysisPbPb.cxx + ) + +string ( REPLACE ".cxx" ".h" HDRS "${SRCS}" ) + +set ( DHDR PWGLFspectraLinkDef.h) + +set ( EXPORT ) + +set ( EINCLUDE PWGLF/SPECTRA/ChargedHadrons/dNdPt TPC PWGUD/base STEER/STEER STEER/ESD STEER/STEERBase) diff --git a/PWGLF/PWGLFspectraLinkDef.h b/PWGLF/PWGLFspectraLinkDef.h new file mode 100644 index 00000000000..d3cb24fea0b --- /dev/null +++ b/PWGLF/PWGLFspectraLinkDef.h @@ -0,0 +1,19 @@ +#ifdef __CINT__ + +#pragma link C++ class AlidNdPtAcceptanceCuts+; +#pragma link C++ class AlidNdPtAnalysis+; +#pragma link C++ class AlidNdPtAnalysisPbPb+; +#pragma link C++ class AlidNdPtBackgroundCuts+; +#pragma link C++ class AlidNdPtCorrection+; +#pragma link C++ class AlidNdPtCutAnalysis+; +#pragma link C++ class AlidNdPtCutAnalysisPbPb+; +#pragma link C++ class AlidNdPt+; +#pragma link C++ class AlidNdPtEfficiency+; +#pragma link C++ class AlidNdPtEventCuts+; +#pragma link C++ class AlidNdPtHelper+; +#pragma link C++ class AlidNdPtTask+; +#pragma link C++ class AlidNdPtTrackDumpTask+; +#pragma link C++ class AliPtResolAnalysis+; +#pragma link C++ class AliPtResolAnalysisPbPb+; + +#endif diff --git a/PWGLF/SPECTRA/ChargedHadrons/dNdPt/AlidNdPtHelper.cxx b/PWGLF/SPECTRA/ChargedHadrons/dNdPt/AlidNdPtHelper.cxx index 88e3a2c1700..5db53339743 100644 --- a/PWGLF/SPECTRA/ChargedHadrons/dNdPt/AlidNdPtHelper.cxx +++ b/PWGLF/SPECTRA/ChargedHadrons/dNdPt/AlidNdPtHelper.cxx @@ -41,9 +41,9 @@ #include #include #include -#include "dNdPt/AlidNdPtEventCuts.h" -#include "dNdPt/AlidNdPtAcceptanceCuts.h" -#include "dNdPt/AlidNdPtHelper.h" +#include "AlidNdPtEventCuts.h" +#include "AlidNdPtAcceptanceCuts.h" +#include "AlidNdPtHelper.h" //____________________________________________________________________ ClassImp(AlidNdPtHelper) diff --git a/PWGLF/SPECTRA/ChargedHadrons/dNdPt/AlidNdPtTask.cxx b/PWGLF/SPECTRA/ChargedHadrons/dNdPt/AlidNdPtTask.cxx index bbf58a88888..af919f4e287 100644 --- a/PWGLF/SPECTRA/ChargedHadrons/dNdPt/AlidNdPtTask.cxx +++ b/PWGLF/SPECTRA/ChargedHadrons/dNdPt/AlidNdPtTask.cxx @@ -36,11 +36,11 @@ #include "AliESDtrackCuts.h" #include "AliMCEventHandler.h" -#include "dNdPt/AlidNdPt.h" -#include "dNdPt/AlidNdPtEventCuts.h" -#include "dNdPt/AlidNdPtAcceptanceCuts.h" +#include "AlidNdPt.h" +#include "AlidNdPtEventCuts.h" +#include "AlidNdPtAcceptanceCuts.h" -#include "dNdPt/AlidNdPtTask.h" +#include "AlidNdPtTask.h" using namespace std; diff --git a/PWGLF/SPECTRA/ChargedHadrons/dNdPt/AlidNdPtTask.h b/PWGLF/SPECTRA/ChargedHadrons/dNdPt/AlidNdPtTask.h index 0d62c8c9548..1af6bb14270 100644 --- a/PWGLF/SPECTRA/ChargedHadrons/dNdPt/AlidNdPtTask.h +++ b/PWGLF/SPECTRA/ChargedHadrons/dNdPt/AlidNdPtTask.h @@ -18,7 +18,7 @@ class AlidNdPtCorrection; class AliMagFMaps; class TList; -#include "dNdPt/AlidNdPtHelper.h" +#include "AlidNdPtHelper.h" #include "AliAnalysisTaskSE.h" class AlidNdPtTask : public AliAnalysisTaskSE { diff --git a/PWGLF/SPECTRA/ChargedHadrons/dNdPt/AlidNdPtTrackDumpTask.cxx b/PWGLF/SPECTRA/ChargedHadrons/dNdPt/AlidNdPtTrackDumpTask.cxx index 75ff5f8e7de..cf460ee941c 100644 --- a/PWGLF/SPECTRA/ChargedHadrons/dNdPt/AlidNdPtTrackDumpTask.cxx +++ b/PWGLF/SPECTRA/ChargedHadrons/dNdPt/AlidNdPtTrackDumpTask.cxx @@ -50,11 +50,11 @@ #include "AliESDtrackCuts.h" #include "AliMCEventHandler.h" -#include "dNdPt/AlidNdPt.h" -#include "dNdPt/AlidNdPtEventCuts.h" -#include "dNdPt/AlidNdPtAcceptanceCuts.h" +#include "AlidNdPt.h" +#include "AlidNdPtEventCuts.h" +#include "AlidNdPtAcceptanceCuts.h" -#include "dNdPt/AlidNdPtTrackDumpTask.h" +#include "AlidNdPtTrackDumpTask.h" using namespace std; @@ -200,7 +200,16 @@ void AlidNdPtTrackDumpTask::Process(AliESDEvent *const esdEvent, AliMCEvent * co Printf("ERROR: Could not receive input handler"); return; } + + // get file name + TTree *chain = (TChain*)GetInputData(0); + if(!chain) { + Printf("ERROR: Could not receive input chain"); + return; + } + TObjString fileName(chain->GetCurrentFile()->GetName()); + // trigger if(evtCuts->IsTriggerRequired()) { // always MB @@ -612,12 +621,16 @@ void AlidNdPtTrackDumpTask::Process(AliESDEvent *const esdEvent, AliMCEvent * co Double_t bz = esdEvent->GetMagneticField(); Double_t runNumber = esdEvent->GetRunNumber(); Double_t evtTimeStamp = esdEvent->GetTimeStamp(); + Int_t evtNumberInFile = esdEvent->GetEventNumberInFile(); + // if(!fTreeSRedirector) return; (*fTreeSRedirector)<<"dNdPtTree"<< + "fileName.="<<&fileName<< "runNumber="<