ALIROOT-5703 Move AliMergeableCollection to STEERBase

diff --git a/PWG/CMakelibPWGmuon.pkg b/PWG/CMakelibPWGmuon.pkg
index 9343b7d87e94e2906ec33f6bde58989161e00d3e..0e7fa6dc950403f54b5ef35f18e2de5a14ac6870 100644 (file)
--- a/PWG/CMakelibPWGmuon.pkg
+++ b/PWG/CMakelibPWGmuon.pkg
@@ -58,7 +58,6 @@ set ( SRCS
     muon/AliMuonEventCuts.cxx 
     muon/AliMuonTrackCuts.cxx 
     muon/AliMuonPairCuts.cxx 
-    muon/AliMergeableCollection.cxx 
     muon/AliVAnalysisMuon.cxx 
     muon/AliAnalysisTaskFlowSingleMu.cxx 
     muon/AliAnalysisMuonUtility.cxx

diff --git a/PWG/PWGmuonLinkDef.h b/PWG/PWGmuonLinkDef.h
index e81d524bb835758e6de8db90f0cac64103e8f9cb..3a585a0f910365805e5395e8a4e00a828aa9e90f 100644 (file)
--- a/PWG/PWGmuonLinkDef.h
+++ b/PWG/PWGmuonLinkDef.h
@@ -37,8 +37,6 @@
 #pragma link C++ class AliMuonEventCuts+;
 #pragma link C++ class AliMuonTrackCuts+;
 #pragma link C++ class AliMuonPairCuts+;
-#pragma link C++ class AliMergeableCollection+;
-#pragma link C++ class AliMergeableCollectionIterator+;
 #pragma link C++ class AliVAnalysisMuon+;
 #pragma link C++ class AliAnalysisTaskFlowSingleMu+;
 #pragma link C++ class AliAnalysisMuonUtility+;

diff --git a/STEER/CMakelibSTEERBase.pkg b/STEER/CMakelibSTEERBase.pkg
index 2be5c87ad426761167ca977310266735a07480b5..362c15cbcc66768389a8b153764970581fc5e0f7 100644 (file)
--- a/STEER/CMakelibSTEERBase.pkg
+++ b/STEER/CMakelibSTEERBase.pkg
@@ -103,6 +103,7 @@ set ( SRCS
     STEERBase/AliVMisc.cxx
     STEERBase/AliVfriendTrack.cxx
     STEERBase/AliVfriendEvent.cxx
+    STEERBase/AliMergeableCollection.cxx
   )
 
 string(REPLACE ".cxx" ".h" HDRS  "${SRCS}")

diff --git a/PWG/muon/AliMergeableCollection.cxx b/STEER/STEERBase/AliMergeableCollection.cxx
similarity index 100%
rename from PWG/muon/AliMergeableCollection.cxx
rename to STEER/STEERBase/AliMergeableCollection.cxx

diff --git a/PWG/muon/AliMergeableCollection.h b/STEER/STEERBase/AliMergeableCollection.h
similarity index 100%
rename from PWG/muon/AliMergeableCollection.h
rename to STEER/STEERBase/AliMergeableCollection.h

diff --git a/STEER/STEERBaseLinkDef.h b/STEER/STEERBaseLinkDef.h
index 3be55b9dacb0c09517c593eeb60b620e556eae34..57fc1a7273dd4444365e7988eceb84d25fbf64a5 100644 (file)
--- a/STEER/STEERBaseLinkDef.h
+++ b/STEER/STEERBaseLinkDef.h
@@ -143,6 +143,8 @@
 #pragma link C++ class AliVTOFcluster+;
 #pragma link C++ class AliVMultiplicity+;
 #pragma link C++ class AliGenHepMCEventHeader+;
+#pragma link C++ class AliMergeableCollection+;
+#pragma link C++ class AliMergeableCollectionIterator+;
 
 #endif