minor corrections in documentation and build system, bugfix in agent to return config...

diff --git a/HLT/BASE/util/AliHLTAgentUtil.cxx b/HLT/BASE/util/AliHLTAgentUtil.cxx
index 63c4fc7e7aa216695bad5586b75d6f8aec1e818a..3442bae28b521b3e71da4521813c22b339b68608 100644 (file)
--- a/HLT/BASE/util/AliHLTAgentUtil.cxx
+++ b/HLT/BASE/util/AliHLTAgentUtil.cxx
@@ -54,7 +54,7 @@ int AliHLTAgentUtil::CreateConfigurations(AliHLTConfigurationHandler* handler,
   return 0;
 }
 
   return 0;
 }
 

-const char* AliHLTAgentUtil::GetTopConfigurations(AliRunLoader* runloader) const
+const char* AliHLTAgentUtil::GetLocalRecConfigurations(AliRunLoader* runloader) const

 {
   // see header file for class documentation
   return NULL;
 {
   // see header file for class documentation
   return NULL;

diff --git a/HLT/BASE/util/AliHLTAgentUtil.h b/HLT/BASE/util/AliHLTAgentUtil.h
index f5159b47f9016b8b998fae38bb5a4eda1d7cd7a5..2c69a371454ed1ae2199ef49d70b5d3ad1506571 100644 (file)
--- a/HLT/BASE/util/AliHLTAgentUtil.h
+++ b/HLT/BASE/util/AliHLTAgentUtil.h
@@ -50,7 +50,7 @@ class AliHLTAgentUtil : public AliHLTModuleAgent {
    * @param runloader    AliRoot runloader
    * @return number of configurations, neg. error code if failed
    */
    * @param runloader    AliRoot runloader
    * @return number of configurations, neg. error code if failed
    */

-  const char* GetTopConfigurations(AliRunLoader* runloader=NULL) const;
+  const char* GetLocalRecConfigurations(AliRunLoader* runloader=NULL) const;

 
   /**
    * Component libraries which the configurations of this agent depend on.
 
   /**
    * Component libraries which the configurations of this agent depend on.

diff --git a/HLT/BASE/util/AliHLTDataGenerator.h b/HLT/BASE/util/AliHLTDataGenerator.h
index d6d0ce8b594c4ad81e6d05c5e3c2049ffa5ca7aa..e7ac7d70fc4984b66f54cdafe0b4412832051182 100644 (file)
--- a/HLT/BASE/util/AliHLTDataGenerator.h
+++ b/HLT/BASE/util/AliHLTDataGenerator.h
@@ -57,7 +57,7 @@ class AliHLTDataGenerator : public AliHLTDataSource  {
 
   const char* GetComponentID();
   AliHLTComponentDataType GetOutputDataType();
 
   const char* GetComponentID();
   AliHLTComponentDataType GetOutputDataType();

-  int GetOutputDataTypes(vector<AliHLTComponentDataType>& /*tgtList*/);
+  int GetOutputDataTypes(vector<AliHLTComponentDataType>& tgtList);

   void GetOutputDataSize( unsigned long& constBase, double& inputMultiplier );
   AliHLTComponent* Spawn();
 
   void GetOutputDataSize( unsigned long& constBase, double& inputMultiplier );
   AliHLTComponent* Spawn();
 

diff --git a/HLT/BASE/util/AliHLTLoaderPublisherComponent.cxx b/HLT/BASE/util/AliHLTLoaderPublisherComponent.cxx
index 74dfbe255618418bf924c50e850b639fcaa28d8d..f9d22cb5d05656612e48daf1a714cd1fe11955d3 100644 (file)
--- a/HLT/BASE/util/AliHLTLoaderPublisherComponent.cxx
+++ b/HLT/BASE/util/AliHLTLoaderPublisherComponent.cxx
@@ -227,6 +227,7 @@ int AliHLTLoaderPublisherComponent::GetEvent(const AliHLTComponentEventData& evt
     }
   } else {
     AliErrorStream() << "component not initialized" << endl;
     }
   } else {
     AliErrorStream() << "component not initialized" << endl;

+    iResult=-EFAULT;

   }
   return iResult;
 }
   }
   return iResult;
 }

diff --git a/HLT/BASE/util/AliHLTLoaderPublisherComponent.h b/HLT/BASE/util/AliHLTLoaderPublisherComponent.h
index 5debfb7b3962f9f158552b4154e82dd0795bf476..e7507e0dade00bac31279152fae3a05ebfc09aa8 100644 (file)
--- a/HLT/BASE/util/AliHLTLoaderPublisherComponent.h
+++ b/HLT/BASE/util/AliHLTLoaderPublisherComponent.h
@@ -114,7 +114,7 @@ class AliHLTLoaderPublisherComponent : public AliHLTOfflineDataSource {
    */
   TTree* GetTree();
 
    */
   TTree* GetTree();
 

-  /** max output block size, estimate during DoInit */
+  /** max output block size, estimated during DoInit */

   Int_t                   fMaxSize;                                //!transient
 
   /** loader string */
   Int_t                   fMaxSize;                                //!transient
 
   /** loader string */

diff --git a/HLT/BASE/util/Makefile.am b/HLT/BASE/util/Makefile.am
index de5862e40cfce98954257732d19e671ebfe9e56c..733b671c9166d5ae8edb54270f77e30ae20f6d6c 100644 (file)
--- a/HLT/BASE/util/Makefile.am
+++ b/HLT/BASE/util/Makefile.am
@@ -41,7 +41,7 @@ libAliHLTUtil_la_LDFLAGS      = -L@ROOTLIBDIR@ \
                                  -version-info $(LIBRARY_VERSION)
 
 # automatic generation of data and time of library build
                                  -version-info $(LIBRARY_VERSION)
 
 # automatic generation of data and time of library build

-COMPILE_INFO                   =  HLTBaseCompileInfo.cxx
+COMPILE_INFO                   =  AliHLTUtilCompileInfo.cxx

 
 # set the file name for the generated root dictionary
 DICTCPP                                =  AliHLTUtil-DICT.cxx
 
 # set the file name for the generated root dictionary
 DICTCPP                                =  AliHLTUtil-DICT.cxx


@@ -56,5 +56,5 @@ $(COMPILE_INFO): $(libAliHLTUtil_la_SOURCES) $(pkginclude_HEADERS) $(noinst_HEAD
        @echo '//automatically generated compilation info' > $@
        @echo '//!!! DO NOT EDIT THIS FILE !!!' >> $@
        @echo '//add changes in Makefile.am' >> $@
        @echo '//automatically generated compilation info' > $@
        @echo '//!!! DO NOT EDIT THIS FILE !!!' >> $@
        @echo '//add changes in Makefile.am' >> $@

-       @echo 'void $(MODULE)CompileInfo( char*& date, char*& time)' >> $@
+       @echo 'extern "C" void CompileInfo( char*& date, char*& time)' >> $@

        @echo '{date=__DATE__; time=__TIME__; return;}' >> $@
        @echo '{date=__DATE__; time=__TIME__; return;}' >> $@