v492 dev8 xg boost

.pre-commit-config.yaml

@@ -1,46 +1,49 @@
+---
 repos:
-  # https://pycqa.github.io/isort/docs/configuration/black_compatibility.html#integration-with-pre-commit
-  - repo: https://github.com/pycqa/isort
-    rev: 6.0.1
-    hooks:
-      - id: isort
-        args: ["--profile", "black", "--filter-files"]
-  - repo: https://github.com/psf/black
-    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.3.0
-    hooks:
-      - id: flake8
-        args: ["--max-line-length=100", "--extend-ignore=E203,E712"]
-  # https://github.com/pre-commit/pre-commit-hooks
-  - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v6.0.0
-    hooks:
-      - id: trailing-whitespace
-      - id: end-of-file-fixer
-      - id: check-executables-have-shebangs
-      - id: check-shebang-scripts-are-executable
-  # gitup action
-  #  - repo: https://github.com/rhysd/actionlint
-  #   rev: v1.6.27
-  #  hooks:
-  #    - id: actionlint
-  # codespell
-  - repo: https://github.com/codespell-project/codespell
-    rev: v2.4.1
-    hooks:
-      - id: codespell
-        args: [
-          "--write-changes",
-          "--skip=*.json,*.bib,*.txt,*.cls,scripts/environment_vtscat_save.yml",
-          "--ignore-words-list=livetime,fom,rsource,gaus,precess,forbit,nd,precessed,crate,parms,safty,sideral,ist,highe,functon,tre,ned,sourc,parm,fo,coo,miror",
-        ]
-        additional_dependencies:
-          - tomli
+# Ruff
+- repo: https://github.com/astral-sh/ruff-pre-commit
+  rev: v0.14.8
+  hooks:
+  - id: ruff
+    args: ["--fix"]
+  - id: ruff-format
+# https://pycqa.github.io/isort/docs/configuration/black_compatibility.html#integration-with-pre-commit
+- repo: https://github.com/pycqa/isort
+  rev: 7.0.0
+  hooks:
+  - id: isort
+    args: ["--profile", "black", "--filter-files"]
+# https://github.com/pre-commit/pre-commit-hooks
+- repo: https://github.com/pre-commit/pre-commit-hooks
+  rev: v6.0.0
+  hooks:
+  - id: trailing-whitespace
+  - id: end-of-file-fixer
+  - id: check-added-large-files
+    args: ['--maxkb=500']
+  - id: check-json
+  - id: check-toml
+  - id: no-commit-to-branch
+    args: [--branch=main]
+  - id: check-executables-have-shebangs
+  - id: check-shebang-scripts-are-executable
+# Gitup action
+#- repo: https://github.com/rhysd/actionlint
+#  rev: v1.7.9
+#  hooks:
+    #  - id: actionlint
+# codespell
+- repo: https://github.com/codespell-project/codespell
+  rev: v2.4.1
+  hooks:
+  - id: codespell
+    args: [
+    "--write-changes",
+    "--skip=*.json,*.bib,*.txt,*.cls,scripts/environment_vtscat_save.yml",
+    "--ignore-words-list=livetime,fom,rsource,gaus,precess,forbit,nd,precessed,crate,parms,safty,sideral,ist,highe,functon,tre,ned,sourc,parm,fo,coo,miror",
+    ]
+    additional_dependencies:
+      - tomli
 #  - repo: https://github.com/Freed-Wu/mirrors-astyle
 #    rev: v3.4.13
 #    hooks:

Makefile

@@ -220,6 +220,7 @@ all VTS:	evndisp \
 	combineEffectiveAreas \
 	makeRadialAcceptance \
 	calculateBinaryPhases \
+	printBinaryOrbitalPhase \
 	compareDatawithMC \
     VTS.analyzeMuonRings \
 	VTS.getRunListFromDB \
@@ -528,6 +529,10 @@ printCrabSensitivity =		./obj/printCrabSensitivity.o \
 							./obj/VHistogramUtilities.o ./obj/VHistogramUtilities_Dict.o \
 							./obj/VUtilities.o \
 							./obj/CEffArea.o ./obj/CEffArea_Dict.o \
+							./obj/CData.o \
+							./obj/VTMVADispAnalyzer.o ./obj/VMeanScaledVariables.o \
+							./obj/VDispAnalyzer.o ./obj/VDispTableReader.o ./obj/VDispTableReader_Dict.o ./obj/VDispTableAnalyzer.o \
+							./obj/VEmissionHeightCalculator.o ./obj/VSimpleStereoReconstructor.o ./obj/VGrIsuAnalyzer.o \
 							./obj/VGammaHadronCuts.o ./obj/VGammaHadronCuts_Dict.o \
 							./obj/VGammaHadronCutsStatistics.o ./obj/VGammaHadronCutsStatistics_Dict.o \
 							./obj/VEnergySpectrumfromLiterature.o ./obj/VEnergySpectrumfromLiterature_Dict.o \
@@ -769,7 +774,10 @@ PRINTANAOBJ=	./obj/VEvndispRunParameter.o ./obj/VEvndispRunParameter_Dict.o \
 		./obj/VTMVAEvaluator.o ./obj/VTMVAEvaluator_Dict.o \
 		./obj/VSpectralWeight.o ./obj/VSpectralWeight_Dict.o \
 		./obj/VPlotUtilities.o ./obj/VPlotUtilities_Dict.o \
-		./obj/VUtilities.o \
+		./obj/VUtilities.o ./obj/CData.o \
+		./obj/VTMVADispAnalyzer.o ./obj/VMeanScaledVariables.o \
+		./obj/VDispAnalyzer.o ./obj/VDispTableReader.o ./obj/VDispTableReader_Dict.o ./obj/VDispTableAnalyzer.o \
+		./obj/VEmissionHeightCalculator.o ./obj/VSimpleStereoReconstructor.o ./obj/VGrIsuAnalyzer.o \
 		./obj/VAstronometry.o ./obj/VAstronometry_Dict.o \
 		./obj/VSkyCoordinatesUtilities.o \
 		./obj/VTimeMask.o ./obj/VTimeMask_Dict.o \
@@ -1072,7 +1080,10 @@ WRITEPARTPHYSOBJ=	./obj/writeParticleRateFilesForTMVA.o \
 			./obj/VTMVARunDataEnergyCut.o ./obj/VTMVARunDataEnergyCut_Dict.o \
 			./obj/VTMVARunDataZenithCut.o ./obj/VTMVARunDataZenithCut_Dict.o \
 			./obj/VInstrumentResponseFunctionRunParameter.o ./obj/VInstrumentResponseFunctionRunParameter_Dict.o \
-			./obj/Ctelconfig.o  \
+			./obj/Ctelconfig.o ./obj/CData.o  \
+			./obj/VTMVADispAnalyzer.o ./obj/VMeanScaledVariables.o \
+			./obj/VDispAnalyzer.o ./obj/VDispTableReader.o ./obj/VDispTableReader_Dict.o ./obj/VDispTableAnalyzer.o \
+			./obj/VEmissionHeightCalculator.o ./obj/VSimpleStereoReconstructor.o ./obj/VGrIsuAnalyzer.o \
 			./obj/VSpectralFitter.o ./obj/VSpectralFitter_Dict.o \
 			./obj/VEnergyThreshold.o ./obj/VEnergyThreshold_Dict.o \
 			./obj/VRunList.o ./obj/VRunList_Dict.o \
@@ -1188,7 +1199,11 @@ COMBINEEFFAREAOBJ=	 ./obj/combineEffectiveAreas.o  \
 			 ./obj/VInstrumentResponseFunctionRunParameter.o ./obj/VInstrumentResponseFunctionRunParameter_Dict.o \
 			 ./obj/VTMVAEvaluator.o ./obj/VTMVAEvaluator_Dict.o \
 			 ./obj/VTMVARunDataEnergyCut.o ./obj/VTMVARunDataEnergyCut_Dict.o \
-			./obj/VTMVARunDataZenithCut.o ./obj/VTMVARunDataZenithCut_Dict.o \
+		 	 ./obj/VTMVARunDataZenithCut.o ./obj/VTMVARunDataZenithCut_Dict.o \
+			 ./obj/CData.o \
+			 ./obj/VTMVADispAnalyzer.o ./obj/VMeanScaledVariables.o \
+			 ./obj/VDispAnalyzer.o ./obj/VDispTableReader.o ./obj/VDispTableReader_Dict.o ./obj/VDispTableAnalyzer.o \
+			 ./obj/VEmissionHeightCalculator.o ./obj/VSimpleStereoReconstructor.o ./obj/VGrIsuAnalyzer.o \
 			 ./obj/VGlobalRunParameter.o ./obj/VGlobalRunParameter_Dict.o \
 			 ./obj/VSkyCoordinatesUtilities.o ./obj/VUtilities.o \
 			 ./obj/VMathsandFunctions.o ./obj/VMathsandFunctions_Dict.o \

docs/changes/322.feature.md

@@ -0,0 +1,9 @@
+Feature: Machine learning interface for direction reconstruction
+
+- Adds an interface to run machine learning models (e.g., scikit-learn).
+- Provides an example using XGBoost regression trees to estimate directions in camera coordinates.
+- Introduces a Python environment and a scripts directory to support training and inference.
+
+The new XGBoost-based training and reconstruction methods estimate the gamma‑ray arrival direction in camera coordinates. They support `DispBDT` and intersection methods, combining image parameters to compute `Xoff`/`Yoff`.
+
+Compared to previous approaches that averaged over all `DispBDT` directions, this implementation better handles edge cases (e.g., truncated images).

environment.yml

@@ -0,0 +1,25 @@
+---
+name: eventdisplay_v4
+channels:
+  - conda-forge
+dependencies:
+  - python=3.13
+  - awkward
+  - awkward-pandas
+  - joblib
+  - matplotlib
+  - numpy
+  - pandas
+  - pre-commit
+  - scikit-learn
+  - scipy
+  - tabulate
+  - towncrier
+  - uproot
+  - xgboost
+
+# cheatsheet
+# create: conda env create -f environment.yml
+# activate: conda activate eventdisplay_v4
+# update (conda/mamba): conda env update -f environment.yml --prune
+# update (micromamba): micromamba update -f environment.yml

inc/CData.h

@@ -11,11 +11,13 @@
 #include "VMeanScaledVariables.h"
 #include "VDispAnalyzer.h"
 #include "VSimpleStereoReconstructor.h"
+#include "VSkyCoordinatesUtilities.h"
 
 #include <bitset>
 #include <cstdlib>
 #include <iostream>
 #include <string>
+#include <utility>
 #include <vector>
 
 using namespace std;
@@ -258,9 +260,16 @@ class CData
         TBranch*        b_Xoff_intersect;
         TBranch*        b_Yoff_intersect;
 
-        CData( TTree* tree = 0, bool bMC = false, bool bShort = false );
+        TTree*          fFriendTree;              //!
+        float         Dir_Xoff;                 //!
+        float         Dir_Yoff;                 //!
+
+        CData( TTree* tree = 0, bool bMC = false, bool bShort = false, TTree* friendTree = 0 );
         virtual ~CData();
         virtual Int_t    GetEntry( Long64_t entry );
+        float get_Xoff( unsigned int method = 0 );
+        float get_Yoff( unsigned int method = 0 );
+        pair<float, float> get_XYoff_derot( unsigned int method = 0 );
         virtual Long64_t LoadTree( Long64_t entry );
         virtual void     Init( TTree* tree );
         virtual Bool_t   Notify();

inc/VAnaSumRunParameter.h

@@ -196,6 +196,9 @@ class VAnaSumRunParameter : public TNamed, public VGlobalRunParameter
         // dead time calculation method
         int  fDeadTimeCalculationMethod;
 
+        // XGB reconstruction
+        string fXGB_file_suffix;
+
         int f2DAcceptanceMode ; // USE2DACCEPTANCE
 
         // add all events to DL3 tree, no gh cuts but add BDT score and IsGamma
@@ -272,6 +275,6 @@ class VAnaSumRunParameter : public TNamed, public VGlobalRunParameter
         bool writeListOfExcludedSkyRegions();
         bool getListOfExcludedSkyRegions( TFile* f );
 
-        ClassDef( VAnaSumRunParameter, 18 ) ;
+        ClassDef( VAnaSumRunParameter, 19 ) ;
 };
 #endif

inc/VDataMCComparision.h

@@ -20,6 +20,7 @@
 #include <iostream>
 #include <map>
 #include <string>
+#include <utility>
 #include <vector>
 
 using namespace std;

inc/VInstrumentResponseFunctionRunParameter.h

@@ -78,6 +78,7 @@ class VInstrumentResponseFunctionRunParameter : public TNamed
         string          fMCdatafile_tree;
         string          fMCdatafile_histo;
         string          fGammaHadronProbabilityFile;
+        string          fXGB_file_suffix;
 
         double          fze;
         int             fnoise;
@@ -117,7 +118,7 @@ class VInstrumentResponseFunctionRunParameter : public TNamed
         bool                  readRunParameterFromTextFile( string iFile );
         bool                  testRunparameters();
 
-        ClassDef( VInstrumentResponseFunctionRunParameter, 18 );
+        ClassDef( VInstrumentResponseFunctionRunParameter, 19 );
 };
 
 #endif

inc/VRadialAcceptance.h

@@ -6,6 +6,7 @@
 #include <cmath>
 #include <iostream>
 #include <string>
+#include <utility>
 
 #include "TDirectory.h"
 #include "TF1.h"

inc/VSkyCoordinatesUtilities.h

@@ -25,6 +25,7 @@ namespace VSkyCoordinatesUtilities
     void   convert_derotatedCoordinates_to_J2000( double iMJD, double i_RA_J2000_deg, double i_DEC_J2000_deg, double& x, double& y );
     void   getDifferenceInCameraCoordinates( double tel_ze, double tel_az, double shower_ze,  double shower_az, float& x, float& y, float& z );
     void   getEquatorialCoordinates( int MJD, double time, double az, double ze, double& dec, double& ra );
+    double getDerotationAngleFromGroundCoordinates( double MJD, double time, double iTelAz, double iTelElevation );
     double getDerotationAngle( double MJD, double time, double iTelRA, double iTelDec, double iObservatoryLongitude, double iObservatoryLatitude );
     double getDerotationAngle( double i_UTC, double iTelRA, double iTelDec, double iObservatoryLongitude, double iObservatoryLatitude );
     double getHourAngle( double i_UTC, double iTelRA, double iObservatoryLongitude );

inc/VStereoAnalysis.h

@@ -220,6 +220,8 @@ class VStereoAnalysis
         CData* fDataRun;
         TTree* fDataRunTree;
         TFile* fDataFile;
+        TDirectory* fXGBFile;
+        TTree* fXGB_tree;
         string fInstrumentEpochMinor;
         vector< unsigned int > fTelToAnalyze;
 

inc/VTableLookupDataHandler.h

@@ -170,7 +170,6 @@ class VTableLookupDataHandler
         void   initializeTelTypeVector();
         int    fillNextEvent( bool bShort );
         pair<float, float > getArrayPointing();
-        float getArrayPointingDeRotationAngle();
         void   printCutStatistics();
         bool   randomSelected();
         void   resetImageParameters();