From: pulvir Date: Tue, 8 Feb 2011 17:17:20 +0000 (+0000) Subject: Splitted resonance library into two separate elements: X-Git-Url: http://git.uio.no/git/?p=u%2Fmrichter%2FAliRoot.git;a=commitdiff_plain;h=c8dc3eb7f8d6b390b5bd29af123c60c86f3d1ce9 Splitted resonance library into two separate elements: 1) PWG2resonances: this contains the basic package, with all necessary to set up a resonance analysis in the old way, using all the objects developed since the introduction of this package and without any dependence on non-analysis libraries 2) PWG2rsnextra: all the classes/code/analysisTasks which do not use the basic RSN package this library can have dependences on non-analysis code (currently, it depends on TOFrec) but it has to be viewed as a temporary entry due to current situation of the available reconstruction or to keep track of analysis tasks related to resonances, but not yet fuly integrated in the standard package --- diff --git a/PWG2/CMakelibPWG2resonances.pkg b/PWG2/CMakelibPWG2resonances.pkg index 295906a1409..5ae2063fc12 100644 --- a/PWG2/CMakelibPWG2resonances.pkg +++ b/PWG2/CMakelibPWG2resonances.pkg @@ -61,13 +61,7 @@ set ( SRCS RESONANCES/AliRsnDaughter.cxx RESONANCES/AliRsnVAnalysisTask.cxx RESONANCES/AliRsnAnalysisTask.cxx RESONANCES/AliRsnMonitorTrack.cxx - RESONANCES/AliRsnAnalysisMonitorTask.cxx - RESONANCES/extra/AliRsnTOFT0maker.cxx - RESONANCES/extra/AliRsnTOFCorrectionESD.cxx - RESONANCES/extra/AliRsnAnalysisPhi900GeV.cxx - RESONANCES/extra/AliRsnAnalysisPhi7TeV.cxx - RESONANCES/extra/AliRsnAnalysisPhi7TeVNoPID.cxx - RESONANCES/extra/AliAnalysisTaskSigma1385.cxx ) + RESONANCES/AliRsnAnalysisMonitorTask.cxx ) string ( REPLACE ".cxx" ".h" HDRS "${SRCS}" ) @@ -75,7 +69,7 @@ set ( DHDR PWG2resonancesLinkDef.h) set ( EXPORT ) -set ( EINCLUDE PYTHIA6 PWG2/RESONANCES CORRFW TOF) +set ( EINCLUDE PYTHIA6 PWG2/RESONANCES CORRFW ) if( ALICE_TARGET STREQUAL "win32gcc") set ( PACKSOFLAGS ${SOFLAGS} -L${ALICE_ROOT}/lib/tgt_${ALICE_TARGET} -lSTEERBase -lESD -lANALYSIS -lANALYSISalice -L${ROOTLIBDIR} -lEG) diff --git a/PWG2/CMakelibPWG2rsnextra.pkg b/PWG2/CMakelibPWG2rsnextra.pkg new file mode 100644 index 00000000000..97828e44440 --- /dev/null +++ b/PWG2/CMakelibPWG2rsnextra.pkg @@ -0,0 +1,46 @@ +#--------------------------------------------------------------------------------# +# Package File for PWG2resonances # +# 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 RESONANCES/extra/AliRsnTOFT0maker.cxx + RESONANCES/extra/AliRsnTOFCorrectionESD.cxx + RESONANCES/extra/AliRsnAnalysisPhi900GeV.cxx + RESONANCES/extra/AliRsnAnalysisPhi7TeV.cxx + RESONANCES/extra/AliRsnAnalysisPhi7TeVNoPID.cxx + RESONANCES/extra/AliAnalysisTaskSigma1385.cxx ) + +string ( REPLACE ".cxx" ".h" HDRS "${SRCS}" ) + +set ( DHDR PWG2rsnextraLinkDef.h) + +set ( EXPORT ) + +set ( EINCLUDE PYTHIA6 CORRFW PWG2/RESONANCES PWG2/RESONANCES/extra TOF ) +if( ALICE_TARGET STREQUAL "win32gcc") + + set ( PACKSOFLAGS ${SOFLAGS} -L${ALICE_ROOT}/lib/tgt_${ALICE_TARGET} -lSTEERBase -lESD -lANALYSIS -lANALYSISalice -L${ROOTLIBDIR} -lEG) + +endif( ALICE_TARGET STREQUAL "win32gcc") diff --git a/PWG2/PROOF-INF.PWG2resonances/SETUP.C b/PWG2/PROOF-INF.PWG2resonances/SETUP.C index 78202b9aed6..ded9ec6e840 100644 --- a/PWG2/PROOF-INF.PWG2resonances/SETUP.C +++ b/PWG2/PROOF-INF.PWG2resonances/SETUP.C @@ -1,9 +1,9 @@ void SETUP() { CheckLoadLibrary("libANALYSISalice"); + CheckLoadLibrary("libCORRFW"); CheckLoadLibrary("libPWG2resonances"); // Set the include paths - gROOT->ProcessLine(".include TOF"); gROOT->ProcessLine(".include PWG2resonances"); gROOT->ProcessLine(".include PWG2resonances/RESONANCES"); diff --git a/PWG2/PWG2resonancesLinkDef.h b/PWG2/PWG2resonancesLinkDef.h index 6e8d57d75fa..12acecf0113 100644 --- a/PWG2/PWG2resonancesLinkDef.h +++ b/PWG2/PWG2resonancesLinkDef.h @@ -47,11 +47,4 @@ #pragma link C++ class AliRsnMonitorTrack+; #pragma link C++ class AliRsnAnalysisMonitorTask+; -#pragma link C++ class AliRsnTOFT0maker+; -#pragma link C++ class AliRsnTOFCorrectionESD+; -#pragma link C++ class AliRsnAnalysisPhi900GeV+; -#pragma link C++ class AliRsnAnalysisPhi7TeV+; -#pragma link C++ class AliRsnAnalysisPhi7TeVNoPID+; -#pragma link C++ class AliAnalysisTaskSigma1385+; - #endif diff --git a/PWG2/PWG2rsnextraLinkDef.h b/PWG2/PWG2rsnextraLinkDef.h new file mode 100644 index 00000000000..2170653decc --- /dev/null +++ b/PWG2/PWG2rsnextraLinkDef.h @@ -0,0 +1,10 @@ +#ifdef __CINT__ + +#pragma link C++ class AliRsnTOFT0maker+; +#pragma link C++ class AliRsnTOFCorrectionESD+; +#pragma link C++ class AliRsnAnalysisPhi900GeV+; +#pragma link C++ class AliRsnAnalysisPhi7TeV+; +#pragma link C++ class AliRsnAnalysisPhi7TeVNoPID+; +#pragma link C++ class AliAnalysisTaskSigma1385+; + +#endif