From 56951e49c36bae46510bde05fe787b757b2fe153 Mon Sep 17 00:00:00 2001 From: richterm Date: Thu, 20 Sep 2007 07:41:43 +0000 Subject: [PATCH] minor corrections in documentation and build system, bugfix in agent to return configurations for local reconstruction --- HLT/BASE/util/AliHLTAgentUtil.cxx | 2 +- HLT/BASE/util/AliHLTAgentUtil.h | 2 +- HLT/BASE/util/AliHLTDataGenerator.h | 2 +- HLT/BASE/util/AliHLTLoaderPublisherComponent.cxx | 1 + HLT/BASE/util/AliHLTLoaderPublisherComponent.h | 2 +- HLT/BASE/util/Makefile.am | 4 ++-- 6 files changed, 7 insertions(+), 6 deletions(-) diff --git a/HLT/BASE/util/AliHLTAgentUtil.cxx b/HLT/BASE/util/AliHLTAgentUtil.cxx index 63c4fc7e7aa..3442bae28b5 100644 --- a/HLT/BASE/util/AliHLTAgentUtil.cxx +++ b/HLT/BASE/util/AliHLTAgentUtil.cxx @@ -54,7 +54,7 @@ int AliHLTAgentUtil::CreateConfigurations(AliHLTConfigurationHandler* handler, return 0; } -const char* AliHLTAgentUtil::GetTopConfigurations(AliRunLoader* runloader) const +const char* AliHLTAgentUtil::GetLocalRecConfigurations(AliRunLoader* runloader) const { // see header file for class documentation return NULL; diff --git a/HLT/BASE/util/AliHLTAgentUtil.h b/HLT/BASE/util/AliHLTAgentUtil.h index f5159b47f90..2c69a371454 100644 --- 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 */ - const char* GetTopConfigurations(AliRunLoader* runloader=NULL) const; + const char* GetLocalRecConfigurations(AliRunLoader* runloader=NULL) const; /** * 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 d6d0ce8b594..e7ac7d70fc4 100644 --- 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(); - int GetOutputDataTypes(vector& /*tgtList*/); + int GetOutputDataTypes(vector& tgtList); void GetOutputDataSize( unsigned long& constBase, double& inputMultiplier ); AliHLTComponent* Spawn(); diff --git a/HLT/BASE/util/AliHLTLoaderPublisherComponent.cxx b/HLT/BASE/util/AliHLTLoaderPublisherComponent.cxx index 74dfbe25561..f9d22cb5d05 100644 --- 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; + iResult=-EFAULT; } return iResult; } diff --git a/HLT/BASE/util/AliHLTLoaderPublisherComponent.h b/HLT/BASE/util/AliHLTLoaderPublisherComponent.h index 5debfb7b396..e7507e0dade 100644 --- a/HLT/BASE/util/AliHLTLoaderPublisherComponent.h +++ b/HLT/BASE/util/AliHLTLoaderPublisherComponent.h @@ -114,7 +114,7 @@ class AliHLTLoaderPublisherComponent : public AliHLTOfflineDataSource { */ TTree* GetTree(); - /** max output block size, estimate during DoInit */ + /** max output block size, estimated during DoInit */ Int_t fMaxSize; //!transient /** loader string */ diff --git a/HLT/BASE/util/Makefile.am b/HLT/BASE/util/Makefile.am index de5862e40cf..733b671c916 100644 --- 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 -COMPILE_INFO = HLTBaseCompileInfo.cxx +COMPILE_INFO = AliHLTUtilCompileInfo.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 'void $(MODULE)CompileInfo( char*& date, char*& time)' >> $@ + @echo 'extern "C" void CompileInfo( char*& date, char*& time)' >> $@ @echo '{date=__DATE__; time=__TIME__; return;}' >> $@ -- 2.31.1