From f06087a4c5cf65cf2f3a78d5fe1a10187997c9da Mon Sep 17 00:00:00 2001 From: Christopher Dilks Date: Sun, 7 May 2023 02:15:46 -0400 Subject: [PATCH 1/6] build: bump version number --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index af24998..a8bc938 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,7 +1,7 @@ cmake_minimum_required(VERSION 3.0.0 FATAL_ERROR) project(IRT - VERSION 1.0.5 + VERSION 2.0.0 LANGUAGES CXX ) From 59cc9537e11b4d4edb86213c65248fc10d6ad512 Mon Sep 17 00:00:00 2001 From: Christopher Dilks Date: Sun, 7 May 2023 14:48:29 -0400 Subject: [PATCH 2/6] fix: use quotes for local inclusion directives --- include/Calibration.h | 2 +- include/Configuration.h | 2 +- include/ConicalSurface.h | 2 +- include/CylindricalSurface.h | 2 +- include/Digitization.h | 4 ++-- include/DigitizedHit.h | 4 ++-- include/FlatSurface.h | 2 +- include/GeantImport.h | 2 +- include/ReconstructionFactory.h | 6 +++--- include/SphericalSurface.h | 2 +- source/Calibration.cc | 4 ++-- source/Configuration.cc | 4 ++-- source/ConicalSurface.cc | 2 +- source/CylindricalSurface.cc | 2 +- source/Digitization.cc | 6 +++--- source/DigitizedHit.cc | 2 +- source/GeantImport.cc | 6 +++--- source/ParametricSurface.cc | 2 +- source/ReconstructionFactory.cc | 6 +++--- 19 files changed, 31 insertions(+), 31 deletions(-) diff --git a/include/Calibration.h b/include/Calibration.h index dadf515..6ed911e 100644 --- a/include/Calibration.h +++ b/include/Calibration.h @@ -5,7 +5,7 @@ class TDatabasePDG; #ifndef _CALIBRATION_ #define _CALIBRATION_ -#include +#include "Configuration.h" // 5 degree binning for calibration purposes suffices?; #define _THETA_BIN_COUNT_ (180/5) diff --git a/include/Configuration.h b/include/Configuration.h index 183aab1..2818f73 100644 --- a/include/Configuration.h +++ b/include/Configuration.h @@ -6,7 +6,7 @@ class TH1D; #ifndef _CONFIGURATION_ #define _CONFIGURATION_ -#include +#include "GeantImport.h" class CherenkovRadiator; class Configuration: public virtual GeantImport { diff --git a/include/ConicalSurface.h b/include/ConicalSurface.h index 7e3b738..97d61e9 100644 --- a/include/ConicalSurface.h +++ b/include/ConicalSurface.h @@ -1,5 +1,5 @@ -#include +#include "ParametricSurface.h" #ifndef _IRT_CONICAL_SURFACE_ #define _IRT_CONICAL_SURFACE_ diff --git a/include/CylindricalSurface.h b/include/CylindricalSurface.h index f424cba..7d91668 100644 --- a/include/CylindricalSurface.h +++ b/include/CylindricalSurface.h @@ -3,7 +3,7 @@ // Yes, prefer to keep it separately even that it is a subset of a ConicalSurface; // -#include +#include "ParametricSurface.h" #ifndef _IRT_CYLINDRICAL_SURFACE_ #define _IRT_CYLINDRICAL_SURFACE_ diff --git a/include/Digitization.h b/include/Digitization.h index 3fa5752..c87b177 100644 --- a/include/Digitization.h +++ b/include/Digitization.h @@ -4,8 +4,8 @@ #ifndef _DIGITIZATION_ #define _DIGITIZATION_ -#include -#include +#include "DigitizedHit.h" +#include "Configuration.h" class CherenkovPhotonDetector; struct BlackoutCell { diff --git a/include/DigitizedHit.h b/include/DigitizedHit.h index 494216d..df52e85 100644 --- a/include/DigitizedHit.h +++ b/include/DigitizedHit.h @@ -9,8 +9,8 @@ #ifndef _DIGITIZED_HIT_ #define _DIGITIZED_HIT_ -#include -#include +#include "CherenkovPhotonDetector.h" +#include "SinglePDF.h" class ChargedParticle; class IRT; diff --git a/include/FlatSurface.h b/include/FlatSurface.h index 2cc1abe..4001231 100644 --- a/include/FlatSurface.h +++ b/include/FlatSurface.h @@ -1,5 +1,5 @@ -#include +#include "ParametricSurface.h" #ifndef _IRT_FLAT_SURFACE_ #define _IRT_FLAT_SURFACE_ diff --git a/include/GeantImport.h b/include/GeantImport.h index cb5e199..8d44fe4 100644 --- a/include/GeantImport.h +++ b/include/GeantImport.h @@ -4,7 +4,7 @@ #ifndef _GEANT_IMPORT_ #define _GEANT_IMPORT_ -#include +#include "CherenkovEvent.h" class CherenkovDetector; class GeantImport { diff --git a/include/ReconstructionFactory.h b/include/ReconstructionFactory.h index 8ab35d1..48726d1 100644 --- a/include/ReconstructionFactory.h +++ b/include/ReconstructionFactory.h @@ -1,9 +1,9 @@ class TParticlePDG; -#include -#include -#include +#include "Configuration.h" +#include "Calibration.h" +#include "Digitization.h" #ifndef _RECONSTRUCTION_FACTORY_ #define _RECONSTRUCTION_FACTORY_ diff --git a/include/SphericalSurface.h b/include/SphericalSurface.h index 0a1e78d..df57b88 100644 --- a/include/SphericalSurface.h +++ b/include/SphericalSurface.h @@ -1,5 +1,5 @@ -#include +#include "ParametricSurface.h" #ifndef _IRT_SPHERICAL_SURFACE_ #define _IRT_SPHERICAL_SURFACE_ diff --git a/source/Calibration.cc b/source/Calibration.cc index 0f4f1a9..5d3a7e0 100644 --- a/source/Calibration.cc +++ b/source/Calibration.cc @@ -3,8 +3,8 @@ #include #include -#include -#include +#include "Calibration.h" +#include "CherenkovDetector.h" // FIXME: yes, fix it please; static unsigned hdim = 100; diff --git a/source/Configuration.cc b/source/Configuration.cc index 547332b..5d34337 100644 --- a/source/Configuration.cc +++ b/source/Configuration.cc @@ -1,8 +1,8 @@ #include -#include -#include +#include "CherenkovDetector.h" +#include "Configuration.h" #define _SPE_THETA_RESOLUTION_DEFAULT_ (0.0040) diff --git a/source/ConicalSurface.cc b/source/ConicalSurface.cc index f4c58bb..733d645 100644 --- a/source/ConicalSurface.cc +++ b/source/ConicalSurface.cc @@ -1,7 +1,7 @@ #include -#include +#include "ConicalSurface.h" // ------------------------------------------------------------------------------------- diff --git a/source/CylindricalSurface.cc b/source/CylindricalSurface.cc index 3c76166..592f4d8 100644 --- a/source/CylindricalSurface.cc +++ b/source/CylindricalSurface.cc @@ -1,7 +1,7 @@ #include -#include +#include "CylindricalSurface.h" // ------------------------------------------------------------------------------------- diff --git a/source/Digitization.cc b/source/Digitization.cc index 3d09089..76cc1db 100644 --- a/source/Digitization.cc +++ b/source/Digitization.cc @@ -1,10 +1,10 @@ #include -#include +#include "CherenkovDetector.h" -#include -#include +#include "GeantImport.h" +#include "Digitization.h" // Kind of digitization; may want to comment out (or set very fine) for debugging; #define _SENSOR_ACTIVE_AREA_PIXELLATION_DEFAULT_ (32) diff --git a/source/DigitizedHit.cc b/source/DigitizedHit.cc index e3f6336..ef0bf99 100644 --- a/source/DigitizedHit.cc +++ b/source/DigitizedHit.cc @@ -1,5 +1,5 @@ -#include +#include "DigitizedHit.h" // ------------------------------------------------------------------------------------- diff --git a/source/GeantImport.cc b/source/GeantImport.cc index 3b5417e..0d52ba7 100644 --- a/source/GeantImport.cc +++ b/source/GeantImport.cc @@ -1,9 +1,9 @@ #include -#include -#include -#include +#include "CherenkovDetectorCollection.h" +#include "CherenkovEvent.h" +#include "GeantImport.h" // ------------------------------------------------------------------------------------- diff --git a/source/ParametricSurface.cc b/source/ParametricSurface.cc index bc84444..63c498b 100644 --- a/source/ParametricSurface.cc +++ b/source/ParametricSurface.cc @@ -1,5 +1,5 @@ -#include +#include "ParametricSurface.h" // ------------------------------------------------------------------------------------- diff --git a/source/ReconstructionFactory.cc b/source/ReconstructionFactory.cc index 4988b54..65924d4 100644 --- a/source/ReconstructionFactory.cc +++ b/source/ReconstructionFactory.cc @@ -13,9 +13,9 @@ #include #include -#include -#include -#include +#include "CherenkovDetectorCollection.h" +#include "CherenkovEvent.h" +#include "ReconstructionFactory.h" // ------------------------------------------------------------------------------------- From 5a55b4c1d21b343324471934e213646815f40bad Mon Sep 17 00:00:00 2001 From: Christopher Dilks Date: Sun, 7 May 2023 14:58:43 -0400 Subject: [PATCH 3/6] fix: guard each `ClassDef` call with `#ifndef DISABLE_ROOT_IO` --- delphes/include/DelphesConfig.h | 8 ++++++++ delphes/include/DelphesConfigDIRC.h | 2 ++ delphes/include/DelphesConfigRICH.h | 2 ++ delphes/include/DelphesConfigTOF.h | 2 ++ include/CherenkovMirror.h | 4 ++++ include/ConicalSurface.h | 2 ++ include/CylindricalSurface.h | 2 ++ include/FlatSurface.h | 2 ++ include/SphericalSurface.h | 2 ++ 9 files changed, 26 insertions(+) diff --git a/delphes/include/DelphesConfig.h b/delphes/include/DelphesConfig.h index c66fbfb..52e01d7 100644 --- a/delphes/include/DelphesConfig.h +++ b/delphes/include/DelphesConfig.h @@ -37,7 +37,9 @@ class MassHypothesis: public TObject { double m_Threshold; +#ifndef DISABLE_ROOT_IO ClassDef(MassHypothesis, 1) +#endif }; class MomentumRange: public TObject { @@ -76,7 +78,9 @@ class MomentumRange: public TObject { std::vector m_SigmaValues; MomentumRange::range m_Range; +#ifndef DISABLE_ROOT_IO ClassDef(MomentumRange, 2) +#endif }; class EtaRange: public TObject { @@ -143,7 +147,9 @@ class EtaRange: public TObject { double m_Min, m_Max; +#ifndef DISABLE_ROOT_IO ClassDef(EtaRange, 1) +#endif }; class DelphesConfig: public TObject { @@ -267,7 +273,9 @@ class DelphesConfig: public TObject { // FIXME: need seed setting method; TRandom m_rndm; //! +#ifndef DISABLE_ROOT_IO ClassDef(DelphesConfig, 1) +#endif }; #endif diff --git a/delphes/include/DelphesConfigDIRC.h b/delphes/include/DelphesConfigDIRC.h index 4ee7656..41d96a7 100644 --- a/delphes/include/DelphesConfigDIRC.h +++ b/delphes/include/DelphesConfigDIRC.h @@ -59,7 +59,9 @@ class DelphesConfigDIRC: public DelphesConfig { std::string m_ParameterizationMap; +#ifndef DISABLE_ROOT_IO ClassDef(DelphesConfigDIRC, 1) +#endif }; #endif diff --git a/delphes/include/DelphesConfigRICH.h b/delphes/include/DelphesConfigRICH.h index 5087ec2..a1ef43c 100644 --- a/delphes/include/DelphesConfigRICH.h +++ b/delphes/include/DelphesConfigRICH.h @@ -33,7 +33,9 @@ class DelphesConfigRICH: public DelphesConfig { return GetTrackingSmearing(momentum.Mag(), momentum.Eta()); }; +#ifndef DISABLE_ROOT_IO ClassDef(DelphesConfigRICH, 3) +#endif }; #endif diff --git a/delphes/include/DelphesConfigTOF.h b/delphes/include/DelphesConfigTOF.h index 431e550..e5a803c 100644 --- a/delphes/include/DelphesConfigTOF.h +++ b/delphes/include/DelphesConfigTOF.h @@ -73,7 +73,9 @@ class DelphesConfigTOF: public DelphesConfig { double m_InstallationDistance; +#ifndef DISABLE_ROOT_IO ClassDef(DelphesConfigTOF, 2) +#endif }; #endif diff --git a/include/CherenkovMirror.h b/include/CherenkovMirror.h index 563422a..17b2505 100644 --- a/include/CherenkovMirror.h +++ b/include/CherenkovMirror.h @@ -84,7 +84,9 @@ class CylindricalMirror: public CherenkovMirror, public CylindricalSurface { CherenkovMirror(solid, material), CylindricalSurface(x0, nz, r0, dz) {}; ~CylindricalMirror() {}; +#ifndef DISABLE_ROOT_IO ClassDef(CylindricalMirror, 1); +#endif }; class ConicalMirror: public CherenkovMirror, public ConicalSurface { @@ -94,7 +96,9 @@ class ConicalMirror: public CherenkovMirror, public ConicalSurface { CherenkovMirror(solid, material), ConicalSurface(x0, nz, r0, r1, dz) {}; ~ConicalMirror() {}; +#ifndef DISABLE_ROOT_IO ClassDef(ConicalMirror, 1); +#endif }; #if 0 diff --git a/include/ConicalSurface.h b/include/ConicalSurface.h index 97d61e9..bbe1db2 100644 --- a/include/ConicalSurface.h +++ b/include/ConicalSurface.h @@ -79,7 +79,9 @@ class ConicalSurface: public ParametricSurface { TVector3 m_Nz, m_Nr; double m_R0, m_R1, m_Dz, m_Alfa, m_Rc, m_Slope; +#ifndef DISABLE_ROOT_IO ClassDef(ConicalSurface, 1); +#endif }; #endif diff --git a/include/CylindricalSurface.h b/include/CylindricalSurface.h index 7d91668..f92f3bb 100644 --- a/include/CylindricalSurface.h +++ b/include/CylindricalSurface.h @@ -74,7 +74,9 @@ class CylindricalSurface: public ParametricSurface { TVector3 m_Nz, m_Nr; double m_Radius, m_Alfa; +#ifndef DISABLE_ROOT_IO ClassDef(CylindricalSurface, 1); +#endif }; #endif diff --git a/include/FlatSurface.h b/include/FlatSurface.h index 4001231..4567426 100644 --- a/include/FlatSurface.h +++ b/include/FlatSurface.h @@ -53,7 +53,9 @@ class FlatSurface: public ParametricSurface, public LocalCoordinatesXY { private: TVector3 m_Nx, m_Ny, m_Nz; +#ifndef DISABLE_ROOT_IO ClassDef(FlatSurface, 1); +#endif }; #endif diff --git a/include/SphericalSurface.h b/include/SphericalSurface.h index df57b88..9cec9f2 100644 --- a/include/SphericalSurface.h +++ b/include/SphericalSurface.h @@ -43,7 +43,9 @@ class SphericalSurface: public ParametricSurface { bool m_Concave; double m_Radius; +#ifndef DISABLE_ROOT_IO ClassDef(SphericalSurface, 2); +#endif }; #endif From 1fd7a4a5ee57a89a013f09d40cc71ad433a01131 Mon Sep 17 00:00:00 2001 From: Kolja Kauder Date: Fri, 8 Dec 2023 12:00:42 -0500 Subject: [PATCH 4/6] Updated ROOT libraries --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index a8bc938..be92d1f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -96,7 +96,7 @@ if(IRT_ROOT_IO) endif() # linking -target_link_libraries(${CMAKE_PROJECT_NAME} ROOT::Core ROOT::Physics EG) +target_link_libraries(${CMAKE_PROJECT_NAME} ROOT::Core ROOT::RIO ROOT::Rint ROOT::Tree ROOT::EG) #---------------------------------------------------------------------------- # optional targets From af346a3c4e304de1a9ce39d6182eaa8e7d731a40 Mon Sep 17 00:00:00 2001 From: Kolja Kauder Date: Fri, 8 Dec 2023 12:05:33 -0500 Subject: [PATCH 5/6] Fix initialization order warning --- include/CherenkovRadiator.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/CherenkovRadiator.h b/include/CherenkovRadiator.h index 609abf2..63e98e2 100644 --- a/include/CherenkovRadiator.h +++ b/include/CherenkovRadiator.h @@ -108,7 +108,6 @@ class CherenkovRadiator: public TObject { // Transient variables for the ReconstructionFactory convenience; unsigned m_TrajectoryBinCount; //! - unsigned m_ID; //! // This is a hack for now; double m_Smearing; //! @@ -129,6 +128,7 @@ class CherenkovRadiator: public TObject { unsigned m_YieldStat; //! double m_YieldCff; //! + unsigned m_ID; //! std::vector m_Calibrations; //! #ifndef DISABLE_ROOT_IO From 87513d422e93a6e3aa631ae72ea230dead5d8ae4 Mon Sep 17 00:00:00 2001 From: Kolja Kauder Date: Tue, 26 Mar 2024 14:30:10 -0400 Subject: [PATCH 6/6] Ignore macOS files --- .gitignore | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.gitignore b/.gitignore index 04088e1..7a2065d 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,6 @@ build athena sim/macro/tmp*.mac + +# macOs +.DS_STORE