Move AliEMCALGeometry to libEMCALUtils class with the other geometry classes for...

diff --git a/EMCAL/EMCALUtilsLinkDef.h b/EMCAL/EMCALUtilsLinkDef.h
index f113de826d20043fbe52ce1f3708696201375b73..e8d8c906239e46cb44148f9643cb38b6594d6ef5 100644 (file)
--- a/EMCAL/EMCALUtilsLinkDef.h
+++ b/EMCAL/EMCALUtilsLinkDef.h
@@ -7,6 +7,7 @@
 #pragma link C++ class AliEMCALGeoParams+;
 #pragma link C++ class AliEMCALGeoUtils+;
 #pragma link C++ class AliEMCALEMCGeometry+;
+#pragma link C++ class AliEMCALGeometry+;
 #pragma link C++ class AliEMCALShishKebabTrd1Module+;
 #pragma link C++ class AliEMCALPIDUtils+;
 #pragma link C++ class AliCaloNeuralFit+;

diff --git a/EMCAL/EMCALbaseLinkDef.h b/EMCAL/EMCALbaseLinkDef.h
index 7380f5d170c84c66d1644b7cb97e45ee1398546e..23eb46974328fe71841b834747077fd448c002e8 100644 (file)
--- a/EMCAL/EMCALbaseLinkDef.h
+++ b/EMCAL/EMCALbaseLinkDef.h
@@ -4,7 +4,6 @@
 #pragma link off all classes;
 #pragma link off all functions;
 
-#pragma link C++ class AliEMCALGeometry+; 
 #pragma link C++ class AliEMCALHit+;
 #pragma link C++ class AliEMCALLoader+;        
 #pragma link C++ class AliEMCALWsuCosmicRaySetUp+;

diff --git a/EMCAL/libEMCALUtils.pkg b/EMCAL/libEMCALUtils.pkg
index f61b1d9e3b039053c5c8fbb8444ca4d71f39779f..9708a501a958f4dd96edc1c96f56c0bd1fb4f0cb 100644 (file)
--- a/EMCAL/libEMCALUtils.pkg
+++ b/EMCAL/libEMCALUtils.pkg
@@ -5,6 +5,7 @@ AliEMCALGeoParams.cxx \
 AliEMCALGeoUtils.cxx \
 AliEMCALEMCGeometry.cxx  \
 AliEMCALShishKebabTrd1Module.cxx \
+AliEMCALGeometry.cxx  \
 AliEMCALPIDUtils.cxx \
 AliCaloNeuralFit.cxx \
 AliCaloRawAnalyzer.cxx \
@@ -15,13 +16,13 @@ AliCaloRawAnalyzerCrude.cxx \
 AliCaloRawAnalyzerLMS.cxx \
 AliCaloRawAnalyzerNN.cxx \
 AliCaloPeakFinderVectors.cxx \
-AliEMCALHistoUtilities.cxx
+AliEMCALHistoUtilities.cxx 
 
 HDRS:= $(SRCS:.cxx=.h)  AliCaloPeakFinderConstants.h 
 
 DHDR= EMCALUtilsLinkDef.h
 
-EXPORT:=AliEMCALGeoParams.h AliEMCALGeoUtils.h AliEMCALEMCGeometry.h AliEMCALShishKebabTrd1Module.h AliEMCALPIDUtils.h AliCaloNeuralFit.h AliCaloRawAnalyzer.h AliCaloBunchInfo.h AliCaloFitResults.h AliCaloRawAnalyzerCrude.h AliCaloRawAnalyzerLMS.h AliCaloRawAnalyzerPeakFinder.h AliCaloRawAnalyzerNN.h 
+EXPORT:=AliEMCALGeoParams.h AliEMCALGeoUtils.h AliEMCALEMCGeometry.h AliEMCALShishKebabTrd1Module.h AliEMCALPIDUtils.h AliCaloNeuralFit.h AliCaloRawAnalyzer.h AliCaloBunchInfo.h AliCaloFitResults.h AliCaloRawAnalyzerCrude.h AliCaloRawAnalyzerLMS.h AliCaloRawAnalyzerPeakFinder.h AliCaloRawAnalyzerNN.h AliEMCALGeometry.h
 
 CXXFLAGS+=-D__EMCALUTIL__
 

diff --git a/EMCAL/libEMCALbase.pkg b/EMCAL/libEMCALbase.pkg
index 8ee7d777b1926d662bac9045af0b952defabfab4..9ecfad262efd80ee7f4b3bc0a5e52cfd9cd03f10 100644 (file)
--- a/EMCAL/libEMCALbase.pkg
+++ b/EMCAL/libEMCALbase.pkg
@@ -1,7 +1,6 @@
 #-*-Mode: Makefile-*-
 
 SRCS = \
-AliEMCALGeometry.cxx \
 AliEMCALHit.cxx \
 AliEMCALLoader.cxx \
 AliEMCALWsuCosmicRaySetUp.cxx \