Skip to content

Commit

Permalink
hcana version is 1.1. Update Podd submodule to 1.7.12 (#518)
Browse files Browse the repository at this point in the history
  • Loading branch information
hansenjo authored Jul 9, 2024
1 parent 6c3429a commit 7d4f1d8
Show file tree
Hide file tree
Showing 5 changed files with 5 additions and 4 deletions.
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -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)

Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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 :=
Expand Down
2 changes: 1 addition & 1 deletion SConstruct
Original file line number Diff line number Diff line change
Expand Up @@ -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'))
Expand Down
2 changes: 1 addition & 1 deletion podd
Submodule podd updated 52 files
+38 −0 .github/workflows/docker-image.yml
+4 −3 .gitignore
+1 −1 CMakeLists.txt
+117 −38 Database/Database.cxx
+44 −2 Database/Database.h
+32 −0 Dockerfile
+10 −0 Podd/Podd_LinkDef.h
+82 −52 Podd/THaAnalyzer.cxx
+3 −0 Podd/THaAnalyzer.h
+5 −0 Podd/THaCut.cxx
+1 −1 Podd/THaCut.h
+6 −0 Podd/THaFormula.cxx
+1 −2 Podd/THaFormula.h
+6 −16 Podd/THaInterface.cxx
+1 −1 Podd/THaRun.cxx
+8 −2 Podd/THaRunBase.cxx
+4 −2 Podd/THaShower.cxx
+5 −0 Podd/THaVform.cxx
+1 −1 Podd/THaVform.h
+1 −1 SConstruct
+1 −1 apps/CMakeLists.txt
+1 −1 cmake/Modules/PoddCMakeEnv.cmake
+6 −10 cmake/Modules/PoddCreateSetup.cmake
+6 −2 cmake/scripts/get_compileinfo.sh
+7 −1 cmake/templates/PoddConfig.cmake.in
+1 −1 cmake/templates/setup.csh.in
+28 −0 cmake/templates/setup_inbuild.csh.in
+12 −0 cmake/templates/setup_inbuild.sh.in
+6 −3 hana_decode/Caen1190Module.cxx
+8 −1 hana_decode/CodaDecoder.cxx
+39 −14 hana_decode/GenScaler.cxx
+1 −1 hana_decode/THaCodaData.cxx
+8 −5 hana_decode/THaCrateMap.cxx
+1 −1 hana_decode/THaCrateMap.h
+12 −0 tests/integration/DB/db_L.cer.dat
+27 −0 tests/integration/DB/db_L.s1.dat
+28 −0 tests/integration/DB/db_L.s2.dat
+28 −0 tests/integration/DB/db_L.s2m.dat
+318 −0 tests/integration/DB/db_L.vdc.dat
+173 −0 tests/integration/DB/db_cratemap.dat
+48,598 −0 tests/integration/DB/db_run.dat
+78 −0 tests/integration/README.md
+19 −0 tests/integration/RunInfo.h
+1 −0 tests/integration/g2p_3132.dat.0.sha1
+179 −0 tests/integration/mkref.cxx
+26 −0 tests/integration/ref.log
+ tests/integration/ref.root
+12 −0 tests/integration/replay.cdef
+112 −0 tests/integration/replay.cxx
+59 −0 tests/integration/replay.odef
+133 −0 tests/integration/run_tests.sh
+254 −0 tests/integration/verify.cxx
1 change: 1 addition & 0 deletions src/THcAnalyzer.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -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 <fstream>
Expand Down

0 comments on commit 7d4f1d8

Please sign in to comment.