From 975877980e1d03fa9cdb670253fa9415d4b6c03d Mon Sep 17 00:00:00 2001 From: hristov Date: Fri, 25 May 2012 16:45:25 +0000 Subject: [PATCH] Modifications in CMake* files to export all required headers. Modification fix in STEER/AOD/AliAODEvent.cxx assures that fAODObjects does not add its own to list of objects - this behavior was noted by Bjorn Nilsen in Feb-March, when he observed that it loads all objects into full memory of 16 GB. Fix in test-macros/compileEveMacros.C to compiles only macros that weren't compiled. Mihai --- ACORDE/CMakelibACORDEbase.pkg | 2 ++ EMCAL/CMakelibEMCALbase.pkg | 11 ++++++++++- EVE/CMakelibEveBase.pkg | 3 +-- EVE/alice-macros/trd_clusters.C | 2 ++ EVE/alieve_main/alieve_main.cxx | 7 ++----- EVE/test-macros/compileEveMacros.C | 27 +++++++++++++++++++++++---- HMPID/CMakelibHMPIDbase.pkg | 2 ++ HMPID/CMakelibHMPIDsim.pkg | 2 ++ ITS/CMakelibITSbase.pkg | 2 ++ MONITOR/CMakelibMONITOR.pkg | 5 ----- MUON/CMakelibMUONbase.pkg | 6 +++++- MUON/CMakelibMUONevaluation.pkg | 2 ++ MUON/CMakelibMUONmapping.pkg | 15 ++++++++++++++- MUON/CMakelibMUONrec.pkg | 11 +++++++++-- PMD/CMakelibPMDbase.pkg | 2 ++ PWGHF/CMakelibPWGHFvertexingHF.pkg | 9 +++++++++ STEER/AOD/AliAODEvent.cxx | 24 ++++++++++++++++-------- STEER/CMakelibSTEER.pkg | 2 +- T0/CMakelibT0base.pkg | 2 ++ TOF/CMakelibTOFbase.pkg | 2 ++ TPC/CMakelibTPCbase.pkg | 2 +- TRD/AliTRDrecoParam.h | 2 +- TRD/CMakelibTRDbase.pkg | 23 +++++++++++++++++++++-- TRD/CMakelibTRDrec.pkg | 5 ++++- VZERO/CMakelibVZERObase.pkg | 2 ++ 25 files changed, 137 insertions(+), 35 deletions(-) diff --git a/ACORDE/CMakelibACORDEbase.pkg b/ACORDE/CMakelibACORDEbase.pkg index bd68d78345c..b4430cb0047 100644 --- a/ACORDE/CMakelibACORDEbase.pkg +++ b/ACORDE/CMakelibACORDEbase.pkg @@ -19,3 +19,5 @@ string(REPLACE ".cxx" ".h" HDRS "${SRCS}") set(DHDR ACORDEbaseLinkDef.h) set(EINCLUDE STEER/STEER STEER/CDB STEER/ESD STEER/STEERBase RAW) + +set(EXPORT AliACORDERawStream.h) diff --git a/EMCAL/CMakelibEMCALbase.pkg b/EMCAL/CMakelibEMCALbase.pkg index 56f27dfc055..19bed6df3b2 100644 --- a/EMCAL/CMakelibEMCALbase.pkg +++ b/EMCAL/CMakelibEMCALbase.pkg @@ -70,4 +70,13 @@ set ( DHDR EMCALbaseLinkDef.h) set ( EINCLUDE RAW STEER/STEER STEER/CDB STEER/ESD STEER/STEERBase) -set (EXPORT AliEMCALGeometry.h AliEMCALDigit.h ) +set (EXPORT + AliEMCALGeometry.h + AliEMCALDigit.h + AliEMCAL.h + AliEMCALLoader.h + AliEMCALTrigger.h + AliEMCALCalibData.h + AliCaloCalibPedestal.h + AliEMCALSimParam.h + AliEMCALRecParam.h) diff --git a/EVE/CMakelibEveBase.pkg b/EVE/CMakelibEveBase.pkg index a256c9bdb5a..e9525e9ba9d 100644 --- a/EVE/CMakelibEveBase.pkg +++ b/EVE/CMakelibEveBase.pkg @@ -38,6 +38,7 @@ set ( EXPORT EveBase/AliEveBeamsInfo.h EveBase/AliEveCascade.h EveBase/AliEveEventManager.h + EveBase/AliEveConfigManager.h EveBase/AliEveHF.h EveBase/AliEveJetPlane.h EveBase/AliEveKineTools.h @@ -53,6 +54,4 @@ set ( EXPORT EveBase/AliEveTracklet.h EveDet/AliEveTRDData.h EveBase/AliEveV0.h - - ) diff --git a/EVE/alice-macros/trd_clusters.C b/EVE/alice-macros/trd_clusters.C index ae43f9abc17..5e99f57c7fe 100644 --- a/EVE/alice-macros/trd_clusters.C +++ b/EVE/alice-macros/trd_clusters.C @@ -13,8 +13,10 @@ #include #include #include +#include #include +#include #include #include #include diff --git a/EVE/alieve_main/alieve_main.cxx b/EVE/alieve_main/alieve_main.cxx index fc520258e85..c56a8136e99 100644 --- a/EVE/alieve_main/alieve_main.cxx +++ b/EVE/alieve_main/alieve_main.cxx @@ -6,9 +6,6 @@ * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * * full copyright notice. * **************************************************************************/ - -#include - #include #include #include @@ -17,8 +14,6 @@ #include #include -#include - #include #include #include @@ -26,6 +21,8 @@ #include #include +#include +#include int main(int argc, char **argv) { diff --git a/EVE/test-macros/compileEveMacros.C b/EVE/test-macros/compileEveMacros.C index 428a3dac7fc..d5b4b2dbb25 100644 --- a/EVE/test-macros/compileEveMacros.C +++ b/EVE/test-macros/compileEveMacros.C @@ -37,16 +37,29 @@ * * Default: * - compiles all macros from AliRoot installation dir ($ALICE_ROOT/EVE/alice-macros) - * - options for compilation (- k f c) + * - options for compilation (- k f c): + * The possible options are: + k : keep the shared library after the session end. + f : force recompilation. + g : compile with debug symbol + O : optimized the code (ignore if 'g' is specified) + c : compile only, do not attempt to load the library. + - : if buildir is set, use a flat structure (see buildir below) */ void compileEveMacros( const char * macDir="", Option_t *opt="") { + + // solves current issue in ROOT when pre-compiling with ACLiC + gSystem->Load("libCint"); + gSystem->Load("libTENDER"); + gSystem->Load("libPWGPP"); + if(macDir == "") macDir = Form("%s/EVE/alice-macros", gSystem->Getenv("ALICE_ROOT") ); if(opt == "") - opt = "-kfc"; // compilation options + opt = "-kc"; // compilation options TObjString *mac; TList * listOfFailedMacros = new TList; // list of macros that failed compilation @@ -59,7 +72,13 @@ void compileEveMacros( const char * macDir="", Option_t *opt="") TPMERegexp regex("\\.C$"); - printf("Files found in macro directory: %d\n", listOfMacros->GetSize() ); + printf("Directory: %s \tfiles:%d\n", curDir->GetName(), listOfMacros->GetSize() ); + gSystem->cd(curDir->GetName()); + + const char* incPath = gSystem->GetIncludePath(); + + gSystem->SetIncludePath(Form("%s -I%s", incPath, "$ROOTSYS/include")); + Int_t nMacros = 0; @@ -73,7 +92,7 @@ void compileEveMacros( const char * macDir="", Option_t *opt="") printf("Macro %s\n", mac->String().Data() ); TEveUtil::CheckMacro(mac->String().Data() ); - if(!gSystem->CompileMacro(mac->String().Data(), opt, mac->String().Data(), macDir) ) + if(!gSystem->CompileMacro(mac->String().Data(), opt ) ) listOfFailedMacros->Add(mac); } diff --git a/HMPID/CMakelibHMPIDbase.pkg b/HMPID/CMakelibHMPIDbase.pkg index d552345df82..8d49cc5fc3f 100644 --- a/HMPID/CMakelibHMPIDbase.pkg +++ b/HMPID/CMakelibHMPIDbase.pkg @@ -43,3 +43,5 @@ string ( REPLACE ".cxx" ".h" HDRS "${SRCS}" ) set ( DHDR HMPIDbaseLinkDef.h) set ( EINCLUDE RAW STEER/STEER STEER/CDB STEER/ESD STEER/STEERBase) + +set ( EXPORT AliHMPIDDigit.h AliHMPIDv3.h AliHMPIDRawStream.h AliHMPIDParam.h) diff --git a/HMPID/CMakelibHMPIDsim.pkg b/HMPID/CMakelibHMPIDsim.pkg index f7c549274dc..e713c3e9dba 100644 --- a/HMPID/CMakelibHMPIDsim.pkg +++ b/HMPID/CMakelibHMPIDsim.pkg @@ -41,3 +41,5 @@ string ( REPLACE ".cxx" ".h" HDRS "${SRCS}" ) set ( DHDR HMPIDsimLinkDef.h) set ( EINCLUDE RAW STEER/STEER STEER/STEERBase) + +set ( EXPORT AliHMPID.h AliHMPIDDigitizer.h) diff --git a/ITS/CMakelibITSbase.pkg b/ITS/CMakelibITSbase.pkg index c7c6929a037..9a60a042862 100644 --- a/ITS/CMakelibITSbase.pkg +++ b/ITS/CMakelibITSbase.pkg @@ -105,3 +105,5 @@ string ( REPLACE ".cxx" ".h" HDRS "${SRCS}" ) set ( DHDR ITSbaseLinkDef.h) set ( EINCLUDE TPC RAW STEER/STEER STEER/CDB STEER/ESD STEER/STEERBase) + +set ( EXPORT AliITSgeomTGeo.h ) diff --git a/MONITOR/CMakelibMONITOR.pkg b/MONITOR/CMakelibMONITOR.pkg index a0294e4460d..bae83c46a60 100644 --- a/MONITOR/CMakelibMONITOR.pkg +++ b/MONITOR/CMakelibMONITOR.pkg @@ -52,11 +52,6 @@ if(DIMDIR) set ( SRCS ${SRCS} SORNotifier.cxx) set ( EINCLUDE ${EINCLUDE} ${DIMDIR}/dim) set ( ELIBS dim) - set ( ELIBSDIR ${DIMDIR}/${ODIR}) - if(ELIBSDIR STREQUAL "${DIMDIR}/") - set (ELIBSDIR ${DIMDIR}/linux) - endif(ELIBSDIR STREQUAL "${DIMDIR}/") set ( PACKCXXFLAGS "${CXXFLAGS} -DALI_DIM") set ( PACKDCXXFLAGS "${CXXFLAGSNO} -DALI_DIM") - endif(DIMDIR) diff --git a/MUON/CMakelibMUONbase.pkg b/MUON/CMakelibMUONbase.pkg index 3e1da2ca423..52ae7c0815e 100644 --- a/MUON/CMakelibMUONbase.pkg +++ b/MUON/CMakelibMUONbase.pkg @@ -74,7 +74,11 @@ set ( EXPORT AliMUONDigitMaker.h AliMUONVDigit.h AliMUONVCluster.h AliMUONConstants.h - AliMUONTriggerCircuit.h ) + AliMUONTriggerCircuit.h + AliMUONTriggerCircuit.h + AliMUONRawClusterV2.h + AliMUONRecoParam.h + ) install (DIRECTORY data DESTINATION MUON diff --git a/MUON/CMakelibMUONevaluation.pkg b/MUON/CMakelibMUONevaluation.pkg index 0cb99286106..9dbf973e3a3 100644 --- a/MUON/CMakelibMUONevaluation.pkg +++ b/MUON/CMakelibMUONevaluation.pkg @@ -44,3 +44,5 @@ string ( REPLACE ".cxx" ".h" HDRS "${SRCS}" ) set ( DHDR MUONevaluationLinkDef.h) set ( EINCLUDE RAW MUON/mapping) + +set ( EXPORT AliMUONRecoCheck.h) diff --git a/MUON/CMakelibMUONmapping.pkg b/MUON/CMakelibMUONmapping.pkg index 3bd5af0bcb7..91639dfa683 100644 --- a/MUON/CMakelibMUONmapping.pkg +++ b/MUON/CMakelibMUONmapping.pkg @@ -138,4 +138,17 @@ set ( DHDR MUONmappingLinkDef.h) set ( EINCLUDE RAW MUON/mapping) -set ( EXPORT mapping/AliMpExMap.h ) +set ( EXPORT + mapping/AliMpCathodType.h + mapping/AliMpCDB.h + mapping/AliMpDDLStore.h + mapping/AliMpEncodePair.h + mapping/AliMpExMap.h + mapping/AliMpPad.h + mapping/AliMpPlaneType.h + mapping/AliMpRegionalTrigger.h + mapping/AliMpSegmentation.h + mapping/AliMpStationType.h + mapping/AliMpStringObjMap.h + mapping/AliMpVSegmentation.h + ) diff --git a/MUON/CMakelibMUONrec.pkg b/MUON/CMakelibMUONrec.pkg index e4acca20ffe..a9dc48465f7 100644 --- a/MUON/CMakelibMUONrec.pkg +++ b/MUON/CMakelibMUONrec.pkg @@ -81,5 +81,12 @@ set ( DHDR MUONrecLinkDef.h) set ( EINCLUDE RAW MUON/mapping STEER/STEER STEER/CDB STEER/ESD STEER/STEERBase) -set ( EXPORT AliMUONESDInterface.h AliMUONTrack.h AliMUONVClusterStore.h - AliMUONTrackExtrap.h AliMUONTrackParam.h AliMUONCDB.h ) +set ( EXPORT + AliMUONESDInterface.h + AliMUONTrack.h + AliMUONVClusterStore.h + AliMUONTrackExtrap.h + AliMUONTrackParam.h + AliMUONCDB.h + AliMUONVTrackStore.h + AliMUONClusterStoreV2.h) diff --git a/PMD/CMakelibPMDbase.pkg b/PMD/CMakelibPMDbase.pkg index 33b858a76c8..89be46d43a7 100644 --- a/PMD/CMakelibPMDbase.pkg +++ b/PMD/CMakelibPMDbase.pkg @@ -54,3 +54,5 @@ string ( REPLACE ".cxx" ".h" HDRS "${SRCS}" ) set ( DHDR PMDbaseLinkDef.h) set ( EINCLUDE RAW STEER/STEER STEER/CDB STEER/ESD STEER/STEERBase) + +set ( EXPORT AliPMDRawStream.h) diff --git a/PWGHF/CMakelibPWGHFvertexingHF.pkg b/PWGHF/CMakelibPWGHFvertexingHF.pkg index 3a34d8198af..46929b44323 100644 --- a/PWGHF/CMakelibPWGHFvertexingHF.pkg +++ b/PWGHF/CMakelibPWGHFvertexingHF.pkg @@ -85,3 +85,12 @@ string ( REPLACE ".cxx" ".h" HDRS "${SRCS}" ) set ( DHDR PWGHFvertexingHFLinkDef.h) set ( EINCLUDE PWGHF/vertexingHF CORRFW STEER/AOD STEER/ESD STEER/STEERBase PWG/FLOW/Base PWG/FLOW/Tasks) + +install ( FILES vertexingHF/AliAODRecoDecayHF.h vertexingHF/AliAODRecoDecayHF2Prong.h + DESTINATION PWGHF/vertexingHF/ ) + +install ( DIRECTORY vertexingHF/macros + DESTINATION PWGHF/vertexingHF/ + PATTERN ".d" EXCLUDE + PATTERN ".so" EXCLUDE + PATTERN ".svn" EXCLUDE) diff --git a/STEER/AOD/AliAODEvent.cxx b/STEER/AOD/AliAODEvent.cxx index 833d28bfd84..84fb6b38a99 100644 --- a/STEER/AOD/AliAODEvent.cxx +++ b/STEER/AOD/AliAODEvent.cxx @@ -659,16 +659,24 @@ void AliAODEvent::ReadFromTree(TTree *tree, Option_t* opt /*= ""*/) } else { // TList* objL = (TList*)(aodEvent->GetList()->Clone()); - TList* objL = (TList*)aodEvent->GetList(); - printf("Get list of object from tree %d !!\n", objL->GetEntries()); - TIter nextobject(objL); - TObject* obj = 0; - while((obj = nextobject())) + TList* objL = aodEvent->GetList(); + + if(objL == fAODObjects) { - printf("Adding object from friend %s !\n", obj->GetName()); - fAODObjects->Add(obj); + AliInfo("Adding object from friend. Same object friend list...skipping\n"); + + } else { + printf("Get list of object from tree %d !!\n", objL->GetEntries()); + + TIter nextobject(objL); + TObject* obj = 0; + while((obj = nextobject())) + { + printf("Adding object from friend %s !\n", obj->GetName()); + fAODObjects->Add(obj); + } } // object "branch" loop - } // has userinfo + } // has userinfo } // friend loop } // has friends // set the branch addresses diff --git a/STEER/CMakelibSTEER.pkg b/STEER/CMakelibSTEER.pkg index 2e8c72de3d4..f17f570d704 100644 --- a/STEER/CMakelibSTEER.pkg +++ b/STEER/CMakelibSTEER.pkg @@ -123,5 +123,5 @@ set ( DHDR STEERLinkDef.h) set ( EINCLUDE RAW HLT/sim TPC STEER/CDB STEER/ESD STEER/STEERBase ANALYSIS) -set ( EXPORT ${HDRS} STEER/AliConst.h STEER/AliCallf77.h STEER/AliRawDataHeaderSim.h ) +set ( EXPORT ${HDRS} STEER/AliConst.h STEER/AliCallf77.h STEER/AliRawDataHeaderSim.h STEER/AliGeomManager.h ) diff --git a/T0/CMakelibT0base.pkg b/T0/CMakelibT0base.pkg index 0acf75efbe3..7f75491e7c7 100644 --- a/T0/CMakelibT0base.pkg +++ b/T0/CMakelibT0base.pkg @@ -55,3 +55,5 @@ set ( EHDr AliT0CalibLatency.h) set ( DHDR T0baseLinkDef.h) set ( EINCLUDE RAW STEER/STEER STEER/CDB STEER/ESD STEER/STEERBase) + +set ( EXPORT AliT0digit.h) diff --git a/TOF/CMakelibTOFbase.pkg b/TOF/CMakelibTOFbase.pkg index ffbe874cd98..e53d3b8cd8e 100644 --- a/TOF/CMakelibTOFbase.pkg +++ b/TOF/CMakelibTOFbase.pkg @@ -83,6 +83,8 @@ set ( DHDR TOFbaseLinkDef.h) set ( EINCLUDE RAW STEER/STEER STEER/CDB STEER/ESD STEER/STEERBase) +set ( EXPORT AliTOFGeometry.h) + install (DIRECTORY data DESTINATION TOF PATTERN ".svn" EXCLUDE) diff --git a/TPC/CMakelibTPCbase.pkg b/TPC/CMakelibTPCbase.pkg index 57dfb0a9fa3..2aa1873e1fa 100644 --- a/TPC/CMakelibTPCbase.pkg +++ b/TPC/CMakelibTPCbase.pkg @@ -117,7 +117,7 @@ set ( DHDR TPCbaseLinkDef.h) set ( EINCLUDE RAW STEER/STEER STEER/CDB STEER/ESD STEER/STEERBase) -set (EXPORT AliSegmentID.h) +set (EXPORT AliSegmentID.h AliTPCCalibViewerGUI.h AliTPCRawStreamV3.h) install ( DIRECTORY mapping DESTINATION TPC diff --git a/TRD/AliTRDrecoParam.h b/TRD/AliTRDrecoParam.h index cbe5b7cd7a2..2c6b587b3d9 100644 --- a/TRD/AliTRDrecoParam.h +++ b/TRD/AliTRDrecoParam.h @@ -16,7 +16,7 @@ #endif #ifndef ALITRDCALPID_H -#include "Cal/AliTRDCalPID.h" +#include "AliTRDCalPID.h" #endif #ifndef ALITRDPIDRESPONSE_H diff --git a/TRD/CMakelibTRDbase.pkg b/TRD/CMakelibTRDbase.pkg index f50fb979364..bf31e8ca928 100644 --- a/TRD/CMakelibTRDbase.pkg +++ b/TRD/CMakelibTRDbase.pkg @@ -110,6 +110,25 @@ string ( REPLACE ".cxx" ".h" HDRS "${SRCS}" ) set ( DHDR TRDbaseLinkDef.h) -set ( EXPORT AliTRDgeometry.h Cal/AliTRDCalPID.h ) - set ( EINCLUDE RAW TRD/Cal STEER/STEER STEER/CDB STEER/ESD STEER/STEERBase) + +set ( EXPORT + Cal/AliTRDCalPID.h + AliTRDgeometry.h + AliTRDarrayADC.h + AliTRDdigitsParam.h + AliTRDReconstructor.h + AliTRDhit.h + AliTRDgtuParam.h + AliTRDarrayADC.h + AliTRDdigitsManager.h + AliTRDpadPlane.h + AliTRDrecoParam.h + AliTRDseedV1.h + AliTRDtrackV1.h + AliTRDtrackletBase.h + AliTRDtrackletWord.h + AliTRDtrackletMCM.h + AliTRDtrackGTU.h + AliTRDtrackletGTU.h + ) diff --git a/TRD/CMakelibTRDrec.pkg b/TRD/CMakelibTRDrec.pkg index 36ff0c9426f..84ebe19243c 100644 --- a/TRD/CMakelibTRDrec.pkg +++ b/TRD/CMakelibTRDrec.pkg @@ -57,9 +57,12 @@ string ( REPLACE ".cxx" ".h" HDRS "${SRCS}" ) set ( EXPORT AliTRDpidUtil.h AliTRDcluster.h + AliTRDtrackV1.h AliTRDtrackerV1.h AliTRDtransform.h - AliTRDtrackingSector.h ) + AliTRDtrackingSector.h + AliTRDReconstructor.h + ) set ( DHDR TRDrecLinkDef.h) diff --git a/VZERO/CMakelibVZERObase.pkg b/VZERO/CMakelibVZERObase.pkg index 45201b9b49d..daf08e44904 100644 --- a/VZERO/CMakelibVZERObase.pkg +++ b/VZERO/CMakelibVZERObase.pkg @@ -47,3 +47,5 @@ string ( REPLACE ".cxx" ".h" HDRS "${SRCS}" ) set ( DHDR VZERObaseLinkDef.h) set ( EINCLUDE STRUCT RAW STEER/STEER STEER/CDB STEER/STEERBase) + +set ( EXPORT AliVZEROdigit.h) -- 2.43.0