Move shuttle classes from shuttle library to base library

diff --git a/EMCAL/EMCALLinkDefbase.h b/EMCAL/EMCALLinkDefbase.h
index d1299627a1862facbfc0d74d81559e237774ecd8..e7779fa95d527b63e1ba7d75643296b65c22b4af 100644 (file)
--- a/EMCAL/EMCALLinkDefbase.h
+++ b/EMCAL/EMCALLinkDefbase.h
@@ -22,6 +22,7 @@
 #pragma link C++ class AliEMCALDigitizer+;
 #pragma link C++ class AliEMCALDigit+;
 #pragma link C++ class AliEMCALCalibData+;
-
+#pragma link C++ class AliEMCALCalibHistoProducer+;
+#pragma link C++ class AliEMCALPreprocessor+;
 
 #endif

diff --git a/EMCAL/libEMCALbase.pkg b/EMCAL/libEMCALbase.pkg
index 3f994301fb76c8eda41e81b46f34ea4bbb08d55d..bce28549391a3d49ad1b3877d828d477aaa70b4d 100644 (file)
--- a/EMCAL/libEMCALbase.pkg
+++ b/EMCAL/libEMCALbase.pkg
@@ -16,7 +16,9 @@ AliEMCALHistoUtilities.cxx \
 AliEMCALSDigitizer.cxx \
 AliEMCALDigitizer.cxx \
 AliEMCALDigit.cxx \
-AliEMCALCalibData.cxx
+AliEMCALCalibData.cxx \
+AliEMCALCalibHistoProducer.cxx \
+AliEMCALPreprocessor.cxx
 
 HDRS= $(SRCS:.cxx=.h) 
 

diff --git a/EMCAL/macros/Shuttle/AliEMCALCalibHistoProducer.C b/EMCAL/macros/Shuttle/AliEMCALCalibHistoProducer.C
index 0ccbc55e5f3103f4b7d7ece23234d298958240b7..84ca481bc6d46fabc31b84ce4db0ca2f640f9b99 100644 (file)
--- a/EMCAL/macros/Shuttle/AliEMCALCalibHistoProducer.C
+++ b/EMCAL/macros/Shuttle/AliEMCALCalibHistoProducer.C
@@ -9,8 +9,6 @@ void AliEMCALCalibHistoProducer(const char* file="EMCAL.raw.root")
   // raw data file in the ROOT format.
   //
   //  Gustavo Conesa Balbastre, December 2006 
-  // Load EMCAL shuttle library as it is not linked to aliroot
-  gSystem->Load("libEMCALshuttle");
 
   AliRawReaderRoot* rf = new AliRawReaderRoot(file);
   AliEMCALCalibHistoProducer hp(rf);