Skip to content
Snippets Groups Projects
Commit 737e09cd authored by Stephen A. Wood's avatar Stephen A. Wood
Browse files

Update to use latest version of podd.

  Makefile and THcInterface changes to reflect the changes in podd
  scaler code
parent 242b6ca8
No related branches found
No related tags found
No related merge requests found
...@@ -62,7 +62,7 @@ ifndef ANALYZER ...@@ -62,7 +62,7 @@ ifndef ANALYZER
$(error $$ANALYZER environment variable not defined) $(error $$ANALYZER environment variable not defined)
endif 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 # Check that root version is new enough (>= 5.32) by requiring
...@@ -172,12 +172,11 @@ all: $(USERLIB) hcana ...@@ -172,12 +172,11 @@ all: $(USERLIB) hcana
LIBDIR:=$(ANALYZER) LIBDIR:=$(ANALYZER)
LIBHALLA := $(LIBDIR)/libHallA.so LIBHALLA := $(LIBDIR)/libHallA.so
LIBDC := $(LIBDIR)/libdc.so LIBDC := $(LIBDIR)/libdc.so
LIBSCALER := $(LIBDIR)/libscaler.so HALLALIBS := -L$(LIBDIR) -lHallA -ldc
HALLALIBS := -L$(LIBDIR) -lHallA -ldc -lscaler
src/THcInterface.d: $(HDR_COMPILEDATA) 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) \ $(LD) $(LDFLAGS) $< $(HALLALIBS) -L. -lHallC $(CCDBLIBS) \
$(GLIBS) -o $@ $(GLIBS) -o $@
...@@ -185,7 +184,7 @@ $(USERLIB): $(HDR) $(OBJS) ...@@ -185,7 +184,7 @@ $(USERLIB): $(HDR) $(OBJS)
$(LD) $(LDFLAGS) $(SOFLAGS) -o $@ $(OBJS) $(LD) $(LDFLAGS) $(SOFLAGS) -o $@ $(OBJS)
@echo "$@ done" @echo "$@ done"
$(HDR_COMPILEDATA) $(LIBHALLA) $(LIBDC) $(LIBSCALER): $(ANALYZER)/Makefile $(HDR_COMPILEDATA) $(LIBHALLA) $(LIBDC): $(ANALYZER)/Makefile
@echo "Building Podd" @echo "Building Podd"
@cd $(ANALYZER) ; export PODD_EXTRA_DEFINES=-DHALLC_MODS ; make @cd $(ANALYZER) ; export PODD_EXTRA_DEFINES=-DHALLC_MODS ; make
......
Subproject commit afce4df317bf88ff161519ee1ee94bd9eb85744f Subproject commit e8e7648acdaa65a8e8410a70e4b3be1089bb8e7c
...@@ -78,8 +78,8 @@ THcInterface::THcInterface( const char* appClassName, int* argc, char** argv, ...@@ -78,8 +78,8 @@ THcInterface::THcInterface( const char* appClassName, int* argc, char** argv,
gHcParms = new THcParmList; gHcParms = new THcParmList;
gHaCuts = new THaCutList( gHaVars ); gHaCuts = new THaCutList( gHaVars );
gHaApps = new TList; gHaApps = new TList;
gHaScalers = new TList;
gHaPhysics = new TList; gHaPhysics = new TList;
gHaEvtHandlers = new TList;
// Use the standard CODA file decoder by default // Use the standard CODA file decoder by default
gHaDecoder = Decoder::CodaDecoder::Class(); gHaDecoder = Decoder::CodaDecoder::Class();
// File-based database by default // File-based database by default
...@@ -110,7 +110,7 @@ THcInterface::THcInterface( const char* appClassName, int* argc, char** argv, ...@@ -110,7 +110,7 @@ THcInterface::THcInterface( const char* appClassName, int* argc, char** argv,
gSystem->FreeDirectory(dp); gSystem->FreeDirectory(dp);
s = p; s = p;
} else } else
s = s+"/src " + s+"/hana_decode " + s+"/hana_scaler"; s = s+"/src " + s+"/hana_decode ";
} }
// Directories names separated by blanks. // Directories names separated by blanks.
// FIXME: allow blanks // FIXME: allow blanks
...@@ -160,7 +160,7 @@ THcInterface::~THcInterface() ...@@ -160,7 +160,7 @@ THcInterface::~THcInterface()
delete gHaTextvars; gHaTextvars=0; delete gHaTextvars; gHaTextvars=0;
// delete gHaDB; gHaDB = 0; // delete gHaDB; gHaDB = 0;
delete gHaPhysics; gHaPhysics=0; delete gHaPhysics; gHaPhysics=0;
delete gHaScalers; gHaScalers=0; delete gHaEvtHandlers; gHaEvtHandlers=0;
delete gHaApps; gHaApps=0; delete gHaApps; gHaApps=0;
delete gHaVars; gHaVars=0; delete gHaVars; gHaVars=0;
delete gHaCuts; gHaCuts=0; delete gHaCuts; gHaCuts=0;
......
...@@ -8,6 +8,7 @@ ...@@ -8,6 +8,7 @@
////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////
#include "TRint.h" #include "TRint.h"
#include "Decoder.h"
class TClass; class TClass;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment