Rearranging EMCLA libraries to avoid circular dependences

diff --git a/EMCAL/EMCALLinkDefbase.h b/EMCAL/EMCALLinkDefbase.h
index db8f1e137f6fca63bd3a59946e8a04f245124698..8c4df0e219c24bcc6ab9fae80c1e3fd2a0c15273 100644 (file)
--- a/EMCAL/EMCALLinkDefbase.h
+++ b/EMCAL/EMCALLinkDefbase.h
@@ -12,7 +12,6 @@
 #pragma link C++ class AliEMCALHit+;
 #pragma link C++ class AliEMCALLoader+;        
 #pragma link C++ class AliEMCALGetter+;
-#pragma link C++ class AliEMCALFast+;
 #pragma link C++ class AliEMCALGeneratorFactory+;
 #pragma link C++ class AliEMCALShishKebabModule+;
 #pragma link C++ class AliEMCALShishKebabTrd1Module+;
@@ -20,5 +19,13 @@
 #pragma link C++ class AliEMCALWsuCosmicRaySetUp+;
 #pragma link C++ class AliEMCALJet+;
 #pragma link C++ class AliEMCALParton+;                
+#pragma link C++ class AliEMCALRecPoint+;
+#pragma link C++ class AliEMCALRawStream+;
+#pragma link C++ class AliEMCALClusterizer+;
+#pragma link C++ class AliEMCALPID+;
+#pragma link C++ class AliEMCALTrackSegmentMaker+;
+#pragma link C++ class AliEMCALSDigitizer+;
+#pragma link C++ class AliEMCALDigitizer+;
+#pragma link C++ class AliEMCALDigit+;
 
 #endif

diff --git a/EMCAL/EMCALLinkDefrec.h b/EMCAL/EMCALLinkDefrec.h
index efc53ffff6a3808e0d1fa4ef82c6af2f21ea8bdf..1f14666d061097ca2301d25869c01f2c6599ee2c 100644 (file)
--- a/EMCAL/EMCALLinkDefrec.h
+++ b/EMCAL/EMCALLinkDefrec.h
@@ -23,19 +23,14 @@
 #pragma link C++ class AliEMCALJetFinderAlgoOmni+;
 #pragma link C++ class AliEMCALJetFinderAlgoUA1Unit+;
 #pragma link C++ class AliEMCALJetFinderPlots+;
-#pragma link C++ class AliEMCALRecPoint+;
-#pragma link C++ class AliEMCALClusterizer+;
 #pragma link C++ class AliEMCALClusterizerv1+;
 #pragma link C++ class AliEMCALLink+;          
 #pragma link C++ class AliEMCALTracker+;
 #pragma link C++ class AliEMCALTrackSegment+;          
-#pragma link C++ class AliEMCALTrackSegmentMaker+;             
 #pragma link C++ class AliEMCALTrackSegmentMakerv1+;           
 #pragma link C++ class AliEMCALRecParticle+;           
 #pragma link C++ class AliEMCALFastRecParticle+;               
-#pragma link C++ class AliEMCALPID+;           
 #pragma link C++ class AliEMCALPIDv1+;
-#pragma link C++ class AliEMCALRawStream+;
 #pragma link C++ class AliEMCALJetMicroDst+;
 #pragma link C++ class AliEMCALHadronCorrection+;               
 #pragma link C++ class AliEMCALHadronCorrectionv0+;

diff --git a/EMCAL/EMCALLinkDefsim.h b/EMCAL/EMCALLinkDefsim.h
index e9092c26f0d5ecd025381126ca88033045f6ded9..4ccc4309d5931fb68b9a4730d912fd0cbbc7d256 100644 (file)
--- a/EMCAL/EMCALLinkDefsim.h
+++ b/EMCAL/EMCALLinkDefsim.h
@@ -4,9 +4,7 @@
 #pragma link off all classes;
 #pragma link off all functions;
 
-#pragma link C++ class AliEMCALDigit+;
-#pragma link C++ class AliEMCALSDigitizer+;
-#pragma link C++ class AliEMCALDigitizer+;
 #pragma link C++ class AliEMCALTick+;
+#pragma link C++ class AliEMCALFast+;
 
 #endif

diff --git a/EMCAL/libEMCALbase.pkg b/EMCAL/libEMCALbase.pkg
index 6ba12ffd716ef598d08fea1db6dd19a3f2ee4932..4fb0d2205942c92e028490f12d1b778de8c8e1fc 100644 (file)
--- a/EMCAL/libEMCALbase.pkg
+++ b/EMCAL/libEMCALbase.pkg
@@ -1,4 +1,4 @@
-FSRCS = jet_finder_ua1.F sgpdge.F
+FSRCS = sgpdge.F
 
 SRCS = \
 AliEMCAL.cxx \
@@ -9,14 +9,21 @@ AliEMCALv2.cxx \
 AliEMCALHit.cxx \
 AliEMCALLoader.cxx \
 AliEMCALGetter.cxx \
-AliEMCALFast.cxx \
 AliEMCALGeneratorFactory.cxx \
 AliEMCALShishKebabModule.cxx \
 AliEMCALShishKebabTrd1Module.cxx \
 AliEMCALGeometryOfflineTrd1.cxx \
 AliEMCALWsuCosmicRaySetUp.cxx \
 AliEMCALJet.cxx \
-AliEMCALParton.cxx 
+AliEMCALParton.cxx \
+AliEMCALRecPoint.cxx \
+AliEMCALRawStream.cxx \
+AliEMCALClusterizer.cxx \
+AliEMCALPID.cxx \
+AliEMCALTrackSegmentMaker.cxx \
+AliEMCALSDigitizer.cxx \
+AliEMCALDigitizer.cxx \
+AliEMCALDigit.cxx
 
 HDRS= $(SRCS:.cxx=.h) 
 

diff --git a/EMCAL/libEMCALrec.pkg b/EMCAL/libEMCALrec.pkg
index ced5a805b901a6d82c61f42445ddb6520b894f11..7fee40f9548537278da06e5b5ba094c3dc4bfe19 100644 (file)
--- a/EMCAL/libEMCALrec.pkg
+++ b/EMCAL/libEMCALrec.pkg
@@ -1,4 +1,5 @@
 # 19-Aug-05 - split from libEMCAL.pkg
+FSRCS = jet_finder_ua1.F
 
 SRCS =\
 AliEMCALReconstructor.cxx \
@@ -11,19 +12,14 @@ AliEMCALJetFinderAlgo.cxx \
 AliEMCALJetFinderAlgoOmni.cxx \
 AliEMCALJetFinderAlgoUA1Unit.cxx \
 AliEMCALJetFinderPlots.cxx \
-AliEMCALRecPoint.cxx \
-AliEMCALClusterizer.cxx \
 AliEMCALClusterizerv1.cxx \
 AliEMCALLink.cxx \
 AliEMCALTracker.cxx \
 AliEMCALTrackSegment.cxx \
-AliEMCALTrackSegmentMaker.cxx \
 AliEMCALTrackSegmentMakerv1.cxx \
 AliEMCALRecParticle.cxx \
 AliEMCALFastRecParticle.cxx \
-AliEMCALPID.cxx \
 AliEMCALPIDv1.cxx \
-AliEMCALRawStream.cxx \
 AliEMCALJetMicroDst.cxx \
 AliEMCALHadronCorrection.cxx \
 AliEMCALHadronCorrectionv0.cxx \

diff --git a/EMCAL/libEMCALsim.pkg b/EMCAL/libEMCALsim.pkg
index adb4b7650100204bf727ca43fc2567f66b451c8c..c446932b403f03f85e19fbbb0737096ab64faa64 100644 (file)
--- a/EMCAL/libEMCALsim.pkg
+++ b/EMCAL/libEMCALsim.pkg
@@ -1,10 +1,8 @@
 # 19-Aug-05 - split from libEMCAL.pkg
 
 SRCS =\
-AliEMCALDigit.cxx \
-AliEMCALSDigitizer.cxx \
-AliEMCALDigitizer.cxx \
-AliEMCALTick.cxx
+AliEMCALTick.cxx \
+AliEMCALFast.cxx
 
 
 HDRS= $(SRCS:.cxx=.h)