Removing obsolete classes and adding new ones (Laurent)

diff --git a/MUON/MUONbaseLinkDef.h b/MUON/MUONbaseLinkDef.h
index 4cfd4bafe76c94edef0a203985cea350543a3a12..18065dc205d7e650cc212ee624fd72031c3b0a1c 100644 (file)
--- a/MUON/MUONbaseLinkDef.h
+++ b/MUON/MUONbaseLinkDef.h
@@ -8,12 +8,6 @@
 #pragma link off all classes;
 #pragma link off all functions;
 
-// segmentation (change in progress)
-#pragma link C++ class AliMUONSegFactory+;
-#pragma link C++ class AliMUONSt12QuadrantSegmentation+; 
-#pragma link C++ class AliMUONSt345SlatSegmentation+;
-#pragma link C++ class AliMUONTriggerSegmentation+;
-
 // geometry 
 #pragma link C++ class AliMUONMathieson+; 
 
@@ -22,12 +16,15 @@
 #pragma link C++ class AliMUONLogger+;
 
 // containers
-#pragma link C++ class AliMUONData+; 
-#pragma link C++ class AliMUONDataIterator+; 
-#pragma link C++ class AliMUONDataDigitIterator+; 
 #pragma link C++ class AliMUONRawCluster+;
 #pragma link C++ class AliMUONDigit+; 
-#pragma link C++ class AliMUONHitMapA1+; 
+#pragma link C++ class AliMUONVDigit+; 
+#pragma link C++ class AliMUONVDigitStore+;
+#pragma link C++ class AliMUONDigitStoreV1+;
+#pragma link C++ class AliMUONDigitStoreV1Iterator+;
+#pragma link C++ class AliMUONTOTCAStoreIterator+;
+#pragma link C++ class AliMUONVTriggerStore+;
+#pragma link C++ class AliMUONTriggerStoreV1+;
 
 // raw data
 #pragma link C++ class AliMUONDigitMaker+;
@@ -38,6 +35,10 @@
 #pragma link C++ class AliMUONCDB+;
 #pragma link C++ class AliMUONHVNamer+;
 
+// misc
+#pragma link C++ class AliMUONDataManager+;
+#pragma link C++ class AliMUONStopwatchGroup+;
+
 #endif
 
 

diff --git a/MUON/MUONcalibLinkDef.h b/MUON/MUONcalibLinkDef.h
index 6de8d2ddb562126cc99fb3530b6d669d6cef0f5f..3f47d30d16cd0821556a4abd6280c930dbfbd937 100644 (file)
--- a/MUON/MUONcalibLinkDef.h
+++ b/MUON/MUONcalibLinkDef.h
@@ -9,15 +9,14 @@
 #pragma link off all functions;
 
 #pragma link C++ class AliMUONObjectPair+;
-#pragma link C++ class AliMUONVDataIterator+; 
-#pragma link C++ class AliMUONV2DStore+;
-#pragma link C++ class AliMUONV1DStore+;
 #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+;
@@ -25,6 +24,8 @@
 #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+;
 
 #endif
 

diff --git a/MUON/MUONevaluationLinkDef.h b/MUON/MUONevaluationLinkDef.h
index 7684536e188271416bc3fb5682f7eec333fd069b..695ddffda2690a94b0f45b300ca1f8bc9703016e 100644 (file)
--- a/MUON/MUONevaluationLinkDef.h
+++ b/MUON/MUONevaluationLinkDef.h
@@ -12,8 +12,6 @@
 #pragma link C++ class AliMUONTrackLight+;
 #pragma link C++ class AliMUONCheck+;
 #pragma link C++ class AliMUONRecoCheck+;
-#pragma link C++ class AliMUONPoints+;
-#pragma link C++ class AliMUONDisplay+;
 #pragma link C++ class AliMUONDataInterface+;
 #pragma link C++ class AliMUONTriggerGUI+;
 #pragma link C++ class AliMUONTriggerGUIbdmap+;

diff --git a/MUON/MUONgeometryLinkDef.h b/MUON/MUONgeometryLinkDef.h
index bb6a572f9c19baf1d57be0595a6de14c331eccc1..a479b166c1d69bef9db0039c3bdc727aead27c68 100644 (file)
--- a/MUON/MUONgeometryLinkDef.h
+++ b/MUON/MUONgeometryLinkDef.h
@@ -21,10 +21,8 @@
 #pragma link C++ class  AliMUONGeometry+;
 #pragma link C++ class  AliMUONVGeometryBuilder+;
 #pragma link C++ class  AliMUONGeometryBuilder+;
-#pragma link C++ class  AliMUONVGeometryDESegmentation+;
-#pragma link C++ class  AliMUONGeometrySegmentation+;
-#pragma link C++ class  AliMUONSegmentation+;
 
-#pragma link C++ enum   AliMUONGeometryDirection;
+//#pragma link C++ enum   AliMUONGeometryDirection;
+
 #endif
 

diff --git a/MUON/MUONrecLinkDef.h b/MUON/MUONrecLinkDef.h
index 7722f47ff53036edd68d6d464bda5849480d63fa..44a7652c533967f379c15ad0593e3a9386563d87 100644 (file)
--- a/MUON/MUONrecLinkDef.h
+++ b/MUON/MUONrecLinkDef.h
@@ -9,14 +9,9 @@
 #pragma link off all functions;
 
 // reconstruction
-#pragma link C++ class AliMUONRecData+; 
-#pragma link C++ class AliMUONRecLoader+; 
 #pragma link C++ class AliMUONClusterReconstructor+; 
-#pragma link C++ class AliMUONClusterFinderVS+; 
 #pragma link C++ class AliMUONClusterFinderAZ+; 
-#pragma link C++ class AliMUONDigitMapA1+; 
 #pragma link C++ class AliMUONPixel+; 
-#pragma link C++ class AliMUONClusterInput+; 
 #pragma link C++ class AliMUONReconstructor+;
 #pragma link C++ class AliMUONVTrackReconstructor+; 
 #pragma link C++ class AliMUONTrackReconstructor+; 
@@ -29,9 +24,6 @@
 #pragma link C++ class AliMUONTriggerTrack+; 
 #pragma link C++ class AliMUONRecoTrack+; 
 #pragma link C++ class AliMUONHitForRec+; 
-#pragma link C++ class AliMUONClusterDrawAZ+;
-#pragma link C++ class AliMUONDetElement+; 
-#pragma link C++ class AliMUONEventRecoCombi+; 
 #pragma link C++ class AliMillepede+;
 #pragma link C++ class AliMUONAlignment+;
 #pragma link C++ class AliMUONVClusterFinder+;
@@ -44,6 +36,13 @@
 #pragma link C++ class AliMUONClusterSplitterMLEM+;
 #pragma link C++ class AliMUONTrackHitPattern+;
 
+#pragma link C++ class AliMUONVClusterStore+;
+#pragma link C++ class AliMUONClusterStoreV1+;
+#pragma link C++ class AliMUONVTrackStore+;
+#pragma link C++ class AliMUONTrackStoreV1+;
+#pragma link C++ class AliMUONVTriggerTrackStore+;
+#pragma link C++ class AliMUONTriggerTrackStoreV1+;
+
 // calibration
 #pragma link C++ class AliMUONDigitCalibrator+;
 #pragma link C++ class AliMUONPadStatusMaker+;

diff --git a/MUON/MUONsimLinkDef.h b/MUON/MUONsimLinkDef.h
index 66e802190ff6fcf3f54b346f8b4d19c1b6861487..d85facdbc1f5d13c51b2c44cecc17f14f205edf2 100644 (file)
--- a/MUON/MUONsimLinkDef.h
+++ b/MUON/MUONsimLinkDef.h
@@ -11,8 +11,6 @@
 
 #pragma link C++ class AliMUON+; 
 #pragma link C++ class AliMUONv1+; 
-#pragma link C++ class AliMUONSimLoader+; 
-#pragma link C++ class AliMUONSimData+; 
 #pragma link C++ class AliMUONHit+; 
 
 // geometry 
@@ -28,6 +26,8 @@
 // digitizer
 #pragma link C++ class AliMUONDigitizerV3+; 
 #pragma link C++ class AliMUONSDigitizerV2+;  
+#pragma link C++ class AliMUONVHitStore+;
+#pragma link C++ class AliMUONHitStoreV1+;
 
 // response
 #pragma link C++ class AliMUONChamber+; 
@@ -42,6 +42,9 @@
 #pragma link C++ class AliMUONChamberTrigger+; 
 #pragma link C++ class AliMUONTriggerElectronics+;
 
+// misc
+#pragma link C++ class AliMUONMCDataInterface+;
+
 #endif
 
 

diff --git a/MUON/libMUONbase.pkg b/MUON/libMUONbase.pkg
index 918ae08fffad6c26662408d472c68eeefd527aeb..81c977963c1958b8d0d461a33e78b5e7600c22fc 100644 (file)
--- a/MUON/libMUONbase.pkg
+++ b/MUON/libMUONbase.pkg
@@ -2,24 +2,25 @@
 
 SRCS:=  AliMUONConstants.cxx \
         AliMUONMathieson.cxx \
-        AliMUONData.cxx \
-        AliMUONDataIterator.cxx \
-        AliMUONDataDigitIterator.cxx \
         AliMUONDigit.cxx \
-        AliMUONHitMapA1.cxx \
         AliMUONRawCluster.cxx \
-        AliMUONSt12QuadrantSegmentation.cxx \
-        AliMUONSt345SlatSegmentation.cxx \
-        AliMUONTriggerSegmentation.cxx \
-        AliMUONSegFactory.cxx \
         AliMUONCalibrationData.cxx \
         AliMUONDigitMaker.cxx \
         AliMUONRawWriter.cxx \
         AliMUONLogger.cxx \
         AliMUONCDB.cxx \
         AliMUONHVNamer.cxx \
- 
-HDRS:= $(SRCS:.cxx=.h)
+        AliMUONVDigitStore.cxx \
+        AliMUONDigitStoreV1.cxx \
+        AliMUONDigitStoreV1Iterator.cxx \
+        AliMUONTOTCAStoreIterator.cxx \
+        AliMUONDataManager.cxx \
+        AliMUONStopwatchGroup.cxx \
+        AliMUONVDigit.cxx \
+        AliMUONVTriggerStore.cxx \
+        AliMUONTriggerStoreV1.cxx \
+        
+HDRS:= $(SRCS:.cxx=.h) AliMUONStopwatchGroupElement.h
 
 DHDR:= MUONbaseLinkDef.h
 

diff --git a/MUON/libMUONcalib.pkg b/MUON/libMUONcalib.pkg
index 2a4ecc768389d16d0ec03026d9627c7bca430870..4ac053ec8d7e30d18b846b05e39657774911fd91 100644 (file)
--- a/MUON/libMUONcalib.pkg
+++ b/MUON/libMUONcalib.pkg
@@ -1,22 +1,23 @@
 # $Id$
 
-SRCS:=  AliMUONVDataIterator.cxx \
-        AliMUONObjectPair.cxx \
+SRCS:=  AliMUONObjectPair.cxx \
         AliMUONTriggerLut.cxx \
-        AliMUONV2DStore.cxx \
-        AliMUONV1DStore.cxx \
         AliMUON2DMap.cxx \
         AliMUON2DMapIterator.cxx \
+        AliMUON2DMapIteratorByI.cxx \
         AliMUON1DArray.cxx \
         AliMUON1DMap.cxx \
         AliMUON1DMapIterator.cxx \
         AliMUONVCalibParam.cxx \
+        AliMUONCalibParamND.cxx \
         AliMUONCalibParamNF.cxx \
         AliMUONCalibParamNI.cxx \
         AliMUONTriggerEfficiencyCells.cxx\
         AliMUON2DStoreValidator.cxx \
         AliMUONCheckItem.cxx \
         AliMUONCheckItemIterator.cxx \
+        AliMUONVStore.cxx \
+        AliMUONTreeManager.cxx
 
 HDRS:= $(SRCS:.cxx=.h)
 

diff --git a/MUON/libMUONevaluation.pkg b/MUON/libMUONevaluation.pkg
index 540cda91acef778bb87d281c4faf6db99bc93555..fdffaa589c73aa1bf342374c32838e34e13242aa 100644 (file)
--- a/MUON/libMUONevaluation.pkg
+++ b/MUON/libMUONevaluation.pkg
@@ -4,13 +4,11 @@ SRCS:= AliMUONPairLight.cxx \
        AliMUONTrackLight.cxx \
        AliMUONCheck.cxx \
        AliMUONRecoCheck.cxx \
-       AliMUONPoints.cxx \
-       AliMUONDisplay.cxx \
        AliMUONDataInterface.cxx \
        AliMUONTriggerGUI.cxx \
        AliMUONTriggerGUIbdmap.cxx \
        AliMUONTriggerGUIdimap.cxx \
-       AliMUONTriggerGUIboard.cxx 
+       AliMUONTriggerGUIboard.cxx
             
 HDRS:= $(SRCS:.cxx=.h)
 

diff --git a/MUON/libMUONgeometry.pkg b/MUON/libMUONgeometry.pkg
index a1ceb4138a3fe7a00c62ff2435f62c8c7252b69c..f64b5082e3a055ec2731d5839e93eb38b188470e 100644 (file)
--- a/MUON/libMUONgeometry.pkg
+++ b/MUON/libMUONgeometry.pkg
@@ -12,14 +12,11 @@ SRCS  =  AliMUONGeometryConstituent.cxx \
         AliMUONGeometryModuleTransformer.cxx \
         AliMUONGeometryModule.cxx \
         AliMUONGeometryTransformer.cxx \
-         AliMUONGeometryMisAligner.cxx \
+   AliMUONGeometryMisAligner.cxx \
         AliMUONGeometry.cxx \
         AliMUONVGeometryBuilder.cxx \
-        AliMUONGeometryBuilder.cxx \
-        AliMUONVGeometryDESegmentation.cxx \
-        AliMUONGeometrySegmentation.cxx \
-        AliMUONSegmentation.cxx \
-
+        AliMUONGeometryBuilder.cxx
+   
 HDRS =  $(SRCS:.cxx=.h) 
 
 EINCLUDE:= RAW MUON/mapping

diff --git a/MUON/libMUONrec.pkg b/MUON/libMUONrec.pkg
index 2e40140e5cee014d7d12d867bcec3c5013b59e2f..fd0da72214c143467afcf3d6a37a44a46721776f 100644 (file)
--- a/MUON/libMUONrec.pkg
+++ b/MUON/libMUONrec.pkg
@@ -1,13 +1,8 @@
 # $Id$
 
-SRCS:= AliMUONRecData.cxx \
-       AliMUONRecLoader.cxx \
-       AliMUONClusterReconstructor.cxx \
-       AliMUONDigitMapA1.cxx \
-       AliMUONClusterFinderVS.cxx \
+SRCS:= AliMUONClusterReconstructor.cxx \
        AliMUONClusterFinderAZ.cxx \
        AliMUONPixel.cxx \
-       AliMUONClusterInput.cxx \
        AliMUONReconstructor.cxx \
        AliMUONVTrackReconstructor.cxx \
        AliMUONTrackReconstructor.cxx \
@@ -18,11 +13,10 @@ SRCS:= AliMUONRecData.cxx \
        AliMUONTrackParam.cxx \
        AliMUONTrackExtrap.cxx \
        AliMUONTriggerTrack.cxx \
+       AliMUONVTriggerTrackStore.cxx \
+       AliMUONTriggerTrackStoreV1.cxx \
        AliMUONRecoTrack.cxx \
        AliMUONHitForRec.cxx \
-       AliMUONClusterDrawAZ.cxx \
-       AliMUONDetElement.cxx \
-       AliMUONEventRecoCombi.cxx \
        AliMUONDigitCalibrator.cxx \
        AliMillepede.cxx \
        AliMUONAlignment.cxx \
@@ -37,7 +31,11 @@ SRCS:= AliMUONRecData.cxx \
        AliMUONPadStatusMaker.cxx \
        AliMUONPadStatusMapMaker.cxx \
        AliMUONTrackHitPattern.cxx \
-
+       AliMUONVClusterStore.cxx \
+       AliMUONClusterStoreV1.cxx \
+       AliMUONVTrackStore.cxx \
+       AliMUONTrackStoreV1.cxx
+       
 HDRS:= $(SRCS:.cxx=.h)
 
 DHDR:= MUONrecLinkDef.h

diff --git a/MUON/libMUONsim.pkg b/MUON/libMUONsim.pkg
index bab37e2930864251c3f245d187d1c3ac8e129b49..3c946a6ce91081e24901f80b57605837b9bdcfac 100644 (file)
--- a/MUON/libMUONsim.pkg
+++ b/MUON/libMUONsim.pkg
@@ -2,8 +2,6 @@
 
 SRCS:= AliMUON.cxx \
        AliMUONv1.cxx \
-       AliMUONSimLoader.cxx \
-       AliMUONSimData.cxx \
        AliMUONHit.cxx \
        AliMUONCommonGeometryBuilder.cxx \
        AliMUONSt1GeometryBuilder.cxx \
@@ -24,6 +22,9 @@ SRCS:= AliMUON.cxx \
        AliMUONSDigitizerV2.cxx \
        AliMUONDigitizerV3.cxx \
        AliMUONTriggerElectronics.cxx \
+       AliMUONVHitStore.cxx \
+       AliMUONHitStoreV1.cxx \
+       AliMUONMCDataInterface.cxx
                            
 HDRS:= $(SRCS:.cxx=.h)
 

diff --git a/MUON/libMUONtrigger.pkg b/MUON/libMUONtrigger.pkg
index 580fb3efab75e6dda4db4e4339f0a96f4661ff5e..8bbd366fbfb5a99dae2a5623cfe7d44d8d3c36b9 100644 (file)
--- a/MUON/libMUONtrigger.pkg
+++ b/MUON/libMUONtrigger.pkg
@@ -9,8 +9,8 @@ SRCS:=  AliMUONLocalTrigger.cxx \
         AliMUONGlobalTriggerBoard.cxx \
         AliMUONTriggerCrate.cxx \
         AliMUONTriggerCrateStore.cxx \
-        AliMUONTriggerCircuit.cxx
- 
+        AliMUONTriggerCircuit.cxx 
+                        
 HDRS:= $(SRCS:.cxx=.h)
 
 DHDR:= MUONtriggerLinkDef.h