Adding MUONcore library (Ivana)

diff --git a/ALIROOT/binaliroot.pkg b/ALIROOT/binaliroot.pkg
index 1c9a4964118910f58902feeebb08bbec0c3646bd..3b5aa9db7a3e500520e761f1ba1744b9c9cdc2c4 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 e4d9d7524a6348c18af052ce1bc259399ba641a0..6cf6c552594496a96896745707661dfd1b785eb6 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 953eb1f8edda62221405706756b0244e0c311db4..4ff0121847db769914973c4448a1f3a0359c55f1 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 9311acfd1a7910a565ac0f268d6148f427036b7e..87b923ac8535109163529880f909078025a8846b 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 882fb881bc3d3bbbcda1d533c1cfe1ff3a3f2594..205b19d3bcb084202e2863a9dc95948c75a6c4a6 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 f5009d2f13d542c5163d9bb8aea179772b0bf6de..abea878c7b518a69db6bb2a2f044c01d162b5246 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 61c7c7da63d694a3f93eab6650014e24d9f08c1d..b86f6931db34a3755d92540d9d1c57c39a917df2 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 e55be7c2b59b150a0049b0364fb4f6f724ad591b..d5031e50ad9b10a029c25e1a93647e8c16ee6b61 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 cffa6ee8f715f5ff830a8897b2ad664449268675..b3b1631ab12d44305be0652d97021b1f34714b33 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 a479b166c1d69bef9db0039c3bdc727aead27c68..e8a724467f26cb0c561d8fddeb283019387b14a5 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 16bfa373a384b2b36982fe603910d8901912acba..c7b7e4b69698f841b701f1de7075d092c0c31d2a 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 bb4f71de9d3b8a9ee55253c48443393f02cbc98d..6ac82844e2e4a68eaa45c19d9c0bc0abd709cfa7 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 5f735eecbee8098488f3916ffb08cf8f5b37ba68..27f33568660e82ed5a0b35449deb4e916a7a78cd 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 f64b5082e3a055ec2731d5839e93eb38b188470e..75b16c427665e0c0c04afbec67e69381e8593429 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 24806eb3a6c435f9ef204cfe89679f8c7ee5d8e3..f9ea30fe678e061bd84b6df0de9ac3df1a0e4109 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 fd9a8f3bc12ad88b242a67a2ec3fbbbb31ceb829..9d3581ba7a70d9c3eca5581a54d71306d014a7b9 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 23513bbf5f892fd7cb2ab0768e41d4062aa0bbf2..c35702c30b6fe40a374e8cf8b2f3e3f3aea4b315 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 956ad75e1c0a2738472c148cb63e59aa0d92e2c2..9e3c83d4cc7fa150ab2b834145a75b794de56641 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__%)