From 6181f8f5e9fbf977ac43908fc471fb5688462cdd Mon Sep 17 00:00:00 2001 From: hristov Date: Mon, 26 Nov 2007 10:06:00 +0000 Subject: [PATCH] Adding MUONcore library (Ivana) --- ALIROOT/binaliroot.pkg | 2 +- ANALYSIS/binaliengui.pkg | 2 +- EVE/binalieve.pkg | 2 +- HLT/bindHLTdumpraw.pkg | 2 +- MONITOR/binderoot.pkg | 2 +- MONITOR/binmonitorCheck.pkg | 2 +- MONITOR/binmonitorGDC.pkg | 2 +- MUON/MUONbaseLinkDef.h | 1 - MUON/MUONcalibLinkDef.h | 11 ----------- MUON/MUONcoreLinkDef.h | 32 ++++++++++++++++++++++++++++++++ MUON/MUONgeometryLinkDef.h | 1 - MUON/MUONmappingLinkDef.h | 4 ---- MUON/libMUONbase.pkg | 1 - MUON/libMUONcalib.pkg | 13 +------------ MUON/libMUONcore.pkg | 25 +++++++++++++++++++++++++ MUON/libMUONgeometry.pkg | 3 +-- MUON/libMUONmapping.pkg | 4 ---- MUON/loadlibs.C | 1 + RAW/binalimdc.pkg | 2 +- RAW/bindateStream.pkg | 2 +- 20 files changed, 69 insertions(+), 45 deletions(-) create mode 100644 MUON/MUONcoreLinkDef.h create mode 100644 MUON/libMUONcore.pkg diff --git a/ALIROOT/binaliroot.pkg b/ALIROOT/binaliroot.pkg index 1c9a4964118..3b5aa9db7a3 100644 --- a/ALIROOT/binaliroot.pkg +++ b/ALIROOT/binaliroot.pkg @@ -7,7 +7,7 @@ ELIBSDIR:= -ELIBS:= MUONgeometry MUONrec MUONsim MUONbase MUONtrigger MUONraw MUONcalib MUONmapping \ +ELIBS:= MUONcore MUONgeometry MUONrec MUONsim MUONbase MUONtrigger MUONraw MUONcalib MUONmapping \ TPCbase TPCsim TPCrec TPCfast \ ITSbase ITSsim ITSrec PMDbase PMDsim PMDrec TRDbase \ TRDsim TRDrec TRDfast \ diff --git a/ANALYSIS/binaliengui.pkg b/ANALYSIS/binaliengui.pkg index e4d9d7524a6..6cf6c552594 100644 --- a/ANALYSIS/binaliengui.pkg +++ b/ANALYSIS/binaliengui.pkg @@ -4,7 +4,7 @@ CSRCS := EINCLUDE := ELIBSDIR := ELIBS := Aliengui \ - MUONevaluation MUONgeometry MUONrec MUONsim MUONbase MUONtrigger MUONraw MUONcalib MUONmapping \ + MUONevaluation MUONgeometry MUONrec MUONsim MUONbase MUONtrigger MUONraw MUONcalib MUONmapping MUONcore \ TPCbase TPCsim TPCrec TPCfast \ ITSbase ITSsim ITSrec PMDbase PMDsim PMDrec TRDbase \ TRDsim TRDrec TRDfast \ diff --git a/EVE/binalieve.pkg b/EVE/binalieve.pkg index 953eb1f8edd..4ff0121847d 100644 --- a/EVE/binalieve.pkg +++ b/EVE/binalieve.pkg @@ -4,7 +4,7 @@ CSRCS := EINCLUDE := ELIBSDIR := ELIBS := Reve Alieve \ - MUONevaluation MUONgeometry MUONrec MUONsim MUONbase MUONtrigger MUONraw MUONcalib MUONmapping \ + MUONevaluation MUONgeometry MUONrec MUONsim MUONbase MUONtrigger MUONraw MUONcalib MUONmapping MUONcore \ TPCbase TPCsim TPCrec TPCfast \ ITSbase ITSsim ITSrec PMDbase PMDsim PMDrec TRDbase \ TRDsim TRDrec TRDfast \ diff --git a/HLT/bindHLTdumpraw.pkg b/HLT/bindHLTdumpraw.pkg index 9311acfd1a7..87b923ac853 100644 --- a/HLT/bindHLTdumpraw.pkg +++ b/HLT/bindHLTdumpraw.pkg @@ -22,7 +22,7 @@ PACKBLIBS := $(ROOTCLIBS) $(SYSLIBS) ELIBS := STEERBase ESD AOD RAWDatabase RAWDatarec RAWDatasim \ CDB STEER HLTbase MUONevaluation MUONsim MUONrec \ - MUONbase MUONtrigger MUONgeometry MUONraw MUONcalib MUONmapping \ + MUONbase MUONtrigger MUONgeometry MUONraw MUONcalib MUONmapping MUONcore \ AliHLTMUON include $(MODDIR)/hlt.conf diff --git a/MONITOR/binderoot.pkg b/MONITOR/binderoot.pkg index 882fb881bc3..205b19d3bcb 100644 --- a/MONITOR/binderoot.pkg +++ b/MONITOR/binderoot.pkg @@ -11,7 +11,7 @@ ifdef DATE_ROOT SRCS += root2date.cxx PACKBLIBS += $(shell date-config --monitorlibs) ELIBSDIR:= -ELIBS:=STEERBase ESD AOD CDB STEER RAWDatabase RAWDatarec RAWDatasim TPCbase TPCsim TPCrec HLTbase ITSbase ITSsim ITSrec MUONsim MUONrec MUONbase MUONgeometry MUONraw MUONcalib MUONmapping MUONtrigger MUONevaluation +ELIBS:=STEERBase ESD AOD CDB STEER RAWDatabase RAWDatarec RAWDatasim TPCbase TPCsim TPCrec HLTbase ITSbase ITSsim ITSrec MUONsim MUONrec MUONbase MUONgeometry MUONraw MUONcalib MUONmapping MUONtrigger MUONevaluation MUONcore EINCLUDE+= ${DATE_COMMON_DEFS} ${DATE_MONITOR_DIR} endif diff --git a/MONITOR/binmonitorCheck.pkg b/MONITOR/binmonitorCheck.pkg index f5009d2f13d..abea878c7b5 100644 --- a/MONITOR/binmonitorCheck.pkg +++ b/MONITOR/binmonitorCheck.pkg @@ -11,7 +11,7 @@ ifdef DATE_ROOT PACKBLIBS += $(shell date-config --monitorlibs) ELIBSDIR:= -ELIBS:=STEERBase ESD AOD CDB STEER RAWDatabase RAWDatarec RAWDatasim TPCbase TPCsim TPCrec ITSbase ITSsim ITSrec HLTbase MUONsim MUONrec MUONbase MUONgeometry MUONraw MUONcalib MUONmapping MUONtrigger MUONevaluation +ELIBS:=STEERBase ESD AOD CDB STEER RAWDatabase RAWDatarec RAWDatasim TPCbase TPCsim TPCrec ITSbase ITSsim ITSrec HLTbase MUONsim MUONrec MUONbase MUONgeometry MUONraw MUONcalib MUONmapping MUONtrigger MUONevaluation MUONcore EINCLUDE+= ${DATE_COMMON_DEFS} ${DATE_MONITOR_DIR} endif diff --git a/MONITOR/binmonitorGDC.pkg b/MONITOR/binmonitorGDC.pkg index 61c7c7da63d..b86f6931db3 100644 --- a/MONITOR/binmonitorGDC.pkg +++ b/MONITOR/binmonitorGDC.pkg @@ -11,7 +11,7 @@ ifdef DATE_ROOT PACKBLIBS += $(shell date-config --monitorlibs) ELIBSDIR:= -ELIBS:=STEERBase ESD AOD CDB STEER RAWDatabase RAWDatarec RAWDatasim TPCbase TPCsim TPCrec HLTbase ITSbase ITSsim ITSrec MUONsim MUONrec MUONbase MUONgeometry MUONraw MUONcalib MUONmapping MUONtrigger MUONevaluation +ELIBS:=STEERBase ESD AOD CDB STEER RAWDatabase RAWDatarec RAWDatasim TPCbase TPCsim TPCrec HLTbase ITSbase ITSsim ITSrec MUONsim MUONrec MUONbase MUONgeometry MUONraw MUONcalib MUONmapping MUONtrigger MUONevaluation MUONcore EINCLUDE+= ${DATE_COMMON_DEFS} ${DATE_MONITOR_DIR} endif diff --git a/MUON/MUONbaseLinkDef.h b/MUON/MUONbaseLinkDef.h index e55be7c2b59..d5031e50ad9 100644 --- a/MUON/MUONbaseLinkDef.h +++ b/MUON/MUONbaseLinkDef.h @@ -13,7 +13,6 @@ // info classes #pragma link C++ class AliMUONConstants+; -#pragma link C++ class AliMUONLogger+; // containers #pragma link C++ class AliMUONVCluster+; diff --git a/MUON/MUONcalibLinkDef.h b/MUON/MUONcalibLinkDef.h index cffa6ee8f71..b3b1631ab12 100644 --- a/MUON/MUONcalibLinkDef.h +++ b/MUON/MUONcalibLinkDef.h @@ -8,24 +8,13 @@ #pragma link off all classes; #pragma link off all functions; -#pragma link C++ class AliMUONObjectPair+; -#pragma link C++ class AliMUON2DMap+; -#pragma link C++ class AliMUON2DMapIterator+; -#pragma link C++ class AliMUON2DMapIteratorByI+; -#pragma link C++ class AliMUON1DArray+; -#pragma link C++ class AliMUON1DMap+; -#pragma link C++ class AliMUON1DMapIterator+; #pragma link C++ class AliMUONVCalibParam+; #pragma link C++ class AliMUONCalibParamND+; #pragma link C++ class AliMUONCalibParamNF+; #pragma link C++ class AliMUONCalibParamNI+; #pragma link C++ class AliMUONTriggerEfficiencyCells+; #pragma link C++ class AliMUONTriggerLut+; -#pragma link C++ class AliMUONCheckItem+; -#pragma link C++ class AliMUONCheckItemIterator+; #pragma link C++ class AliMUON2DStoreValidator+; -#pragma link C++ class AliMUONVStore+; -#pragma link C++ class AliMUONTreeManager+; #pragma link C++ class AliMUONTriggerIO+; #endif diff --git a/MUON/MUONcoreLinkDef.h b/MUON/MUONcoreLinkDef.h new file mode 100644 index 00000000000..86eca8d16fc --- /dev/null +++ b/MUON/MUONcoreLinkDef.h @@ -0,0 +1,32 @@ +/* Copyright(c) 1998-1999, ALICE Experiment at CERN, All rights reserved. * + * See cxx source for full Copyright notice */ + +// $Id $ + +#ifdef __CINT__ +#pragma link off all globals; +#pragma link off all classes; +#pragma link off all functions; + +#pragma link C++ class AliMpIntPair+; +#pragma link C++ class AliMpExMap-; +#pragma link C++ class AliMpArrayI+; +#pragma link C++ class AliMpStringObjMap+; + +#pragma link C++ class AliMUONObjectPair+; +#pragma link C++ class AliMUONStringIntMap+; +#pragma link C++ class AliMUON2DMap+; +#pragma link C++ class AliMUON2DMapIterator+; +#pragma link C++ class AliMUON2DMapIteratorByI+; +#pragma link C++ class AliMUON1DArray+; +#pragma link C++ class AliMUON1DMap+; +#pragma link C++ class AliMUON1DMapIterator+; +#pragma link C++ class AliMUONCheckItem+; +#pragma link C++ class AliMUONCheckItemIterator+; +#pragma link C++ class AliMUONVStore+; +#pragma link C++ class AliMUONTreeManager+; +#pragma link C++ class AliMUONLogger+; + +#endif + + diff --git a/MUON/MUONgeometryLinkDef.h b/MUON/MUONgeometryLinkDef.h index a479b166c1d..e8a724467f2 100644 --- a/MUON/MUONgeometryLinkDef.h +++ b/MUON/MUONgeometryLinkDef.h @@ -9,7 +9,6 @@ /* $Id$ */ -#pragma link C++ class AliMUONStringIntMap+; #pragma link C++ class AliMUONGeometryConstituent+; #pragma link C++ class AliMUONGeometryEnvelope+; #pragma link C++ class AliMUONGeometryEnvelopeStore+; diff --git a/MUON/MUONmappingLinkDef.h b/MUON/MUONmappingLinkDef.h index 16bfa373a38..c7b7e4b6969 100644 --- a/MUON/MUONmappingLinkDef.h +++ b/MUON/MUONmappingLinkDef.h @@ -9,10 +9,6 @@ #pragma link C++ class AliMpArea+; #pragma link C++ class AliMpConstants+; -#pragma link C++ class AliMpIntPair+; -#pragma link C++ class AliMpExMap-; -#pragma link C++ class AliMpArrayI+; -#pragma link C++ class AliMpStringObjMap+; #pragma link C++ class AliMpPad+; #pragma link C++ class AliMpPadPair+; #pragma link C++ class AliMpVIndexed+; diff --git a/MUON/libMUONbase.pkg b/MUON/libMUONbase.pkg index bb4f71de9d3..6ac82844e2e 100644 --- a/MUON/libMUONbase.pkg +++ b/MUON/libMUONbase.pkg @@ -10,7 +10,6 @@ SRCS:= AliMUONConstants.cxx \ AliMUONCalibrationData.cxx \ AliMUONDigitMaker.cxx \ AliMUONRawWriter.cxx \ - AliMUONLogger.cxx \ AliMUONCDB.cxx \ AliMUONVDigitStore.cxx \ AliMUONDigitStoreV1.cxx \ diff --git a/MUON/libMUONcalib.pkg b/MUON/libMUONcalib.pkg index 5f735eecbee..27f33568660 100644 --- a/MUON/libMUONcalib.pkg +++ b/MUON/libMUONcalib.pkg @@ -1,23 +1,12 @@ # $Id$ -SRCS:= AliMUONObjectPair.cxx \ - AliMUONTriggerLut.cxx \ - AliMUON2DMap.cxx \ - AliMUON2DMapIterator.cxx \ - AliMUON2DMapIteratorByI.cxx \ - AliMUON1DArray.cxx \ - AliMUON1DMap.cxx \ - AliMUON1DMapIterator.cxx \ +SRCS:= AliMUONTriggerLut.cxx \ AliMUONVCalibParam.cxx \ AliMUONCalibParamND.cxx \ AliMUONCalibParamNF.cxx \ AliMUONCalibParamNI.cxx \ AliMUONTriggerEfficiencyCells.cxx\ AliMUON2DStoreValidator.cxx \ - AliMUONCheckItem.cxx \ - AliMUONCheckItemIterator.cxx \ - AliMUONVStore.cxx \ - AliMUONTreeManager.cxx \ AliMUONTriggerIO.cxx HDRS:= $(SRCS:.cxx=.h) diff --git a/MUON/libMUONcore.pkg b/MUON/libMUONcore.pkg new file mode 100644 index 00000000000..41e1948d0fa --- /dev/null +++ b/MUON/libMUONcore.pkg @@ -0,0 +1,25 @@ +# $Id$ + +SRCS:= mapping/AliMpIntPair.cxx \ + mapping/AliMpExMap.cxx \ + mapping/AliMpArrayI.cxx \ + mapping/AliMpStringObjMap.cxx \ + AliMUONObjectPair.cxx \ + AliMUONStringIntMap.cxx \ + AliMUON2DMap.cxx \ + AliMUON2DMapIterator.cxx \ + AliMUON2DMapIteratorByI.cxx \ + AliMUON1DArray.cxx \ + AliMUON1DMap.cxx \ + AliMUON1DMapIterator.cxx \ + AliMUONCheckItem.cxx \ + AliMUONCheckItemIterator.cxx \ + AliMUONVStore.cxx \ + AliMUONTreeManager.cxx \ + AliMUONLogger.cxx \ + +HDRS:= $(SRCS:.cxx=.h) + +DHDR:= MUONcoreLinkDef.h + +EINCLUDE:= MUON/mapping diff --git a/MUON/libMUONgeometry.pkg b/MUON/libMUONgeometry.pkg index f64b5082e3a..75b16c42766 100644 --- a/MUON/libMUONgeometry.pkg +++ b/MUON/libMUONgeometry.pkg @@ -8,11 +8,10 @@ SRCS = AliMUONGeometryConstituent.cxx \ AliMUONGeometryEnvelope.cxx \ AliMUONGeometryEnvelopeStore.cxx \ AliMUONGeometryDetElement.cxx \ - AliMUONStringIntMap.cxx \ AliMUONGeometryModuleTransformer.cxx \ AliMUONGeometryModule.cxx \ AliMUONGeometryTransformer.cxx \ - AliMUONGeometryMisAligner.cxx \ + AliMUONGeometryMisAligner.cxx \ AliMUONGeometry.cxx \ AliMUONVGeometryBuilder.cxx \ AliMUONGeometryBuilder.cxx diff --git a/MUON/libMUONmapping.pkg b/MUON/libMUONmapping.pkg index 24806eb3a6c..f9ea30fe678 100644 --- a/MUON/libMUONmapping.pkg +++ b/MUON/libMUONmapping.pkg @@ -12,14 +12,10 @@ SRCS += \ mapping/AliMpCathodType.cxx \ mapping/AliMpArea.cxx \ mapping/AliMpConstants.cxx \ - mapping/AliMpExMap.cxx \ - mapping/AliMpArrayI.cxx \ mapping/AliMpFiles.cxx \ - mapping/AliMpIntPair.cxx \ mapping/AliMpPad.cxx \ mapping/AliMpPadIteratorPtr.cxx \ mapping/AliMpPadPair.cxx \ - mapping/AliMpStringObjMap.cxx \ mapping/AliMpVIndexed.cxx \ mapping/AliMpVPadIterator.cxx \ mapping/AliMpVSegmentation.cxx \ diff --git a/MUON/loadlibs.C b/MUON/loadlibs.C index fd9a8f3bc12..9d3581ba7a7 100644 --- a/MUON/loadlibs.C +++ b/MUON/loadlibs.C @@ -35,6 +35,7 @@ void loadlibs () gSystem->Load("libSTEER"); gSystem->Load("libPhysics"); + gSystem->Load("libMUONcore"); gSystem->Load("libMUONmapping"); gSystem->Load("libMUONcalib"); gSystem->Load("libMUONgeometry"); diff --git a/RAW/binalimdc.pkg b/RAW/binalimdc.pkg index 23513bbf5f8..c35702c30b6 100644 --- a/RAW/binalimdc.pkg +++ b/RAW/binalimdc.pkg @@ -7,7 +7,7 @@ EINCLUDE+= TPC ITS RAW PACKBLIBS := $(ROOTCLIBS) $(SYSLIBS) -ELIBS:=STEERBase ESD AOD RAWDatabase RAWDatarec RAWDatasim MDC MDCFilter CDB STEER TPCbase TPCsim TPCrec HLTbase ITSbase ITSsim ITSrec MUONevaluation MUONsim MUONrec MUONbase MUONtrigger MUONgeometry MUONraw MUONcalib MUONmapping +ELIBS:=STEERBase ESD AOD RAWDatabase RAWDatarec RAWDatasim MDC MDCFilter CDB STEER TPCbase TPCsim TPCrec HLTbase ITSbase ITSsim ITSrec MUONevaluation MUONsim MUONrec MUONbase MUONtrigger MUONgeometry MUONraw MUONcalib MUONmapping MUONcore ifneq (,$(findstring macosx,$(ALICE_TARGET))) PACKLDFLAGS:=$(LDFLAGS) $(@PACKAGE@LIBSINIT:%=-Wl,-u,_G__cpp_setupG__%) diff --git a/RAW/bindateStream.pkg b/RAW/bindateStream.pkg index 956ad75e1c0..9e3c83d4cc7 100644 --- a/RAW/bindateStream.pkg +++ b/RAW/bindateStream.pkg @@ -6,7 +6,7 @@ EINCLUDE+= TPC ITS RAW PACKBLIBS := $(ROOTCLIBS) $(SYSLIBS) -ELIBS:=STEERBase ESD AOD RAWDatabase RAWDatarec RAWDatasim MDC MDCFilter CDB STEER TPCbase TPCsim TPCrec HLTbase ITSbase ITSsim ITSrec MUONevaluation MUONsim MUONrec MUONbase MUONtrigger MUONgeometry MUONraw MUONcalib MUONmapping +ELIBS:=STEERBase ESD AOD RAWDatabase RAWDatarec RAWDatasim MDC MDCFilter CDB STEER TPCbase TPCsim TPCrec HLTbase ITSbase ITSsim ITSrec MUONevaluation MUONsim MUONrec MUONbase MUONtrigger MUONgeometry MUONraw MUONcalib MUONmapping MUONcore ifneq (,$(findstring macosx,$(ALICE_TARGET))) PACKLDFLAGS:=$(LDFLAGS) $(@PACKAGE@LIBSINIT:%=-Wl,-u,_G__cpp_setupG__%) -- 2.43.0