Adding MUONcore library (Ivana)

diff --git a/ALIROOT/binaliroot.pkg b/ALIROOT/binaliroot.pkg
index 1c9a496..3b5aa9d 100644 (file)
--- 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 e4d9d75..6cf6c55 100644 (file)
--- 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 953eb1f..4ff0121 100644 (file)
--- 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 9311acf..87b923a 100644 (file)
--- 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 882fb88..205b19d 100644 (file)
--- 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 f5009d2..abea878 100644 (file)
--- 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 61c7c7d..b86f693 100644 (file)
--- 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 e55be7c..d5031e5 100644 (file)
--- 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 cffa6ee..b3b1631 100644 (file)
--- 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 (file)
index 0000000..86eca8d
--- /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 a479b16..e8a7244 100644 (file)
--- 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 16bfa37..c7b7e4b 100644 (file)
--- 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 bb4f71d..6ac8284 100644 (file)
--- 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 5f735ee..27f3356 100644 (file)
--- 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 (file)
index 0000000..41e1948
--- /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 f64b508..75b16c4 100644 (file)
--- 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 24806eb..f9ea30f 100644 (file)
--- 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 fd9a8f3..9d3581b 100644 (file)
--- 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 23513bb..c35702c 100644 (file)
--- 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 956ad75..9e3c83d 100644 (file)
--- 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__%)