- PHOS raw analyzers now uses the algorithms implemented in the EMCAL library

- needed to add dependency to the EMCAL library

diff --git a/HLT/CALO/AliHLTCaloRawAnalyzerComponentv3.cxx b/HLT/CALO/AliHLTCaloRawAnalyzerComponentv3.cxx
index ce95f83b4fc0eaa12b8b045c1969bf86904ecd28..72728313e959dae9d7ac478a6aed74d0a9e5445e 100644 (file)
--- a/HLT/CALO/AliHLTCaloRawAnalyzerComponentv3.cxx
+++ b/HLT/CALO/AliHLTCaloRawAnalyzerComponentv3.cxx
@@ -352,12 +352,12 @@ AliHLTCaloRawAnalyzerComponentv3::DoIt(const AliHLTComponentBlockData* iter, Ali
           fRawDataWriter->NewChannel();
         }
 
-      }
   }
 
-  // return 1;
 
-  //Writing the header
+// return 1;
+
+//Writing the header
   channelDataHeaderPtr->fNChannels   =  channelCount;
   channelDataHeaderPtr->fAlgorithm   = fAlgorithm;
   channelDataHeaderPtr->fInfo        = 0;

diff --git a/HLT/PHOS/AliHLTPHOSRawAnalyzerCrudeComponent.cxx b/HLT/PHOS/AliHLTPHOSRawAnalyzerCrudeComponent.cxx
index 82a633e4361069bf10b3e0d09dfccf9b37eb53cc..7e94cf99c0f53bbf8f758209b5f7c7f42a9db297 100644 (file)
--- a/HLT/PHOS/AliHLTPHOSRawAnalyzerCrudeComponent.cxx
+++ b/HLT/PHOS/AliHLTPHOSRawAnalyzerCrudeComponent.cxx
@@ -18,7 +18,7 @@
 
 
 #include "AliHLTPHOSRawAnalyzerCrudeComponent.h"
-#include "AliHLTCaloRawAnalyzerCrude.h"
+#include "AliCaloRawAnalyzerCrude.h"
 
 AliHLTPHOSRawAnalyzerCrudeComponent gAliHLTPHOSRawAnalyzerCrudeComponent;
 
@@ -26,7 +26,7 @@ AliHLTPHOSRawAnalyzerCrudeComponent gAliHLTPHOSRawAnalyzerCrudeComponent;
 AliHLTPHOSRawAnalyzerCrudeComponent::AliHLTPHOSRawAnalyzerCrudeComponent()
 {
   HLTError("Creating raw analyzer");
-  fAnalyzerPtr = new AliHLTCaloRawAnalyzerCrude();
+  fAnalyzerPtr = new AliCaloRawAnalyzerCrude();
 } 
 
 //___________________________________________________________________________

diff --git a/HLT/libAliHLTCalo.pkg b/HLT/libAliHLTCalo.pkg
index 62c10c8eac2c97b8efc7c5967d1b79784a6f0a21..cc59e1de37bb655dd5c163bc2afe142874cfd156 100644 (file)
--- a/HLT/libAliHLTCalo.pkg
+++ b/HLT/libAliHLTCalo.pkg
@@ -8,13 +8,7 @@ include $(MODDIR)/hlt.conf
 ## header files of all classes
 ## optionally, the link def file of the library is generated
 ## automatically from those header files
-CLASS_HDRS:= AliHLTCaloRawAnalyzerChiSquareFit.h \
-AliHLTCaloRawAnalyzerComponentv3.h \
-AliHLTCaloRawAnalyzerCrudeComponent.h \
-AliHLTCaloRawAnalyzerCrude.h \
-AliHLTCaloRawAnalyzer.h \
-AliHLTCaloRawAnalyzerPeakFinderComponent.h \
-AliHLTCaloRawAnalyzerPeakFinder.h \
+CLASS_HDRS:= AliHLTCaloRawAnalyzerComponentv3.h \
 AliHLTCaloUtilities.h \
 AliHLTCaloMapper.h \
 AliHLTCaloDefinitions.h \
@@ -29,7 +23,6 @@ AliHLTCaloClusterAnalyser.h \
 AliHLTCaloRcuProcessor.h \
 AliHLTCaloConstants.h \
 AliHLTCaloProcessor.h 
->>>>>>> - adding the new CALO clusterizer component to the CALO library
 
 ## all source files of this module
 ## all source files corresponding to the class headers

diff --git a/HLT/libAliHLTPHOS.pkg b/HLT/libAliHLTPHOS.pkg
index eac0944176bfe35afe9dcbe7c894f2494bc0b1c4..ff212227a548578cdf026f50a2786d5994b8a1e3 100644 (file)
--- a/HLT/libAliHLTPHOS.pkg
+++ b/HLT/libAliHLTPHOS.pkg
@@ -17,7 +17,6 @@ CLASS_HDRS:=  AliHLTPHOSClusterizerComponent.h \
                  AliHLTPHOSRawAnalyzerComponentv3.h \
                  AliHLTPHOSRawAnalyzerCrude.h \
                  AliHLTPHOSRawAnalyzerCrudeComponent.h \
-                 AliHLTPHOSRawAnalyzerPeakFinderComponent.h \
                  AliHLTPHOSDigitMakerComponent.h \
                  AliHLTPHOSRcuProcessor.h \
                  AliHLTPHOSMapper.h \
@@ -53,10 +52,10 @@ MODULE_HDRS:=         $(CLASS_HDRS) \
 ##Left empty for auto generation:
 MODULE_DHDR:=    
 
-EINCLUDE     := HLT/BASE HLT/BASE/util HLT/CALO HLT/PHOS  STEER RAW PHOS 
+EINCLUDE     := HLT/BASE HLT/BASE/util HLT/CALO HLT/PHOS  STEER RAW PHOS EMCAL 
 
 LIBRARY_DEP := -lHLTbase -lPHOSbase -lPHOSshuttle -lESD \
-               -lSTEER -lRAWDatarec 
+               -lSTEER -lRAWDatarec -lEMCALrec
 
 ###############################################################################
 #