From 6e61c746882c24a7c30c6412763f6915f34cdf04 Mon Sep 17 00:00:00 2001 From: loizides Date: Sat, 9 Oct 2004 11:28:31 +0000 Subject: [PATCH] Changes to integrate the MLUC libs from http://www.kip.uni-heidelberg.de/ti/L3/software/software.html You need version 0.4.5 in order to have it compiling. --- HLT/hlt.conf | 8 ++++++++ HLT/libAliL3Comp.pkg | 2 +- HLT/libAliL3Hough.pkg | 2 +- HLT/libAliL3Misc.pkg | 2 +- HLT/libAliL3Src.pkg | 2 +- HLT/src/AliHLTReconstructor.cxx | 4 ++++ HLT/src/AliL3Logger.cxx | 31 ++++++++++++++----------------- HLT/src/AliL3Logging.h | 2 -- 8 files changed, 30 insertions(+), 23 deletions(-) diff --git a/HLT/hlt.conf b/HLT/hlt.conf index 473287c2a4a..3cd4df79647 100644 --- a/HLT/hlt.conf +++ b/HLT/hlt.conf @@ -9,3 +9,11 @@ HLTDEFS := -Duse_aliroot -Duse_root -Ddo_mc \ HLTCXXFLAGS := $(filter-out -ansi,$(filter-out -pedantic-errors, $(filter-out -Werror,$(CXXFLAGS)))) HLTCFLAGS := $(filter-out -ansi, $(filter-out -pedantic-errors, $(filter-out -Werror,$(CFLAGS)))) HLTDCXXFLAGS:= $(filter-out -pedantic-errors, $(filter-out -Werror,$(CXXFLAGS))) + + +ifdef ALIHLT_MLUCDIR +HLTDEFS += -Duse_logging +EINCLUDE := $(ALIHLT_MLUCDIR)/include +ELIBS := MLUC +ELIBSDIR :=$(ALIHLT_MLUCDIR)/lib/tgt_$(ALICE_TARGET) +endif diff --git a/HLT/libAliL3Comp.pkg b/HLT/libAliL3Comp.pkg index 962a12af6f2..3f3ae71b95c 100644 --- a/HLT/libAliL3Comp.pkg +++ b/HLT/libAliL3Comp.pkg @@ -25,6 +25,6 @@ PACKCXXFLAGS := ${HLTCXXFLAGS} PACKCFLAGS := ${HLTCLFAGS} PACKDCXXFLAGS:= ${HLTDCXXFLAGS} -EINCLUDE:= HLT/src HLT/hough HLT/comp HLT/misc TPC STEER CONTAINERS +EINCLUDE+= HLT/src HLT/hough HLT/comp HLT/misc TPC STEER CONTAINERS SUBDIR:=comp diff --git a/HLT/libAliL3Hough.pkg b/HLT/libAliL3Hough.pkg index ef875e56f00..a7ff5c466f4 100644 --- a/HLT/libAliL3Hough.pkg +++ b/HLT/libAliL3Hough.pkg @@ -34,6 +34,6 @@ PACKCXXFLAGS := ${HLTCXXFLAGS} PACKCFLAGS := ${HLTCLFAGS} PACKDCXXFLAGS:= ${HLTDCXXFLAGS} -EINCLUDE:= HLT/src HLT/hough HLT/comp HLT/misc TPC STEER CONTAINERS +EINCLUDE+= HLT/src HLT/hough HLT/comp HLT/misc TPC STEER CONTAINERS SUBDIR:=hough diff --git a/HLT/libAliL3Misc.pkg b/HLT/libAliL3Misc.pkg index 10b20348055..f89ed40661a 100644 --- a/HLT/libAliL3Misc.pkg +++ b/HLT/libAliL3Misc.pkg @@ -24,6 +24,6 @@ PACKCXXFLAGS := ${HLTCXXFLAGS} PACKCFLAGS := ${HLTCLFAGS} PACKDCXXFLAGS:= ${HLTDCXXFLAGS} -EINCLUDE:= HLT/src HLT/hough HLT/comp HLT/misc TPC STEER CONTAINERS +EINCLUDE+= HLT/src HLT/hough HLT/comp HLT/misc TPC STEER CONTAINERS SUBDIR:=misc \ No newline at end of file diff --git a/HLT/libAliL3Src.pkg b/HLT/libAliL3Src.pkg index 704381c1026..b29841cc4a6 100644 --- a/HLT/libAliL3Src.pkg +++ b/HLT/libAliL3Src.pkg @@ -40,6 +40,6 @@ PACKCXXFLAGS := ${HLTCXXFLAGS} PACKCFLAGS := ${HLTCLFAGS} PACKDCXXFLAGS:= ${HLTDCXXFLAGS} -EINCLUDE:= HLT/src HLT/hough HLT/comp HLT/misc TPC STEER CONTAINERS +EINCLUDE += HLT/src HLT/hough HLT/comp HLT/misc TPC STEER CONTAINERS SUBDIR:=src diff --git a/HLT/src/AliHLTReconstructor.cxx b/HLT/src/AliHLTReconstructor.cxx index d68afd3dbe9..59954d7aa57 100644 --- a/HLT/src/AliHLTReconstructor.cxx +++ b/HLT/src/AliHLTReconstructor.cxx @@ -42,7 +42,9 @@ ClassImp(AliHLTReconstructor) AliHLTReconstructor::AliHLTReconstructor(): AliReconstructor() { //constructor +#ifndef use_logging AliL3Log::fgLevel=AliL3Log::kWarning; +#endif fDoTracker=1; fDoHough=1; fDoBench=0; @@ -52,7 +54,9 @@ AliHLTReconstructor::AliHLTReconstructor(): AliReconstructor() AliHLTReconstructor::AliHLTReconstructor(Bool_t doTracker, Bool_t doHough): AliReconstructor() { //constructor +#ifndef use_logging AliL3Log::fgLevel=AliL3Log::kWarning; +#endif fDoTracker=doTracker; fDoHough=doHough; fDoBench=0; diff --git a/HLT/src/AliL3Logger.cxx b/HLT/src/AliL3Logger.cxx index a97e388aa66..08490d59536 100644 --- a/HLT/src/AliL3Logger.cxx +++ b/HLT/src/AliL3Logger.cxx @@ -42,23 +42,23 @@ AliL3Logger::AliL3Logger() AliL3Logger::~AliL3Logger() { //destructor - if(fdn) {gLog->DelServer(fdn);delete fdn;} - if(fso) {gLog->DelServer(fso);delete fso;} - if(fse) {gLog->DelServer(fse);delete fse;} - if(fsm) {gLog->DelServer(fsm);delete fsm;} + if(fdn) {gLogP->DelServer(fdn);delete fdn;} + if(fso) {gLogP->DelServer(fso);delete fso;} + if(fse) {gLogP->DelServer(fse);delete fse;} + if(fsm) {gLogP->DelServer(fsm);delete fsm;} if(fof) {fof->close();delete fof;} } void AliL3Logger::Set(Int_t l) { //set logger - (*gLogLevel) |=l; + (*gLogLevelP) |=l; } void AliL3Logger::UnSet(Int_t l) { //unset logger - (*gLogLevel) &=(~l); + (*gLogLevelP) &=(~l); } void AliL3Logger::UseDevNull() @@ -66,21 +66,21 @@ void AliL3Logger::UseDevNull() //use dev null if(fdn) return; fdn = new AliL3DevNullLogServer(); - gLog->AddServer(dn); + gLogP->AddServer(fdn); } void AliL3Logger::UseStdout() { //use stdout if(fso)return; fso = new AliL3StdoutLogServer(); - gLog->AddServer(fso); + gLogP->AddServer(fso); } void AliL3Logger::UseStderr() { //use stderr if(fse) return; fse = new AliL3StderrLogServer(); - gLog->AddServer(fse); + gLogP->AddServer(fse); } void AliL3Logger::UseStream(Char_t *name) @@ -93,31 +93,31 @@ void AliL3Logger::UseStream(Char_t *name) fof = new ofstream(); fof->open(name); fsm = new AliL3StreamLogServer(*fof); - gLog->AddServer(fsm); + gLogP->AddServer(fsm); } void AliL3Logger::NotUseDevNull() { //not dev null - if(fdn) {gLog->DelServer(fdn);delete fdn;fdn=0;} + if(fdn) {gLogP->DelServer(fdn);delete fdn;fdn=0;} } void AliL3Logger::NotUseStdout() { //not stdout - if(fso) {gLog->DelServer(fso);delete fso;fso=0;} + if(fso) {gLogP->DelServer(fso);delete fso;fso=0;} } void AliL3Logger::NotUseStderr() { //not stderr - if(fse) {gLog->DelServer(fse);delete fse;fse=0;} + if(fse) {gLogP->DelServer(fse);delete fse;fse=0;} } void AliL3Logger::NotUseStream() { //not stream - if(fsm) {gLog->DelServer(fsm);delete fsm;fsm=0;} + if(fsm) {gLogP->DelServer(fsm);delete fsm;fsm=0;} if(fof) {fof->close();delete fof;fof=0;} } @@ -202,6 +202,3 @@ void AliL3Logger::NotUseStream() ; } #endif - - - diff --git a/HLT/src/AliL3Logging.h b/HLT/src/AliL3Logging.h index a0a53d6be3c..d84534bdb94 100644 --- a/HLT/src/AliL3Logging.h +++ b/HLT/src/AliL3Logging.h @@ -22,5 +22,3 @@ typedef MLUCStreamLogServer AliL3StreamLogServer; #include "AliL3Log.h" #endif /* use_logging */ #endif /* ALIL3LOGGING_H */ - - -- 2.39.3