v492.0 base development branch

.github/workflows/ci-buildmatrix-cpp17.yml

@@ -4,7 +4,6 @@ name: cpp17-buildmatrix
 # Controls when the workflow will run
 on:
   pull_request:
-    branches: [main, master]
   workflow_dispatch:
 
 jobs:
@@ -36,7 +35,7 @@ jobs:
 
       - name: sofa
         run: |
-          curl https://syncandshare.desy.de/index.php/s/${{ secrets.SOFA }}/download > sofa/sofa.tar.gz
+          curl https://syncandshare.desy.de/index.php/s/${{ secrets.SOFA20231011 }}/download > sofa/sofa.tar.gz
           ./install_sofa.sh
 
       - name: eventdisplay

.pre-commit-config.yaml

@@ -1,18 +1,18 @@
 repos:
   # https://pycqa.github.io/isort/docs/configuration/black_compatibility.html#integration-with-pre-commit
   - repo: https://github.com/pycqa/isort
-    rev: 5.13.2
+    rev: 6.0.1
     hooks:
       - id: isort
         args: ["--profile", "black", "--filter-files"]
   - repo: https://github.com/psf/black
-    rev: 24.10.0
+    rev: 25.1.0
     hooks:
       - id: black
         args: ["--line-length=100"]
   # https://black.readthedocs.io/en/stable/guides/using_black_with_other_tools.html?highlight=other%20tools#flake8
   - repo: https://github.com/PyCQA/flake8
-    rev: 7.1.1
+    rev: 7.2.0
     hooks:
       - id: flake8
         args: ["--max-line-length=100", "--extend-ignore=E203,E712"]
@@ -31,7 +31,7 @@ repos:
   #    - id: actionlint
   # codespell
   - repo: https://github.com/codespell-project/codespell
-    rev: v2.3.0
+    rev: v2.4.1
     hooks:
       - id: codespell
         args: [

CHANGELOG

@@ -0,0 +1,17 @@
+# Changelog
+
+Note that this changelog starts only with version v491.1
+
+## v492.0 (dev)
+
+### Maintenance
+
+- improve efficiency oF MVA calling for gamma/hadron separation cuts
+- update SOFA to version 2023-10-11
+
+## v491.1 (dev)
+
+### Bugfix
+
+- fix segmentation fault in anasum when trying to analysis a mscw file with an
+empty data tree

INSTALL.md

@@ -1,4 +1,4 @@
-#  INSTALLATION
+# INSTALLATION
 
 Eventdisplay is a C++ based library and designed to run in typical Linux environments. It has not been tested on MacOS (use Docker containers in this instance).
 
@@ -8,19 +8,19 @@ Eventdisplay is a C++ based library and designed to run in typical Linux environ
 
 CERN's [ROOT](https://root.cern.ch/) library for I/O, histogramming, and statistical applications:
 
-- ROOT versions >= 6.28
-- the first-stage tool `evndisp` requires ROOT compiled with mysql for access to the VERITAS database. Pre-compiled version of ROOT (downloaded from [here](https://root.cern/install/)) have mysql installed. If building from source, ensure the mysql dependencies are installed and compiler flags are added (see [root installation page](https://root.cern/install/build_from_source/)). All other stages of Eventdisplay do not required mysql - meaning e.g., the conda-based installation of Eventdisplay is fine.
-- paths for ROOT should be set through e.g.,
+* ROOT versions >= 6.28
+* the first-stage tool `evndisp` requires ROOT compiled with mysql for access to the VERITAS database. Pre-compiled version of ROOT (downloaded from [here](https://root.cern/install/)) have mysql installed. If building from source, ensure the mysql dependencies are installed and compiler flags are added (see [root installation page](https://root.cern/install/build_from_source/)). All other stages of Eventdisplay do not required mysql - meaning e.g., the conda-based installation of Eventdisplay is fine.
+* paths for ROOT should be set through e.g.,
 
-```
+```console
 export ROOTSYS=<Path to ROOT installation>/root/
 cd $ROOTSYS
 source ./bin/thisroot.sh
 ```
 
-- test your ROOT installation using the `root-config` tool, which should be accessible from any directory (through the `PATH` variable) if the system is setup correctly:
+Test your ROOT installation using the `root-config` tool, which should be accessible from any directory (through the `PATH` variable) if the system is setup correctly:
 
-```
+```console
 root-config --version
 root-config --has-mysql
 ```
@@ -31,7 +31,7 @@ root-config --has-mysql
 
 Download and install using this script in the $EVNDISPSYS directory:
 
-```
+```console
 ./install_sofa.sh
 ```
 
@@ -41,9 +41,9 @@ Set the following environmental variable: `SOFASYS=$EVNDISPSYS/sofa`
 
 The first-stage tool `evndisp` requires the [VBF](https://github.com/VERITAS-Observatory/VBF) (VERITAS bank format) library to read VERITAS raw data files.
 
-- use VBF version VBF >= 0.3.4
-- https://github.com/VERITAS-Observatory/VBF/releases/tag/0.3.4-1-c%2B%2B17 for newer Linux systems C++17 support
-- https://github.com/VERITAS-Observatory/VBF/releases/tag/0.3.4-1 for all other systems
+* use VBF version VBF >= 0.3.4
+* https://github.com/VERITAS-Observatory/VBF/releases/tag/0.3.4-1-c%2B%2B17 for newer Linux systems C++17 support
+* https://github.com/VERITAS-Observatory/VBF/releases/tag/0.3.4-1 for all other systems
 
 Simple installation instructions are found in `VBF/README`. To install in a local directory instead of the first installation command in VBF/README use `$ /.configure --prefix=<local directory>` and change the environment variable `VBFSYS` to `<local directory>`.
 
@@ -67,21 +67,21 @@ Eventdisplay can be used efficiently with the correct environmental variables se
 
 ### Compiling and Linking
 
-ROOTSYS :   (required) ROOT installation; add $ROOTSYS/lib to $LD_LIBRARY_PATH and $ROOTSYS/bin to $PATH
+`ROOTSYS` :   (required) ROOT installation; add $ROOTSYS/lib to $LD_LIBRARY_PATH and $ROOTSYS/bin to $PATH
 
-SOFASYS:    (required) Astronomy library from Sofa
+`SOFASYS` :    (required) Astronomy library from Sofa
 
-VBSYS :     (optional) VBF libraries (for `evndisp` analysis only); add $VBFSYS/bin to $PATH and $VBFSYS/lib to $LD_LIBRARY_PATH
+`VBFSYS` :     (optional) VBF libraries (for `evndisp` analysis only); add $VBFSYS/bin to $PATH and $VBFSYS/lib to $LD_LIBRARY_PATH
 
-FITSSYS :   (optional, not needed in most cases) FITS libraries
+`FITSSYS` :   (optional, not needed in most cases) FITS libraries
 
-GSLSYS :    (optional, not needed in most cases) GSL libraries
+`GSLSYS` :    (optional, not needed in most cases) GSL libraries
 
 ### Analysis
 
-EVNDISPSYS : Eventdisplay code directory (scripts expect binaries in $EVNDISPSYS/bin and libraries in $EVNDISPSYS/lib). Add $EVNDISPSYS/obj to LD_LIBRARY_PATH.
+`EVNDISPSYS` : Eventdisplay code directory (scripts expect binaries in `$EVNDISPSYS/bin` and libraries in `$EVNDISPSYS/lib`). Add `$EVNDISPSYS/obj` to `LD_LIBRARY_PATH`.
 
-EVNDISPSCRIPTS: Eventdisplay scripts directory
+`EVNDISPSCRIPTS`: Eventdisplay scripts directory (see [Eventdisplay_AnalysisScripts_VTS](https://github.com/VERITAS-Observatory/Eventdisplay_AnalysisScripts_VTS)).
 
 ### Data directories
 
@@ -90,57 +90,57 @@ Assume a computing environment, where several users are analysis the same raw da
 directories ($VERITAS_USER_DATA_DIR).
 Note that $VERITAS_DATA_DIR and $VERITAS_USER_DATA_DIR can point to the same directory.
 
-- VERITAS_EVNDISP_AUX_DIR:  directory with all auxiliary data like calibration files, lookup tables, effective areas, etc
-- VERITAS_DATA_DIR :        directory containing the raw telescope data or input simulation files
-- VERITAS_USER_DATA_DIR :   user data directory: containing output files from this analysis package
-- VERITAS_USER_LOG_DIR :    user log file directory: log files and temporary scripts are written to this directory
+* VERITAS_EVNDISP_AUX_DIR:  directory with all auxiliary data like calibration files, lookup tables, effective areas, etc
+* VERITAS_DATA_DIR :        directory containing the raw telescope data or input simulation files
+* VERITAS_USER_DATA_DIR :   user data directory: containing output files from this analysis package
+* VERITAS_USER_LOG_DIR :    user log file directory: log files and temporary scripts are written to this directory
 
 To set the variables for VERITAS:
 
-```
+```console
 ./setObservatory.sh VERITAS
 ```
 
-# Compiling
+## Compiling
 
 Check your systems configuration:
 
-```
+```console
 make config
 ```
 
 Compare the output with the requirements on software and environmental variable settings described above.
 
 In the main Eventdisplay directory ($EVNDISPSYS is pointing to this directory), compile all Eventdisplay binaries with
 
-```
+```console
 source ./setObservatory.sh VTS
 make VTS
 ```
 
 If you are working on a computing with several cores, this can be accelerated by e.g. compiling with four cores in parallel:
 
-```
+```console
 source ./setObservatory.sh VTS
 make -j 12 VTS
 ```
 
 To compile a single component of the software only, e.g.:
 
-```
+```console
 source ./setObservatory.sh VTS
 make slib
 ```
 
 Use `make clean` to remove any files produced in earlier compilation runs.
 
-# Troubleshooting
+## Troubleshooting
 
-- many compilation issues are related to incorrect settings of the environmental variables, especially `ROOTSYS` and `VBFSYS`.
-- ask via ELOG, slack, or GitHub issues for persistent issues
-- check your installation, it should look something like this (with different directories):
+* many compilation issues are related to incorrect settings of the environmental variables, especially `ROOTSYS` and `VBFSYS`.
+* ask via ELOG, slack, or GitHub issues for persistent issues
+* check your installation, it should look something like this (with different directories):
 
-```
+```console
 CONFIGURATION SUMMARY FOR EVNDISP version 490
 ======================================================
 

Makefile

@@ -32,7 +32,7 @@ ARCH = $(shell uname)
 # basic numbers
 #############################
 package = EVNDISP
-version = 491
+version = 492
 #############################
 #############################
 # check root version number
@@ -355,6 +355,7 @@ MSCOBJECTS=	./obj/Cshowerpars.o ./obj/Ctpars.o \
 		./obj/VStatistics_Dict.o \
 		./obj/VEvndispReconstructionParameter.o ./obj/VEvndispReconstructionParameter_Dict.o \
 		./obj/VSimpleStereoReconstructor.o \
+		./obj/VMeanScaledVariables.o \
 		./obj/VGrIsuAnalyzer.o \
 		./obj/VDispAnalyzer.o \
 		./obj/VDispTableReader.o \
@@ -412,6 +413,9 @@ ACCOBJECT = 	./obj/makeRadialAcceptance.o \
 		./obj/VAnaSumRunParameter.o ./obj/VAnaSumRunParameter_Dict.o \
 		./obj/VEvndispRunParameter.o ./obj/VEvndispRunParameter_Dict.o \
 		./obj/VImageCleaningRunParameter.o ./obj/VImageCleaningRunParameter_Dict.o \
+		./obj/VDispAnalyzer.o ./obj/VDispTableReader.o ./obj/VDispTableReader_Dict.o ./obj/VDispTableAnalyzer.o \
+		./obj/VTMVADispAnalyzer.o ./obj/VMeanScaledVariables.o \
+		./obj/VEmissionHeightCalculator.o ./obj/VSimpleStereoReconstructor.o ./obj/VGrIsuAnalyzer.o \
 		 ./obj/VUtilities.o
 
 
@@ -457,6 +461,9 @@ ACCOBJECT = ./obj/VTS.getRun_TimeElevAzim.o \
 		./obj/VStarCatalogue.o ./obj/VStarCatalogue_Dict.o \
 		./obj/VStar.o ./obj/VStar_Dict.o \
 		./obj/VDB_Connection.o \
+		./obj/VDispAnalyzer.o ./obj/VDispTableReader.o ./obj/VDispTableReader_Dict.o ./obj/VDispTableAnalyzer.o \
+		./obj/VTMVADispAnalyzer.o ./obj/VMeanScaledVariables.o \
+		./obj/VEmissionHeightCalculator.o ./obj/VSimpleStereoReconstructor.o ./obj/VGrIsuAnalyzer.o \
 		./obj/VUtilities.o
 
 ifeq ($(ASTRONMETRY),-DASTROSLALIB)
@@ -496,6 +503,9 @@ EFFOBJECT =	./obj/VGammaHadronCuts.o ./obj/VGammaHadronCuts_Dict.o ./obj/CData.o
 		./obj/VMathsandFunctions.o ./obj/VMathsandFunctions_Dict.o \
 		./obj/VAstronometry.o ./obj/VAstronometry_Dict.o \
 		./obj/VEnergySpectrumfromLiterature.o ./obj/VEnergySpectrumfromLiterature_Dict.o \
+		./obj/VDispAnalyzer.o ./obj/VDispTableReader.o ./obj/VDispTableReader_Dict.o ./obj/VDispTableAnalyzer.o \
+		./obj/VTMVADispAnalyzer.o ./obj/VMeanScaledVariables.o \
+		./obj/VEmissionHeightCalculator.o ./obj/VSimpleStereoReconstructor.o ./obj/VGrIsuAnalyzer.o \
 		./obj/makeEffectiveArea.o
 
 ifeq ($(ASTRONMETRY),-DASTROSLALIB)
@@ -624,6 +634,9 @@ ANASUMOBJECTS =	./obj/VAnaSum.o ./obj/VGammaHadronCuts.o ./obj/VGammaHadronCuts_
 		./obj/VGlobalRunParameter.o ./obj/VGlobalRunParameter_Dict.o \
 		./obj/VSkyCoordinatesUtilities.o ./obj/VUtilities.o \
 		./obj/VMathsandFunctions.o ./obj/VMathsandFunctions_Dict.o \
+		./obj/VDispAnalyzer.o ./obj/VDispTableReader.o ./obj/VDispTableReader_Dict.o ./obj/VDispTableAnalyzer.o \
+		./obj/VTMVADispAnalyzer.o ./obj/VMeanScaledVariables.o \
+		./obj/VEmissionHeightCalculator.o ./obj/VSimpleStereoReconstructor.o ./obj/VGrIsuAnalyzer.o \
 		./obj/anasum.o
 
 ifeq ($(ASTRONMETRY),-DASTROSLALIB)
@@ -911,6 +924,9 @@ COMPAREDATAMCOBJ=	./obj/CData.o \
 			./obj/VPlotUtilities.o ./obj/VPlotUtilities_Dict.o ./obj/Ctelconfig.o \
 			./obj/VHistogramUtilities.o ./obj/VHistogramUtilities_Dict.o \
 			./obj/VMathsandFunctions.o ./obj/VMathsandFunctions_Dict.o \
+			./obj/VDispAnalyzer.o ./obj/VDispTableReader.o ./obj/VDispTableReader_Dict.o ./obj/VDispTableAnalyzer.o \
+			./obj/VTMVADispAnalyzer.o  ./obj/VMeanScaledVariables.o \
+			./obj/VEmissionHeightCalculator.o ./obj/VSimpleStereoReconstructor.o ./obj/VGrIsuAnalyzer.o \
 			./obj/compareDatawithMC.o
 
 ifeq ($(ASTRONMETRY),-DASTROSLALIB)
@@ -1072,6 +1088,8 @@ WRITEPARTPHYSOBJ=	./obj/writeParticleRateFilesForTMVA.o \
 			./obj/VTimeMask.o ./obj/VTimeMask_Dict.o \
 			./obj/VAnaSumRunParameter.o ./obj/VAnaSumRunParameter_Dict.o \
 			./obj/VImageCleaningRunParameter.o ./obj/VImageCleaningRunParameter_Dict.o \
+			./obj/VDispAnalyzer.o ./obj/VDispTableReader.o ./obj/VDispTableReader_Dict.o ./obj/VDispTableAnalyzer.o \
+			./obj/VTMVADispAnalyzer.o \
 			./obj/VUtilities.o
 
 ifeq ($(ASTRONMETRY),-DASTROSLALIB)
@@ -1251,6 +1269,9 @@ calculateCrabRateFromMC:	./obj/CEffArea.o ./obj/CEffArea_Dict.o \
 				./obj/VImageCleaningRunParameter.o ./obj/VImageCleaningRunParameter_Dict.o \
 				./obj/VTimeMask.o ./obj/VTimeMask_Dict.o \
 				./obj/VAnaSumRunParameter.o ./obj/VAnaSumRunParameter_Dict.o \
+				./obj/VDispAnalyzer.o ./obj/VDispTableReader.o ./obj/VDispTableReader_Dict.o ./obj/VDispTableAnalyzer.o \
+				./obj/VTMVADispAnalyzer.o  ./obj/VMeanScaledVariables.o \
+				./obj/VEmissionHeightCalculator.o ./obj/VSimpleStereoReconstructor.o ./obj/VGrIsuAnalyzer.o \
 				./obj/calculateCrabRateFromMC.o
 	$(LD) $(LDFLAGS) $^ $(GLIBS) $(OutPutOpt) ./bin/$@
 	@echo "$@ done"
@@ -1357,6 +1378,9 @@ calculateBinaryPhases:	./obj/CData.o \
 			./obj/VImageCleaningRunParameter.o ./obj/VImageCleaningRunParameter_Dict.o \
 			./obj/VTableLookupRunParameter.o ./obj/VTableLookupRunParameter_Dict.o \
 			./obj/VGlobalRunParameter.o ./obj/VGlobalRunParameter_Dict.o \
+			./obj/VDispAnalyzer.o ./obj/VDispTableReader.o ./obj/VDispTableReader_Dict.o ./obj/VDispTableAnalyzer.o \
+			./obj/VTMVADispAnalyzer.o ./obj/VMeanScaledVariables.o ./obj/VUtilities.o \
+			./obj/VEmissionHeightCalculator.o ./obj/VSimpleStereoReconstructor.o ./obj/VGrIsuAnalyzer.o \
 			./obj/VOrbitalPhase.o ./obj/VOrbitalPhase_Dict.o \
 			./obj/VSkyCoordinatesUtilities.o \
 			./obj/VAstronometry.o \
@@ -1486,31 +1510,6 @@ binaryVisibility:	./obj/VLibNovaStar.o ./obj/VLibNovaSunAndMoon.o ./obj/binaryVi
 	@echo "$@ done"
 
 
-########################################################
-# writeFITS_eventlist
-########################################################
-writeFITS_eventlistOBJ	= ./obj/writeFITS_eventlist.o \
-			  ./obj/CData.o \
-			  ./obj/VSkyCoordinates.o \
-			  ./obj/VSkyCoordinatesUtilities.o \
-			  ./obj/VDB_Connection.o \
-			  ./obj/VStarCatalogue.o  ./obj/VStarCatalogue_Dict.o \
-			  ./obj/VStar.o ./obj/VStar_Dict.o \
-			  ./obj/VUtilities.o  \
-			  ./obj/VGlobalRunParameter.o ./obj/VGlobalRunParameter_Dict.o \
-			  ./obj/VAstronometry.o ./obj/VAstronometry_Dict.o
-
-ifeq ($(ASTRONMETRY),-DASTROSLALIB)
-    writeEventListTMVAOBJ += ./obj/VASlalib.o
-endif
-
-./obj/writeFITS_eventlist.o:	./src/writeFITS_eventlist.cpp
-	$(CXX) $(CXXFLAGS) -I $(EVLIOSYS)/records/ -I $(EVLIOSYS)/include/ -c -o $@ $<
-
-writeFITS_eventlist:	$(writeFITS_eventlistOBJ)
-	$(LD) $(LDFLAGS) $^ $(GLIBS) -L $(EVLIOSYS)/lib -lfitsrecord $(OutPutOpt) ./bin/$@
-	@echo "$@ done"
-
 ###############################################################################################################################
 # print environment and compilation parameters
 ###############################################################################################################################