From 914143dd309fe45ede0978551f0c4cf0bce1ee58 Mon Sep 17 00:00:00 2001 From: hristov Date: Thu, 1 Dec 2005 16:28:13 +0000 Subject: [PATCH] Library split --- ALIROOT/binaliroot.pkg | 6 ++++-- PHOS/PHOSbaseLinkDef.h | 10 ++++++++++ PHOS/PHOSrecLinkDef.h | 4 ---- PHOS/PHOSsimLinkDef.h | 6 ------ PHOS/libPHOS.pkg | 38 -------------------------------------- PHOS/libPHOSbase.pkg | 7 ++++++- PHOS/libPHOSrec.pkg | 8 ++++---- PHOS/libPHOSsim.pkg | 7 ++----- build/module.dep | 2 +- macros/loadlibs.C | 4 +++- 10 files changed, 30 insertions(+), 62 deletions(-) delete mode 100644 PHOS/libPHOS.pkg diff --git a/ALIROOT/binaliroot.pkg b/ALIROOT/binaliroot.pkg index f7daec987ce..c0026ea1cee 100644 --- a/ALIROOT/binaliroot.pkg +++ b/ALIROOT/binaliroot.pkg @@ -9,7 +9,7 @@ ELIBS:= MUONgeometry MUONrec MUONsim MUONbase MUONmapping \ TPCbase TPCsim TPCrec TPCfast \ ITSbase ITSsim ITSrec PMDbase PMDsim PMDrec TRDbase \ TRDsim TRDrec TRDfast \ - FMDbase FMDsim FMDrec TOFbase TOFrec TOFsim PHOS CRT \ + FMDbase FMDsim FMDrec TOFbase TOFrec TOFsim PHOSbase PHOSsim PHOSrec CRT \ RICHbase RICHrec RICHsim \ ZDCbase ZDCsim ZDCrec VZERObase VZEROsim VZEROrec EMCALbase EMCALsim EMCALrec \ STRUCT STARTbase STARTsim STARTrec EVGEN ESD STEER \ @@ -76,7 +76,9 @@ ARLIBS:= \ MUON/tgt_$(ALICE_TARGET)/G__MUONbase.o $(LIBPATH)/libMUONbase.a \ MUON/tgt_$(ALICE_TARGET)/G__MUONsim.o $(LIBPATH)/libMUONsim.a \ MUON/tgt_$(ALICE_TARGET)/G__MUONrec.o $(LIBPATH)/libMUONrec.a \ - PHOS/tgt_$(ALICE_TARGET)/G__PHOS.o $(LIBPATH)/libPHOS.a \ + PHOS/tgt_$(ALICE_TARGET)/G__PHOSbase.o $(LIBPATH)/libPHOSbase.a \ + PHOS/tgt_$(ALICE_TARGET)/G__PHOSsim.o $(LIBPATH)/libPHOSsim.a \ + PHOS/tgt_$(ALICE_TARGET)/G__PHOSrec.o $(LIBPATH)/libPHOSrec.a \ ITS/tgt_$(ALICE_TARGET)/G__ITSbase.o $(LIBPATH)/libITSbase.a \ ITS/tgt_$(ALICE_TARGET)/G__ITSsim.o $(LIBPATH)/libITSsim.a \ ITS/tgt_$(ALICE_TARGET)/G__ITSrec.o $(LIBPATH)/libITSrec.a \ diff --git a/PHOS/PHOSbaseLinkDef.h b/PHOS/PHOSbaseLinkDef.h index da88e841934..2783262ac3a 100644 --- a/PHOS/PHOSbaseLinkDef.h +++ b/PHOS/PHOSbaseLinkDef.h @@ -13,5 +13,15 @@ #pragma link C++ class AliPHOSLoader+; #pragma link C++ class AliPHOSGetter+; #pragma link C++ class AliPHOSGetterLight+; +#pragma link C++ class AliPHOSHit+; +#pragma link C++ class AliPHOSTrackSegmentMaker+; +#pragma link C++ class AliPHOSPID+; +#pragma link C++ class AliPHOSRawStream+; +#pragma link C++ class AliPHOSClusterizer+; +#pragma link C++ class AliPHOSCalibrationDB+; +#pragma link C++ class AliPHOSDigitizer+; +#pragma link C++ class AliPHOSSDigitizer+; +#pragma link C++ class AliPHOSDigit+; +#pragma link C++ class AliPHOSFastRecParticle+; #endif diff --git a/PHOS/PHOSrecLinkDef.h b/PHOS/PHOSrecLinkDef.h index b3d68a893d2..4a8b1e6a5cd 100644 --- a/PHOS/PHOSrecLinkDef.h +++ b/PHOS/PHOSrecLinkDef.h @@ -7,16 +7,12 @@ #pragma link C++ class AliPHOSLink+; #pragma link C++ class AliPHOSReconstructor+; #pragma link C++ class AliPHOSRecPoint+; -#pragma link C++ class AliPHOSClusterizer+; #pragma link C++ class AliPHOSClusterizerv1+; #pragma link C++ class AliPHOSCpvRecPoint+; #pragma link C++ class AliPHOSEmcRecPoint+; -#pragma link C++ class AliPHOSFastRecParticle+; #pragma link C++ class AliPHOSTrackSegment+; -#pragma link C++ class AliPHOSTrackSegmentMaker+; #pragma link C++ class AliPHOSTrackSegmentMakerv1+; #pragma link C++ class AliPHOSRecParticle+; -#pragma link C++ class AliPHOSPID+; #pragma link C++ class AliPHOSPIDv0+; #pragma link C++ class AliPHOSAnalyze+; #pragma link C++ class AliPHOSIhepAnalyze+; diff --git a/PHOS/PHOSsimLinkDef.h b/PHOS/PHOSsimLinkDef.h index 4b4e412668d..11541994faa 100644 --- a/PHOS/PHOSsimLinkDef.h +++ b/PHOS/PHOSsimLinkDef.h @@ -4,26 +4,20 @@ #pragma link off all classes; #pragma link off all functions; -#pragma link C++ class AliPHOSHit+; #pragma link C++ class AliPHOSv0+; #pragma link C++ class AliPHOSv1+; #pragma link C++ class AliPHOSv2+; #pragma link C++ class AliPHOSvFast+; #pragma link C++ class AliPHOSvImpacts+; #pragma link C++ class AliPHOSImpact+; -#pragma link C++ class AliPHOSSDigitizer+; -#pragma link C++ class AliPHOSDigitizer+; -#pragma link C++ class AliPHOSDigit+; #pragma link C++ class AliPHOSCPVDigit+; #pragma link C++ class AliPHOSTick+; #pragma link C++ class AliPHOSRaw2Digits+; #pragma link C++ class AliPHOSBeamTestEvent+; -#pragma link C++ class AliPHOSCalibrationDB+; #pragma link C++ class AliPHOSCalibrationData+; #pragma link C++ class AliPHOSCalibrManager+; #pragma link C++ class AliPHOSCalibrator+; #pragma link C++ class AliPHOSConTableDB+; -#pragma link C++ class AliPHOSRawStream+; #pragma link C++ class AliPHOSOnlineMonitor+; #pragma link C++ class AliPHOSCalibData+; diff --git a/PHOS/libPHOS.pkg b/PHOS/libPHOS.pkg deleted file mode 100644 index 9c2a96b7c8d..00000000000 --- a/PHOS/libPHOS.pkg +++ /dev/null @@ -1,38 +0,0 @@ -SRCS = AliPHOS.cxx AliPHOSv0.cxx AliPHOSv1.cxx AliPHOSv2.cxx \ - AliPHOSvFast.cxx AliPHOSvImpacts.cxx \ - AliPHOSImpact.cxx \ - AliPHOSHit.cxx \ - AliPHOSGeometry.cxx \ - AliPHOSEMCAGeometry.cxx \ - AliPHOSCPVGeometry.cxx AliPHOSCPVBaseGeometry.cxx \ - AliPHOSSupportGeometry.cxx \ - AliPHOSCPVDigit.cxx AliPHOSDigit.cxx \ - AliPHOSRecPoint.cxx AliPHOSEmcRecPoint.cxx \ - AliPHOSCpvRecPoint.cxx \ - AliPHOSClusterizer.cxx AliPHOSClusterizerv1.cxx \ - AliPHOSLink.cxx AliPHOSSDigitizer.cxx AliPHOSDigitizer.cxx\ - AliPHOSReconstructor.cxx AliPHOSTrackSegment.cxx \ - AliPHOSTrackSegmentMaker.cxx AliPHOSTrackSegmentMakerv1.cxx \ - AliPHOSRecParticle.cxx AliPHOSPID.cxx AliPHOSPIDv0.cxx \ - AliPHOSAnalyze.cxx AliPHOSFastRecParticle.cxx \ - AliPHOSTick.cxx \ - AliPHOSIhepAnalyze.cxx AliPHOSEvalRecPoint.cxx \ - AliPHOSRecManager.cxx AliPHOSRecCpvManager.cxx AliPHOSRecEmcManager.cxx \ - AliPHOSClusterizerv2.cxx AliPHOSPIDv1.cxx AliPHOSJet.cxx AliPHOSJetFinder.cxx\ - AliPHOSLoader.cxx AliPHOSRaw2Digits.cxx AliPHOSBeamTestEvent.cxx \ - AliPHOSCalibrationDB.cxx AliPHOSCalibrationData.cxx\ - AliPHOSCalibrator.cxx AliPHOSCalibrManager.cxx AliPHOSConTableDB.cxx \ - AliPHOSFastGlobalReconstruction.cxx AliPHOSGetter.cxx \ - AliPHOSGammaJet.cxx \ - AliPHOSGridFile.cxx AliPHOSRawStream.cxx \ - AliPHOSGetterLight.cxx AliPHOSOnlineMonitor.cxx \ - AliPHOSTracker.cxx AliPHOSCalibData.cxx - -HDRS:= $(SRCS:.cxx=.h) - -DHDR= PHOSLinkDef.h - -EINCLUDE:=RAW - - - diff --git a/PHOS/libPHOSbase.pkg b/PHOS/libPHOSbase.pkg index 96de16c4a3c..466e9dd6db3 100644 --- a/PHOS/libPHOSbase.pkg +++ b/PHOS/libPHOSbase.pkg @@ -4,7 +4,12 @@ SRCS = AliPHOS.cxx \ AliPHOSCPVGeometry.cxx AliPHOSCPVBaseGeometry.cxx \ AliPHOSSupportGeometry.cxx \ AliPHOSLoader.cxx AliPHOSGetter.cxx \ - AliPHOSGetterLight.cxx + AliPHOSGetterLight.cxx \ + AliPHOSHit.cxx AliPHOSTrackSegmentMaker.cxx AliPHOSPID.cxx \ + AliPHOSRawStream.cxx AliPHOSClusterizer.cxx \ + AliPHOSCalibrationDB.cxx AliPHOSDigitizer.cxx \ + AliPHOSSDigitizer.cxx AliPHOSDigit.cxx \ + AliPHOSFastRecParticle.cxx HDRS:= $(SRCS:.cxx=.h) diff --git a/PHOS/libPHOSrec.pkg b/PHOS/libPHOSrec.pkg index 36df0b0cc36..eb868f8b904 100644 --- a/PHOS/libPHOSrec.pkg +++ b/PHOS/libPHOSrec.pkg @@ -1,11 +1,11 @@ SRCS = AliPHOSRecPoint.cxx AliPHOSEmcRecPoint.cxx \ AliPHOSCpvRecPoint.cxx \ - AliPHOSClusterizer.cxx AliPHOSClusterizerv1.cxx \ + AliPHOSClusterizerv1.cxx \ AliPHOSLink.cxx \ AliPHOSReconstructor.cxx AliPHOSTrackSegment.cxx \ - AliPHOSTrackSegmentMaker.cxx AliPHOSTrackSegmentMakerv1.cxx \ - AliPHOSRecParticle.cxx AliPHOSPID.cxx AliPHOSPIDv0.cxx \ - AliPHOSAnalyze.cxx AliPHOSFastRecParticle.cxx \ + AliPHOSTrackSegmentMakerv1.cxx \ + AliPHOSRecParticle.cxx AliPHOSPIDv0.cxx \ + AliPHOSAnalyze.cxx \ AliPHOSIhepAnalyze.cxx AliPHOSEvalRecPoint.cxx \ AliPHOSRecManager.cxx AliPHOSRecCpvManager.cxx \ AliPHOSRecEmcManager.cxx \ diff --git a/PHOS/libPHOSsim.pkg b/PHOS/libPHOSsim.pkg index 5bf14d023bf..d5fd95c2089 100644 --- a/PHOS/libPHOSsim.pkg +++ b/PHOS/libPHOSsim.pkg @@ -1,15 +1,12 @@ SRCS = AliPHOSv0.cxx AliPHOSv1.cxx AliPHOSv2.cxx \ AliPHOSvFast.cxx AliPHOSvImpacts.cxx \ AliPHOSImpact.cxx \ - AliPHOSHit.cxx \ - AliPHOSSDigitizer.cxx AliPHOSDigitizer.cxx \ - AliPHOSCPVDigit.cxx AliPHOSDigit.cxx \ + AliPHOSCPVDigit.cxx \ AliPHOSTick.cxx \ AliPHOSRaw2Digits.cxx AliPHOSBeamTestEvent.cxx \ - AliPHOSCalibrationDB.cxx AliPHOSCalibrationData.cxx\ + AliPHOSCalibrationData.cxx\ AliPHOSCalibrator.cxx AliPHOSCalibrManager.cxx \ AliPHOSConTableDB.cxx \ - AliPHOSRawStream.cxx \ AliPHOSOnlineMonitor.cxx \ AliPHOSCalibData.cxx diff --git a/build/module.dep b/build/module.dep index d69ec094cb9..dba0096363a 100644 --- a/build/module.dep +++ b/build/module.dep @@ -23,7 +23,7 @@ MONITOR/module.mk: MONITOR/libMONITOR.pkg MONITOR/binmonitorGDC.pkg MONITO MUON/module.mk: MUON/libMUONrec.pkg MUON/libMUONsim.pkg MUON/libMUONbase.pkg MUON/libMUONmapping.pkg LHC/module.mk: LHC/libLHC.pkg PDF/module.mk: PDF/libpdf.pkg -PHOS/module.mk: PHOS/libPHOS.pkg +PHOS/module.mk: PHOS/libPHOSbase.pkg PHOS/libPHOSsim.pkg PHOS/libPHOSrec.pkg PMD/module.mk: PMD/libPMDbase.pkg PMD/libPMDsim.pkg PMD/libPMDrec.pkg PYTHIA6/module.mk: PYTHIA6/libpythia6.pkg RALICE/module.mk: RALICE/libRALICE.pkg diff --git a/macros/loadlibs.C b/macros/loadlibs.C index 6cd6f0f4e32..0bbe8ab7e17 100644 --- a/macros/loadlibs.C +++ b/macros/loadlibs.C @@ -36,7 +36,9 @@ void loadlibs () gSystem->Load("libTHijing");// AliGenHijingEventHeader needed by libZDCsim.so gSystem->Load("libSTRUCT"); - gSystem->Load("libPHOS"); + gSystem->Load("libPHOSbase"); + gSystem->Load("libPHOSsim"); + gSystem->Load("libPHOSrec"); gSystem->Load("libMUONmapping"); gSystem->Load("libMUONgeometry"); gSystem->Load("libMUONbase"); -- 2.43.0