Correct circular dependence between EMCALbase and EMCALsim

Move AliEMCALClusterizer from EMCALbase to EMCALrec
Update PAR Makefile to allow the compilation of several EMCAL libraries at the same time

diff --git a/EMCAL/AliEMCALDigitizer.cxx b/EMCAL/AliEMCALDigitizer.cxx
index 2e3e9ce4d756a7eee7c47708050abbe6dfca292f..39382cd567d0a88b4ce52dcda459a50029dcd30d 100644 (file)
--- a/EMCAL/AliEMCALDigitizer.cxx
+++ b/EMCAL/AliEMCALDigitizer.cxx
@@ -82,7 +82,7 @@
 #include "AliEMCALDigitizer.h"
 #include "AliEMCALSDigitizer.h"
 #include "AliEMCALGeometry.h"
-#include "AliEMCALTick.h"
+//#include "AliEMCALTick.h"
 #include "AliEMCALCalibData.h"
 #include "AliEMCALSimParam.h"
 #include "AliEMCALRawDigit.h"

diff --git a/EMCAL/EMCALbaseLinkDef.h b/EMCAL/EMCALbaseLinkDef.h
index 75ca4bc712e10295905b27dbbe8a75a3cc64014a..13f7cdd3a11728cecedc314594a8a850abd95567 100644 (file)
--- a/EMCAL/EMCALbaseLinkDef.h
+++ b/EMCAL/EMCALbaseLinkDef.h
@@ -9,9 +9,9 @@
 #pragma link C++ class AliEMCALLoader+;        
 #pragma link C++ class AliEMCALWsuCosmicRaySetUp+;
 #pragma link C++ class AliEMCALRecPoint+;
-#pragma link C++ class AliEMCALClusterizer+;
 #pragma link C++ class AliEMCALHistoUtilities+;
 #pragma link C++ class AliEMCALSDigitizer+;
+#pragma link C++ class AliEMCALDigitizer+;
 #pragma link C++ class AliEMCALDigit+;
 #pragma link C++ class AliEMCALCalibData+;
 #pragma link C++ class AliEMCALCalibHistoProducer+;
@@ -40,6 +40,7 @@
 #pragma link C++ class AliEMCALCalibMapAPDVal+;
 #pragma link C++ class AliEMCALSuperModuleCalibMapAPD+;
 #pragma link C++ class AliEMCALRawDigit+;
+#pragma link C++ class AliEMCALTrigger+;
 #pragma link C++ class AliEMCALTriggerSTURawStream+;
 #pragma link C++ class AliEMCALRawUtils+;
 #pragma link C++ class AliCaloRawAnalyzerFastFit+;

diff --git a/EMCAL/EMCALrecLinkDef.h b/EMCAL/EMCALrecLinkDef.h
index d5c5cf7bb375ad58dbac0a12a1d42871ec09965c..6979aaf889f32aa08079f93e24f645c2a7f3d80f 100644 (file)
--- a/EMCAL/EMCALrecLinkDef.h
+++ b/EMCAL/EMCALrecLinkDef.h
@@ -4,6 +4,7 @@
 #pragma link off all classes;
 #pragma link off all functions;
 #pragma link C++ class AliEMCALReconstructor+;
+#pragma link C++ class AliEMCALClusterizer+;
 #pragma link C++ class AliEMCALClusterizerv1+;
 #pragma link C++ class AliEMCALTrack+;
 #pragma link C++ class AliEMCALTracker+;

diff --git a/EMCAL/EMCALsimLinkDef.h b/EMCAL/EMCALsimLinkDef.h
index 5cd408fc6dce625bccff9e1da11f709d7f994e81..54e0669e123ac0e9aa5ed37b9d1184d58663bc2b 100644 (file)
--- a/EMCAL/EMCALsimLinkDef.h
+++ b/EMCAL/EMCALsimLinkDef.h
@@ -5,11 +5,9 @@
 #pragma link off all functions;
 
 #pragma link C++ class AliEMCALTick+;
-#pragma link C++ class AliEMCALTrigger+;
 #pragma link C++ class AliEMCALv0+;
 #pragma link C++ class AliEMCALv1+;
 #pragma link C++ class AliEMCALv2+;
-#pragma link C++ class AliEMCALDigitizer+;
 #pragma link C++ class AliEMCALQADataMakerSim+;
 #pragma link C++ class AliEMCALTriggerBoard+;
 #pragma link C++ class AliEMCALTriggerPatch+;

diff --git a/EMCAL/Makefile b/EMCAL/Makefile
index 52c0b0b284bb93843f90a724264b4fc94a993c24..08a826e23975598f625d636ae90314ba6e39fad5 100644 (file)
--- a/EMCAL/Makefile
+++ b/EMCAL/Makefile
@@ -10,12 +10,22 @@ ALICEINC      = -I.
 
 ### define include dir for local case and par case
 
+### in case of Root compilation for ANALYSIS, only load EMCALUtils
+### if modification of EMCAL libraries, include STEER and RAW
 ifneq ($(STEERBase_INCLUDE),)
   ALICEINC += -I../$(STEERBase_INCLUDE)
+else
+    ALICEINC += -I$(ALICE_ROOT)/include
+    ALICEINC += -I$(ALICE_ROOT)/STEER
+    ALICEINC += -I$(ALICE_ROOT)/RAW
+    ALICEINC += -I$(ALICE_ROOT)/VZERO
 endif
 
+### in modification of EMCAL libraries, and not modification of EMCALUtils, include EMCAL from aliroot 
 ifneq ($(EMCALUtils_INCLUDE),)
   ALICEINC += -I../$(EMCALUtils_INCLUDE)
+else
+ ALICEINC += -I$(ALICE_ROOT)/EMCAL
 endif
 
 ifneq ($(EMCALbase_INCLUDE),)

diff --git a/EMCAL/libEMCALbase.pkg b/EMCAL/libEMCALbase.pkg
index ab6453e22e1a51397717362b356c99ac49bebfc9..0c0f0c8d1ce9913c51b36d19e46bd459d2d573c8 100644 (file)
--- a/EMCAL/libEMCALbase.pkg
+++ b/EMCAL/libEMCALbase.pkg
@@ -6,9 +6,9 @@ AliEMCALHit.cxx \
 AliEMCALLoader.cxx \
 AliEMCALWsuCosmicRaySetUp.cxx \
 AliEMCALRecPoint.cxx \
-AliEMCALClusterizer.cxx \
 AliEMCALHistoUtilities.cxx \
 AliEMCALSDigitizer.cxx \
+AliEMCALDigitizer.cxx \
 AliEMCALDigit.cxx \
 AliEMCALCalibData.cxx \
 AliEMCALCalibHistoProducer.cxx \
@@ -30,6 +30,7 @@ AliEMCALCalibReference.cxx \
 AliEMCALCalibMapAPD.cxx \
 SMcalib/AliEMCALCCUSBRawStream.cxx \
 AliEMCALRawDigit.cxx \
+AliEMCALTrigger.cxx \
 AliEMCALTriggerSTURawStream.cxx \
 AliEMCAL.cxx \
 AliEMCALRawUtils.cxx \

diff --git a/EMCAL/libEMCALrec.pkg b/EMCAL/libEMCALrec.pkg
index 2328ad29cab4e0e0bcc63949d3ff19dddecfb1e6..ea5e2234097dbd9330502058ccfea7a0270545c9 100644 (file)
--- a/EMCAL/libEMCALrec.pkg
+++ b/EMCAL/libEMCALrec.pkg
@@ -3,6 +3,7 @@
 # 19-Aug-05 - split from libEMCAL.pkg
 SRCS =\
 AliEMCALReconstructor.cxx \
+AliEMCALClusterizer.cxx \
 AliEMCALClusterizerv1.cxx \
 AliEMCALTrack.cxx \
 AliEMCALTracker.cxx \
@@ -17,7 +18,7 @@ CINTHDRS:= $(HDRS) AliEMCALGeometry.h AliEMCALGeoUtils.h
 
 DHDR:=EMCALrecLinkDef.h
 # have to tune
-EINCLUDE:=PYTHIA6 RAW EVGEN THijing VZERO 
+EINCLUDE:=PYTHIA6 RAW EVGEN THijing VZERO
 
 ifeq (win32gcc,$(ALICE_TARGET))
 PACKSOFLAGS:= $(SOFLAGS) -L$(ALICE_ROOT)/lib/tgt_$(ALICE_TARGET) \

diff --git a/EMCAL/libEMCALsim.pkg b/EMCAL/libEMCALsim.pkg
index 503ec90c49dfa7b75634599fd0f8eb7b8e4a1680..e1e6423aee5633c25e8aa69bc25bb26f745d9156 100644 (file)
--- a/EMCAL/libEMCALsim.pkg
+++ b/EMCAL/libEMCALsim.pkg
@@ -6,9 +6,7 @@ SRCS =\
 AliEMCALv0.cxx \
 AliEMCALv1.cxx \
 AliEMCALv2.cxx \
-AliEMCALDigitizer.cxx \
 AliEMCALTick.cxx \
-AliEMCALTrigger.cxx \
 AliEMCALQADataMakerSim.cxx \
 AliEMCALTriggerBoard.cxx \
 AliEMCALTriggerPatch.cxx \