From 7d4f1d83500fd3a040b2fdd745a3ac32f4427fde Mon Sep 17 00:00:00 2001 From: Ole Hansen Date: Tue, 9 Jul 2024 08:39:35 -0400 Subject: [PATCH] hcana version is 1.1. Update Podd submodule to 1.7.12 (#518) --- CMakeLists.txt | 2 +- Makefile | 2 +- SConstruct | 2 +- podd | 2 +- src/THcAnalyzer.cxx | 1 + 5 files changed, 5 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index c5d8feeb..f11a65da 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,6 +1,6 @@ cmake_minimum_required(VERSION 3.5) -project(hcana VERSION 1.0 LANGUAGES CXX) +project(hcana VERSION 1.1 LANGUAGES CXX) option(HCANA_BUILTIN_PODD "Use built-in Podd submodule (default: YES)" ON) diff --git a/Makefile b/Makefile index 93104bbe..a027d2bb 100644 --- a/Makefile +++ b/Makefile @@ -7,7 +7,7 @@ # List only the implementation files (*.cxx). For every implementation file # there must be a corresponding header file (*.h). -SOVERSION := 1.0 +SOVERSION := 1.1 PATCH := 0 VERSION := $(SOVERSION).$(PATCH) EXTVERS := diff --git a/SConstruct b/SConstruct index d1ec7344..a32e7cae 100644 --- a/SConstruct +++ b/SConstruct @@ -28,7 +28,7 @@ baseenv.Append(HA_Podd=os.path.join(baseenv.subst('$HA_DIR'), 'Podd')) baseenv.Append(HA_DC=os.path.join(baseenv.subst('$HA_DIR'), 'hana_decode')) baseenv.Append(HA_DB=os.path.join(baseenv.subst('$HA_DIR'), 'Database')) baseenv.Append(MAJORVERSION='1') -baseenv.Append(MINORVERSION='0') +baseenv.Append(MINORVERSION='1') baseenv.Append(PATCH='0') baseenv.Append(SOVERSION=baseenv.subst('$MAJORVERSION') + '.' + baseenv.subst('$MINORVERSION')) baseenv.Append(VERSION=baseenv.subst('$SOVERSION') + '.' + baseenv.subst('$PATCH')) diff --git a/podd b/podd index 86f5c094..1343c947 160000 --- a/podd +++ b/podd @@ -1 +1 @@ -Subproject commit 86f5c09448c8384e07237634e430ab94fa3a6cce +Subproject commit 1343c947c9f9aa0293db10b949a42a0a7c2c4f58 diff --git a/src/THcAnalyzer.cxx b/src/THcAnalyzer.cxx index 3f2b6190..8793f8a2 100644 --- a/src/THcAnalyzer.cxx +++ b/src/THcAnalyzer.cxx @@ -19,6 +19,7 @@ Adds the following to the Hall A analyzer base class. #include "THcParmList.h" #include "THcFormula.h" #include "THcGlobals.h" +#include "THaGlobals.h" #include "TMath.h" #include