Merging irt-2.1c into main

.github/workflows/linux-eic-shell.yml

@@ -27,7 +27,7 @@ jobs:
       - uses: cvmfs-contrib/github-action-cvmfs@v3
       - uses: eic/run-cvmfs-osg-eic-shell@main
         with:
-          platform-release: "jug_xl:nightly"
+          platform-release: "eic_xl:nightly"
           run: |
             CC=${{matrix.cc}} CXX=${{matrix.cxx}} cmake -S . -B build -DDELPHES=ON -DEVALUATION=OFF -DCMAKE_INSTALL_PREFIX=install
             cmake --build build

.gitignore

@@ -1,5 +1,4 @@
 .*.sw*
 build
 athena
-*.root
 sim/macro/tmp*.mac

CMakeLists.txt

@@ -1,7 +1,7 @@
 cmake_minimum_required(VERSION 3.0.0 FATAL_ERROR)
 
 project(IRT
-  VERSION 1.0.5
+  VERSION 2.1.0
   LANGUAGES CXX
 )
 
@@ -18,7 +18,7 @@ option(IRT_ROOT_IO "Generate dictionary for ROOT I/O of libIRT objects" ON)
 
 list(APPEND CMAKE_PREFIX_PATH $ENV{ROOTSYS})
 set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake)
-find_package(ROOT 6 REQUIRED COMPONENTS Core RIO Hist Tree)
+find_package(ROOT 6 REQUIRED COMPONENTS Core EG Hist MathCore RIO Tree)
 include(${ROOT_USE_FILE})
 
 #----------------------------------------------------------------------------
@@ -41,23 +41,48 @@ else()
   endif()
 endif()
 
+set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-vla-cxx-extension")
+
 #----------------------------------------------------------------------------
 # IRT library
 
 # headers
 include_directories(
   ${PROJECT_SOURCE_DIR}/include 
   ${ROOT_INCLUDE_DIRS}
+
+  # For now assume that newly installed edm4eic::(CherenkovPID, ...) event structures are available 
+  # in the same place where IRT is supposed to be installed;
+  ${CMAKE_INSTALL_PREFIX}/include
+
+  # Help ePIC installation find json.hpp if needed;
+  #/opt/local/include
 )
 file(GLOB HEADERS ${PROJECT_SOURCE_DIR}/include/*.h)
 list(FILTER HEADERS EXCLUDE REGEX "LinkDef\\.h$")
 
+#if(DEFINED EICRECON)
+#   set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DEICRECON")
+#endif()
+
 # sources
 set(IRT_SRC
+  ${PROJECT_SOURCE_DIR}/source/ParametricSurface.cc
   ${PROJECT_SOURCE_DIR}/source/SphericalSurface.cc
+  ${PROJECT_SOURCE_DIR}/source/ToricSurface.cc
+  ${PROJECT_SOURCE_DIR}/source/CylindricalSurface.cc
+  ${PROJECT_SOURCE_DIR}/source/ConicalSurface.cc
   ${PROJECT_SOURCE_DIR}/source/FlatSurface.cc
   ${PROJECT_SOURCE_DIR}/source/IRT.cc
   ${PROJECT_SOURCE_DIR}/source/ChargedParticle.cc
+  ${PROJECT_SOURCE_DIR}/source/CherenkovRadiator.cc
+
+  ${PROJECT_SOURCE_DIR}/source/DigitizedHit.cc
+  ${PROJECT_SOURCE_DIR}/source/GeantImport.cc
+  #${PROJECT_SOURCE_DIR}/source/Configuration.cc
+  ${PROJECT_SOURCE_DIR}/source/Calibration.cc
+  ${PROJECT_SOURCE_DIR}/source/Digitization.cc
+  ${PROJECT_SOURCE_DIR}/source/ReconstructionFactory.cc
 )
 if(IRT_ROOT_IO)
   set(IRT_DICT G__${CMAKE_PROJECT_NAME})
@@ -87,7 +112,7 @@ if(IRT_ROOT_IO)
 endif()
 
 # linking
-target_link_libraries(${CMAKE_PROJECT_NAME} ROOT::Core ROOT::Physics)
+target_link_libraries(${CMAKE_PROJECT_NAME} ROOT::Core ROOT::EG ROOT::Hist ROOT::RIO ROOT::MathCore ROOT::Tree)
 
 #----------------------------------------------------------------------------
 # optional targets

delphes/database/dp_p_parameters_22.11.2.txt

@@ -0,0 +1,11 @@
+Fit Function: TMath::Sqrt(A*A*p*p + B*B)
+eta_low eta_up A(%/GeV/c) A_error(%/GeV/c) B(%) B_error(%)
+-3.750000 -3.500000 0.877826 0.309161 5.340663 3.111992
+-3.500000 -3.250000 0.378699 0.031187 5.788582 0.254332
+-3.250000 -3.000000 0.160939 0.006459 3.919744 0.042138
+-3.000000 -2.750000 0.109806 0.003064 3.069245 0.016178
+-2.750000 -2.500000 0.079910 0.001914 2.306708 0.009870
+-2.500000 -2.250000 0.044451 0.001313 1.727002 0.005510
+-2.250000 -2.000000 0.031395 0.000849 1.335242 0.003319
+-2.000000 -1.750000 0.023104 0.000512 0.997181 0.001978
+-1.750000 -1.500000 0.020739 0.000367 0.918249 0.001263

delphes/database/dph_parameters_22.11.2.txt

@@ -0,0 +1,11 @@
+Fit Function: TMath::Sqrt(A*A/p/p + B*B)
+eta_low eta_up A(mrad*GeV/c) A_error(mrad*GeV/c) B(mrad) B_error(mrad)
+-3.750000 -3.500000 8.767745 2.975858 2.840607 0.185980
+-3.500000 -3.250000 26.223149 4.695639 2.166096 1.177175
+-3.250000 -3.000000 24.668888 2.148689 1.097056 0.695744
+-3.000000 -2.750000 13.564047 0.683447 1.383093 0.303657
+-2.750000 -2.500000 10.659769 0.283753 0.761713 0.130763
+-2.500000 -2.250000 7.193395 0.211557 0.554353 0.146864
+-2.250000 -2.000000 5.804141 0.103400 0.377310 0.071403
+-2.000000 -1.750000 4.601817 0.040954 0.360673 0.027744
+-1.750000 -1.500000 2.918327 0.013354 0.226098 0.008278

delphes/database/dth_parameters_22.11.2.txt

@@ -0,0 +1,11 @@
+Fit Function: TMath::Sqrt(A*A/p/p + B*B)
+eta_low eta_up A(mrad*GeV/c) A_error(mrad*GeV/c) B(mrad) B_error(mrad)
+-3.750000 -3.500000 0.460936 0.020625 0.031520 0.010290
+-3.500000 -3.250000 0.397658 0.007943 0.059921 0.004048
+-3.250000 -3.000000 0.308481 0.004553 0.091966 0.002631
+-3.000000 -2.750000 0.360891 0.004550 0.140578 0.002855
+-2.750000 -2.500000 0.671160 0.010679 0.156604 0.002246
+-2.500000 -2.250000 1.118727 0.008803 0.095410 0.002425
+-2.250000 -2.000000 1.325261 0.007638 0.066403 0.002405
+-2.000000 -1.750000 1.558780 0.007507 0.067387 0.002469
+-1.750000 -1.500000 0.947363 0.007429 0.070301 0.004823

delphes/database/par_ph.modified.txt

@@ -0,0 +1,11 @@
+Fit Function: TMath::Sqrt(A*A/p/p + B*B)
+eta	 theta(deg)	 phi(deg)	 A(mrad*GeV/c)	 A_error(mrad*GeV/c)	 B(mrad)	 B_error(mrad)
+-1.90 -1.50	  8.94625	 0.01041	 0.11778	 0.00430
+-2.10 -1.90	 10.66608	 0.01247	 0.16708	 0.00445
+-2.30 -2.10	 10.45560	 0.01217	 0.15283	 0.00470
+-2.50 -2.30	 12.95601	 0.01529	 0.19061	 0.00577
+-2.70 -2.50	 16.25261	 0.01902	 0.31083	 0.00559
+-2.90 -2.70	 20.10263	 0.02393	 0.43041	 0.00649
+-3.10 -2.90	 25.21533	 0.03046	 0.74886	 0.00629
+-3.30 -3.10	 30.57967	 0.03829	 1.23431	 0.00642
+-3.50 -3.30	 37.86733	 0.04794	 1.91826	 0.00721

delphes/database/par_ph.txt

@@ -0,0 +1,11 @@
+Fit Function: TMath::Sqrt(A*A/p/p + B*B)
+eta	 theta(deg)	 phi(deg)	 A(mrad*GeV/c)	 A_error(mrad*GeV/c)	 B(mrad)	 B_error(mrad)
+-1.80	 161.20	 75.00	 8.94625	 0.01041	 0.11778	 0.00430
+-2.00	 164.60	 75.00	 10.66608	 0.01247	 0.16708	 0.00445
+-2.20	 167.40	 75.00	 10.45560	 0.01217	 0.15283	 0.00470
+-2.40	 169.60	 75.00	 12.95601	 0.01529	 0.19061	 0.00577
+-2.60	 171.50	 75.00	 16.25261	 0.01902	 0.31083	 0.00559
+-2.79	 173.00	 75.00	 20.10263	 0.02393	 0.43041	 0.00649
+-3.00	 174.30	 75.00	 25.21533	 0.03046	 0.74886	 0.00629
+-3.19	 175.30	 75.00	 30.57967	 0.03829	 1.23431	 0.00642
+-3.41	 176.20	 75.00	 37.86733	 0.04794	 1.91826	 0.00721

delphes/database/par_th.modified.txt

@@ -0,0 +1,11 @@
+Fit Function: TMath::Sqrt(A*A/p/p + B*B)
+eta	 theta(deg)	 phi(deg)	 A(mrad*GeV/c)	 A_error(mrad*GeV/c)	 B(mrad)	 B_error(mrad)
+-1.90 -1.50	 1.55478	 0.00199	 0.07303	 0.00033
+-2.10 -1.90	 1.87628	 0.00266	 0.06926	 0.00043
+-2.30 -2.10	 1.46848	 0.00197	 0.04872	 0.00032
+-2.50 -2.30	 1.32076	 0.00194	 0.07509	 0.00024
+-2.70 -2.50	 1.32949	 0.00244	 0.08976	 0.00027
+-2.90 -2.70	 0.74853	 0.00198	 0.12466	 0.00019
+-3.10 -2.90	 0.19174	 0.00078	 0.12507	 0.00013
+-3.30 -3.10	 0.13527	 0.00061	 0.08524	 0.00010
+-3.50 -3.30	 0.30369	 0.00056	 0.04715	 0.00008

delphes/database/par_th.txt

@@ -0,0 +1,11 @@
+Fit Function: TMath::Sqrt(A*A/p/p + B*B)
+eta	 theta(deg)	 phi(deg)	 A(mrad*GeV/c)	 A_error(mrad*GeV/c)	 B(mrad)	 B_error(mrad)
+-1.80	 161.20	 75.00	 1.55478	 0.00199	 0.07303	 0.00033
+-2.00	 164.60	 75.00	 1.87628	 0.00266	 0.06926	 0.00043
+-2.20	 167.40	 75.00	 1.46848	 0.00197	 0.04872	 0.00032
+-2.40	 169.60	 75.00	 1.32076	 0.00194	 0.07509	 0.00024
+-2.60	 171.50	 75.00	 1.32949	 0.00244	 0.08976	 0.00027
+-2.79	 173.00	 75.00	 0.74853	 0.00198	 0.12466	 0.00019
+-3.00	 174.30	 75.00	 0.19174	 0.00078	 0.12507	 0.00013
+-3.19	 175.30	 75.00	 0.13527	 0.00061	 0.08524	 0.00010
+-3.41	 176.20	 75.00	 0.30369	 0.00056	 0.04715	 0.00008