Skip to content

An intermediate irt-2.1d branch #51

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
veprbl merged 3 commits into from
Feb 12, 2026
Merged

An intermediate irt-2.1d branch #51

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
299aec6
An intermediate irt-2.1d branch
alexander-kiselev Feb 12, 2026
f223af7
remove comment
veprbl Feb 12, 2026
d0b451e
cmake: fix target_link_libraries
veprbl Feb 12, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ endif()
IF(JSON_EXPORT)
message(STATUS "NOTE: JSON_EXPORT enabled")
set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DJSON_EXPORT")
find_package(nlohmann_json 3.12.0 REQUIRED)
find_package(nlohmann_json 3.11.3 REQUIRED)
target_link_libraries(${CMAKE_PROJECT_NAME} PRIVATE nlohmann_json::nlohmann_json)
ENDIF()
target_include_directories(${CMAKE_PROJECT_NAME} PUBLIC
Expand All @@ -149,8 +149,7 @@ if(IRT_ROOT_IO)
endif()

# linking
target_link_libraries(${CMAKE_PROJECT_NAME} ROOT::Core ROOT::EG ROOT::Hist ROOT::RIO ROOT::MathCore ROOT::Tree)

target_link_libraries(${CMAKE_PROJECT_NAME} PUBLIC ROOT::Core ROOT::EG ROOT::Hist ROOT::RIO ROOT::MathCore ROOT::Tree)
#----------------------------------------------------------------------------
# optional targets

Expand Down
3 changes: 2 additions & 1 deletion include/GeantImport.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,11 @@

#define _MOMENTUM_CUTOFF_DEFAULT_ (0.010)

#include "CherenkovDetector.h"

namespace IRT2 {

class CherenkovDetectorCollection;
class CherenkovDetector;

class GeantImport {
public:
Expand Down
86 changes: 43 additions & 43 deletions include/irtLinkDef.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,55 +5,55 @@
#pragma link off all classes;
#pragma link off all functions;

#pragma link C++ class SinglePDF+;
#pragma link C++ class UniformPDF+;
#pragma link C++ class VectorPDF+;

#pragma link C++ class TransientParticle+;
#pragma link C++ class ChargedParticle+;
#pragma link C++ class ChargedParticleStep+;
#pragma link C++ class OpticalPhoton+;

#pragma link C++ class ReflectionPoint+;
#pragma link C++ class RefractionPoint+;

#pragma link C++ class OpticalBoundary+;
#pragma link C++ class IRT+;

#pragma link C++ class CherenkovRadiator+;
#pragma link C++ class CherenkovRadiatorCalibration+;
#pragma link C++ class CherenkovDetector+;
#pragma link C++ class CherenkovDetectorCollection+;
#pragma link C++ class CherenkovEvent+;
#pragma link C++ class BitMask+;

#pragma link C++ class RadiatorHistory+;

#pragma link C++ class ParametricSurface+;
#pragma link C++ class SphericalSurface+;
#pragma link C++ class ToricSurface+;
#pragma link C++ class CylindricalSurface+;
#pragma link C++ class ConicalSurface+;
#pragma link C++ class LocalCoordinatesXY+;
#pragma link C++ class FlatSurface+;

#pragma link C++ class G4Object+;
#pragma link C++ class G4ObjectCopy+;

#pragma link C++ class SurfaceCopy+;
#pragma link C++ class CherenkovMirror+;
#pragma link C++ class IRT2::SinglePDF+;
#pragma link C++ class IRT2::UniformPDF+;
#pragma link C++ class IRT2::VectorPDF+;

#pragma link C++ class IRT2::TransientParticle+;
#pragma link C++ class IRT2::ChargedParticle+;
#pragma link C++ class IRT2::ChargedParticleStep+;
#pragma link C++ class IRT2::OpticalPhoton+;

#pragma link C++ class IRT2::ReflectionPoint+;
#pragma link C++ class IRT2::RefractionPoint+;

#pragma link C++ class IRT2::OpticalBoundary+;
#pragma link C++ class IRT2::IRT+;

#pragma link C++ class IRT2::CherenkovRadiator+;
#pragma link C++ class IRT2::CherenkovRadiatorCalibration+;
#pragma link C++ class IRT2::CherenkovDetector+;
#pragma link C++ class IRT2::CherenkovDetectorCollection+;
#pragma link C++ class IRT2::CherenkovEvent+;
#pragma link C++ class IRT2::BitMask+;

#pragma link C++ class IRT2::RadiatorHistory+;

#pragma link C++ class IRT2::ParametricSurface+;
#pragma link C++ class IRT2::SphericalSurface+;
#pragma link C++ class IRT2::ToricSurface+;
#pragma link C++ class IRT2::CylindricalSurface+;
#pragma link C++ class IRT2::ConicalSurface+;
#pragma link C++ class IRT2::LocalCoordinatesXY+;
#pragma link C++ class IRT2::FlatSurface+;

#pragma link C++ class IRT2::G4Object+;
#pragma link C++ class IRT2::G4ObjectCopy+;

#pragma link C++ class IRT2::SurfaceCopy+;
#pragma link C++ class IRT2::CherenkovMirror+;
//#pragma link C++ class CherenkovMirrorGroup+;
#pragma link C++ class FlatMirror+;
#pragma link C++ class ConicalMirror+;
#pragma link C++ class CylindricalMirror+;
#pragma link C++ class SphericalMirror+;
#pragma link C++ class IRT2::FlatMirror+;
#pragma link C++ class IRT2::ConicalMirror+;
#pragma link C++ class IRT2::CylindricalMirror+;
#pragma link C++ class IRT2::SphericalMirror+;

#pragma link C++ class CherenkovPhotonDetector+;
#pragma link C++ class IRT2::CherenkovPhotonDetector+;

// Are these two really needed?;
#pragma link C++ class std::pair<TRef, TRef>+;
#pragma link C++ class std::vector<TRef>+;

#pragma link C++ class ReconstructionFactory+;
#pragma link C++ class IRT2::ReconstructionFactory+;

#endif