* removed HLT logging

* added use of specification

diff --git a/HLT/BASE/AliHLTHOMERBlockDesc.cxx b/HLT/BASE/AliHLTHOMERBlockDesc.cxx
index 449babe92d986c4a7ac4095e1dc96b465855f622..fe13e64011748f1ee56a4c724759f8068259cb35 100644 (file)
--- a/HLT/BASE/AliHLTHOMERBlockDesc.cxx
+++ b/HLT/BASE/AliHLTHOMERBlockDesc.cxx
@@ -98,7 +98,7 @@ void AliHLTHOMERBlockDesc::SetBlock( void * data, ULong_t size, TString origin,
   fDataType = dataType;
   fSpecification = specification; 
 
-  fBlockName.Form("%s_%s%_%lu", fDetector.Data(), fDataType.Data(), fSpecification ); 
+  fBlockName.Form("%s_%s_0x%08LX", fDetector.Data(), fDataType.Data(), fSpecification ); 
 
   // -- Set block parameters
   SetBlockParameters();
@@ -197,10 +197,10 @@ void AliHLTHOMERBlockDesc::SetBlockParameters() {
   }
   
   // -- Check if classname has been defined
-  if ( iResult < 0 ) {
-    AliWarning( Form("The classname for data type %s for the detector %s has not been defined yet.", 
-                    fDataType.Data(), fDetector.Data()) );
-  }
+  //  if ( iResult < 0 ) {
+    //   AliWarning( Form("The classname for data type %s for the detector %s has not been defined yet.", 
+    //      fDataType.Data(), fDetector.Data()) );
+  // }
   return;
 }
   

diff --git a/HLT/BASE/AliHLTHOMERManager.cxx b/HLT/BASE/AliHLTHOMERManager.cxx
index afc077bee0f12d7ecca02535448abfb2f2d565bb..f3a0f85d64315dad0d571fdac6dfca5c3d86bd87 100644 (file)
--- a/HLT/BASE/AliHLTHOMERManager.cxx
+++ b/HLT/BASE/AliHLTHOMERManager.cxx
@@ -39,7 +39,8 @@
 #include "AliHLTHOMERLibManager.h"
 #include "AliHLTHOMERSourceDesc.h"
 #include "AliHLTHOMERBlockDesc.h"
-
+// -- -- -- -- -- -- -- 
+#include "AliLog.h"
 ClassImp(AliHLTHOMERManager)
 
 /*
@@ -105,11 +106,11 @@ Int_t AliHLTHOMERManager::Initialize() {
   if ( fProxyHandler ) {
     iResult = fProxyHandler->Initialize();
     if (iResult)
-      HLTError("Initialize of ProxyHandler failed.");
+      AliError(Form("Initialize of ProxyHandler failed."));
   }
   else {
     iResult = -1;
-    HLTError("Creating of ProxyHandler failed.");
+    AliError(Form("Creating of ProxyHandler failed."));
   }
  
   return iResult;
@@ -136,13 +137,13 @@ Int_t AliHLTHOMERManager::CreateSourcesList() {
 
   iResult = fProxyHandler->FillSourceList( fSourceList );
   if ( iResult < 0 ) {
-    HLTWarning("There have been errors, while creating the sources list.");
+    AliWarning(Form("There have been errors, while creating the sources list."));
   }
   else if ( iResult > 0 ) {
-    HLTWarning("No active services found.");
+    AliWarning(Form("No active services found."));
   }
   else {
-    HLTInfo("New sources list created.");
+     AliInfo(Form("New sources list created."));
 
     // -- New SourceList has been created 
     // --> All Sources are new --> State has changed
@@ -171,14 +172,14 @@ void AliHLTHOMERManager::SetSourceState( AliHLTHOMERSourceDesc * source, Bool_t
  */
 
 //##################################################################################
-Int_t AliHLTHOMERManager::ConnectHOMER( TString detector="" ){
+Int_t AliHLTHOMERManager::ConnectHOMER( TString detector ){
   // see header file for class documentation
 
   Int_t iResult = 0;
 
   // -- Check if already connected and state has not changed
   if ( fStateHasChanged == kFALSE && IsConnected() ) {
-    HLTInfo("No need for reconnection.");
+    AliInfo(Form("No need for reconnection."));
     return iResult;
   }
 
@@ -193,7 +194,7 @@ Int_t AliHLTHOMERManager::ConnectHOMER( TString detector="" ){
 
   CreateReadoutList( sourceHostnames, sourcePorts, sourceCount, detector );
   if ( sourceCount == 0 ) {
-    HLTError("No sources selected, aborting.");
+    AliError(Form("No sources selected, aborting."));
     return -1;
   }
 
@@ -201,7 +202,7 @@ Int_t AliHLTHOMERManager::ConnectHOMER( TString detector="" ){
   if ( !fReader && fLibManager )
     fReader = fLibManager->OpenReader( sourceCount, sourceHostnames, sourcePorts );
   else {
-    HLTError("No LibManager present.");
+    AliError(Form("No LibManager present."));
     return -2;
   }
     
@@ -212,12 +213,12 @@ Int_t AliHLTHOMERManager::ConnectHOMER( TString detector="" ){
     UInt_t ndx = fReader->GetErrorConnectionNdx();
 
     if ( ndx < sourceCount ) {
-      HLTError("Error establishing connection to TCP source %s:%hu: %s (%d)",
-              sourceHostnames[ndx], sourcePorts[ndx], strerror(iResult), iResult);
+      AliError(Form("Error establishing connection to TCP source %s:%hu: %s (%d)",
+                   sourceHostnames[ndx], sourcePorts[ndx], strerror(iResult), iResult));
     }
     else {
-      HLTError("Error establishing connection to unknown source with index %d: %s (%d)",
-              ndx, strerror(iResult), iResult);
+      AliError(Form("Error establishing connection to unknown source with index %d: %s (%d)",
+                   ndx, strerror(iResult), iResult));
     }
 
     if ( fReader )
@@ -228,7 +229,7 @@ Int_t AliHLTHOMERManager::ConnectHOMER( TString detector="" ){
     // -- Connection ok - set reader
     fConnected = kTRUE;
 
-    HLTInfo("Connection established.");
+    AliInfo(Form("Connection established."));
   }
 
   delete[] sourceHostnames;
@@ -251,7 +252,7 @@ void AliHLTHOMERManager::DisconnectHOMER(){
   fStateHasChanged = kTRUE;
   fConnected = kFALSE;
 
-  HLTInfo("Connection closed.");
+  AliInfo(Form("Connection closed."));
 
   return;
 }
@@ -267,7 +268,7 @@ Int_t AliHLTHOMERManager::ReconnectHOMER( TString detector="" ){
 
   iResult = ConnectHOMER(detector);
   if ( iResult ) {
-    HLTError("Error reconnecting.");
+    AliError(Form("Error reconnecting."));
   }
 
   return iResult;
@@ -288,7 +289,7 @@ Int_t AliHLTHOMERManager::NextEvent(){
   Int_t iRetryCount = 0;
 
   if ( !fReader || ! IsConnected() ) {
-    HLTWarning( "Not connected yet." );
+    AliWarning(Form( "Not connected yet." ));
     return -1;
   }
 
@@ -300,32 +301,32 @@ Int_t AliHLTHOMERManager::NextEvent(){
     iResult = fReader->ReadNextEvent( 40000000 /*timeout in us*/);
 
     if ( iResult == 111 || iResult == 32 || iResult == 6 ) {
-      HLTError("No Connection to source %d: %s (%d)", 
-              fReader->GetErrorConnectionNdx(), strerror(iResult), iResult);
+      AliError(Form("No Connection to source %d: %s (%d)", 
+                   fReader->GetErrorConnectionNdx(), strerror(iResult), iResult));
       return -iResult;
     }
     else if ( iResult == 110 ) {
-      HLTError("Timout occured, reading event from source %d: %s (%d)", 
-              fReader->GetErrorConnectionNdx(), strerror(iResult), iResult);
+      AliError(Form("Timout occured, reading event from source %d: %s (%d)", 
+                   fReader->GetErrorConnectionNdx(), strerror(iResult), iResult));
       return -iResult;
     }
     else if ( iResult == 56) {
       ++iRetryCount;
 
       if ( iRetryCount >= 20 ) {
-       HLTError("Retry Failed: Error reading event from source %d: %s (%d)", 
-                fReader->GetErrorConnectionNdx(), strerror(iResult), iResult);
+       AliError(Form("Retry Failed: Error reading event from source %d: %s (%d)", 
+                     fReader->GetErrorConnectionNdx(), strerror(iResult), iResult));
        return -iResult;
       }
       else {
-       HLTError("Retry: Error reading event from source %d: %s (%d)", 
-                fReader->GetErrorConnectionNdx(), strerror(iResult), iResult);
+       AliError(Form("Retry: Error reading event from source %d: %s (%d)", 
+                     fReader->GetErrorConnectionNdx(), strerror(iResult), iResult));
        continue;
       }
     }
     else if ( iResult ) {
-      HLTError("General Error reading event from source %d: %s (%d)", 
-              fReader->GetErrorConnectionNdx(), strerror(iResult), iResult);
+      AliError(Form("General Error reading event from source %d: %s (%d)", 
+                   fReader->GetErrorConnectionNdx(), strerror(iResult), iResult));
       fConnected = kFALSE;
       return -iResult;
     }
@@ -339,7 +340,7 @@ Int_t AliHLTHOMERManager::NextEvent(){
   fEventID = static_cast<ULong64_t>(fReader->GetEventID());
   fCurrentBlk = 0;
 
-  HLTInfo("Event 0x%016LX (%Lu) with %lu blocks", fEventID, fEventID, fNBlks);
+  AliInfo(Form("Event 0x%016LX (%Lu) with %lu blocks", fEventID, fEventID, fNBlks));
 
 #if EVE_DEBUG
   // Loop for Debug only
@@ -349,17 +350,17 @@ Int_t AliHLTHOMERManager::NextEvent(){
     memset( tmp2, 0, 5 );
     void *tmp11 = tmp1;
     ULong64_t* tmp12 = static_cast<ULong64_t*>(tmp11);
-    *tmp12 = fReader->GetBlockDataType( ii );
+    *tmp12 = fReader->GetBlockDataType(ii);
     void *tmp21 = tmp2;
     ULong_t* tmp22 = static_cast<ULong_t*>(tmp21);
-    *tmp22 = fReader->GetBlockDataOrigin( ii );
-    HLTInfo("Block %lu length: %lu - type: %s - origin: %s",
-           ii, fReader->GetBlockDataLength( ii ), tmp1, tmp2);
+    *tmp22 = fReader->GetBlockDataOrigin(ii);
+    AliInfo(Form( "Block %lu length: %lu - type: %s - origin: %s - spec 0x%08X",
+                 ii, fReader->GetBlockDataLength(ii), tmp1, tmp2, fReader->GetBlockDataSpec(ii) ));
   } // end for ( ULong_t ii = 0; ii < fNBlks; ii++ ) {
 #endif
 
   // -- Create BlockList
-  HLTInfo("Create Block List");
+  AliInfo(Form("Create Block List"));
   CreateBlockList();
 
   return iResult;
@@ -382,18 +383,21 @@ void AliHLTHOMERManager::CreateReadoutList( const char** sourceHostnames, UShort
   TIter next( fSourceList );
   while ( ( source = dynamic_cast<AliHLTHOMERSourceDesc*>(next()) ) ) {
 
-    
+    printf("DAT = %s\n",detector.Data());
 
-    // -- If detector name given
-    if ( ! detector.IsNull() ) {
-      // -- Continue if detector name doesn't match
-      if ( detector.CompareTo(source->GetDetector()) )
+    // -- If detector NO detector name given
+    if ( ! detector.CompareTo("ALL") ) {
+      // -- Continue if source is not selected
+      if ( ! source->IsSelected() )
        continue;
     }
+    // -- DetectorName given
     else {
-      // -- Continue if source is not selected
-      if ( ! source->IsSelected() )
+      // -- Continue if detector name doesn't match
+      if ( detector.CompareTo(source->GetDetector()) )
        continue;
+      else
+       source->Select();
     }
     
     Bool_t exists = kFALSE;
@@ -475,7 +479,7 @@ void* AliHLTHOMERManager::GetBlk( Int_t ndx ) {
   // Get pointer to current block in current event
    
   if ( !fReader || !IsConnected() ) {
-    HLTError("Not connected yet.");
+    AliError(Form("Not connected yet."));
     return NULL;
   }
   if ( ndx < static_cast<Int_t>(fNBlks) )
@@ -489,7 +493,7 @@ ULong_t AliHLTHOMERManager::GetBlkSize( Int_t ndx ) {
   // see header file for class documentation
    
   if ( !fReader || !IsConnected() ) {
-    HLTError("Not connected yet.");
+    AliError(Form("Not connected yet."));
     return 0;
   }
   
@@ -507,13 +511,13 @@ TString AliHLTHOMERManager::GetBlkOrigin( Int_t ndx ) {
 
   // -- Check for Connection
   if ( !fReader || ! IsConnected() ) {
-    HLTError("Not connected yet.");
+    AliError(Form("Not connected yet."));
     return origin;
   }
 
   // -- Check block index
   if ( ndx >= static_cast<Int_t>(fNBlks) ) {
-    HLTError("Block index %d out of range.", ndx );
+    AliError(Form("Block index %d out of range.", ndx ));
     return origin;
   }
 
@@ -543,13 +547,13 @@ TString AliHLTHOMERManager::GetBlkType( Int_t ndx ) {
 
   // -- Check for Connection
   if ( !fReader || ! IsConnected() ) {
-    HLTError("Not connected yet.");
+    AliError(Form("Not connected yet."));
     return type;
   }
 
   // -- Check block index
   if ( ndx >= static_cast<Int_t>(fNBlks) ) {
-    HLTError("Block index %d out of range.", ndx );
+    AliError(Form("Block index %d out of range.", ndx ));
     return type;
   }
 
@@ -577,13 +581,13 @@ ULong_t AliHLTHOMERManager::GetBlkSpecification( Int_t ndx ) {
 
   // -- Check for Connection
   if ( !fReader || ! IsConnected() ) {
-    HLTError("Not connected yet.");
+    AliError(Form("Not connected yet."));
     return 0;
   }
 
   // -- Check block index
   if ( ndx >= static_cast<Int_t>(fNBlks) ) {
-    HLTError("Block index %d out of range.", ndx );
+    AliError(Form("Block index %d out of range.", ndx ));
     return 0;
   }
 
@@ -602,10 +606,14 @@ Bool_t AliHLTHOMERManager::CheckIfRequested( AliHLTHOMERBlockDesc * block ) {
   TIter next( fSourceList );
   while ( ( source = dynamic_cast<AliHLTHOMERSourceDesc*>(next()) ) ) {
     
+
+
     // -- Check if source is selected
     if ( ! source->IsSelected() )
       continue;
-
+    else
+      AliError(Form("IS SELECTED"));
+    
     // -- Check if detector matches
     if ( source->GetSourceName().CompareTo( block->GetBlockName() ) )
       continue;
@@ -617,10 +625,10 @@ Bool_t AliHLTHOMERManager::CheckIfRequested( AliHLTHOMERBlockDesc * block ) {
   
 #if EVE_DEBUG
   if ( requested ) {
-    HLTInfo ("Block requested : %s", block->GetBlockName().Data()); 
+    AliInfo(Form("Block requested : %s", block->GetBlockName().Data())); 
   }
   else {
-    HLTInfo("Block NOT requested : %s", block->GetBlockName().Data()); 
+    AliInfo(Form("Block NOT requested : %s", block->GetBlockName().Data())); 
   }
 #endif
 

diff --git a/HLT/BASE/AliHLTHOMERManager.h b/HLT/BASE/AliHLTHOMERManager.h
index 7cc33b627548e9730433422c4fbc811756817954..59841a1f3ef1cc0208c74bdb55e5d10135f0f068 100644 (file)
--- a/HLT/BASE/AliHLTHOMERManager.h
+++ b/HLT/BASE/AliHLTHOMERManager.h
@@ -25,7 +25,7 @@
 #include "AliHLTHOMERReader.h"
 #include "AliHLTHOMERProxyHandler.h"
 
-#include "AliHLTLogging.h"
+//#include "AliHLTLogging.h"
 
 class AliHLTHOMERLibManager;
 
@@ -44,7 +44,8 @@ class AliHLTHOMERLibManager;
  * @ingroup alihlt_homer
  */
 
-class AliHLTHOMERManager : public TObject, public AliHLTLogging {
+class AliHLTHOMERManager : public TObject//, public AliHLTLogging 
+{
 public:
   
   /*
@@ -95,7 +96,7 @@ public:
    *  @param detector    Detector to be connected to
    *  @return            0 on success, <0 for failure
    */
-  Int_t ConnectHOMER( TString detector );
+  Int_t ConnectHOMER( TString detector="ALL" );
 
   /** Disconnect from HOMER sources */
   void  DisconnectHOMER();

diff --git a/HLT/BASE/AliHLTHOMERProxyHandler.cxx b/HLT/BASE/AliHLTHOMERProxyHandler.cxx
index 3a92bdbefa88ff41b9b31cd9302a8d76d2245416..e847cafcf3510daee419827d4630ca9ffaae41b8 100644 (file)
--- a/HLT/BASE/AliHLTHOMERProxyHandler.cxx
+++ b/HLT/BASE/AliHLTHOMERProxyHandler.cxx
@@ -37,6 +37,8 @@
 #include "TSystem.h"
 // -- -- -- -- -- -- -- 
 #include "AliHLTHOMERProxyHandler.h"
+// -- -- -- -- -- -- -- 
+#include "AliLog.h"
 
 ClassImp(AliHLTHOMERProxyHandler)
 
@@ -95,7 +97,7 @@ Int_t AliHLTHOMERProxyHandler::FillSourceList(TList *srcList) {
     iResult = ProcessXmlRpcResponse();
 
   if (iResult < 0) {
-    HLTError("Filling SourceList failed.");
+    AliError(Form("Filling SourceList failed."));
   }
 
   return iResult;
@@ -156,14 +158,15 @@ Int_t AliHLTHOMERProxyHandler::RequestXmlRpcResponse() {
 
   TSocket *socket = new TSocket(fgkHOMERProxyNode[fRealm], proxyPort);
   if ( ! socket->IsValid() ) {
-    HLTWarning("Failed to create socket to %s:%d,",fgkHOMERProxyNode[fRealm], proxyPort);
-    HLTWarning("trying %s:%d now.", fgkHOMERProxyNode[fRealm+kHOMERRealmsMax],proxyPort);
+    AliWarning(Form("Failed to create socket to %s:%d,",fgkHOMERProxyNode[fRealm], proxyPort));
+    AliWarning(Form("trying %s:%d now.", fgkHOMERProxyNode[fRealm+kHOMERRealmsMax],proxyPort));
 
     socket = new TSocket(fgkHOMERProxyNode[fRealm+kHOMERRealmsMax], proxyPort);
     if ( ! socket->IsValid() ) {
-      HLTError("Failed to create socket to %s:%d and %s:%d.",
-              fgkHOMERProxyNode[fRealm], proxyPort,
-              fgkHOMERProxyNode[fRealm+kHOMERRealmsMax],proxyPort);
+      AliError(Form("Failed to create socket to %s:%d and %s:%d.",
+                   fgkHOMERProxyNode[fRealm], proxyPort,
+                   fgkHOMERProxyNode[fRealm+kHOMERRealmsMax],proxyPort));
+
       fRealm = -1;
       return -1;
     }
@@ -185,7 +188,7 @@ Content-Length: 68\r\n\
   iResult = socket->SendRaw( reqMsg, strlen(reqMsg) );
   if ( iResult < 1 || 
        iResult !=  static_cast<Int_t>(strlen(reqMsg))) {
-    HLTError("Error sending! -- send length %d  -- msg length %d.", iResult, strlen(reqMsg) );
+    AliError(Form("Error sending! -- send length %d  -- msg length %d.", iResult, static_cast<Int_t>(strlen(reqMsg)) ));
     socket->Close();
     return iResult;
   }
@@ -210,7 +213,7 @@ Content-Length: 68\r\n\
 
       iResult = socket->RecvRaw(&buffer[bufferLength], 1);
       if ( iResult < 0) {
-       HLTError("Error reading form socket.");
+       AliError(Form("Error reading form socket."));
        socket->Close();
        return iResult;
       }
@@ -258,12 +261,14 @@ Int_t AliHLTHOMERProxyHandler::ProcessXmlRpcResponse() {
   TDOMParser xmlParser;
   xmlParser.SetValidate(kFALSE);
 
-  HLTDebug("XMLResponse:\n %s",fXmlRpcResponse.Data());
+  AliInfo(Form("XMLResponse: %s",fXmlRpcResponse.Data()));
 
   iResult = xmlParser.ParseBuffer(fXmlRpcResponse.Data(), fXmlRpcResponse.Length());
   if ( iResult < 0 ) {
-    HLTError("Parsing buffer with error: %s", 
-            xmlParser.GetParseCodeMessage(xmlParser.GetParseCode()) );
+    AliError(Form("Parsing buffer with error: %s", 
+                 xmlParser.GetParseCodeMessage(xmlParser.GetParseCode()) ));
+    
+
     return iResult;
   }
 
@@ -271,7 +276,7 @@ Int_t AliHLTHOMERProxyHandler::ProcessXmlRpcResponse() {
     GetChildren()->GetChildren()->GetChildren()->GetChildren();
   
   if ( strcmp( node->GetNodeName(), "string" ) ) {
-    HLTError("No node 'string' in XmlRpcResponse.");
+    AliError(Form("No node 'string' in XmlRpcResponse."));
     return -1;
   }
 
@@ -281,18 +286,19 @@ Int_t AliHLTHOMERProxyHandler::ProcessXmlRpcResponse() {
   // -- Get Content
   TString xmlContent(node->GetText() );
 
-  HLTDebug("XMLContent:\n %s",xmlContent.Data());
+  AliInfo(Form("XMLContent: %s",xmlContent.Data()));
 
   iResult = xmlParser.ParseBuffer(xmlContent.Data(), xmlContent.Length());
   if ( iResult < 0 ) {
-    HLTError("Parsing buffer with error: %s", 
-            xmlParser.GetParseCodeMessage(xmlParser.GetParseCode()) );
+    AliError(Form("Parsing buffer with error: %s", 
+                 xmlParser.GetParseCodeMessage(xmlParser.GetParseCode()) ));
+
     return iResult;
   }
   
 
   if ( !xmlParser.GetXMLDocument()->GetRootNode()->HasChildren() ) {
-    HLTInfo("No Services active.");
+    AliWarning(Form("No Services active."));
     return 1;
   }
 
@@ -323,7 +329,7 @@ Int_t AliHLTHOMERProxyHandler::AddService(TXMLNode *innerNode) {
 
   Int_t iResult = 0;
 
-  HLTInfo(">> New service");    
+  AliInfo(Form(">> New service"));    
 
   // -- Loop over all service properties and 
   //    read them from the service tag
@@ -343,7 +349,7 @@ Int_t AliHLTHOMERProxyHandler::AddService(TXMLNode *innerNode) {
     if ( ! strcmp(innerNode->GetNodeName(), "text" ) )
       continue;
     
-    HLTInfo(" %s ++ %s", innerNode->GetNodeName(), innerNode->GetText() );
+    AliInfo(Form(" %s ++ %s", innerNode->GetNodeName(), innerNode->GetText() ));
     
     // -- hostname
     if ( ! strcmp( innerNode->GetNodeName(), "address") )
@@ -353,7 +359,7 @@ Int_t AliHLTHOMERProxyHandler::AddService(TXMLNode *innerNode) {
       if ( portS.IsDigit() )
        port = portS.Atoi();
       else {
-       HLTError("Port %s is not a digit.", portS.Data());
+       AliError(Form("Port %s is not a digit.", portS.Data()));
        iResult = -1;
       }
     }
@@ -375,9 +381,10 @@ Int_t AliHLTHOMERProxyHandler::AddService(TXMLNode *innerNode) {
 
   // -- Check for completeness of the source properties
   if ( hostname.IsNull() || !port || dataOrigin.IsNull() ||
-       dataType.IsNull() /*|| dataSpecification.IsNull()*/ ) {
-    HLTError("Service provides not all values:\n\thostname\t\t %s\n\tport\t\t\t %d\n\tdataorigin\t\t %s\n\tdatatype\t\t %s\n\tdataspecification\t %s", hostname.Data(),
-            port, dataOrigin.Data(), dataType.Data(), dataSpecification.Data());
+       dataType.IsNull() || dataSpecification.IsNull() ) {
+    AliError(Form("Service provides not all values:\n\thostname\t\t %s\n\tport\t\t\t %d\n\tdataorigin\t\t %s\n\tdatatype\t\t %s\n\tdataspecification\t %s", 
+                 hostname.Data(), port, dataOrigin.Data(), dataType.Data(), dataSpecification.Data()));
+
     return -2;
   }
 
@@ -389,7 +396,7 @@ Int_t AliHLTHOMERProxyHandler::AddService(TXMLNode *innerNode) {
 
   fSourceList->Add( source );
 
-  HLTInfo( "New Source added : %s", source->GetSourceName().Data());
+  AliInfo(Form( "New Source added : %s", source->GetSourceName().Data()));
   
   return iResult;
 }

diff --git a/HLT/BASE/AliHLTHOMERProxyHandler.h b/HLT/BASE/AliHLTHOMERProxyHandler.h
index 303b11f7a9e1663ea05b04f45f6015655a4ff5e8..c0dbf821d442780b29a39024f9d77283dfd6d011 100644 (file)
--- a/HLT/BASE/AliHLTHOMERProxyHandler.h
+++ b/HLT/BASE/AliHLTHOMERProxyHandler.h
@@ -22,7 +22,7 @@
 // -- -- -- -- -- -- -- 
 #include "AliHLTHOMERSourceDesc.h"
 // -- -- -- -- -- -- -- 
-#include "AliHLTLogging.h"
+//#include "AliHLTLogging.h"
 
 /**
  * @class AliHLTHOMERProxyHandler
@@ -32,7 +32,7 @@
  * @ingroup alihlt_homer
  */
 
-class AliHLTHOMERProxyHandler : public TObject, public AliHLTLogging
+class AliHLTHOMERProxyHandler : public TObject//, public AliHLTLogging
 {
 public:
 

diff --git a/HLT/BASE/AliHLTHOMERSourceDesc.cxx b/HLT/BASE/AliHLTHOMERSourceDesc.cxx
index 0803f83f48a196f99b60820e1c2afbe185b20769..fa9830be1cfa2fb5d488fe3d745391596fb60d93 100644 (file)
--- a/HLT/BASE/AliHLTHOMERSourceDesc.cxx
+++ b/HLT/BASE/AliHLTHOMERSourceDesc.cxx
@@ -65,7 +65,7 @@ AliHLTHOMERSourceDesc::~AliHLTHOMERSourceDesc() {
 
 //#################################################################################
 void AliHLTHOMERSourceDesc::SetService( TString hostname, Int_t port, TString origin, 
-                                       TString type, TString /*spec*/ ) {
+                                       TString type, TString spec ) {
   // see header file for class documentation
 
   fHostname = hostname;
@@ -78,11 +78,11 @@ void AliHLTHOMERSourceDesc::SetService( TString hostname, Int_t port, TString or
   fDetector.Remove( TString::kTrailing, ' ' );
 
   // -- Temporary until Specification is set in service
-  fSpecification = 0;
+  fSpecification = spec.Atoi();
   fSubDetector = 0;
   fSubSubDetector = 0;
 
-  fSourceName.Form("%s_%s_%lu", fDetector.Data(), fDataType.Data(), fSpecification); 
+  fSourceName.Form("%s_%s_0x%08LX", fDetector.Data(), fDataType.Data(), fSpecification ); 
 
   return;
 }

diff --git a/HLT/exa/HOMERManager.C b/HLT/exa/HOMERManager.C
index d4084e3d6a814d2e1691c21ef4a6ad5fd810a113..541adc0cc28ff2950adb3b01216187d06770dad5 100644 (file)
--- a/HLT/exa/HOMERManager.C
+++ b/HLT/exa/HOMERManager.C
@@ -45,7 +45,7 @@ Int_t HOMERManager() {
 
   printf( "== CONNECT HOMER ==\n" );
   
-  iResult = hM->ConnectHOMER("TPC");
+  iResult = hM->ConnectHOMER("TRD");
   if (iResult) return iResult;
   
   printf( "== NEXT EVENT ==\n" );
@@ -68,7 +68,7 @@ Int_t HOMERManager() {
     if ( block->IsTObject() )
       object = block->GetTObject();
     
-    printf("ClassName %s\n", block->GetClassName() );
+    printf("ClassName %s\n", block->GetClassName().Data() );
     
   }