From de2fbe5540a87e118c6fb33d56f082e2df8efcfe Mon Sep 17 00:00:00 2001 From: hristov Date: Tue, 27 Nov 2007 20:35:23 +0000 Subject: [PATCH] Restoring possibility to load the libraries --- EMCAL/EMCALLinkDefbase.h | 4 ---- EMCAL/EMCALLinkDefrec.h | 4 ++++ EMCAL/libEMCALbase.pkg | 3 --- EMCAL/libEMCALrec.pkg | 5 +++++ PHOS/PHOSbaseLinkDef.h | 2 ++ PHOS/PHOSrecLinkDef.h | 1 - PHOS/libPHOSbase.pkg | 3 ++- PHOS/libPHOSrec.pkg | 1 - TOF/TOFbaseLinkDef.h | 2 -- TOF/TOFsimLinkDef.h | 2 ++ TOF/libTOFbase.pkg | 2 -- TOF/libTOFsim.pkg | 4 +++- macros/loadlibs.C | 14 ++++++-------- macros/loadlibsrec.C | 13 +++---------- macros/loadlibssim.C | 10 ++++++++-- 15 files changed, 35 insertions(+), 35 deletions(-) diff --git a/EMCAL/EMCALLinkDefbase.h b/EMCAL/EMCALLinkDefbase.h index 046bb54738e..03f5b9edc7c 100644 --- a/EMCAL/EMCALLinkDefbase.h +++ b/EMCAL/EMCALLinkDefbase.h @@ -25,10 +25,6 @@ #pragma link C++ class AliEMCALCalibHistoProducer+; #pragma link C++ class AliEMCALPreprocessor+; #pragma link C++ class AliEMCALRawUtils+; -// Calibration staff -#pragma link C++ class AliEMCALFolder; -#pragma link C++ class AliEMCALSuperModule; -#pragma link C++ class AliEMCALCell; // Tables without TTable #pragma link C++ class AliEMCALPi0SelectionParam+; #pragma link C++ class AliEMCALPi0SelectionParRec+; diff --git a/EMCAL/EMCALLinkDefrec.h b/EMCAL/EMCALLinkDefrec.h index 1b9fe5fb8ed..7e1ed1513f5 100644 --- a/EMCAL/EMCALLinkDefrec.h +++ b/EMCAL/EMCALLinkDefrec.h @@ -12,5 +12,9 @@ #pragma link C++ class AliEMCALRecPointsQaESDSelector+; // #pragma link C++ class AliEMCALRecParam+; +// Calibration staff +#pragma link C++ class AliEMCALFolder; +#pragma link C++ class AliEMCALSuperModule; +#pragma link C++ class AliEMCALCell; #endif diff --git a/EMCAL/libEMCALbase.pkg b/EMCAL/libEMCALbase.pkg index 9c3a672911b..ce2e1300003 100644 --- a/EMCAL/libEMCALbase.pkg +++ b/EMCAL/libEMCALbase.pkg @@ -20,9 +20,6 @@ AliEMCALCalibData.cxx \ AliEMCALCalibHistoProducer.cxx \ AliEMCALPreprocessor.cxx \ AliEMCALRawUtils.cxx \ -AliEMCALFolder.cxx \ -AliEMCALSuperModule.cxx \ -AliEMCALCell.cxx \ AliEMCALPi0SelectionParam.cxx \ AliEMCALCalibCoefs.cxx \ AliEMCALCellInfo.cxx\ diff --git a/EMCAL/libEMCALrec.pkg b/EMCAL/libEMCALrec.pkg index 42dd0bd2772..da02587b448 100644 --- a/EMCAL/libEMCALrec.pkg +++ b/EMCAL/libEMCALrec.pkg @@ -7,9 +7,14 @@ AliEMCALTracker.cxx \ AliEMCALPID.cxx \ AliEMCALRecParam.cxx \ AliEMCALRecPointsQaESDSelector.cxx \ +AliEMCALFolder.cxx \ +AliEMCALSuperModule.cxx \ +AliEMCALCell.cxx \ HDRS= $(SRCS:.cxx=.h) +CINTHDRS:= $(HDRS) AliEMCALGeometry.h AliEMCALPi0SelectionParam.h + DHDR:=EMCALLinkDefrec.h # have to tune EINCLUDE:=PYTHIA6 RAW EVGEN THijing diff --git a/PHOS/PHOSbaseLinkDef.h b/PHOS/PHOSbaseLinkDef.h index 014f63b3250..1eda380da93 100644 --- a/PHOS/PHOSbaseLinkDef.h +++ b/PHOS/PHOSbaseLinkDef.h @@ -42,4 +42,6 @@ #pragma link C++ class AliPHOSEmcRecPoint+; #pragma link C++ class AliPHOSTrackSegment+; +#pragma link C++ class AliPHOSReconstructor+; + #endif diff --git a/PHOS/PHOSrecLinkDef.h b/PHOS/PHOSrecLinkDef.h index a887b56ee5f..5d5de2736df 100644 --- a/PHOS/PHOSrecLinkDef.h +++ b/PHOS/PHOSrecLinkDef.h @@ -5,7 +5,6 @@ #pragma link off all functions; #pragma link C++ class AliPHOSLink+; -#pragma link C++ class AliPHOSReconstructor+; #pragma link C++ class AliPHOSClusterizerv1+; #pragma link C++ class AliPHOSTrackSegmentMakerv1+; #pragma link C++ class AliPHOSTrackSegmentMakerv2+; diff --git a/PHOS/libPHOSbase.pkg b/PHOS/libPHOSbase.pkg index c1dc9fa1e6c..e6f764a3fa9 100644 --- a/PHOS/libPHOSbase.pkg +++ b/PHOS/libPHOSbase.pkg @@ -24,7 +24,8 @@ SRCS = AliPHOS.cxx \ AliPHOSQAChecker.cxx \ AliPHOSRecParticle.cxx AliPHOSRecPoint.cxx \ AliPHOSEmcRecPoint.cxx \ - AliPHOSCpvRecPoint.cxx AliPHOSTrackSegment.cxx + AliPHOSCpvRecPoint.cxx AliPHOSTrackSegment.cxx \ + AliPHOSReconstructor.cxx HDRS:= $(SRCS:.cxx=.h) diff --git a/PHOS/libPHOSrec.pkg b/PHOS/libPHOSrec.pkg index 608e99aaf07..0e7648144b7 100644 --- a/PHOS/libPHOSrec.pkg +++ b/PHOS/libPHOSrec.pkg @@ -1,7 +1,6 @@ SRCS = \ AliPHOSClusterizerv1.cxx \ AliPHOSLink.cxx \ - AliPHOSReconstructor.cxx \ AliPHOSTrackSegmentMakerv1.cxx \ AliPHOSTrackSegmentMakerv2.cxx \ AliPHOSPIDv0.cxx \ diff --git a/TOF/TOFbaseLinkDef.h b/TOF/TOFbaseLinkDef.h index c06c6974e21..f5bf2e9c967 100644 --- a/TOF/TOFbaseLinkDef.h +++ b/TOF/TOFbaseLinkDef.h @@ -24,7 +24,5 @@ #pragma link C++ class AliTOFPreprocessorFDR+; #pragma link C++ class AliTOFDataDCS+; #pragma link C++ class AliTOFFormatDCS+; -#pragma link C++ class AliTOFQADataMaker+; -#pragma link C++ class AliTOFQAChecker+; #endif diff --git a/TOF/TOFsimLinkDef.h b/TOF/TOFsimLinkDef.h index 529d935709f..0b045dbb64f 100644 --- a/TOF/TOFsimLinkDef.h +++ b/TOF/TOFsimLinkDef.h @@ -24,5 +24,7 @@ #pragma link C++ class AliTOFT0+; #pragma link C++ class AliTOFTrigger+; +#pragma link C++ class AliTOFQADataMaker+; +#pragma link C++ class AliTOFQAChecker+; #endif diff --git a/TOF/libTOFbase.pkg b/TOF/libTOFbase.pkg index c8ea981f727..7de608a4488 100644 --- a/TOF/libTOFbase.pkg +++ b/TOF/libTOFbase.pkg @@ -16,8 +16,6 @@ SRCS = AliTOFGeometry.cxx \ AliTOFPreprocessor.cxx \ AliTOFDataDCS.cxx \ AliTOFFormatDCS.cxx \ - AliTOFQADataMaker.cxx \ - AliTOFQAChecker.cxx \ AliTOFPreprocessorFDR.cxx diff --git a/TOF/libTOFsim.pkg b/TOF/libTOFsim.pkg index bb28bb9bbe4..018429317b1 100644 --- a/TOF/libTOFsim.pkg +++ b/TOF/libTOFsim.pkg @@ -8,7 +8,9 @@ SRCS = AliTOF.cxx AliTOFv6T0.cxx AliTOFv5T0.cxx \ AliTOFDigitizer.cxx \ AliTOFDigitMap.cxx \ AliTOFDDLRawData.cxx \ - AliTOFT0.cxx AliTOFTrigger.cxx + AliTOFT0.cxx AliTOFTrigger.cxx \ + AliTOFQADataMaker.cxx \ + AliTOFQAChecker.cxx HDRS:= $(SRCS:.cxx=.h) diff --git a/macros/loadlibs.C b/macros/loadlibs.C index 37cf00c1e42..11069ccfc89 100644 --- a/macros/loadlibs.C +++ b/macros/loadlibs.C @@ -31,9 +31,9 @@ void loadlibs () gSystem->Load("libSTEERBase"); gSystem->Load("libESD"); gSystem->Load("libCDB"); - gSystem->Load("libSTEER"); gSystem->Load("libRAWDatabase"); gSystem->Load("libRAWDatarec"); + gSystem->Load("libSTEER"); gSystem->Load("libRAWDatasim"); gSystem->Load("libEVGEN"); gSystem->Load("libFASTSIM"); @@ -51,6 +51,7 @@ void loadlibs () gSystem->Load("libMUONcalib"); gSystem->Load("libMUONraw"); gSystem->Load("libMUONtrigger"); + gSystem->Load("libMUONcore"); gSystem->Load("libMUONbase"); gSystem->Load("libMUONsim"); gSystem->Load("libMUONrec"); @@ -95,14 +96,11 @@ void loadlibs () gSystem->Load("libTRDrec"); gSystem->Load("libTRDfast"); gSystem->Load("libTOFbase"); - gSystem->Load("libTOFsim"); gSystem->Load("libTOFrec"); + gSystem->Load("libTOFsim"); gSystem->Load("libHLTbase"); - gSystem->Load("libAliHLTITS"); - gSystem->Load("libAliHLTSrc"); - gSystem->Load("libAliHLTMisc"); - gSystem->Load("libAliHLTComp"); - gSystem->Load("libThread"); - gSystem->Load("libAliHLTHough"); + gSystem->Load("libHLTinterface"); + gSystem->Load("libHLTsim"); + gSystem->Load("libHLTrec"); } diff --git a/macros/loadlibsrec.C b/macros/loadlibsrec.C index 265651e671d..b4242b25ca7 100644 --- a/macros/loadlibsrec.C +++ b/macros/loadlibsrec.C @@ -23,9 +23,9 @@ void loadlibsrec () gSystem->Load("libSTEERBase"); gSystem->Load("libESD"); gSystem->Load("libCDB"); - gSystem->Load("libSTEER"); gSystem->Load("libRAWDatabase"); gSystem->Load("libRAWDatarec"); + gSystem->Load("libSTEER"); gSystem->Load("libSTRUCT"); gSystem->Load("libPHOSbase"); @@ -36,6 +36,7 @@ void loadlibsrec () gSystem->Load("libMUONcalib"); gSystem->Load("libMUONraw"); gSystem->Load("libMUONtrigger"); + gSystem->Load("libMUONcore"); gSystem->Load("libMUONbase"); gSystem->Load("libMUONsim"); gSystem->Load("libMUONrec"); @@ -76,14 +77,6 @@ void loadlibsrec () gSystem->Load("libTRDsim"); gSystem->Load("libTRDrec"); gSystem->Load("libTOFbase"); - gSystem->Load("libTOFsim"); gSystem->Load("libTOFrec"); - - gSystem->Load("libHLTbase"); - gSystem->Load("libAliHLTITS"); - gSystem->Load("libAliHLTSrc"); - gSystem->Load("libAliHLTMisc"); - gSystem->Load("libAliHLTComp"); - gSystem->Load("libThread"); - gSystem->Load("libAliHLTHough"); + gSystem->Load("libTOFsim"); } diff --git a/macros/loadlibssim.C b/macros/loadlibssim.C index 019747ea0f9..ebdd4df1fc7 100644 --- a/macros/loadlibssim.C +++ b/macros/loadlibssim.C @@ -29,10 +29,9 @@ void loadlibssim () gSystem->Load("libSTEERBase"); gSystem->Load("libESD"); gSystem->Load("libCDB"); - gSystem->Load("libSTEER"); gSystem->Load("libRAWDatabase"); gSystem->Load("libRAWDatarec"); - + gSystem->Load("libSTEER"); gSystem->Load("libRAWDatasim"); gSystem->Load("libEVGEN"); gSystem->Load("libFASTSIM"); @@ -49,6 +48,7 @@ void loadlibssim () gSystem->Load("libMUONcalib"); gSystem->Load("libMUONraw"); gSystem->Load("libMUONtrigger"); + gSystem->Load("libMUONcore"); gSystem->Load("libMUONbase"); gSystem->Load("libMUONsim"); gSystem->Load("libFMDbase"); @@ -78,5 +78,11 @@ void loadlibssim () gSystem->Load("libTRDbase"); gSystem->Load("libTRDsim"); gSystem->Load("libTOFbase"); + gSystem->Load("libTOFrec"); gSystem->Load("libTOFsim"); + + gSystem->Load("libHLTbase"); + gSystem->Load("libHLTinterface"); + gSystem->Load("libHLTsim"); + gSystem->Load("libHLTrec"); } -- 2.39.3