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.

diff --git a/HLT/hlt.conf b/HLT/hlt.conf
index 473287c2a4a8f52edaec29ff73de9b5b2090e798..3cd4df79647ced7fc039cf627c4e49798281dcad 100644 (file)
--- 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 962a12af6f2806d356cbcc3cdd00703c172f03aa..3f3ae71b95c33b62690522203a1ca9ce48b5299a 100644 (file)
--- 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 ef875e56f00c53025acfe53e74607054444f2073..a7ff5c466f46e482faedc0376e95f04ee15e3b1d 100644 (file)
--- 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 10b20348055c763c6d5a35cf05eff2f46d5eaf65..f89ed40661a7194262ec8fe487774f38d295e234 100644 (file)
--- 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 704381c1026e620f963f4a0cb2260490d0560bb7..b29841cc4a6324cfc221dbdf674a6de7427e19f5 100644 (file)
--- 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 d68afd3dbe942180f4d5427e5fbf473a9138b505..59954d7aa5779deaa17bd4e922d9b1fcabac7daf 100644 (file)
--- 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 a97e388aa66368a6f152f44a6727422495846952..08490d59536e2559865000c221057c0edf537018 100644 (file)
--- 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 a0a53d6be3ce79da0db86861e634e89bb5098939..d84534bdb94f8f590600e395a78e293957d90b3b 100644 (file)
--- 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 */
-
-