- changes to make the clusterisation work for EMCAL

diff --git a/HLT/CALO/AliHLTCaloClusterizer.cxx b/HLT/CALO/AliHLTCaloClusterizer.cxx
index 38ff7ab4f4bb95a901b5013ec2b36f299f275912..f50cc8ea12cbd2dc2be2eae34d58a195c78d2c61 100644 (file)
--- a/HLT/CALO/AliHLTCaloClusterizer.cxx
+++ b/HLT/CALO/AliHLTCaloClusterizer.cxx
@@ -145,7 +145,6 @@ AliHLTCaloClusterizer::ClusterizeEvent(Int_t nDigits)
       fNRecPoints++;\r
       \r
     }//end of clusterization\r
-\r
    return nRecPoints;\r
 }\r
 \r
@@ -246,7 +245,7 @@ Int_t AliHLTCaloClusterizer::CheckArray()
 {\r
       if(fArraySize == fNRecPoints)\r
        {\r
-          cout << "Increasing array!" << endl;\r
+//        cout << "Increasing array!" << endl;\r
           fArraySize *= 2;\r
           AliHLTCaloRecPointDataStruct **tmp = new AliHLTCaloRecPointDataStruct*[fArraySize];\r
           memcpy(tmp, fRecPointArray, fArraySize/2 * sizeof(AliHLTCaloRecPointDataStruct*));\r

diff --git a/HLT/CALO/AliHLTCaloClusterizerComponent.cxx b/HLT/CALO/AliHLTCaloClusterizerComponent.cxx
index f566dd570dbbec54f23397e01eca697c1efa92a0..89cea769bd9c64ba4db98f3bd0d1be654a0a9c49 100644 (file)
--- a/HLT/CALO/AliHLTCaloClusterizerComponent.cxx
+++ b/HLT/CALO/AliHLTCaloClusterizerComponent.cxx
@@ -130,9 +130,9 @@ AliHLTCaloClusterizerComponent::DoEvent(const AliHLTComponentEventData& evtData,
     {
       iter = blocks+ndx;
       //            HLTError("Got block");
+//      PrintComponentDataTypeInfo(iter->fDataType);
       if (iter->fDataType == (AliHLTCaloDefinitions::fgkDigitDataType|fDataOrigin))
        {
-
          // Update the number of digits
          nDigits = iter->fSize/sizeof(AliHLTCaloDigitDataStruct);;
          

diff --git a/HLT/EMCAL/AliHLTEMCALClusterizerComponent.cxx b/HLT/EMCAL/AliHLTEMCALClusterizerComponent.cxx
index c2f9bb60cc86d62dcf43ff1513cbb463f311541f..680d5b15a1ab86c847da7af3a36da884a1ba9633 100644 (file)
--- a/HLT/EMCAL/AliHLTEMCALClusterizerComponent.cxx
+++ b/HLT/EMCAL/AliHLTEMCALClusterizerComponent.cxx
@@ -38,6 +38,8 @@
 // visit http://web.ift.uib.no/~kjeks/doc/alice-hlt
 
 #include "AliHLTCaloDefinitions.h"
+#include "AliHLTEMCALDefinitions.h"
+
 
 AliHLTEMCALClusterizerComponent gAliHLTEMCALClusterizerComponent;
 
@@ -64,14 +66,15 @@ AliHLTEMCALClusterizerComponent::GetInputDataTypes( vector<AliHLTComponentDataTy
 {
   //See headerfile for documentation
   list.clear();
-  list.push_back(AliHLTCaloDefinitions::fgkDigitDataType|kAliHLTDataOriginEMCAL);
+  //list.push_back(AliHLTCaloDefinitions::fgkDigitDataType|kAliHLTDataOriginEMCAL);
+  list.push_back(AliHLTEMCALDefinitions::fgkDigitDataType);
 }
 
 AliHLTComponentDataType
 AliHLTEMCALClusterizerComponent::GetOutputDataType()
 {
   //See headerfile for documentation
-  return AliHLTCaloDefinitions::fgkCaloClusterDataType|kAliHLTDataOriginEMCAL;
+  return kAliHLTDataTypeCaloCluster|kAliHLTDataOriginEMCAL;
 }
 
 void

diff --git a/HLT/EMCAL/AliHLTEMCALConstants.h b/HLT/EMCAL/AliHLTEMCALConstants.h
index 0101e366f99858220e574cc9276bada0bb53c185..89b73b1596bbda6d7d61374a1a8f1b9f3ead578d 100644 (file)
--- a/HLT/EMCAL/AliHLTEMCALConstants.h
+++ b/HLT/EMCAL/AliHLTEMCALConstants.h
@@ -87,7 +87,7 @@ public:
 
   Float_t GetCELLSTEP() const { return fkCELLSTEP; }           //BALLE must be set correctly                   
   Int_t GetNRCUSPERSECTOR() const { return fkNRCUSPERSECTOR; }                                         
-  Int_t GetDDLOffset() const { return fkDDLOFFSET; }
+  Int_t GetDDLOFFSET() const { return fkDDLOFFSET; }
 
 
 private:

diff --git a/HLT/EMCAL/AliHLTEMCALDefinitions.cxx b/HLT/EMCAL/AliHLTEMCALDefinitions.cxx
index a85d773b8575b79998392db01340d8af513a0736..b6bf0445163548000e9bfe9370035af9f24e9bd0 100644 (file)
--- a/HLT/EMCAL/AliHLTEMCALDefinitions.cxx
+++ b/HLT/EMCAL/AliHLTEMCALDefinitions.cxx
@@ -29,7 +29,7 @@ const AliHLTComponentDataType AliHLTEMCALDefinitions::fgkDDLRawDataType =
 AliHLTComponentDataTypeInitializer("DDL_RAW ", kAliHLTDataOriginEMCAL);
 
 const AliHLTComponentDataType AliHLTEMCALDefinitions::fgkDigitDataType =
-AliHLTComponentDataTypeInitializer("DIGIT", kAliHLTDataOriginEMCAL);
+AliHLTComponentDataTypeInitializer("DIGITTYP", kAliHLTDataOriginEMCAL);
 
 const AliHLTComponentDataType AliHLTEMCALDefinitions::fgkClusterDataType =
 AliHLTComponentDataTypeInitializer("CLUSTERS", kAliHLTDataOriginEMCAL);

diff --git a/HLT/EMCAL/AliHLTEMCALDigitMakerComponent.cxx b/HLT/EMCAL/AliHLTEMCALDigitMakerComponent.cxx
index 77edd0c3ab226e10ef38f4f46000739d07fb797b..9d1f0939a88c3b8cd08909dd6e93f6c83dfa153a 100644 (file)
--- a/HLT/EMCAL/AliHLTEMCALDigitMakerComponent.cxx
+++ b/HLT/EMCAL/AliHLTEMCALDigitMakerComponent.cxx
@@ -89,6 +89,7 @@ AliHLTComponentDataType
 AliHLTEMCALDigitMakerComponent::GetOutputDataType()
 {
   //see header file for documentation
+//  return AliHLTCaloDefinitions::fgkDigitDataType|kAliHLTDataOriginEMCAL;
   return AliHLTEMCALDefinitions::fgkDigitDataType;
 }
 

diff --git a/HLT/EMCAL/AliHLTEMCALRawAnalyzerPeakFinderComponent.cxx b/HLT/EMCAL/AliHLTEMCALRawAnalyzerPeakFinderComponent.cxx
index 64d930a190885e47d72b398bf2a9d05704f434b1..a4b9113bbd4dc9a372d7cbd2669ed3b98b7041a4 100644 (file)
--- a/HLT/EMCAL/AliHLTEMCALRawAnalyzerPeakFinderComponent.cxx
+++ b/HLT/EMCAL/AliHLTEMCALRawAnalyzerPeakFinderComponent.cxx
@@ -32,7 +32,7 @@ AliHLTEMCALRawAnalyzerPeakFinderComponent  gAliHLTEMCALRawAnalyzerPeakFinderComp
 
 AliHLTEMCALRawAnalyzerPeakFinderComponent::AliHLTEMCALRawAnalyzerPeakFinderComponent (): AliHLTEMCALRawAnalyzerComponent()
 {
-  fAnalyzerPtr = new    AliCaloRawAnalyzerPeakFinder();
+  //  fAnalyzerPtr = new    AliCaloRawAnalyzerPeakFinder();
 }
 
 

diff --git a/HLT/PHOS/AliHLTPHOSClusterizerComponent.cxx b/HLT/PHOS/AliHLTPHOSClusterizerComponent.cxx
index 60bb6044fd7aa7391af246d94e31da10676cc7e7..26575c056dcf564c5c78a95256b6161b3453698f 100644 (file)
--- a/HLT/PHOS/AliHLTPHOSClusterizerComponent.cxx
+++ b/HLT/PHOS/AliHLTPHOSClusterizerComponent.cxx
@@ -83,7 +83,6 @@ AliHLTPHOSClusterizerComponent::GetOutputDataSize(unsigned long& constBase, doub
   inputMultiplier = 2.0;
 }
 
-
 const Char_t*
 AliHLTPHOSClusterizerComponent::GetComponentID()
 {