From 4a6b48940e54afbc6492dcd01a393bac7deb50a7 Mon Sep 17 00:00:00 2001
From: richterm <richterm@f7af4fe6-9843-0410-8265-dc069ae4e863>
Date: Wed, 13 Sep 2006 21:28:26 +0000
Subject: [PATCH] - version HLT-v0-4 ready - changes in configure to make it
 work with several PubSub directory layouts - generation of the dictonary for
 TPCDisplay library corrected - protection in TPCDigitReaderRaw agains
 corrupted data

---
 HLT/TPCLib/AliHLTTPCDigitReaderRaw.cxx | 10 ++++++++--
 HLT/TPCLib/OnlineDisplay/Makefile.am   | 11 ++++++-----
 HLT/configure.ac                       | 12 +++++++++---
 HLT/make.dict                          |  9 ++++++---
 4 files changed, 29 insertions(+), 13 deletions(-)

diff --git a/HLT/TPCLib/AliHLTTPCDigitReaderRaw.cxx b/HLT/TPCLib/AliHLTTPCDigitReaderRaw.cxx
index c32c40f001c..54662540110 100644
--- a/HLT/TPCLib/AliHLTTPCDigitReaderRaw.cxx
+++ b/HLT/TPCLib/AliHLTTPCDigitReaderRaw.cxx
@@ -213,12 +213,18 @@ int AliHLTTPCDigitReaderRaw::InitBlock(void* ptr,unsigned long size, Int_t patch
 	      if ( bin > fNTimeBins )
 		HLTFatal("Time bin out of range: %d (bin count %d)", bin, fNTimeBins);
 	    }
-	    continue;
+	    // stop at the fist error message in order to avoid endless messages and
+	    // to handle corrupted events
+	    //continue;
+	    break;
 	  } else if ((row-fRowOffset)*fNMaxPads*fNTimeBins+ pad*fNTimeBins + bin >=  fNMaxRows*fNMaxPads*fNTimeBins ) {
 	    if (errorCount++<maxErrorPrintout) {
 	      HLTFatal("index out of range: PAD=%d ||| ROW=%d ||| BIN=%d ||| OFFSET=%d ||| ROWOFFSET=%d", pad, row, bin, offset, fRowOffset);
 	    }
-	    continue;
+	    // stop at the fist error message in order to avoid endless messages and
+	    // to handle corrupted events
+	    //continue;
+	    break;
 	  } else {
 	    fData[ (row-fRowOffset)*fNMaxPads*fNTimeBins+ pad*fNTimeBins + bin ] = GetRealSignal() ;
 	  }
diff --git a/HLT/TPCLib/OnlineDisplay/Makefile.am b/HLT/TPCLib/OnlineDisplay/Makefile.am
index 96182a7e9de..65096d1d8e3 100644
--- a/HLT/TPCLib/OnlineDisplay/Makefile.am
+++ b/HLT/TPCLib/OnlineDisplay/Makefile.am
@@ -23,11 +23,7 @@ libAliHLTTPCDisplay_la_SOURCES	= AliHLTTPCDisplayMain.cxx \
 
 # class header files, the link definition for the root dictionary
 # will be created from the names of the header files
-CLASS_HDRS			= 
-
-
-pkginclude_HEADERS		= $(CLASS_HDRS) \
-				  AliHLTTPCDisplayMain.h  \
+CLASS_HDRS			= AliHLTTPCDisplayMain.h  \
 				  AliHLTTPCDisplay.h  \
 				  AliHLTTPCDisplay3D.h  \
 				  AliHLTTPCDisplayCharge.h  \
@@ -38,6 +34,7 @@ pkginclude_HEADERS		= $(CLASS_HDRS) \
 
 
 
+pkginclude_HEADERS		= $(CLASS_HDRS)
 
 # version info for the library
 libAliHLTTPCDisplay_la_LDFLAGS	= -L@ROOTLIBDIR@ \
@@ -49,6 +46,10 @@ libAliHLTTPCDisplay_la_LDFLAGS	= -L@ROOTLIBDIR@ \
 
 # set the file name for the generated root dictionary
 DICTCPP				=  AliHLTTPCDisplay-DICT.cxx
+# add additional include files which are necessary for the compilation of the 
+# dictionary files and which are not part of the CLASS_HDRS
+DICTINCLUDE			= AliHLTTPCSpacePointData.h \
+				  AliHLTTPCTrackArray.h
 nodist_libAliHLTTPCDisplay_la_SOURCES  =  $(DICTCPP)
 
 CLEANFILES			= 
diff --git a/HLT/configure.ac b/HLT/configure.ac
index 9dc85f1da7b..b7fdaec2eef 100644
--- a/HLT/configure.ac
+++ b/HLT/configure.ac
@@ -5,7 +5,7 @@ dnl template for the configuration script for the Alice HLT
 dnl framework and components
 dnl 
 dnl ------------------------------------------------------------------
-AC_INIT([Alice High Level Trigger] , [0.4-dev], [Matthias.Richter@ift.uib.no], alice-hlt)
+AC_INIT([Alice High Level Trigger] , [0.4], [Matthias.Richter@ift.uib.no], alice-hlt)
 
 dnl ------------------------------------------------------------------
 dnl the package from CVS contains the old Makefiles as well. In order to
@@ -237,8 +237,14 @@ if test "x$with_pubsub" != "xno" ; then
   save_CPPFLAGS=$CPPFLAGS
   save_LDFLAGS=$LDFLAGS
   save_LIBS=$LIBS
-  HOMER_CPPFLAGS="-I${with_pubsub}/include/HOMER/reader"
-  HOMER_LDFLAGS="-L${with_pubsub}/lib/`uname -s`-`uname -p`"
+  # currently the different versions of the HLT PubSub framework have a different
+  # directory layout
+  if test -d ${with_pubsub}/include/HOMER/reader ; then
+    HOMER_CPPFLAGS="-I${with_pubsub}/include/HOMER/reader"
+  else
+    HOMER_CPPFLAGS="-I${with_pubsub}/src/Util/HOMER/reader/include -I${with_pubsub}/src/Util/HOMER/data/include"
+  fi
+  HOMER_LDFLAGS="-L${with_pubsub}/lib/`uname -s`-`uname -m`"
   CPPFLAGS="$save_CPPFLAGS $HOMER_CPPFLAGS"
   LDFLAGS="$save_LDFLAGS $HOMER_LDFLAGS"
   LIBS="$save_LIBS "
diff --git a/HLT/make.dict b/HLT/make.dict
index f3161b442b7..a3aa7ec6b30 100644
--- a/HLT/make.dict
+++ b/HLT/make.dict
@@ -3,10 +3,13 @@
 # usage:
 #  1. set variable CLASS_HDRS to the class header files
 #  2. set DICTCPP variable to dictionary c++ file name
-#     e.g. <module>-DICT.cxx
+#     e.g. <module>-DICT.cxx (<module> replaced by your module name)
 #  3. add the source file name to the list of generated sources
 #     nodist_lib<module>_la_SOURCES  =  $(DICTCPP)
-#  4. include this file from your Makefile(.am)
+#  4. add additional include files which are necessary for the compilation
+#     of the dictionary files and which are not part of the CLASS_HDRS to
+#     the DICTINCLUDE variable
+#  5. include this file from your Makefile(.am)
 #     e.g. include ../make.dict
 #
 # Author: Matthias.Richter@ift.uib.no
@@ -22,7 +25,7 @@ $(DICTCPP:.cxx=.h): $(DICTCPP)
 	if test $@ ; then : ; else rm -f $< ; $(MAKE) $(MAKEFLAGS) $< ; fi 
 
 $(DICTCPP): $(DICTHEADERS:%=$(srcdir)/%) $(DICTDEF)
-	if [ -x $(ROOTCINT) ]; then $(ROOTCINT) -f $@ -c $(CPPFLAGS) $(AM_CPPFLAGS) $(DEFS) $^ ; fi
+	if [ -x $(ROOTCINT) ]; then $(ROOTCINT) -f $@ -c $(CPPFLAGS) $(AM_CPPFLAGS) $(DEFS) $(foreach i, $(DICTINCLUDE), $(i)) $^ ; fi
 $(DICTDEF): Makefile.am
 	@echo '//automatically generated ROOT DICT definition' > $@
 	@echo '//!!! DO NOT EDIT THIS FILE !!!' >> $@
-- 
2.39.3