minor changes (inherit from TNamed, reset TMessage - Jochen)

diff --git a/HLT/BASE/AliHLTCalibrationProcessor.cxx b/HLT/BASE/AliHLTCalibrationProcessor.cxx
index 1466be56239e80815870e2ad7418ff9ceb677107..f52ed9215a228ddb8eccef14b996140552b4e4a1 100644 (file)
--- a/HLT/BASE/AliHLTCalibrationProcessor.cxx
+++ b/HLT/BASE/AliHLTCalibrationProcessor.cxx
@@ -201,24 +201,22 @@ Int_t AliHLTCalibrationProcessor::DoEvent( const AliHLTComponentEventData& evtDa
   Int_t iResult = 0;
 
   const AliHLTComponentBlockData* blkSOR = NULL;
+  blkSOR = GetFirstInputBlock( kAliHLTDataTypeSOR );
   const AliHLTComponentBlockData* blkEOR = NULL;
-  const AliHLTComponentBlockData* blkDDL = NULL;
+  blkEOR = GetFirstInputBlock( kAliHLTDataTypeEOR );
+
+  //  const AliHLTComponentBlockData* blkDDL = NULL;
 
   HLTInfo( "Event ID: %lu", evtData.fEventID );
 
-  // ---------------  START OF RUN -----------------
-  blkSOR = GetFirstInputBlock( kAliHLTDataTypeSOR );
-  
-  // ----------------  END OF RUN ------------------
-  blkEOR = GetFirstInputBlock( kAliHLTDataTypeEOR );
-  
+
   // --------------  GET DDLNumber -----------------
-  blkDDL = GetFirstInputBlock( kAliHLTDataTypeDDL );
+  //  blkDDL = GetFirstInputBlock( kAliHLTDataTypeDDL );
   
-  if ( blkDDL ) {
-    HLTInfo("DDLLIST block received, size: %u", blkDDL->fSize );
-    //AliHLTEventDDL ddlList = ( AliHLTEventDDL* ) iter->fPtr;
-  }
+  //  if ( blkDDL ) {
+  //HLTInfo("DDLLIST block received, size: %u", blkDDL->fSize );
+    //AliHLTEventDDL ddlList = ( AliHLTEventDDL* ) blkDDL->fPtr;
+  //}
   
   // ------------ decide which event type ----------
 

diff --git a/HLT/BASE/AliHLTCalibrationProcessor.h b/HLT/BASE/AliHLTCalibrationProcessor.h
index 15227c962c41c0548e610e6a8e275776061dbd06..110fbedf201eec979a8dab45eae387b025617ca8 100644 (file)
--- a/HLT/BASE/AliHLTCalibrationProcessor.h
+++ b/HLT/BASE/AliHLTCalibrationProcessor.h
@@ -274,7 +274,7 @@ class AliHLTCalibrationProcessor : public AliHLTProcessor {
    * digit (0 - F)
    */
   //Char_t fDDLNumber[gkAliHLTFXSHeaderfDDLNumberSize];  // see above
-   Char_t fDDLNumber[64];  // see above
+  Char_t fDDLNumber[64];  // see above
 
   /** Dummy in order to cope with RC 11 */
   Int_t fDummy;                                        // see above

diff --git a/HLT/BASE/AliHLTHOMERBlockDesc.cxx b/HLT/BASE/AliHLTHOMERBlockDesc.cxx
index d311d5dbe14780af60bd6d588d28855b573eae51..adfffb72b571fc6d71ab6a80b19728cd66451e3b 100644 (file)
--- a/HLT/BASE/AliHLTHOMERBlockDesc.cxx
+++ b/HLT/BASE/AliHLTHOMERBlockDesc.cxx
@@ -247,8 +247,11 @@ Bool_t AliHLTHOMERBlockDesc::CheckIfRawData() {
 TObject* AliHLTHOMERBlockDesc::GetTObject() {
   // see header file for class documentation
   
- if ( fMessage )
-   return (TObject*) fMessage->ReadObject( fMessage->GetClass() );
+  if ( fMessage ) {
+    TObject* obj = fMessage->ReadObject( fMessage->GetClass() );
+    fMessage->Reset();
+    return obj;
+  }
  else
    return NULL;
 }

diff --git a/HLT/BASE/AliHLTHOMERSourceDesc.h b/HLT/BASE/AliHLTHOMERSourceDesc.h
index e0250e5a9dffd2f14b1f01156b57b8110cf71731..f1078c1675f54d0eb6c972c77f71eb482470513c 100644 (file)
--- a/HLT/BASE/AliHLTHOMERSourceDesc.h
+++ b/HLT/BASE/AliHLTHOMERSourceDesc.h
@@ -19,7 +19,7 @@
 // visit http://web.ift.uib.no/~kjeks/doc/alice-hlt
 
 #include "TString.h"
-#include "TObject.h"
+#include "TNamed.h"
 
 /**
  * @class AliHLTHOMERSourceDesc
@@ -31,7 +31,7 @@
  * 
  * @ingroup alihlt_homer
  */
-class AliHLTHOMERSourceDesc : public TObject {
+class AliHLTHOMERSourceDesc : public TNamed {
 
 public: