From 737e09cd16590f2a863670d481ffa396e4c41bf0 Mon Sep 17 00:00:00 2001
From: "Stephen A. Wood" <saw@jlab.org>
Date: Tue, 26 May 2015 11:21:36 -0400
Subject: [PATCH] Update to use latest version of podd. Makefile and
THcInterface changes to reflect the changes in podd scaler code
---
Makefile | 9 ++++-----
podd | 2 +-
src/THcInterface.cxx | 6 +++---
src/THcInterface.h | 1 +
4 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/Makefile b/Makefile
index ac36479..4a56fa8 100644
--- a/Makefile
+++ b/Makefile
@@ -62,7 +62,7 @@ ifndef ANALYZER
$(error $$ANALYZER environment variable not defined)
endif
-INCDIRS = $(wildcard $(addprefix $(ANALYZER)/, include src hana_decode hana_scaler)), $(shell pwd)/src
+INCDIRS = $(wildcard $(addprefix $(ANALYZER)/, include src hana_decode)) $(shell pwd)/src
#------------------------------------------------------------------------------
# Check that root version is new enough (>= 5.32) by requiring
@@ -172,12 +172,11 @@ all: $(USERLIB) hcana
LIBDIR:=$(ANALYZER)
LIBHALLA := $(LIBDIR)/libHallA.so
LIBDC := $(LIBDIR)/libdc.so
-LIBSCALER := $(LIBDIR)/libscaler.so
-HALLALIBS := -L$(LIBDIR) -lHallA -ldc -lscaler
+HALLALIBS := -L$(LIBDIR) -lHallA -ldc
src/THcInterface.d: $(HDR_COMPILEDATA)
-hcana: src/main.o $(LIBDC) $(LIBSCALER) $(LIBHALLA) $(USERLIB)
+hcana: src/main.o $(LIBDC) $(LIBHALLA) $(USERLIB)
$(LD) $(LDFLAGS) $< $(HALLALIBS) -L. -lHallC $(CCDBLIBS) \
$(GLIBS) -o $@
@@ -185,7 +184,7 @@ $(USERLIB): $(HDR) $(OBJS)
$(LD) $(LDFLAGS) $(SOFLAGS) -o $@ $(OBJS)
@echo "$@ done"
-$(HDR_COMPILEDATA) $(LIBHALLA) $(LIBDC) $(LIBSCALER): $(ANALYZER)/Makefile
+$(HDR_COMPILEDATA) $(LIBHALLA) $(LIBDC): $(ANALYZER)/Makefile
@echo "Building Podd"
@cd $(ANALYZER) ; export PODD_EXTRA_DEFINES=-DHALLC_MODS ; make
diff --git a/podd b/podd
index afce4df..e8e7648 160000
--- a/podd
+++ b/podd
@@ -1 +1 @@
-Subproject commit afce4df317bf88ff161519ee1ee94bd9eb85744f
+Subproject commit e8e7648acdaa65a8e8410a70e4b3be1089bb8e7c
diff --git a/src/THcInterface.cxx b/src/THcInterface.cxx
index 53c190e..c52398a 100644
--- a/src/THcInterface.cxx
+++ b/src/THcInterface.cxx
@@ -78,8 +78,8 @@ THcInterface::THcInterface( const char* appClassName, int* argc, char** argv,
gHcParms = new THcParmList;
gHaCuts = new THaCutList( gHaVars );
gHaApps = new TList;
- gHaScalers = new TList;
gHaPhysics = new TList;
+ gHaEvtHandlers = new TList;
// Use the standard CODA file decoder by default
gHaDecoder = Decoder::CodaDecoder::Class();
// File-based database by default
@@ -110,7 +110,7 @@ THcInterface::THcInterface( const char* appClassName, int* argc, char** argv,
gSystem->FreeDirectory(dp);
s = p;
} else
- s = s+"/src " + s+"/hana_decode " + s+"/hana_scaler";
+ s = s+"/src " + s+"/hana_decode ";
}
// Directories names separated by blanks.
// FIXME: allow blanks
@@ -160,7 +160,7 @@ THcInterface::~THcInterface()
delete gHaTextvars; gHaTextvars=0;
// delete gHaDB; gHaDB = 0;
delete gHaPhysics; gHaPhysics=0;
- delete gHaScalers; gHaScalers=0;
+ delete gHaEvtHandlers; gHaEvtHandlers=0;
delete gHaApps; gHaApps=0;
delete gHaVars; gHaVars=0;
delete gHaCuts; gHaCuts=0;
diff --git a/src/THcInterface.h b/src/THcInterface.h
index 9ce09cd..839b2ad 100644
--- a/src/THcInterface.h
+++ b/src/THcInterface.h
@@ -8,6 +8,7 @@
//////////////////////////////////////////////////////////////////////////
#include "TRint.h"
+#include "Decoder.h"
class TClass;
--
GitLab