- changing the digit format to now come as a linked list instead of an array

  - will slow down digit maker, but give a significant speed up of the clusterizer at high multiplicities
  - also need to always ship the full list of digits, even after clusterisation, but
    this is anyway needed if one is to provide AliESDCaloCells in the ESDs
- now sorting the digits

diff --git a/HLT/PHOS/AliHLTPHOSClusterizer.cxx b/HLT/PHOS/AliHLTPHOSClusterizer.cxx
index 9b4be5445836fbf492d4c82b5db049b705eef69e..fd59dcdf173451c2f0bb5bc8cb4046d0d0b98199 100644 (file)
--- a/HLT/PHOS/AliHLTPHOSClusterizer.cxx
+++ b/HLT/PHOS/AliHLTPHOSClusterizer.cxx
@@ -105,6 +105,7 @@ AliHLTPHOSClusterizer::ClusterizeEvent(AliHLTPHOSDigitHeaderStruct *digitHeader,
        {
          continue;
        }
+
       if(fAvailableSize < (sizeof(AliHLTPHOSRecPointDataStruct)))
        {
          HLTError("Out of buffer, stopping clusterisation");

diff --git a/HLT/PHOS/AliHLTPHOSDigitMaker.cxx b/HLT/PHOS/AliHLTPHOSDigitMaker.cxx
index 33b974baa90cb9e5e99a9714c6687db8e9a8ec6d..d39fd4eed6da3271c3fd800579326b17aaa62237 100644 (file)
--- a/HLT/PHOS/AliHLTPHOSDigitMaker.cxx
+++ b/HLT/PHOS/AliHLTPHOSDigitMaker.cxx
@@ -1,4 +1,4 @@
-// $Id$
+3// $Id$
 
 /**************************************************************************
  * This file is property of and copyright by the ALICE HLT Project        * 

diff --git a/HLT/PHOS/AliHLTPHOSDigitMaker.h b/HLT/PHOS/AliHLTPHOSDigitMaker.h
index 22b5b34f9c232c669e93c59a7206a867138bbef0..7a0a3c58a498a7e1eaa0e66d17b917aeabc40ee7 100644 (file)
--- a/HLT/PHOS/AliHLTPHOSDigitMaker.h
+++ b/HLT/PHOS/AliHLTPHOSDigitMaker.h
@@ -112,7 +112,7 @@ public:
    * @param channelDataHeader is the data header from the AliHLTPHOSRawAnalyzer
    * @return the number of digits found
    */
-  Int_t MakeDigits(AliHLTPHOSChannelDataHeaderStruct* channelDataHeader, AliHLTUInt32_t availableSize);
+  Int_t MakeDigits(AliHLTPHOSChannelDataHeaderStruct* channelDataHeader, AliHLTUInt32_t availableSize)
 
 
   /**

diff --git a/HLT/PHOS/AliHLTPHOSMapper.h b/HLT/PHOS/AliHLTPHOSMapper.h
index a79937281eba4c82a77d7b12e79c3234ec684d86..30a837287e7345a5c007e29a596b040f336d9d1f 100644 (file)
--- a/HLT/PHOS/AliHLTPHOSMapper.h
+++ b/HLT/PHOS/AliHLTPHOSMapper.h
@@ -48,7 +48,7 @@ class AliHLTPHOSMapper : public AliHLTLogging
   static void GetChannelCoord(const UShort_t channelId, UShort_t* channelCoord);
   static void ChannelId2Coordinate(const UShort_t channelId, AliHLTPHOSCoordinate &channelCoord );
   static void GetLocalCoord(const UShort_t channelId, Float_t* localCoord);
-  int GetDDLFromSpec(Int_t specification);
+  static int GetDDLFromSpec(Int_t specification);
   int GetModuleFromSpec(Int_t specification);
 
   struct fAltromap{ 

diff --git a/HLT/PHOS/AliHLTPHOSRecPointDataStruct.h b/HLT/PHOS/AliHLTPHOSRecPointDataStruct.h
index 7fcf9e29250ae64262094421141a4dcee0e885c8..9bcb481b4ca316456044a4a0db76c8ae2e58a2d4 100644 (file)
--- a/HLT/PHOS/AliHLTPHOSRecPointDataStruct.h
+++ b/HLT/PHOS/AliHLTPHOSRecPointDataStruct.h
@@ -1,4 +1,4 @@
-//-*- Mode: C++ -*-
+\//-*- Mode: C++ -*-
 // $Id$