From 8575ec54e5773598318c91235001411ee97f4c49 Mon Sep 17 00:00:00 2001 From: Austin Schneider Date: Sun, 10 Mar 2024 12:57:42 -0600 Subject: [PATCH] LI_ --> SIREN_ --- CMakeLists.txt | 100 +++++++++--------- cmake/pyproject.cmake | 8 +- projects/dataclasses/CMakeLists.txt | 14 +-- .../public/SIREN/dataclasses/DecaySignature.h | 6 +- .../SIREN/dataclasses/InteractionRecord.h | 6 +- .../SIREN/dataclasses/InteractionSignature.h | 6 +- .../SIREN/dataclasses/InteractionTree.h | 6 +- .../public/SIREN/dataclasses/Particle.h | 6 +- .../public/SIREN/dataclasses/ParticleID.h | 6 +- .../public/SIREN/dataclasses/ParticleType.h | 6 +- projects/detector/CMakeLists.txt | 18 ++-- .../detector/private/test/FakeDetectorModel.h | 6 +- .../detector/private/test/FakeMaterialModel.h | 6 +- .../detector/public/SIREN/detector/Axis1D.h | 6 +- .../public/SIREN/detector/CartesianAxis1D.h | 6 +- .../CartesianAxisDensityDistribution.h | 6 +- ...tesianAxisExponentialDensityDistribution.h | 6 +- ...rtesianAxisPolynomialDensityDistribution.h | 6 +- .../detector/ConstantDensityDistribution.h | 6 +- .../SIREN/detector/ConstantDistribution1D.h | 6 +- .../public/SIREN/detector/Coordinates.h | 6 +- .../SIREN/detector/DensityDistribution.h | 6 +- .../SIREN/detector/DensityDistribution1D.h | 6 +- .../public/SIREN/detector/DetectorModel.h | 6 +- .../public/SIREN/detector/DetectorModel.tcc | 4 +- .../public/SIREN/detector/Distribution1D.h | 6 +- .../detector/ExponentialDistribution1D.h | 6 +- .../public/SIREN/detector/MaterialModel.h | 6 +- .../public/SIREN/detector/MaterialModel.tcc | 4 +- .../detector/public/SIREN/detector/Path.h | 6 +- .../SIREN/detector/PolynomialDistribution1D.h | 6 +- .../public/SIREN/detector/RadialAxis1D.h | 6 +- ...RadialAxisExponentialDensityDistribution.h | 6 +- .../RadialAxisPolynomialDensityDistribution.h | 6 +- projects/distributions/CMakeLists.txt | 22 ++-- .../private/primary/direction/Cone.cxx | 4 +- .../primary/direction/FixedDirection.cxx | 4 +- .../primary/direction/IsotropicDirection.cxx | 4 +- .../PrimaryDirectionDistribution.cxx | 2 +- ...MoyalPlusExponentialEnergyDistribution.cxx | 4 +- .../private/primary/energy/Monoenergetic.cxx | 4 +- .../private/primary/energy/PowerLaw.cxx | 4 +- .../energy/PrimaryEnergyDistribution.cxx | 2 +- .../energy/TabulatedFluxDistribution.cxx | 4 +- .../PrimaryNeutrinoHelicityDistribution.cxx | 2 +- .../private/primary/mass/PrimaryMass.cxx | 2 +- .../ColumnDepthPositionDistribution.cxx | 6 +- .../CylinderVolumePositionDistribution.cxx | 4 +- .../vertex/DecayRangePositionDistribution.cxx | 4 +- .../OrientedCylinderPositionDistribution.cxx | 6 +- .../PointSourcePositionDistribution.cxx | 4 +- .../vertex/RangePositionDistribution.cxx | 4 +- .../vertex/VertexPositionDistribution.cxx | 2 +- .../private/pybindings/distributions.cxx | 10 +- .../SecondaryBoundedVertexDistribution.cxx | 4 +- .../SecondaryPhysicalVertexDistribution.cxx | 4 +- .../SecondaryVertexPositionDistribution.cxx | 2 +- .../private/test/DistributionTest.h | 6 +- .../PrimaryDirectionDistribution_TEST.cxx | 16 +-- .../test/PrimaryEnergyDistribution_TEST.cxx | 6 +- .../SIREN/distributions/Distributions.h | 14 +-- .../distributions/primary/direction/Cone.h | 10 +- .../primary/direction/FixedDirection.h | 10 +- .../primary/direction/IsotropicDirection.h | 10 +- .../direction/PrimaryDirectionDistribution.h | 14 +-- ...edMoyalPlusExponentialEnergyDistribution.h | 10 +- .../primary/energy/Monoenergetic.h | 10 +- .../distributions/primary/energy/PowerLaw.h | 10 +- .../energy/PrimaryEnergyDistribution.h | 12 +-- .../energy/TabulatedFluxDistribution.h | 10 +- .../PrimaryNeutrinoHelicityDistribution.h | 10 +- .../distributions/primary/mass/PrimaryMass.h | 10 +- .../vertex/ColumnDepthPositionDistribution.h | 14 +-- .../CylinderVolumePositionDistribution.h | 10 +- .../primary/vertex/DecayRangeFunction.h | 6 +- .../vertex/DecayRangePositionDistribution.h | 12 +-- .../primary/vertex/DepthFunction.h | 6 +- .../primary/vertex/LeptonDepthFunction.h | 6 +- .../OrientedCylinderPositionDistribution.h | 12 +-- .../vertex/PointSourcePositionDistribution.h | 12 +-- .../primary/vertex/RangeFunction.h | 6 +- .../vertex/RangePositionDistribution.h | 12 +-- .../vertex/VertexPositionDistribution.h | 12 +-- .../SecondaryBoundedVertexDistribution.h | 10 +- .../SecondaryPhysicalVertexDistribution.h | 10 +- .../SecondaryVertexPositionDistribution.h | 12 +-- projects/geometry/CMakeLists.txt | 12 +-- projects/geometry/public/SIREN/geometry/Box.h | 6 +- .../geometry/public/SIREN/geometry/Cylinder.h | 6 +- .../geometry/public/SIREN/geometry/ExtrPoly.h | 6 +- .../geometry/public/SIREN/geometry/Geometry.h | 6 +- .../public/SIREN/geometry/GeometryMesh.h | 6 +- .../public/SIREN/geometry/MeshBuilder.h | 6 +- .../public/SIREN/geometry/Placement.h | 6 +- .../geometry/public/SIREN/geometry/Sphere.h | 6 +- projects/injection/CMakeLists.txt | 24 ++--- .../private/ColumnDepthLeptonInjector.cxx | 2 +- .../private/CylinderVolumeLeptonInjector.cxx | 2 +- .../private/DecayRangeLeptonInjector.cxx | 2 +- projects/injection/private/Injector.cxx | 8 +- .../private/RangedLeptonInjector.cxx | 2 +- .../private/pybindings/injection.cxx | 14 +-- .../injection/private/test/CCM_HNL_TEST.cxx | 2 +- .../injection/private/test/Injector_TEST.cxx | 2 +- .../injection/ColumnDepthLeptonInjector.h | 10 +- .../injection/CylinderVolumeLeptonInjector.h | 12 +-- .../injection/DecayRangeLeptonInjector.h | 10 +- .../public/SIREN/injection/Injector.h | 18 ++-- .../public/SIREN/injection/Process.h | 6 +- .../SIREN/injection/RangedLeptonInjector.h | 10 +- .../public/SIREN/injection/TreeWeighter.h | 6 +- .../public/SIREN/injection/TreeWeighter.tcc | 6 +- .../public/SIREN/injection/Weighter.h | 6 +- .../public/SIREN/injection/WeightingUtils.h | 6 +- projects/interactions/CMakeLists.txt | 18 ++-- .../interactions/private/CrossSection.cxx | 2 +- .../interactions/private/DISFromSpline.cxx | 4 +- .../private/DarkNewsCrossSection.cxx | 4 +- .../interactions/private/DarkNewsDecay.cxx | 6 +- .../interactions/private/DipoleFromTable.cxx | 4 +- .../private/DummyCrossSection.cxx | 4 +- .../private/ElasticScattering.cxx | 4 +- projects/interactions/private/HNLDecay.cxx | 2 +- .../interactions/private/HNLFromSpline.cxx | 4 +- .../interactions/private/NeutrissimoDecay.cxx | 4 +- .../private/pybindings/CrossSection.h | 4 +- .../private/pybindings/DarkNewsCrossSection.h | 4 +- .../private/pybindings/DarkNewsDecay.h | 6 +- .../private/test/DISFromSpline_TEST.cxx | 2 +- .../private/test/DipoleFromTable_TEST.cxx | 2 +- .../private/test/ElasticScattering_TEST.cxx | 2 +- .../public/SIREN/interactions/CrossSection.h | 12 +-- .../public/SIREN/interactions/DISFromSpline.h | 10 +- .../SIREN/interactions/DarkNewsCrossSection.h | 10 +- .../public/SIREN/interactions/DarkNewsDecay.h | 12 +-- .../public/SIREN/interactions/Decay.h | 10 +- .../SIREN/interactions/DipoleFromTable.h | 10 +- .../SIREN/interactions/DummyCrossSection.h | 10 +- .../SIREN/interactions/ElasticScattering.h | 10 +- .../public/SIREN/interactions/HNLDecay.h | 8 +- .../public/SIREN/interactions/HNLFromSpline.h | 10 +- .../interactions/InteractionCollection.h | 6 +- .../SIREN/interactions/NeutrissimoDecay.h | 10 +- projects/math/CMakeLists.txt | 14 +-- projects/math/public/SIREN/math/Conversions.h | 6 +- projects/math/public/SIREN/math/EulerAngles.h | 6 +- .../SIREN/math/EulerQuaternionConversions.h | 6 +- .../math/public/SIREN/math/Interpolation.h | 6 +- projects/math/public/SIREN/math/Matrix3D.h | 6 +- projects/math/public/SIREN/math/Polynomial.h | 6 +- projects/math/public/SIREN/math/Quaternion.h | 6 +- projects/math/public/SIREN/math/Vector3D.h | 6 +- projects/serialization/CMakeLists.txt | 4 +- .../public/SIREN/serialization/array.h | 6 +- projects/utilities/CMakeLists.txt | 6 +- projects/utilities/private/Random.cxx | 10 +- .../private/pybindings/utilities.cxx | 6 +- .../public/SIREN/utilities/Constants.h | 6 +- .../utilities/public/SIREN/utilities/Errors.h | 4 +- .../public/SIREN/utilities/Integration.h | 6 +- .../public/SIREN/utilities/Interpolator.h | 6 +- .../utilities/public/SIREN/utilities/Random.h | 12 +-- python/LIController.py | 2 +- 163 files changed, 627 insertions(+), 627 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index ee9f4432f..8defbc1b4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -21,7 +21,7 @@ endif() # parse pyproject.toml for the version include(pyproject) -project(siren VERSION ${LI_VERSION} LANGUAGES CXX) +project(siren VERSION ${SIREN_VERSION} LANGUAGES CXX) # include cmake dependencies include(GNUInstallDirs) @@ -50,11 +50,11 @@ if(DEFINED SKBUILD) cmake_path(RELATIVE_PATH SKBUILD_PLATLIB_DIR BASE_DIRECTORY ${SKBUILD_PLATLIB_DIR} OUTPUT_VARIABLE CMAKE_INSTALL_LIBDIR) message(STATUS "Setting include dir to: ${CMAKE_INSTALL_INCLUDEDIR}") message(STATUS "Setting lib dir to: ${CMAKE_INSTALL_LIBDIR}") - set(LI_INSTALL_INCLUDEDIR ${SKBUILD_HEADERS_DIR}) - set(LI_INSTALL_LIBDIR ${SKBUILD_PLATLIB_DIR}) + set(SIREN_INSTALL_INCLUDEDIR ${SKBUILD_HEADERS_DIR}) + set(SIREN_INSTALL_LIBDIR ${SKBUILD_PLATLIB_DIR}) else() - set(LI_INSTALL_INCLUDEDIR ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_INCLUDEDIR}) - set(LI_INSTALL_LIBDIR ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}) + set(SIREN_INSTALL_INCLUDEDIR ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_INCLUDEDIR}) + set(SIREN_INSTALL_LIBDIR ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}) endif() # load python and pybind11 @@ -99,15 +99,15 @@ target_link_libraries(SIREN PUBLIC delabella_shared photospline - LI_utilities - LI_serialization - LI_math - LI_dataclasses - LI_geometry - LI_detector - LI_interactions - LI_distributions - LI_injection + SIREN_utilities + SIREN_serialization + SIREN_math + SIREN_dataclasses + SIREN_geometry + SIREN_detector + SIREN_interactions + SIREN_distributions + SIREN_injection ) else() target_link_libraries(SIREN @@ -115,15 +115,15 @@ target_link_libraries(SIREN PUBLIC photospline delabella_shared - LI_utilities - LI_serialization - LI_math - LI_dataclasses - LI_geometry - LI_detector - LI_interactions - LI_distributions - LI_injection + SIREN_utilities + SIREN_serialization + SIREN_math + SIREN_dataclasses + SIREN_geometry + SIREN_detector + SIREN_interactions + SIREN_distributions + SIREN_injection ) endif() @@ -137,30 +137,30 @@ if(DEFINED SKBUILD) message(STATUS "Setting SIREN install include dir to: ${CI_INSTALL_PREFIX}/include") install(TARGETS SIREN delabella_shared - LI_utilities - LI_serialization - LI_math - LI_dataclasses - LI_geometry - LI_detector - LI_interactions - LI_distributions - LI_injection + SIREN_utilities + SIREN_serialization + SIREN_math + SIREN_dataclasses + SIREN_geometry + SIREN_detector + SIREN_interactions + SIREN_distributions + SIREN_injection EXPORT ${PROJECT_NAME}Config LIBRARY DESTINATION "${CI_INSTALL_PREFIX}/lib" PUBLIC_HEADER DESTINATION "${CI_INSTALL_PREFIX}/include") else() install(TARGETS SIREN delabella_shared - LI_utilities - LI_serialization - LI_math - LI_dataclasses - LI_geometry - LI_detector - LI_interactions - LI_distributions - LI_injection + SIREN_utilities + SIREN_serialization + SIREN_math + SIREN_dataclasses + SIREN_geometry + SIREN_detector + SIREN_interactions + SIREN_distributions + SIREN_injection EXPORT ${PROJECT_NAME}Config LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/siren.libs PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) @@ -168,15 +168,15 @@ if(DEFINED SKBUILD) else() install(TARGETS SIREN delabella_shared - LI_utilities - LI_serialization - LI_math - LI_dataclasses - LI_geometry - LI_detector - LI_interactions - LI_distributions - LI_injection + SIREN_utilities + SIREN_serialization + SIREN_math + SIREN_dataclasses + SIREN_geometry + SIREN_detector + SIREN_interactions + SIREN_distributions + SIREN_injection EXPORT ${PROJECT_NAME}Config LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) diff --git a/cmake/pyproject.cmake b/cmake/pyproject.cmake index 7fd579abf..320dd2539 100644 --- a/cmake/pyproject.cmake +++ b/cmake/pyproject.cmake @@ -1,5 +1,5 @@ file(READ ${CMAKE_CURRENT_LIST_DIR}/../pyproject.toml PYPROJECT_CONTENTS) -string(REGEX MATCH "\\[project\\](\n(([A-Za-z0-9_])+([ \t\n\r])*=([ \t\n\r])*(\".*\"|\[.*\]|true|false))?([ \t\n\r])*)*([ \t]*name[ \t]*=[ \t]*\"siren\"[ \t]*)[ \t\n\r]+([ \t]*version[ \t]*=[ \t]\"[0-9\.]+\")" LI_VERSION_BLOCK ${PYPROJECT_CONTENTS}) -string(REGEX MATCH "([ \t]*version[ \t]*=[ \t]\"[0-9\.]+\")" LI_VERSION_LINE ${LI_VERSION_BLOCK}) -string(REGEX MATCH "\"[0-9\.]+\"" LI_VERSION_STRING ${LI_VERSION_LINE}) -string(REGEX MATCH "[0-9\.]+" LI_VERSION ${LI_VERSION_STRING}) +string(REGEX MATCH "\\[project\\](\n(([A-Za-z0-9_])+([ \t\n\r])*=([ \t\n\r])*(\".*\"|\[.*\]|true|false))?([ \t\n\r])*)*([ \t]*name[ \t]*=[ \t]*\"siren\"[ \t]*)[ \t\n\r]+([ \t]*version[ \t]*=[ \t]\"[0-9\.]+\")" SIREN_VERSION_BLOCK ${PYPROJECT_CONTENTS}) +string(REGEX MATCH "([ \t]*version[ \t]*=[ \t]\"[0-9\.]+\")" SIREN_VERSION_LINE ${SIREN_VERSION_BLOCK}) +string(REGEX MATCH "\"[0-9\.]+\"" SIREN_VERSION_STRING ${SIREN_VERSION_LINE}) +string(REGEX MATCH "[0-9\.]+" SIREN_VERSION ${SIREN_VERSION_STRING}) diff --git a/projects/dataclasses/CMakeLists.txt b/projects/dataclasses/CMakeLists.txt index 1caab7eea..2a7cda1f9 100644 --- a/projects/dataclasses/CMakeLists.txt +++ b/projects/dataclasses/CMakeLists.txt @@ -9,18 +9,18 @@ LIST (APPEND dataclasses_SOURCES ${PROJECT_SOURCE_DIR}/projects/dataclasses/private/ParticleID.cxx ${PROJECT_SOURCE_DIR}/projects/dataclasses/private/ParticleType.cxx ) -add_library(LI_dataclasses OBJECT ${dataclasses_SOURCES}) -set_property(TARGET LI_dataclasses PROPERTY POSITION_INDEPENDENT_CODE ON) -target_include_directories(LI_dataclasses PUBLIC +add_library(SIREN_dataclasses OBJECT ${dataclasses_SOURCES}) +set_property(TARGET SIREN_dataclasses PROPERTY POSITION_INDEPENDENT_CODE ON) +target_include_directories(SIREN_dataclasses PUBLIC $ $ ) -target_link_libraries(LI_dataclasses PUBLIC +target_link_libraries(SIREN_dataclasses PUBLIC photospline - LI_serialization - LI_utilities - LI_math + SIREN_serialization + SIREN_utilities + SIREN_math ) install(DIRECTORY "${PROJECT_SOURCE_DIR}/projects/dataclasses/public/" diff --git a/projects/dataclasses/public/SIREN/dataclasses/DecaySignature.h b/projects/dataclasses/public/SIREN/dataclasses/DecaySignature.h index bb0785d96..3f602600e 100644 --- a/projects/dataclasses/public/SIREN/dataclasses/DecaySignature.h +++ b/projects/dataclasses/public/SIREN/dataclasses/DecaySignature.h @@ -1,5 +1,5 @@ -#ifndef LI_DecaySignature_H -#define LI_DecaySignature_H +#ifndef SIREN_DecaySignature_H +#define SIREN_DecaySignature_H #include // for uint32_t #include // for vector @@ -41,4 +41,4 @@ struct DecaySignature { CEREAL_CLASS_VERSION(siren::dataclasses::DecaySignature, 0); -#endif // LI_DecaySignature_H +#endif // SIREN_DecaySignature_H diff --git a/projects/dataclasses/public/SIREN/dataclasses/InteractionRecord.h b/projects/dataclasses/public/SIREN/dataclasses/InteractionRecord.h index b91a2bf1e..e1e3364d0 100644 --- a/projects/dataclasses/public/SIREN/dataclasses/InteractionRecord.h +++ b/projects/dataclasses/public/SIREN/dataclasses/InteractionRecord.h @@ -1,6 +1,6 @@ #pragma once -#ifndef LI_InteractionRecord_H -#define LI_InteractionRecord_H +#ifndef SIREN_InteractionRecord_H +#define SIREN_InteractionRecord_H #include // for array #include // for ostream @@ -349,4 +349,4 @@ class SecondaryDistributionRecord { CEREAL_CLASS_VERSION(siren::dataclasses::InteractionRecord, 0); -#endif // LI_InteractionRecord_H +#endif // SIREN_InteractionRecord_H diff --git a/projects/dataclasses/public/SIREN/dataclasses/InteractionSignature.h b/projects/dataclasses/public/SIREN/dataclasses/InteractionSignature.h index 78271b2a2..f3325d5b6 100644 --- a/projects/dataclasses/public/SIREN/dataclasses/InteractionSignature.h +++ b/projects/dataclasses/public/SIREN/dataclasses/InteractionSignature.h @@ -1,6 +1,6 @@ #pragma once -#ifndef LI_InteractionSignature_H -#define LI_InteractionSignature_H +#ifndef SIREN_InteractionSignature_H +#define SIREN_InteractionSignature_H #include // for ostream #include // for vector @@ -43,4 +43,4 @@ struct InteractionSignature { CEREAL_CLASS_VERSION(siren::dataclasses::InteractionSignature, 0); -#endif // LI_InteractionSignature_H +#endif // SIREN_InteractionSignature_H diff --git a/projects/dataclasses/public/SIREN/dataclasses/InteractionTree.h b/projects/dataclasses/public/SIREN/dataclasses/InteractionTree.h index 4cbfa31f4..85a027632 100644 --- a/projects/dataclasses/public/SIREN/dataclasses/InteractionTree.h +++ b/projects/dataclasses/public/SIREN/dataclasses/InteractionTree.h @@ -1,6 +1,6 @@ #pragma once -#ifndef LI_InteractionTree_H -#define LI_InteractionTree_H +#ifndef SIREN_InteractionTree_H +#define SIREN_InteractionTree_H #include "SIREN/dataclasses/InteractionRecord.h" @@ -62,5 +62,5 @@ struct InteractionTree { } // namespace dataclasses } // namespace siren -#endif // LI_InteractionTree_H +#endif // SIREN_InteractionTree_H diff --git a/projects/dataclasses/public/SIREN/dataclasses/Particle.h b/projects/dataclasses/public/SIREN/dataclasses/Particle.h index 374de42bc..94a61693f 100644 --- a/projects/dataclasses/public/SIREN/dataclasses/Particle.h +++ b/projects/dataclasses/public/SIREN/dataclasses/Particle.h @@ -1,6 +1,6 @@ #pragma once -#ifndef LI_Particle_H -#define LI_Particle_H +#ifndef SIREN_Particle_H +#define SIREN_Particle_H // Used to define the Particle class // Partiles have a type, energy, position, and direction @@ -80,4 +80,4 @@ bool isNeutrino(ParticleType p); CEREAL_CLASS_VERSION(siren::dataclasses::Particle, 0); -#endif // LI_Particle_H +#endif // SIREN_Particle_H diff --git a/projects/dataclasses/public/SIREN/dataclasses/ParticleID.h b/projects/dataclasses/public/SIREN/dataclasses/ParticleID.h index 312abf4ab..3ec58b924 100644 --- a/projects/dataclasses/public/SIREN/dataclasses/ParticleID.h +++ b/projects/dataclasses/public/SIREN/dataclasses/ParticleID.h @@ -1,5 +1,5 @@ -#ifndef LI_ParticleID_H -#define LI_ParticleID_H +#ifndef SIREN_ParticleID_H +#define SIREN_ParticleID_H #include // for uint32_t #include // for ostream @@ -62,4 +62,4 @@ class ParticleID { CEREAL_CLASS_VERSION(siren::dataclasses::ParticleID, 0); -#endif // LI_ParticleID_H +#endif // SIREN_ParticleID_H diff --git a/projects/dataclasses/public/SIREN/dataclasses/ParticleType.h b/projects/dataclasses/public/SIREN/dataclasses/ParticleType.h index 19f1f2c4e..aae4a91ad 100644 --- a/projects/dataclasses/public/SIREN/dataclasses/ParticleType.h +++ b/projects/dataclasses/public/SIREN/dataclasses/ParticleType.h @@ -1,6 +1,6 @@ #pragma once -#ifndef LI_ParticleType_H -#define LI_ParticleType_H +#ifndef SIREN_ParticleType_H +#define SIREN_ParticleType_H #include #include @@ -88,4 +88,4 @@ namespace cereal { } } -#endif // LI_ParticleType_H +#endif // SIREN_ParticleType_H diff --git a/projects/detector/CMakeLists.txt b/projects/detector/CMakeLists.txt index 8ca864be5..5942a65e4 100644 --- a/projects/detector/CMakeLists.txt +++ b/projects/detector/CMakeLists.txt @@ -17,23 +17,23 @@ LIST (APPEND detector_SOURCES ${PROJECT_SOURCE_DIR}/projects/detector/private/MaterialModel.cxx ${PROJECT_SOURCE_DIR}/projects/detector/private/Path.cxx ) -add_library(LI_detector OBJECT ${detector_SOURCES}) -set_property(TARGET LI_detector PROPERTY POSITION_INDEPENDENT_CODE ON) -target_include_directories(LI_detector PUBLIC +add_library(SIREN_detector OBJECT ${detector_SOURCES}) +set_property(TARGET SIREN_detector PROPERTY POSITION_INDEPENDENT_CODE ON) +target_include_directories(SIREN_detector PUBLIC $ $ ) -target_link_libraries(LI_detector +target_link_libraries(SIREN_detector PRIVATE $ PUBLIC photospline - LI_serialization - LI_utilities - LI_math - LI_dataclasses - LI_geometry + SIREN_serialization + SIREN_utilities + SIREN_math + SIREN_dataclasses + SIREN_geometry ) install(DIRECTORY "${PROJECT_SOURCE_DIR}/projects/detector/public/" diff --git a/projects/detector/private/test/FakeDetectorModel.h b/projects/detector/private/test/FakeDetectorModel.h index da52435bb..57aa144d3 100644 --- a/projects/detector/private/test/FakeDetectorModel.h +++ b/projects/detector/private/test/FakeDetectorModel.h @@ -1,5 +1,5 @@ -#ifndef LI_TEST_FakeDetectorModel_H -#define LI_TEST_FakeDetectorModel_H +#ifndef SIREN_TEST_FakeDetectorModel_H +#define SIREN_TEST_FakeDetectorModel_H #include #include @@ -760,5 +760,5 @@ class FakeLegacyDetectorModelTest : public FakeLegacyDetectorModelFile, public F } }; -#endif // LI_TEST_FakeDetectorModel_H +#endif // SIREN_TEST_FakeDetectorModel_H diff --git a/projects/detector/private/test/FakeMaterialModel.h b/projects/detector/private/test/FakeMaterialModel.h index c5a18396d..619696281 100644 --- a/projects/detector/private/test/FakeMaterialModel.h +++ b/projects/detector/private/test/FakeMaterialModel.h @@ -1,5 +1,5 @@ -#ifndef LI_TEST_FakeMaterialModel_H -#define LI_TEST_FakeMaterialModel_H +#ifndef SIREN_TEST_FakeMaterialModel_H +#define SIREN_TEST_FakeMaterialModel_H #include #include @@ -286,5 +286,5 @@ class FakeMaterialModelTest : public FakeMaterialModelFile, public ::testing::Te } }; -#endif // LI_TEST_FakeMaterialModel_H +#endif // SIREN_TEST_FakeMaterialModel_H diff --git a/projects/detector/public/SIREN/detector/Axis1D.h b/projects/detector/public/SIREN/detector/Axis1D.h index 23c92fde6..d4e393152 100644 --- a/projects/detector/public/SIREN/detector/Axis1D.h +++ b/projects/detector/public/SIREN/detector/Axis1D.h @@ -1,6 +1,6 @@ #pragma once -#ifndef LI_Axis1D_H -#define LI_Axis1D_H +#ifndef SIREN_Axis1D_H +#define SIREN_Axis1D_H #include // for shared_ptr #include // for uint32_t @@ -58,4 +58,4 @@ friend cereal::access; CEREAL_CLASS_VERSION(siren::detector::Axis1D, 0); -#endif // LI_Axis1D_H +#endif // SIREN_Axis1D_H diff --git a/projects/detector/public/SIREN/detector/CartesianAxis1D.h b/projects/detector/public/SIREN/detector/CartesianAxis1D.h index 1b166b25d..9734d3a98 100644 --- a/projects/detector/public/SIREN/detector/CartesianAxis1D.h +++ b/projects/detector/public/SIREN/detector/CartesianAxis1D.h @@ -1,6 +1,6 @@ #pragma once -#ifndef LI_CartesianAxis1D_H -#define LI_CartesianAxis1D_H +#ifndef SIREN_CartesianAxis1D_H +#define SIREN_CartesianAxis1D_H #include // for shared_ptr #include // for uint32_t @@ -53,4 +53,4 @@ CEREAL_CLASS_VERSION(siren::detector::CartesianAxis1D, 0); CEREAL_REGISTER_TYPE(siren::detector::CartesianAxis1D); CEREAL_REGISTER_POLYMORPHIC_RELATION(siren::detector::Axis1D, siren::detector::CartesianAxis1D); -#endif // LI_CartesianAxis1D_H +#endif // SIREN_CartesianAxis1D_H diff --git a/projects/detector/public/SIREN/detector/CartesianAxisDensityDistribution.h b/projects/detector/public/SIREN/detector/CartesianAxisDensityDistribution.h index 1271814e9..c5d07e837 100644 --- a/projects/detector/public/SIREN/detector/CartesianAxisDensityDistribution.h +++ b/projects/detector/public/SIREN/detector/CartesianAxisDensityDistribution.h @@ -1,6 +1,6 @@ #pragma once -#ifndef LI_CartesianAxisDensityDistribution_H -#define LI_CartesianAxisDensityDistribution_H +#ifndef SIREN_CartesianAxisDensityDistribution_H +#define SIREN_CartesianAxisDensityDistribution_H #include #include #include @@ -157,4 +157,4 @@ class DensityDistribution1D #include #include @@ -25,4 +25,4 @@ CEREAL_CLASS_VERSION(siren::detector::CartesianAxisExponentialDensityDistributio CEREAL_REGISTER_TYPE(siren::detector::CartesianAxisExponentialDensityDistribution); CEREAL_REGISTER_POLYMORPHIC_RELATION(siren::detector::DensityDistribution, siren::detector::CartesianAxisExponentialDensityDistribution); -#endif // LI_CartesianAxisExponentialDensityDistribution.h +#endif // SIREN_CartesianAxisExponentialDensityDistribution.h diff --git a/projects/detector/public/SIREN/detector/CartesianAxisPolynomialDensityDistribution.h b/projects/detector/public/SIREN/detector/CartesianAxisPolynomialDensityDistribution.h index 9ac97b166..a7acfb042 100644 --- a/projects/detector/public/SIREN/detector/CartesianAxisPolynomialDensityDistribution.h +++ b/projects/detector/public/SIREN/detector/CartesianAxisPolynomialDensityDistribution.h @@ -1,6 +1,6 @@ #pragma once -#ifndef LI_CartesianAxisDensityDistribution_H -#define LI_CartesianAxisDensityDistribution_H +#ifndef SIREN_CartesianAxisDensityDistribution_H +#define SIREN_CartesianAxisDensityDistribution_H #include #include #include @@ -25,4 +25,4 @@ CEREAL_CLASS_VERSION(siren::detector::CartesianAxisPolynomialDensityDistribution CEREAL_REGISTER_TYPE(siren::detector::CartesianAxisPolynomialDensityDistribution); CEREAL_REGISTER_POLYMORPHIC_RELATION(siren::detector::DensityDistribution, siren::detector::CartesianAxisPolynomialDensityDistribution); -#endif // LI_CartesianAxisPolynomialDensityDistribution.h +#endif // SIREN_CartesianAxisPolynomialDensityDistribution.h diff --git a/projects/detector/public/SIREN/detector/ConstantDensityDistribution.h b/projects/detector/public/SIREN/detector/ConstantDensityDistribution.h index 38cf7326a..a68ee970b 100644 --- a/projects/detector/public/SIREN/detector/ConstantDensityDistribution.h +++ b/projects/detector/public/SIREN/detector/ConstantDensityDistribution.h @@ -1,6 +1,6 @@ #pragma once -#ifndef LI_ConstantDensityDistribution_H -#define LI_ConstantDensityDistribution_H +#ifndef SIREN_ConstantDensityDistribution_H +#define SIREN_ConstantDensityDistribution_H #include #include #include @@ -134,4 +134,4 @@ CEREAL_CLASS_VERSION(siren::detector::ConstantDensityDistribution, 0); CEREAL_REGISTER_TYPE(siren::detector::ConstantDensityDistribution); CEREAL_REGISTER_POLYMORPHIC_RELATION(siren::detector::DensityDistribution, siren::detector::ConstantDensityDistribution); -#endif // LI_ConstantDensityDistribution.h +#endif // SIREN_ConstantDensityDistribution.h diff --git a/projects/detector/public/SIREN/detector/ConstantDistribution1D.h b/projects/detector/public/SIREN/detector/ConstantDistribution1D.h index b1313bcee..279a00d96 100644 --- a/projects/detector/public/SIREN/detector/ConstantDistribution1D.h +++ b/projects/detector/public/SIREN/detector/ConstantDistribution1D.h @@ -1,6 +1,6 @@ #pragma once -#ifndef LI_ConstantDistribution1D_H -#define LI_ConstantDistribution1D_H +#ifndef SIREN_ConstantDistribution1D_H +#define SIREN_ConstantDistribution1D_H #include // for shared_ptr #include // for uint32_t @@ -50,4 +50,4 @@ CEREAL_CLASS_VERSION(siren::detector::ConstantDistribution1D, 0); CEREAL_REGISTER_TYPE(siren::detector::ConstantDistribution1D); CEREAL_REGISTER_POLYMORPHIC_RELATION(siren::detector::Distribution1D, siren::detector::ConstantDistribution1D); -#endif // LI_ConstantDistribution1D_H +#endif // SIREN_ConstantDistribution1D_H diff --git a/projects/detector/public/SIREN/detector/Coordinates.h b/projects/detector/public/SIREN/detector/Coordinates.h index 489602b73..f2755c1a5 100644 --- a/projects/detector/public/SIREN/detector/Coordinates.h +++ b/projects/detector/public/SIREN/detector/Coordinates.h @@ -1,6 +1,6 @@ #pragma once -#ifndef LI_Coordinates_H -#define LI_Coordinates_H +#ifndef SIREN_Coordinates_H +#define SIREN_Coordinates_H #include #include "SIREN/math/Vector3D.h" // for Vector3D @@ -55,4 +55,4 @@ using DetectorDirection = fluent::NamedType // for basic_string #include // for shared_ptr @@ -98,5 +98,5 @@ friend cereal::access; CEREAL_CLASS_VERSION(siren::detector::DensityDistribution, 0); -#endif // LI_DensityDistribution_H +#endif // SIREN_DensityDistribution_H diff --git a/projects/detector/public/SIREN/detector/DensityDistribution1D.h b/projects/detector/public/SIREN/detector/DensityDistribution1D.h index ab149b3d9..4c3ea0539 100644 --- a/projects/detector/public/SIREN/detector/DensityDistribution1D.h +++ b/projects/detector/public/SIREN/detector/DensityDistribution1D.h @@ -1,6 +1,6 @@ #pragma once -#ifndef LI_DensityDistribution1D_H -#define LI_DensityDistribution1D_H +#ifndef SIREN_DensityDistribution1D_H +#define SIREN_DensityDistribution1D_H #include #include #include @@ -150,4 +150,4 @@ class DensityDistribution1D } // namespace detector } // namespace siren -#endif // LI_DensityDistribution1D.h +#endif // SIREN_DensityDistribution1D.h diff --git a/projects/detector/public/SIREN/detector/DetectorModel.h b/projects/detector/public/SIREN/detector/DetectorModel.h index 71a9e9723..ac995e3b0 100644 --- a/projects/detector/public/SIREN/detector/DetectorModel.h +++ b/projects/detector/public/SIREN/detector/DetectorModel.h @@ -1,6 +1,6 @@ #pragma once -#ifndef LI_DetectorModel_H -#define LI_DetectorModel_H +#ifndef SIREN_DetectorModel_H +#define SIREN_DetectorModel_H #include // for map #include // for set @@ -294,4 +294,4 @@ std::ostream& operator<<(std::ostream& oss, siren::detector::DetectorSector & bc CEREAL_CLASS_VERSION(siren::detector::DetectorModel, 0); -#endif // LI_DetectorModel_H +#endif // SIREN_DetectorModel_H diff --git a/projects/detector/public/SIREN/detector/DetectorModel.tcc b/projects/detector/public/SIREN/detector/DetectorModel.tcc index f14471af4..ac32caf9c 100644 --- a/projects/detector/public/SIREN/detector/DetectorModel.tcc +++ b/projects/detector/public/SIREN/detector/DetectorModel.tcc @@ -1,6 +1,6 @@ #pragma once -#ifndef LI_DetectorModel_TCC -#define LI_DetectorModel_TCC +#ifndef SIREN_DetectorModel_TCC +#define SIREN_DetectorModel_TCC #include #include diff --git a/projects/detector/public/SIREN/detector/Distribution1D.h b/projects/detector/public/SIREN/detector/Distribution1D.h index f57844409..8ae41bb5a 100644 --- a/projects/detector/public/SIREN/detector/Distribution1D.h +++ b/projects/detector/public/SIREN/detector/Distribution1D.h @@ -1,6 +1,6 @@ #pragma once -#ifndef LI_Distribution1D_H -#define LI_Distribution1D_H +#ifndef SIREN_Distribution1D_H +#define SIREN_Distribution1D_H #include // for shared_ptr #include // for uint32_t @@ -33,4 +33,4 @@ friend cereal::access; CEREAL_CLASS_VERSION(siren::detector::Distribution1D, 0); -#endif // LI_Distribution1D_H +#endif // SIREN_Distribution1D_H diff --git a/projects/detector/public/SIREN/detector/ExponentialDistribution1D.h b/projects/detector/public/SIREN/detector/ExponentialDistribution1D.h index fd74bb0a3..a2b7a14ec 100644 --- a/projects/detector/public/SIREN/detector/ExponentialDistribution1D.h +++ b/projects/detector/public/SIREN/detector/ExponentialDistribution1D.h @@ -1,6 +1,6 @@ #pragma once -#ifndef LI_ExponentialDistribution1D_H -#define LI_ExponentialDistribution1D_H +#ifndef SIREN_ExponentialDistribution1D_H +#define SIREN_ExponentialDistribution1D_H #include // for shared_ptr #include // for uint32_t @@ -51,4 +51,4 @@ CEREAL_CLASS_VERSION(siren::detector::ExponentialDistribution1D, 0); CEREAL_REGISTER_TYPE(siren::detector::ExponentialDistribution1D); CEREAL_REGISTER_POLYMORPHIC_RELATION(siren::detector::Distribution1D, siren::detector::ExponentialDistribution1D); -#endif // LI_ExponentialDistribution1D_H +#endif // SIREN_ExponentialDistribution1D_H diff --git a/projects/detector/public/SIREN/detector/MaterialModel.h b/projects/detector/public/SIREN/detector/MaterialModel.h index 22e450c2c..a0e3deb04 100644 --- a/projects/detector/public/SIREN/detector/MaterialModel.h +++ b/projects/detector/public/SIREN/detector/MaterialModel.h @@ -1,6 +1,6 @@ #pragma once -#ifndef LI_MaterialModel_H -#define LI_MaterialModel_H +#ifndef SIREN_MaterialModel_H +#define SIREN_MaterialModel_H #include // for map #include // for tuple @@ -158,5 +158,5 @@ CEREAL_CLASS_VERSION(siren::detector::MaterialModel::MaterialComponent, 0); #include "SIREN/detector/MaterialModel.tcc" -# endif // LI_MaterialModel_H +# endif // SIREN_MaterialModel_H diff --git a/projects/detector/public/SIREN/detector/MaterialModel.tcc b/projects/detector/public/SIREN/detector/MaterialModel.tcc index a4b397671..4bb1f6a98 100644 --- a/projects/detector/public/SIREN/detector/MaterialModel.tcc +++ b/projects/detector/public/SIREN/detector/MaterialModel.tcc @@ -1,6 +1,6 @@ #pragma once -#ifndef LI_MaterialModel_TCC -#define LI_MaterialModel_TCC +#ifndef SIREN_MaterialModel_TCC +#define SIREN_MaterialModel_TCC #include "SIREN/detector/MaterialModel.h" diff --git a/projects/detector/public/SIREN/detector/Path.h b/projects/detector/public/SIREN/detector/Path.h index ed8a6eec0..5f4fb6326 100644 --- a/projects/detector/public/SIREN/detector/Path.h +++ b/projects/detector/public/SIREN/detector/Path.h @@ -1,6 +1,6 @@ #pragma once -#ifndef LI_Path_H -#define LI_Path_H +#ifndef SIREN_Path_H +#define SIREN_Path_H #include // for vector #include // for shared_ptr @@ -257,5 +257,5 @@ class Path { CEREAL_CLASS_VERSION(siren::detector::Path, 0); -# endif // LI_Path_H +# endif // SIREN_Path_H diff --git a/projects/detector/public/SIREN/detector/PolynomialDistribution1D.h b/projects/detector/public/SIREN/detector/PolynomialDistribution1D.h index 39d0875c4..5e7fcb25c 100644 --- a/projects/detector/public/SIREN/detector/PolynomialDistribution1D.h +++ b/projects/detector/public/SIREN/detector/PolynomialDistribution1D.h @@ -1,6 +1,6 @@ #pragma once -#ifndef LI_PolynomialDistribution1D_H -#define LI_PolynomialDistribution1D_H +#ifndef SIREN_PolynomialDistribution1D_H +#define SIREN_PolynomialDistribution1D_H #include // for shared_ptr #include // for vector @@ -60,4 +60,4 @@ CEREAL_CLASS_VERSION(siren::detector::PolynomialDistribution1D, 0); CEREAL_REGISTER_TYPE(siren::detector::PolynomialDistribution1D); CEREAL_REGISTER_POLYMORPHIC_RELATION(siren::detector::Distribution1D, siren::detector::PolynomialDistribution1D); -#endif // LI_PolynomialDistribution1D_H +#endif // SIREN_PolynomialDistribution1D_H diff --git a/projects/detector/public/SIREN/detector/RadialAxis1D.h b/projects/detector/public/SIREN/detector/RadialAxis1D.h index c0f53c7fc..c66882136 100644 --- a/projects/detector/public/SIREN/detector/RadialAxis1D.h +++ b/projects/detector/public/SIREN/detector/RadialAxis1D.h @@ -1,6 +1,6 @@ #pragma once -#ifndef LI_RadialAxis1D_H -#define LI_RadialAxis1D_H +#ifndef SIREN_RadialAxis1D_H +#define SIREN_RadialAxis1D_H #include // for shared_ptr #include // for uint32_t @@ -54,4 +54,4 @@ CEREAL_CLASS_VERSION(siren::detector::RadialAxis1D, 0); CEREAL_REGISTER_TYPE(siren::detector::RadialAxis1D); CEREAL_REGISTER_POLYMORPHIC_RELATION(siren::detector::Axis1D, siren::detector::RadialAxis1D); -#endif // LI_RadialAxis1D_H +#endif // SIREN_RadialAxis1D_H diff --git a/projects/detector/public/SIREN/detector/RadialAxisExponentialDensityDistribution.h b/projects/detector/public/SIREN/detector/RadialAxisExponentialDensityDistribution.h index 61d17f5d8..04faffafa 100644 --- a/projects/detector/public/SIREN/detector/RadialAxisExponentialDensityDistribution.h +++ b/projects/detector/public/SIREN/detector/RadialAxisExponentialDensityDistribution.h @@ -1,6 +1,6 @@ #pragma once -#ifndef LI_RadialAxisExponentialDensityDistribution_H -#define LI_RadialAxisExponentialDensityDistribution_H +#ifndef SIREN_RadialAxisExponentialDensityDistribution_H +#define SIREN_RadialAxisExponentialDensityDistribution_H #include #include #include @@ -32,5 +32,5 @@ CEREAL_CLASS_VERSION(siren::detector::RadialAxisExponentialDensityDistribution, CEREAL_REGISTER_TYPE(siren::detector::RadialAxisExponentialDensityDistribution); CEREAL_REGISTER_POLYMORPHIC_RELATION(siren::detector::DensityDistribution, siren::detector::RadialAxisExponentialDensityDistribution); -#endif // LI_RadialAxisExponentialDensityDistribution.h +#endif // SIREN_RadialAxisExponentialDensityDistribution.h diff --git a/projects/detector/public/SIREN/detector/RadialAxisPolynomialDensityDistribution.h b/projects/detector/public/SIREN/detector/RadialAxisPolynomialDensityDistribution.h index c8dc60437..10b6bf907 100644 --- a/projects/detector/public/SIREN/detector/RadialAxisPolynomialDensityDistribution.h +++ b/projects/detector/public/SIREN/detector/RadialAxisPolynomialDensityDistribution.h @@ -1,6 +1,6 @@ #pragma once -#ifndef LI_RadialAxisPolynomialDensityDistribution_H -#define LI_RadialAxisPolynomialDensityDistribution_H +#ifndef SIREN_RadialAxisPolynomialDensityDistribution_H +#define SIREN_RadialAxisPolynomialDensityDistribution_H #include #include #include @@ -167,4 +167,4 @@ CEREAL_CLASS_VERSION(siren::detector::RadialAxisPolynomialDensityDistribution, 0 CEREAL_REGISTER_TYPE(siren::detector::RadialAxisPolynomialDensityDistribution); CEREAL_REGISTER_POLYMORPHIC_RELATION(siren::detector::DensityDistribution, siren::detector::RadialAxisPolynomialDensityDistribution); -#endif // LI_RadialAxisPolynomialDensityDistribution.h +#endif // SIREN_RadialAxisPolynomialDensityDistribution.h diff --git a/projects/distributions/CMakeLists.txt b/projects/distributions/CMakeLists.txt index 2b0ad7780..3339d25ae 100644 --- a/projects/distributions/CMakeLists.txt +++ b/projects/distributions/CMakeLists.txt @@ -34,25 +34,25 @@ LIST (APPEND distributions_SOURCES ${PROJECT_SOURCE_DIR}/projects/distributions/private/secondary/vertex/SecondaryPhysicalVertexDistribution.cxx ${PROJECT_SOURCE_DIR}/projects/distributions/private/secondary/vertex/SecondaryBoundedVertexDistribution.cxx ) -add_library(LI_distributions OBJECT ${distributions_SOURCES}) -set_property(TARGET LI_distributions PROPERTY POSITION_INDEPENDENT_CODE ON) -target_include_directories(LI_distributions PUBLIC +add_library(SIREN_distributions OBJECT ${distributions_SOURCES}) +set_property(TARGET SIREN_distributions PROPERTY POSITION_INDEPENDENT_CODE ON) +target_include_directories(SIREN_distributions PUBLIC $ $ ) -target_link_libraries(LI_distributions +target_link_libraries(SIREN_distributions PRIVATE $ PUBLIC photospline - LI_serialization - LI_utilities - LI_math - LI_dataclasses - LI_geometry - LI_detector - LI_interactions + SIREN_serialization + SIREN_utilities + SIREN_math + SIREN_dataclasses + SIREN_geometry + SIREN_detector + SIREN_interactions ) install(DIRECTORY "${PROJECT_SOURCE_DIR}/projects/distributions/public/" diff --git a/projects/distributions/private/primary/direction/Cone.cxx b/projects/distributions/private/primary/direction/Cone.cxx index a78774dee..421da402a 100644 --- a/projects/distributions/private/primary/direction/Cone.cxx +++ b/projects/distributions/private/primary/direction/Cone.cxx @@ -9,7 +9,7 @@ #include "SIREN/distributions/Distributions.h" // for InjectionD... #include "SIREN/math/Quaternion.h" // for Quaternion #include "SIREN/math/Vector3D.h" // for Vector3D -#include "SIREN/utilities/Random.h" // for LI_random +#include "SIREN/utilities/Random.h" // for SIREN_random namespace siren { namespace interactions { class InteractionCollection; } } namespace siren { namespace detector { class DetectorModel; } } @@ -34,7 +34,7 @@ Cone::Cone(siren::math::Vector3D dir, double opening_angle) : dir(dir), opening_ } } -siren::math::Vector3D Cone::SampleDirection(std::shared_ptr rand, std::shared_ptr detector_model, std::shared_ptr interactions, siren::dataclasses::PrimaryDistributionRecord & record) const{ +siren::math::Vector3D Cone::SampleDirection(std::shared_ptr rand, std::shared_ptr detector_model, std::shared_ptr interactions, siren::dataclasses::PrimaryDistributionRecord & record) const{ double theta = acos(rand->Uniform(cos(opening_angle), 1)); double phi = rand->Uniform(0, 2.0 * M_PI); siren::math::Quaternion q; diff --git a/projects/distributions/private/primary/direction/FixedDirection.cxx b/projects/distributions/private/primary/direction/FixedDirection.cxx index b1ad53cc1..fd23ec099 100644 --- a/projects/distributions/private/primary/direction/FixedDirection.cxx +++ b/projects/distributions/private/primary/direction/FixedDirection.cxx @@ -11,7 +11,7 @@ namespace siren { namespace interactions { class InteractionCollection; } } namespace siren { namespace detector { class DetectorModel; } } -namespace siren { namespace utilities { class LI_random; } } +namespace siren { namespace utilities { class SIREN_random; } } namespace siren { namespace distributions { @@ -19,7 +19,7 @@ namespace distributions { //--------------- // class FixedDirection : PrimaryDirectionDistribution //--------------- -siren::math::Vector3D FixedDirection::SampleDirection(std::shared_ptr rand, std::shared_ptr detector_model, std::shared_ptr interactions, siren::dataclasses::PrimaryDistributionRecord & record) const { +siren::math::Vector3D FixedDirection::SampleDirection(std::shared_ptr rand, std::shared_ptr detector_model, std::shared_ptr interactions, siren::dataclasses::PrimaryDistributionRecord & record) const { return dir; } diff --git a/projects/distributions/private/primary/direction/IsotropicDirection.cxx b/projects/distributions/private/primary/direction/IsotropicDirection.cxx index d6b6036cd..61cdfe1dc 100644 --- a/projects/distributions/private/primary/direction/IsotropicDirection.cxx +++ b/projects/distributions/private/primary/direction/IsotropicDirection.cxx @@ -5,7 +5,7 @@ #include "SIREN/distributions/Distributions.h" // for InjectionDis... #include "SIREN/math/Vector3D.h" // for Vector3D -#include "SIREN/utilities/Random.h" // for LI_random +#include "SIREN/utilities/Random.h" // for SIREN_random namespace siren { namespace interactions { class InteractionCollection; } } namespace siren { namespace dataclasses { class InteractionRecord; } } @@ -17,7 +17,7 @@ namespace distributions { //--------------- // class IsotropicDirection : PrimaryDirectionDistribution //--------------- -siren::math::Vector3D IsotropicDirection::SampleDirection(std::shared_ptr rand, std::shared_ptr detector_model, std::shared_ptr interactions, siren::dataclasses::PrimaryDistributionRecord & record) const { +siren::math::Vector3D IsotropicDirection::SampleDirection(std::shared_ptr rand, std::shared_ptr detector_model, std::shared_ptr interactions, siren::dataclasses::PrimaryDistributionRecord & record) const { double nz = rand->Uniform(-1, 1); double nr = sqrt(1.0 - nz*nz); double phi = rand->Uniform(-M_PI, M_PI); diff --git a/projects/distributions/private/primary/direction/PrimaryDirectionDistribution.cxx b/projects/distributions/private/primary/direction/PrimaryDirectionDistribution.cxx index be2d9a0b3..5dc2bd46d 100644 --- a/projects/distributions/private/primary/direction/PrimaryDirectionDistribution.cxx +++ b/projects/distributions/private/primary/direction/PrimaryDirectionDistribution.cxx @@ -13,7 +13,7 @@ namespace distributions { //--------------- // class PrimaryDirectionDistribution : PrimaryInjectionDistribution //--------------- -void PrimaryDirectionDistribution::Sample(std::shared_ptr rand, std::shared_ptr detector_model, std::shared_ptr interactions, siren::dataclasses::PrimaryDistributionRecord & record) const { +void PrimaryDirectionDistribution::Sample(std::shared_ptr rand, std::shared_ptr detector_model, std::shared_ptr interactions, siren::dataclasses::PrimaryDistributionRecord & record) const { siren::math::Vector3D dir = SampleDirection(rand, detector_model, interactions, record); record.SetDirection(dir); } diff --git a/projects/distributions/private/primary/energy/ModifiedMoyalPlusExponentialEnergyDistribution.cxx b/projects/distributions/private/primary/energy/ModifiedMoyalPlusExponentialEnergyDistribution.cxx index dc702bd90..93ed191e9 100644 --- a/projects/distributions/private/primary/energy/ModifiedMoyalPlusExponentialEnergyDistribution.cxx +++ b/projects/distributions/private/primary/energy/ModifiedMoyalPlusExponentialEnergyDistribution.cxx @@ -10,7 +10,7 @@ #include "SIREN/dataclasses/InteractionRecord.h" // for Interactio... #include "SIREN/distributions/Distributions.h" // for InjectionD... #include "SIREN/utilities/Integration.h" // for rombergInt... -#include "SIREN/utilities/Random.h" // for LI_random +#include "SIREN/utilities/Random.h" // for SIREN_random namespace siren { namespace interactions { class InteractionCollection; } } namespace siren { namespace detector { class DetectorModel; } } @@ -62,7 +62,7 @@ ModifiedMoyalPlusExponentialEnergyDistribution::ModifiedMoyalPlusExponentialEner } } -double ModifiedMoyalPlusExponentialEnergyDistribution::SampleEnergy(std::shared_ptr rand, std::shared_ptr detector_model, std::shared_ptr interactions, siren::dataclasses::PrimaryDistributionRecord & record) const { +double ModifiedMoyalPlusExponentialEnergyDistribution::SampleEnergy(std::shared_ptr rand, std::shared_ptr detector_model, std::shared_ptr interactions, siren::dataclasses::PrimaryDistributionRecord & record) const { // Metropolis-Hastings algorithm to sample from PDF. // Pass in a function pointer for the PDF diff --git a/projects/distributions/private/primary/energy/Monoenergetic.cxx b/projects/distributions/private/primary/energy/Monoenergetic.cxx index 1d41f6666..ab5dc3f53 100644 --- a/projects/distributions/private/primary/energy/Monoenergetic.cxx +++ b/projects/distributions/private/primary/energy/Monoenergetic.cxx @@ -11,7 +11,7 @@ namespace siren { namespace interactions { class InteractionCollection; } } namespace siren { namespace detector { class DetectorModel; } } -namespace siren { namespace utilities { class LI_random; } } +namespace siren { namespace utilities { class SIREN_random; } } namespace siren { namespace distributions { @@ -23,7 +23,7 @@ Monoenergetic::Monoenergetic(double gen_energy) : gen_energy(gen_energy) {} -double Monoenergetic::SampleEnergy(std::shared_ptr rand, std::shared_ptr detector_model, std::shared_ptr interactions, siren::dataclasses::PrimaryDistributionRecord & record) const { +double Monoenergetic::SampleEnergy(std::shared_ptr rand, std::shared_ptr detector_model, std::shared_ptr interactions, siren::dataclasses::PrimaryDistributionRecord & record) const { return gen_energy; } diff --git a/projects/distributions/private/primary/energy/PowerLaw.cxx b/projects/distributions/private/primary/energy/PowerLaw.cxx index ecd2c09d6..923dbb955 100644 --- a/projects/distributions/private/primary/energy/PowerLaw.cxx +++ b/projects/distributions/private/primary/energy/PowerLaw.cxx @@ -7,7 +7,7 @@ #include "SIREN/dataclasses/InteractionRecord.h" // for Interactio... #include "SIREN/distributions/Distributions.h" // for InjectionD... -#include "SIREN/utilities/Random.h" // for LI_random +#include "SIREN/utilities/Random.h" // for SIREN_random namespace siren { namespace interactions { class InteractionCollection; } } namespace siren { namespace detector { class DetectorModel; } } @@ -24,7 +24,7 @@ PowerLaw::PowerLaw(double powerLawIndex, double energyMin, double energyMax) , energyMax(energyMax) {} -double PowerLaw::SampleEnergy(std::shared_ptr rand, std::shared_ptr detector_model, std::shared_ptr interactions, siren::dataclasses::PrimaryDistributionRecord & record) const { +double PowerLaw::SampleEnergy(std::shared_ptr rand, std::shared_ptr detector_model, std::shared_ptr interactions, siren::dataclasses::PrimaryDistributionRecord & record) const { if(energyMin == energyMax) return energyMin; //return the only allowed energy diff --git a/projects/distributions/private/primary/energy/PrimaryEnergyDistribution.cxx b/projects/distributions/private/primary/energy/PrimaryEnergyDistribution.cxx index 7896668f7..4bac8eb8d 100644 --- a/projects/distributions/private/primary/energy/PrimaryEnergyDistribution.cxx +++ b/projects/distributions/private/primary/energy/PrimaryEnergyDistribution.cxx @@ -12,7 +12,7 @@ namespace distributions { // class PrimaryEnergyDistribution : PrimaryInjectionDistribution //--------------- void PrimaryEnergyDistribution::Sample( - std::shared_ptr rand, + std::shared_ptr rand, std::shared_ptr detector_model, std::shared_ptr interactions, siren::dataclasses::PrimaryDistributionRecord & record) const { diff --git a/projects/distributions/private/primary/energy/TabulatedFluxDistribution.cxx b/projects/distributions/private/primary/energy/TabulatedFluxDistribution.cxx index 9dc1a94c1..acc131a71 100644 --- a/projects/distributions/private/primary/energy/TabulatedFluxDistribution.cxx +++ b/projects/distributions/private/primary/energy/TabulatedFluxDistribution.cxx @@ -9,7 +9,7 @@ #include "SIREN/distributions/Distributions.h" // for InjectionD... #include "SIREN/utilities/Integration.h" // for rombergInt... #include "SIREN/utilities/Interpolator.h" // for TableData1D -#include "SIREN/utilities/Random.h" // for LI_random +#include "SIREN/utilities/Random.h" // for SIREN_random namespace siren { namespace interactions { class InteractionCollection; } } namespace siren { namespace detector { class DetectorModel; } } @@ -261,7 +261,7 @@ TabulatedFluxDistribution::TabulatedFluxDistribution(double energyMin, double en ComputeCDF(); } -double TabulatedFluxDistribution::SampleEnergy(std::shared_ptr rand, std::shared_ptr detector_model, std::shared_ptr interactions, siren::dataclasses::PrimaryDistributionRecord & record) const { +double TabulatedFluxDistribution::SampleEnergy(std::shared_ptr rand, std::shared_ptr detector_model, std::shared_ptr interactions, siren::dataclasses::PrimaryDistributionRecord & record) const { // inverse CDF algorithm to sample from PDF. double randomValue = rand->Uniform(0,1); diff --git a/projects/distributions/private/primary/helicity/PrimaryNeutrinoHelicityDistribution.cxx b/projects/distributions/private/primary/helicity/PrimaryNeutrinoHelicityDistribution.cxx index 10c8c0be5..a5dbbe9c8 100644 --- a/projects/distributions/private/primary/helicity/PrimaryNeutrinoHelicityDistribution.cxx +++ b/projects/distributions/private/primary/helicity/PrimaryNeutrinoHelicityDistribution.cxx @@ -16,7 +16,7 @@ namespace distributions { //--------------- // class PrimaryNeutrinoHelicityDistribution : PrimaryInjectionDistribution //--------------- -void PrimaryNeutrinoHelicityDistribution::Sample(std::shared_ptr rand, std::shared_ptr detector_model, std::shared_ptr interactions, siren::dataclasses::PrimaryDistributionRecord & record) const { +void PrimaryNeutrinoHelicityDistribution::Sample(std::shared_ptr rand, std::shared_ptr detector_model, std::shared_ptr interactions, siren::dataclasses::PrimaryDistributionRecord & record) const { siren::dataclasses::ParticleType const & t = record.type; if(static_cast(t) > 0) // Particles are left handed, anti-particles are right handed record.SetHelicity(-0.5); diff --git a/projects/distributions/private/primary/mass/PrimaryMass.cxx b/projects/distributions/private/primary/mass/PrimaryMass.cxx index 130c69f01..da6223527 100644 --- a/projects/distributions/private/primary/mass/PrimaryMass.cxx +++ b/projects/distributions/private/primary/mass/PrimaryMass.cxx @@ -25,7 +25,7 @@ double PrimaryMass::GetPrimaryMass() const { return primary_mass; } -void PrimaryMass::Sample(std::shared_ptr rand, std::shared_ptr detector_model, std::shared_ptr interactions, siren::dataclasses::PrimaryDistributionRecord & record) const { +void PrimaryMass::Sample(std::shared_ptr rand, std::shared_ptr detector_model, std::shared_ptr interactions, siren::dataclasses::PrimaryDistributionRecord & record) const { record.SetMass(primary_mass); } diff --git a/projects/distributions/private/primary/vertex/ColumnDepthPositionDistribution.cxx b/projects/distributions/private/primary/vertex/ColumnDepthPositionDistribution.cxx index 691ee79b1..a4eed9b3c 100644 --- a/projects/distributions/private/primary/vertex/ColumnDepthPositionDistribution.cxx +++ b/projects/distributions/private/primary/vertex/ColumnDepthPositionDistribution.cxx @@ -48,7 +48,7 @@ namespace { //--------------- // class ColumnDepthPositionDistribution : VertexPositionDistribution //--------------- -siren::math::Vector3D ColumnDepthPositionDistribution::SampleFromDisk(std::shared_ptr rand, siren::math::Vector3D const & dir) const { +siren::math::Vector3D ColumnDepthPositionDistribution::SampleFromDisk(std::shared_ptr rand, siren::math::Vector3D const & dir) const { double t = rand->Uniform(0, 2 * M_PI); double r = radius * std::sqrt(rand->Uniform()); siren::math::Vector3D pos(r * cos(t), r * sin(t), 0.0); @@ -56,7 +56,7 @@ siren::math::Vector3D ColumnDepthPositionDistribution::SampleFromDisk(std::share return q.rotate(pos, false); } -std::tuple ColumnDepthPositionDistribution::SamplePosition(std::shared_ptr rand, std::shared_ptr detector_model, std::shared_ptr interactions, siren::dataclasses::PrimaryDistributionRecord & record) const { +std::tuple ColumnDepthPositionDistribution::SamplePosition(std::shared_ptr rand, std::shared_ptr detector_model, std::shared_ptr interactions, siren::dataclasses::PrimaryDistributionRecord & record) const { siren::math::Vector3D dir(record.GetDirection()); dir.normalize(); siren::math::Vector3D pca = SampleFromDisk(rand, dir); @@ -110,7 +110,7 @@ std::tuple ColumnDepthPositionDist } // public getter function for the private SamplePosition function (for debugging) -std::tuple ColumnDepthPositionDistribution::GetSamplePosition(std::shared_ptr rand, std::shared_ptr detector_model, std::shared_ptr interactions, siren::dataclasses::PrimaryDistributionRecord & record) { +std::tuple ColumnDepthPositionDistribution::GetSamplePosition(std::shared_ptr rand, std::shared_ptr detector_model, std::shared_ptr interactions, siren::dataclasses::PrimaryDistributionRecord & record) { std::tuple samplepos = ColumnDepthPositionDistribution::SamplePosition(rand, detector_model, interactions, record); diff --git a/projects/distributions/private/primary/vertex/CylinderVolumePositionDistribution.cxx b/projects/distributions/private/primary/vertex/CylinderVolumePositionDistribution.cxx index c3deed3d9..9eac92b28 100644 --- a/projects/distributions/private/primary/vertex/CylinderVolumePositionDistribution.cxx +++ b/projects/distributions/private/primary/vertex/CylinderVolumePositionDistribution.cxx @@ -11,7 +11,7 @@ #include "SIREN/distributions/Distributions.h" // for InjectionD... #include "SIREN/geometry/Geometry.h" // for Geometry #include "SIREN/math/Vector3D.h" // for Vector3D -#include "SIREN/utilities/Random.h" // for LI_random +#include "SIREN/utilities/Random.h" // for SIREN_random namespace siren { namespace interactions { class InteractionCollection; } } @@ -21,7 +21,7 @@ namespace distributions { //--------------- // class CylinderVolumePositionDistribution : public VertexPositionDistribution //--------------- -std::tuple CylinderVolumePositionDistribution::SamplePosition(std::shared_ptr rand, std::shared_ptr detector_model, std::shared_ptr interactions, siren::dataclasses::PrimaryDistributionRecord & record) const { +std::tuple CylinderVolumePositionDistribution::SamplePosition(std::shared_ptr rand, std::shared_ptr detector_model, std::shared_ptr interactions, siren::dataclasses::PrimaryDistributionRecord & record) const { double t = rand->Uniform(0, 2 * M_PI); const double outer_radius = cylinder.GetRadius(); const double inner_radius = cylinder.GetInnerRadius(); diff --git a/projects/distributions/private/primary/vertex/DecayRangePositionDistribution.cxx b/projects/distributions/private/primary/vertex/DecayRangePositionDistribution.cxx index 0ab4ce869..2b28d0dae 100644 --- a/projects/distributions/private/primary/vertex/DecayRangePositionDistribution.cxx +++ b/projects/distributions/private/primary/vertex/DecayRangePositionDistribution.cxx @@ -26,7 +26,7 @@ using detector::DetectorDirection; //--------------- // class DecayRangePositionDistribution : public VertexPositionDistribution //--------------- -siren::math::Vector3D DecayRangePositionDistribution::SampleFromDisk(std::shared_ptr rand, siren::math::Vector3D const & dir) const { +siren::math::Vector3D DecayRangePositionDistribution::SampleFromDisk(std::shared_ptr rand, siren::math::Vector3D const & dir) const { double t = rand->Uniform(0, 2 * M_PI); double r = radius * std::sqrt(rand->Uniform()); siren::math::Vector3D pos(r * cos(t), r * sin(t), 0.0); @@ -34,7 +34,7 @@ siren::math::Vector3D DecayRangePositionDistribution::SampleFromDisk(std::shared return q.rotate(pos, false); } -std::tuple DecayRangePositionDistribution::SamplePosition(std::shared_ptr rand, std::shared_ptr detector_model, std::shared_ptr interactions, siren::dataclasses::PrimaryDistributionRecord & record) const { +std::tuple DecayRangePositionDistribution::SamplePosition(std::shared_ptr rand, std::shared_ptr detector_model, std::shared_ptr interactions, siren::dataclasses::PrimaryDistributionRecord & record) const { siren::math::Vector3D dir(record.GetDirection()); dir.normalize(); siren::math::Vector3D pca = SampleFromDisk(rand, dir); diff --git a/projects/distributions/private/primary/vertex/OrientedCylinderPositionDistribution.cxx b/projects/distributions/private/primary/vertex/OrientedCylinderPositionDistribution.cxx index a878f4e27..cbc55afc7 100644 --- a/projects/distributions/private/primary/vertex/OrientedCylinderPositionDistribution.cxx +++ b/projects/distributions/private/primary/vertex/OrientedCylinderPositionDistribution.cxx @@ -6,7 +6,7 @@ #include "SIREN/dataclasses/InteractionRecord.h" // for Interactio... #include "SIREN/math/Quaternion.h" // for rotation_b... #include "SIREN/math/Vector3D.h" // for Vector3D -#include "SIREN/utilities/Random.h" // for LI_random +#include "SIREN/utilities/Random.h" // for SIREN_random namespace siren { namespace distributions { class WeightableDistribution; } } @@ -17,7 +17,7 @@ namespace distributions { // class OrientedCylinderPositionDistribution : VertexPositionDistribution //--------------- // -siren::math::Vector3D OrientedCylinderPositionDistribution::SampleFromDisk(std::shared_ptr rand, siren::math::Vector3D const & dir) const { +siren::math::Vector3D OrientedCylinderPositionDistribution::SampleFromDisk(std::shared_ptr rand, siren::math::Vector3D const & dir) const { double t = rand->Uniform(0, 2 * M_PI); double r = radius * std::sqrt(rand->Uniform()); siren::math::Vector3D pos(r * cos(t), r * sin(t), 0.0); @@ -25,7 +25,7 @@ siren::math::Vector3D OrientedCylinderPositionDistribution::SampleFromDisk(std:: return q.rotate(pos, false); } -std::tuple OrientedCylinderPositionDistribution::SamplePosition(std::shared_ptr rand, std::shared_ptr detector_model, std::shared_ptr interactions, siren::dataclasses::PrimaryDistributionRecord & record) const { +std::tuple OrientedCylinderPositionDistribution::SamplePosition(std::shared_ptr rand, std::shared_ptr detector_model, std::shared_ptr interactions, siren::dataclasses::PrimaryDistributionRecord & record) const { siren::math::Vector3D dir(record.GetDirection()); dir.normalize(); siren::math::Vector3D pca = SampleFromDisk(rand, dir); diff --git a/projects/distributions/private/primary/vertex/PointSourcePositionDistribution.cxx b/projects/distributions/private/primary/vertex/PointSourcePositionDistribution.cxx index 5c1ee51a2..977ae58da 100644 --- a/projects/distributions/private/primary/vertex/PointSourcePositionDistribution.cxx +++ b/projects/distributions/private/primary/vertex/PointSourcePositionDistribution.cxx @@ -17,7 +17,7 @@ #include "SIREN/distributions/Distributions.h" // for Inj... #include "SIREN/math/Vector3D.h" // for Vec... #include "SIREN/utilities/Errors.h" // for Inj... -#include "SIREN/utilities/Random.h" // for LI_... +#include "SIREN/utilities/Random.h" // for SIREN_... namespace siren { namespace distributions { @@ -47,7 +47,7 @@ namespace { // class PointSourcePositionDistribution : public VertexPositionDistribution //--------------- -std::tuple PointSourcePositionDistribution::SamplePosition(std::shared_ptr rand, std::shared_ptr detector_model, std::shared_ptr interactions, siren::dataclasses::PrimaryDistributionRecord & record) const { +std::tuple PointSourcePositionDistribution::SamplePosition(std::shared_ptr rand, std::shared_ptr detector_model, std::shared_ptr interactions, siren::dataclasses::PrimaryDistributionRecord & record) const { siren::math::Vector3D dir(record.GetDirection()); siren::math::Vector3D endcap_0 = origin; diff --git a/projects/distributions/private/primary/vertex/RangePositionDistribution.cxx b/projects/distributions/private/primary/vertex/RangePositionDistribution.cxx index e2e388a9b..c4a1e683b 100644 --- a/projects/distributions/private/primary/vertex/RangePositionDistribution.cxx +++ b/projects/distributions/private/primary/vertex/RangePositionDistribution.cxx @@ -48,7 +48,7 @@ namespace { //--------------- // class RangePositionDistribution : public VertexPositionDistribution //--------------- -siren::math::Vector3D RangePositionDistribution::SampleFromDisk(std::shared_ptr rand, siren::math::Vector3D const & dir) const { +siren::math::Vector3D RangePositionDistribution::SampleFromDisk(std::shared_ptr rand, siren::math::Vector3D const & dir) const { double t = rand->Uniform(0, 2 * M_PI); double r = radius * std::sqrt(rand->Uniform()); siren::math::Vector3D pos(r * cos(t), r * sin(t), 0.0); @@ -56,7 +56,7 @@ siren::math::Vector3D RangePositionDistribution::SampleFromDisk(std::shared_ptr< return q.rotate(pos, false); } -std::tuple RangePositionDistribution::SamplePosition(std::shared_ptr rand, std::shared_ptr detector_model, std::shared_ptr interactions, siren::dataclasses::PrimaryDistributionRecord & record) const { +std::tuple RangePositionDistribution::SamplePosition(std::shared_ptr rand, std::shared_ptr detector_model, std::shared_ptr interactions, siren::dataclasses::PrimaryDistributionRecord & record) const { siren::math::Vector3D dir(record.GetDirection()); dir.normalize(); siren::math::Vector3D pca = SampleFromDisk(rand, dir); diff --git a/projects/distributions/private/primary/vertex/VertexPositionDistribution.cxx b/projects/distributions/private/primary/vertex/VertexPositionDistribution.cxx index 9144058b2..bf9aa3c4b 100644 --- a/projects/distributions/private/primary/vertex/VertexPositionDistribution.cxx +++ b/projects/distributions/private/primary/vertex/VertexPositionDistribution.cxx @@ -14,7 +14,7 @@ namespace distributions { //--------------- // class VertexPositionDistribution : PrimaryInjectionDistribution //--------------- -void VertexPositionDistribution::Sample(std::shared_ptr rand, std::shared_ptr detector_model, std::shared_ptr interactions, siren::dataclasses::PrimaryDistributionRecord & record) const { +void VertexPositionDistribution::Sample(std::shared_ptr rand, std::shared_ptr detector_model, std::shared_ptr interactions, siren::dataclasses::PrimaryDistributionRecord & record) const { std::tuple init_and_pos = SamplePosition(rand, detector_model, interactions, record); siren::math::Vector3D const & init = std::get<0>(init_and_pos); siren::math::Vector3D const & pos = std::get<1>(init_and_pos); diff --git a/projects/distributions/private/pybindings/distributions.cxx b/projects/distributions/private/pybindings/distributions.cxx index d9804fd27..e698f5a15 100644 --- a/projects/distributions/private/pybindings/distributions.cxx +++ b/projects/distributions/private/pybindings/distributions.cxx @@ -56,7 +56,7 @@ PYBIND11_MODULE(distributions,m) { .def("Name",&NormalizationConstant::Name); class_, WeightableDistribution>(m, "PrimaryInjectionDistribution") - .def("Sample",overload_cast, std::shared_ptr, std::shared_ptr, siren::dataclasses::PrimaryDistributionRecord &>(&PrimaryInjectionDistribution::Sample, const_)) + .def("Sample",overload_cast, std::shared_ptr, std::shared_ptr, siren::dataclasses::PrimaryDistributionRecord &>(&PrimaryInjectionDistribution::Sample, const_)) ; // Direciton distributions @@ -216,16 +216,16 @@ PYBIND11_MODULE(distributions,m) { class_, WeightableDistribution>(m, "SecondaryInjectionDistribution") - .def("Sample",overload_cast, std::shared_ptr, std::shared_ptr, siren::dataclasses::SecondaryDistributionRecord &>(&SecondaryInjectionDistribution::Sample, const_)); + .def("Sample",overload_cast, std::shared_ptr, std::shared_ptr, siren::dataclasses::SecondaryDistributionRecord &>(&SecondaryInjectionDistribution::Sample, const_)); class_, SecondaryInjectionDistribution>(m, "SecondaryVertexPositionDistribution") .def("DensityVariables",&SecondaryVertexPositionDistribution::DensityVariables) .def("AreEquivalent",&SecondaryVertexPositionDistribution::AreEquivalent) - .def("Sample",overload_cast, std::shared_ptr, std::shared_ptr, siren::dataclasses::SecondaryDistributionRecord &>(&SecondaryVertexPositionDistribution::Sample, const_)); + .def("Sample",overload_cast, std::shared_ptr, std::shared_ptr, siren::dataclasses::SecondaryDistributionRecord &>(&SecondaryVertexPositionDistribution::Sample, const_)); class_, SecondaryVertexPositionDistribution>(m, "SecondaryPhysicalVertexDistribution") .def(init<>()) - .def("SampleVertex",overload_cast, std::shared_ptr, std::shared_ptr, siren::dataclasses::SecondaryDistributionRecord &>(&SecondaryPhysicalVertexDistribution::SampleVertex, const_)) + .def("SampleVertex",overload_cast, std::shared_ptr, std::shared_ptr, siren::dataclasses::SecondaryDistributionRecord &>(&SecondaryPhysicalVertexDistribution::SampleVertex, const_)) .def("GenerationProbability",overload_cast, std::shared_ptr, siren::dataclasses::InteractionRecord const &>(&SecondaryPhysicalVertexDistribution::GenerationProbability, const_)) .def("InjectionBounds",overload_cast, std::shared_ptr, siren::dataclasses::InteractionRecord const &>(&SecondaryPhysicalVertexDistribution::InjectionBounds, const_)) .def("Name",&SecondaryPhysicalVertexDistribution::Name); @@ -235,7 +235,7 @@ PYBIND11_MODULE(distributions,m) { .def(init()) .def(init>()) .def(init, double>()) - .def("SampleVertex",overload_cast, std::shared_ptr, std::shared_ptr, siren::dataclasses::SecondaryDistributionRecord &>(&SecondaryBoundedVertexDistribution::SampleVertex, const_)) + .def("SampleVertex",overload_cast, std::shared_ptr, std::shared_ptr, siren::dataclasses::SecondaryDistributionRecord &>(&SecondaryBoundedVertexDistribution::SampleVertex, const_)) .def("GenerationProbability",overload_cast, std::shared_ptr, siren::dataclasses::InteractionRecord const &>(&SecondaryBoundedVertexDistribution::GenerationProbability, const_)) .def("InjectionBounds",overload_cast, std::shared_ptr, siren::dataclasses::InteractionRecord const &>(&SecondaryBoundedVertexDistribution::InjectionBounds, const_)) .def("Name",&SecondaryBoundedVertexDistribution::Name); diff --git a/projects/distributions/private/secondary/vertex/SecondaryBoundedVertexDistribution.cxx b/projects/distributions/private/secondary/vertex/SecondaryBoundedVertexDistribution.cxx index 82a35e9d8..2a648aac5 100644 --- a/projects/distributions/private/secondary/vertex/SecondaryBoundedVertexDistribution.cxx +++ b/projects/distributions/private/secondary/vertex/SecondaryBoundedVertexDistribution.cxx @@ -19,7 +19,7 @@ #include "SIREN/geometry/Geometry.h" // for Geo... #include "SIREN/math/Vector3D.h" // for Vec... #include "SIREN/utilities/Errors.h" // for Sec... -#include "SIREN/utilities/Random.h" // for LI_... +#include "SIREN/utilities/Random.h" // for SIREN_... namespace siren { namespace distributions { @@ -52,7 +52,7 @@ double log_one_minus_exp_of_negative(double x) { //--------------- -void SecondaryBoundedVertexDistribution::SampleVertex(std::shared_ptr rand, std::shared_ptr detector_model, std::shared_ptr interactions, siren::dataclasses::SecondaryDistributionRecord & record) const { +void SecondaryBoundedVertexDistribution::SampleVertex(std::shared_ptr rand, std::shared_ptr detector_model, std::shared_ptr interactions, siren::dataclasses::SecondaryDistributionRecord & record) const { siren::math::Vector3D pos = record.initial_position; siren::math::Vector3D dir = record.direction; diff --git a/projects/distributions/private/secondary/vertex/SecondaryPhysicalVertexDistribution.cxx b/projects/distributions/private/secondary/vertex/SecondaryPhysicalVertexDistribution.cxx index 732c5e54a..9b58ce9e7 100644 --- a/projects/distributions/private/secondary/vertex/SecondaryPhysicalVertexDistribution.cxx +++ b/projects/distributions/private/secondary/vertex/SecondaryPhysicalVertexDistribution.cxx @@ -19,7 +19,7 @@ #include "SIREN/geometry/Geometry.h" // for Geo... #include "SIREN/math/Vector3D.h" // for Vec... #include "SIREN/utilities/Errors.h" // for Sec... -#include "SIREN/utilities/Random.h" // for LI_... +#include "SIREN/utilities/Random.h" // for SIREN_... namespace siren { namespace distributions { @@ -50,7 +50,7 @@ double log_one_minus_exp_of_negative(double x) { //--------------- -void SecondaryPhysicalVertexDistribution::SampleVertex(std::shared_ptr rand, std::shared_ptr detector_model, std::shared_ptr interactions, siren::dataclasses::SecondaryDistributionRecord & record) const { +void SecondaryPhysicalVertexDistribution::SampleVertex(std::shared_ptr rand, std::shared_ptr detector_model, std::shared_ptr interactions, siren::dataclasses::SecondaryDistributionRecord & record) const { siren::math::Vector3D pos = record.initial_position; siren::math::Vector3D dir = record.direction; diff --git a/projects/distributions/private/secondary/vertex/SecondaryVertexPositionDistribution.cxx b/projects/distributions/private/secondary/vertex/SecondaryVertexPositionDistribution.cxx index 32c2c8a45..87b44e63d 100644 --- a/projects/distributions/private/secondary/vertex/SecondaryVertexPositionDistribution.cxx +++ b/projects/distributions/private/secondary/vertex/SecondaryVertexPositionDistribution.cxx @@ -14,7 +14,7 @@ namespace distributions { //--------------- // class SecondaryVertexPositionDistribution : InjectionDistribution //--------------- -void SecondaryVertexPositionDistribution::Sample(std::shared_ptr rand, std::shared_ptr detector_model, std::shared_ptr interactions, siren::dataclasses::SecondaryDistributionRecord & record) const { +void SecondaryVertexPositionDistribution::Sample(std::shared_ptr rand, std::shared_ptr detector_model, std::shared_ptr interactions, siren::dataclasses::SecondaryDistributionRecord & record) const { SampleVertex(rand, detector_model, interactions, record); } diff --git a/projects/distributions/private/test/DistributionTest.h b/projects/distributions/private/test/DistributionTest.h index 500d0baa1..8f6e3b143 100644 --- a/projects/distributions/private/test/DistributionTest.h +++ b/projects/distributions/private/test/DistributionTest.h @@ -1,5 +1,5 @@ -#ifndef LI_DistributionTest_H -#define LI_DistributionTest_H +#ifndef SIREN_DistributionTest_H +#define SIREN_DistributionTest_H #include #include @@ -315,4 +315,4 @@ class DistributionTest { } }; -#endif // LI_DistributionTest_H +#endif // SIREN_DistributionTest_H diff --git a/projects/distributions/private/test/PrimaryDirectionDistribution_TEST.cxx b/projects/distributions/private/test/PrimaryDirectionDistribution_TEST.cxx index 357571e7b..740584b6d 100644 --- a/projects/distributions/private/test/PrimaryDirectionDistribution_TEST.cxx +++ b/projects/distributions/private/test/PrimaryDirectionDistribution_TEST.cxx @@ -36,7 +36,7 @@ TEST(Cone, Constructor) { TEST(Cone, SampleBounds) { size_t N = 100; size_t M = 10000; - std::shared_ptr rand = std::make_shared(); + std::shared_ptr rand = std::make_shared(); for(size_t i=0; i rand = std::make_shared(); + std::shared_ptr rand = std::make_shared(); for(size_t i=0; i rand = std::make_shared(); + std::shared_ptr rand = std::make_shared(); for(size_t i=0; i rand = std::make_shared(); + std::shared_ptr rand = std::make_shared(); for(size_t i=0; i rand = std::make_shared(); + std::shared_ptr rand = std::make_shared(); for(size_t i=0; i rand = std::make_shared(); + std::shared_ptr rand = std::make_shared(); IsotropicDirection A; double bin_max = 1.0; double bin_min = -1.0; @@ -308,7 +308,7 @@ TEST(IsotropicDirection, SampleDistributionTheta) { TEST(IsotropicDirection, SampleDistributionPhi) { size_t N = 100000; - std::shared_ptr rand = std::make_shared(); + std::shared_ptr rand = std::make_shared(); IsotropicDirection A; double bin_max = M_PI; double bin_min = -M_PI; @@ -335,7 +335,7 @@ TEST(IsotropicDirection, SampleDistributionPhi) { TEST(IsotropicDirection, GenerationProbability) { size_t N = 100000; - std::shared_ptr rand = std::make_shared(); + std::shared_ptr rand = std::make_shared(); IsotropicDirection A; double expected_density = 1.0 / (4.0 * M_PI); for(size_t i=0; i rand = std::make_shared(); + std::shared_ptr rand = std::make_shared(); size_t N = 1000; size_t M = 10000; for(size_t i=0; i rand = std::make_shared(); + std::shared_ptr rand = std::make_shared(); for(size_t i=0; i rand = std::make_shared(); + std::shared_ptr rand = std::make_shared(); for(size_t i=0; i // for string #include // for shared_ptr @@ -18,11 +18,11 @@ namespace siren { namespace interactions { class InteractionCollection; } } namespace siren { namespace dataclasses { class InteractionRecord; } } namespace siren { namespace detector { class DetectorModel; } } -namespace siren { namespace utilities { class LI_random; } } +namespace siren { namespace utilities { class SIREN_random; } } namespace siren { namespace utilities { -class LI_random; +class SIREN_random; } namespace detector { @@ -140,7 +140,7 @@ friend cereal::access; private: public: virtual ~PrimaryInjectionDistribution() {}; - virtual void Sample(std::shared_ptr rand, std::shared_ptr detector_model, std::shared_ptr interactions, siren::dataclasses::PrimaryDistributionRecord & record) const = 0; + virtual void Sample(std::shared_ptr rand, std::shared_ptr detector_model, std::shared_ptr interactions, siren::dataclasses::PrimaryDistributionRecord & record) const = 0; virtual std::shared_ptr clone() const = 0; template void save(Archive & archive, std::uint32_t const version) const { @@ -167,7 +167,7 @@ friend cereal::access; private: public: virtual ~SecondaryInjectionDistribution() {}; - virtual void Sample(std::shared_ptr rand, std::shared_ptr detector_model, std::shared_ptr interactions, siren::dataclasses::SecondaryDistributionRecord & record) const = 0; + virtual void Sample(std::shared_ptr rand, std::shared_ptr detector_model, std::shared_ptr interactions, siren::dataclasses::SecondaryDistributionRecord & record) const = 0; virtual std::shared_ptr clone() const = 0; template void save(Archive & archive, std::uint32_t const version) const { @@ -209,6 +209,6 @@ CEREAL_CLASS_VERSION(siren::distributions::SecondaryInjectionDistribution, 0); CEREAL_REGISTER_TYPE(siren::distributions::SecondaryInjectionDistribution); CEREAL_REGISTER_POLYMORPHIC_RELATION(siren::distributions::WeightableDistribution, siren::distributions::SecondaryInjectionDistribution); -#endif // LI_Distributions_H +#endif // SIREN_Distributions_H diff --git a/projects/distributions/public/SIREN/distributions/primary/direction/Cone.h b/projects/distributions/public/SIREN/distributions/primary/direction/Cone.h index 4a9f2683d..333038e4d 100644 --- a/projects/distributions/public/SIREN/distributions/primary/direction/Cone.h +++ b/projects/distributions/public/SIREN/distributions/primary/direction/Cone.h @@ -1,5 +1,5 @@ -#ifndef LI_Cone_H -#define LI_Cone_H +#ifndef SIREN_Cone_H +#define SIREN_Cone_H #include #include @@ -20,7 +20,7 @@ namespace siren { namespace dataclasses { class InteractionRecord; } } namespace siren { namespace detector { class DetectorModel; } } namespace siren { namespace distributions { class PrimaryInjectionDistribution; } } namespace siren { namespace distributions { class WeightableDistribution; } } -namespace siren { namespace utilities { class LI_random; } } +namespace siren { namespace utilities { class SIREN_random; } } namespace siren { namespace distributions { @@ -35,7 +35,7 @@ friend cereal::access; double opening_angle; public: Cone(siren::math::Vector3D dir, double opening_angle); - siren::math::Vector3D SampleDirection(std::shared_ptr rand, std::shared_ptr detector_model, std::shared_ptr interactions, siren::dataclasses::PrimaryDistributionRecord & record) const override; + siren::math::Vector3D SampleDirection(std::shared_ptr rand, std::shared_ptr detector_model, std::shared_ptr interactions, siren::dataclasses::PrimaryDistributionRecord & record) const override; virtual double GenerationProbability(std::shared_ptr detector_model, std::shared_ptr interactions, siren::dataclasses::InteractionRecord const & record) const override; virtual std::shared_ptr clone() const override; std::string Name() const override; @@ -74,5 +74,5 @@ CEREAL_CLASS_VERSION(siren::distributions::Cone, 0); CEREAL_REGISTER_TYPE(siren::distributions::Cone); CEREAL_REGISTER_POLYMORPHIC_RELATION(siren::distributions::PrimaryDirectionDistribution, siren::distributions::Cone); -#endif // LI_Cone_H +#endif // SIREN_Cone_H diff --git a/projects/distributions/public/SIREN/distributions/primary/direction/FixedDirection.h b/projects/distributions/public/SIREN/distributions/primary/direction/FixedDirection.h index 144c2d311..3ee4607a9 100644 --- a/projects/distributions/public/SIREN/distributions/primary/direction/FixedDirection.h +++ b/projects/distributions/public/SIREN/distributions/primary/direction/FixedDirection.h @@ -1,5 +1,5 @@ -#ifndef LI_FixedDirection_H -#define LI_FixedDirection_H +#ifndef SIREN_FixedDirection_H +#define SIREN_FixedDirection_H #include #include @@ -20,7 +20,7 @@ namespace siren { namespace dataclasses { class InteractionRecord; } } namespace siren { namespace detector { class DetectorModel; } } namespace siren { namespace distributions { class PrimaryInjectionDistribution; } } namespace siren { namespace distributions { class WeightableDistribution; } } -namespace siren { namespace utilities { class LI_random; } } +namespace siren { namespace utilities { class SIREN_random; } } namespace siren { namespace distributions { @@ -34,7 +34,7 @@ friend cereal::access; public: FixedDirection(siren::math::Vector3D dir) : dir(dir) {}; private: - siren::math::Vector3D SampleDirection(std::shared_ptr rand, std::shared_ptr detector_model, std::shared_ptr interactions, siren::dataclasses::PrimaryDistributionRecord & record) const override; + siren::math::Vector3D SampleDirection(std::shared_ptr rand, std::shared_ptr detector_model, std::shared_ptr interactions, siren::dataclasses::PrimaryDistributionRecord & record) const override; virtual double GenerationProbability(std::shared_ptr detector_model, std::shared_ptr interactions, siren::dataclasses::InteractionRecord const & record) const override; virtual std::vector DensityVariables() const override; virtual std::shared_ptr clone() const override; @@ -71,4 +71,4 @@ CEREAL_CLASS_VERSION(siren::distributions::FixedDirection, 0); CEREAL_REGISTER_TYPE(siren::distributions::FixedDirection); CEREAL_REGISTER_POLYMORPHIC_RELATION(siren::distributions::PrimaryDirectionDistribution, siren::distributions::FixedDirection); -#endif // LI_FixedDirection_H +#endif // SIREN_FixedDirection_H diff --git a/projects/distributions/public/SIREN/distributions/primary/direction/IsotropicDirection.h b/projects/distributions/public/SIREN/distributions/primary/direction/IsotropicDirection.h index bcd5c823b..f06f142ae 100644 --- a/projects/distributions/public/SIREN/distributions/primary/direction/IsotropicDirection.h +++ b/projects/distributions/public/SIREN/distributions/primary/direction/IsotropicDirection.h @@ -1,6 +1,6 @@ #pragma once -#ifndef LI_IsotropicDirection_H -#define LI_IsotropicDirection_H +#ifndef SIREN_IsotropicDirection_H +#define SIREN_IsotropicDirection_H #include #include @@ -20,7 +20,7 @@ namespace siren { namespace dataclasses { class InteractionRecord; } } namespace siren { namespace detector { class DetectorModel; } } namespace siren { namespace distributions { class PrimaryInjectionDistribution; } } namespace siren { namespace distributions { class WeightableDistribution; } } -namespace siren { namespace utilities { class LI_random; } } +namespace siren { namespace utilities { class SIREN_random; } } namespace siren { namespace math { @@ -31,7 +31,7 @@ namespace distributions { class IsotropicDirection : virtual public PrimaryDirectionDistribution { friend cereal::access; public: - siren::math::Vector3D SampleDirection(std::shared_ptr rand, std::shared_ptr detector_model, std::shared_ptr interactions, siren::dataclasses::PrimaryDistributionRecord & record) const override; + siren::math::Vector3D SampleDirection(std::shared_ptr rand, std::shared_ptr detector_model, std::shared_ptr interactions, siren::dataclasses::PrimaryDistributionRecord & record) const override; virtual double GenerationProbability(std::shared_ptr detector_model, std::shared_ptr interactions, siren::dataclasses::InteractionRecord const & record) const override; virtual std::shared_ptr clone() const override; std::string Name() const override; @@ -64,4 +64,4 @@ CEREAL_CLASS_VERSION(siren::distributions::IsotropicDirection, 0); CEREAL_REGISTER_TYPE(siren::distributions::IsotropicDirection); CEREAL_REGISTER_POLYMORPHIC_RELATION(siren::distributions::PrimaryDirectionDistribution, siren::distributions::IsotropicDirection); -#endif // LI_IsotropicDirection_H +#endif // SIREN_IsotropicDirection_H diff --git a/projects/distributions/public/SIREN/distributions/primary/direction/PrimaryDirectionDistribution.h b/projects/distributions/public/SIREN/distributions/primary/direction/PrimaryDirectionDistribution.h index fa2a64da3..15768634b 100644 --- a/projects/distributions/public/SIREN/distributions/primary/direction/PrimaryDirectionDistribution.h +++ b/projects/distributions/public/SIREN/distributions/primary/direction/PrimaryDirectionDistribution.h @@ -1,6 +1,6 @@ #pragma once -#ifndef LI_PrimaryDirectionDistribution_H -#define LI_PrimaryDirectionDistribution_H +#ifndef SIREN_PrimaryDirectionDistribution_H +#define SIREN_PrimaryDirectionDistribution_H #include // for string #include // for shared_ptr @@ -14,11 +14,11 @@ namespace siren { namespace interactions { class InteractionCollection; } } namespace siren { namespace dataclasses { class InteractionRecord; } } namespace siren { namespace detector { class DetectorModel; } } namespace siren { namespace math { class Vector3D; } } -namespace siren { namespace utilities { class LI_random; } } +namespace siren { namespace utilities { class SIREN_random; } } namespace siren { namespace utilities { -class LI_random; +class SIREN_random; } // namespace utilities namespace math { @@ -48,9 +48,9 @@ friend cereal::access; protected: PrimaryDirectionDistribution() {}; private: - virtual siren::math::Vector3D SampleDirection(std::shared_ptr rand, std::shared_ptr detector_model, std::shared_ptr interactions, siren::dataclasses::PrimaryDistributionRecord & record) const = 0; + virtual siren::math::Vector3D SampleDirection(std::shared_ptr rand, std::shared_ptr detector_model, std::shared_ptr interactions, siren::dataclasses::PrimaryDistributionRecord & record) const = 0; public: - void Sample(std::shared_ptr rand, std::shared_ptr detector_model, std::shared_ptr interactions, siren::dataclasses::PrimaryDistributionRecord & record) const override; + void Sample(std::shared_ptr rand, std::shared_ptr detector_model, std::shared_ptr interactions, siren::dataclasses::PrimaryDistributionRecord & record) const override; virtual double GenerationProbability(std::shared_ptr detector_model, std::shared_ptr interactions, siren::dataclasses::InteractionRecord const & record) const override = 0; virtual std::vector DensityVariables() const override; virtual std::shared_ptr clone() const override = 0; @@ -82,4 +82,4 @@ CEREAL_CLASS_VERSION(siren::distributions::PrimaryDirectionDistribution, 0); CEREAL_REGISTER_TYPE(siren::distributions::PrimaryDirectionDistribution); CEREAL_REGISTER_POLYMORPHIC_RELATION(siren::distributions::PrimaryInjectionDistribution, siren::distributions::PrimaryDirectionDistribution); -#endif // LI_PrimaryDirectionDistribution_H +#endif // SIREN_PrimaryDirectionDistribution_H diff --git a/projects/distributions/public/SIREN/distributions/primary/energy/ModifiedMoyalPlusExponentialEnergyDistribution.h b/projects/distributions/public/SIREN/distributions/primary/energy/ModifiedMoyalPlusExponentialEnergyDistribution.h index 7d8e69cc8..2f9ad3b7d 100644 --- a/projects/distributions/public/SIREN/distributions/primary/energy/ModifiedMoyalPlusExponentialEnergyDistribution.h +++ b/projects/distributions/public/SIREN/distributions/primary/energy/ModifiedMoyalPlusExponentialEnergyDistribution.h @@ -1,6 +1,6 @@ #pragma once -#ifndef LI_ModifiedMoyalPlusExponentialEnergyDistribution_H -#define LI_ModifiedMoyalPlusExponentialEnergyDistribution_H +#ifndef SIREN_ModifiedMoyalPlusExponentialEnergyDistribution_H +#define SIREN_ModifiedMoyalPlusExponentialEnergyDistribution_H #include #include @@ -20,7 +20,7 @@ namespace siren { namespace dataclasses { class InteractionRecord; } } namespace siren { namespace detector { class DetectorModel; } } namespace siren { namespace distributions { class PrimaryInjectionDistribution; } } namespace siren { namespace distributions { class WeightableDistribution; } } -namespace siren { namespace utilities { class LI_random; } } +namespace siren { namespace utilities { class SIREN_random; } } namespace siren { namespace distributions { @@ -43,7 +43,7 @@ friend cereal::access; double pdf(double energy) const; double pdf_integral() const; public: - double SampleEnergy(std::shared_ptr rand, std::shared_ptr detector_model, std::shared_ptr interactions, siren::dataclasses::PrimaryDistributionRecord & record) const override; + double SampleEnergy(std::shared_ptr rand, std::shared_ptr detector_model, std::shared_ptr interactions, siren::dataclasses::PrimaryDistributionRecord & record) const override; virtual double GenerationProbability(std::shared_ptr detector_model, std::shared_ptr interactions, siren::dataclasses::InteractionRecord const & record) const override; ModifiedMoyalPlusExponentialEnergyDistribution(double energyMin, double energyMax, double mu, double sigma, double A, double l, double B, bool has_physical_normalization=false); std::string Name() const override; @@ -92,4 +92,4 @@ CEREAL_CLASS_VERSION(siren::distributions::ModifiedMoyalPlusExponentialEnergyDis CEREAL_REGISTER_TYPE(siren::distributions::ModifiedMoyalPlusExponentialEnergyDistribution); CEREAL_REGISTER_POLYMORPHIC_RELATION(siren::distributions::PrimaryEnergyDistribution, siren::distributions::ModifiedMoyalPlusExponentialEnergyDistribution); -#endif // LI_ModifiedMoyalPlusExponentialEnergyDistribution_H +#endif // SIREN_ModifiedMoyalPlusExponentialEnergyDistribution_H diff --git a/projects/distributions/public/SIREN/distributions/primary/energy/Monoenergetic.h b/projects/distributions/public/SIREN/distributions/primary/energy/Monoenergetic.h index d454106c2..06ca4d59b 100644 --- a/projects/distributions/public/SIREN/distributions/primary/energy/Monoenergetic.h +++ b/projects/distributions/public/SIREN/distributions/primary/energy/Monoenergetic.h @@ -1,6 +1,6 @@ #pragma once -#ifndef LI_Monoenergetic_H -#define LI_Monoenergetic_H +#ifndef SIREN_Monoenergetic_H +#define SIREN_Monoenergetic_H #include #include @@ -19,7 +19,7 @@ namespace siren { namespace dataclasses { class InteractionRecord; } } namespace siren { namespace detector { class DetectorModel; } } namespace siren { namespace distributions { class PrimaryInjectionDistribution; } } namespace siren { namespace distributions { class WeightableDistribution; } } -namespace siren { namespace utilities { class LI_random; } } +namespace siren { namespace utilities { class SIREN_random; } } namespace siren { namespace distributions { @@ -33,7 +33,7 @@ friend cereal::access; public: Monoenergetic(double gen_energy); double pdf(double energy) const; - virtual double SampleEnergy(std::shared_ptr rand, std::shared_ptr detector_model, std::shared_ptr interactions, siren::dataclasses::PrimaryDistributionRecord & record) const override; + virtual double SampleEnergy(std::shared_ptr rand, std::shared_ptr detector_model, std::shared_ptr interactions, siren::dataclasses::PrimaryDistributionRecord & record) const override; virtual double GenerationProbability(std::shared_ptr detector_model, std::shared_ptr interactions, siren::dataclasses::InteractionRecord const & record) const override; std::string Name() const override; virtual std::shared_ptr clone() const override; @@ -69,4 +69,4 @@ CEREAL_CLASS_VERSION(siren::distributions::Monoenergetic, 0); CEREAL_REGISTER_TYPE(siren::distributions::Monoenergetic); CEREAL_REGISTER_POLYMORPHIC_RELATION(siren::distributions::PrimaryEnergyDistribution, siren::distributions::Monoenergetic); -#endif // LI_Monoenergetic_H +#endif // SIREN_Monoenergetic_H diff --git a/projects/distributions/public/SIREN/distributions/primary/energy/PowerLaw.h b/projects/distributions/public/SIREN/distributions/primary/energy/PowerLaw.h index 2f2f310c0..8a6eca90b 100644 --- a/projects/distributions/public/SIREN/distributions/primary/energy/PowerLaw.h +++ b/projects/distributions/public/SIREN/distributions/primary/energy/PowerLaw.h @@ -1,6 +1,6 @@ #pragma once -#ifndef LI_PowerLaw_H -#define LI_PowerLaw_H +#ifndef SIREN_PowerLaw_H +#define SIREN_PowerLaw_H #include #include @@ -20,7 +20,7 @@ namespace siren { namespace dataclasses { class PrimaryDistributionRecord; } } namespace siren { namespace detector { class DetectorModel; } } namespace siren { namespace distributions { class PrimaryInjectionDistribution; } } namespace siren { namespace distributions { class WeightableDistribution; } } -namespace siren { namespace utilities { class LI_random; } } +namespace siren { namespace utilities { class SIREN_random; } } namespace siren { namespace distributions { @@ -36,7 +36,7 @@ friend cereal::access; public: PowerLaw(double powerLawIndex, double energyMin, double energyMax); double pdf(double energy) const; - double SampleEnergy(std::shared_ptr rand, std::shared_ptr detector_model, std::shared_ptr interactions, siren::dataclasses::PrimaryDistributionRecord & record) const override; + double SampleEnergy(std::shared_ptr rand, std::shared_ptr detector_model, std::shared_ptr interactions, siren::dataclasses::PrimaryDistributionRecord & record) const override; virtual double GenerationProbability(std::shared_ptr detector_model, std::shared_ptr interactions, siren::dataclasses::InteractionRecord const & record) const override; std::string Name() const override; void SetNormalizationAtEnergy(double normalization, double energy); @@ -77,4 +77,4 @@ CEREAL_CLASS_VERSION(siren::distributions::PowerLaw, 0); CEREAL_REGISTER_TYPE(siren::distributions::PowerLaw); CEREAL_REGISTER_POLYMORPHIC_RELATION(siren::distributions::PrimaryEnergyDistribution, siren::distributions::PowerLaw); -#endif // LI_PowerLaw_H +#endif // SIREN_PowerLaw_H diff --git a/projects/distributions/public/SIREN/distributions/primary/energy/PrimaryEnergyDistribution.h b/projects/distributions/public/SIREN/distributions/primary/energy/PrimaryEnergyDistribution.h index 73b5f0167..e922ec59c 100644 --- a/projects/distributions/public/SIREN/distributions/primary/energy/PrimaryEnergyDistribution.h +++ b/projects/distributions/public/SIREN/distributions/primary/energy/PrimaryEnergyDistribution.h @@ -1,6 +1,6 @@ #pragma once -#ifndef LI_PrimaryEnergyDistribution_H -#define LI_PrimaryEnergyDistribution_H +#ifndef SIREN_PrimaryEnergyDistribution_H +#define SIREN_PrimaryEnergyDistribution_H #include // for shared_ptr #include // for string @@ -18,7 +18,7 @@ namespace siren { namespace interactions { class InteractionCollection; } } namespace siren { namespace dataclasses { class InteractionRecord; } } namespace siren { namespace detector { class DetectorModel; } } -namespace siren { namespace utilities { class LI_random; } } +namespace siren { namespace utilities { class SIREN_random; } } namespace cereal { class access; } namespace siren { @@ -29,9 +29,9 @@ friend cereal::access; public: virtual ~PrimaryEnergyDistribution() {}; private: - virtual double SampleEnergy(std::shared_ptr rand, std::shared_ptr detector_model, std::shared_ptr interactions, siren::dataclasses::PrimaryDistributionRecord & record) const = 0; + virtual double SampleEnergy(std::shared_ptr rand, std::shared_ptr detector_model, std::shared_ptr interactions, siren::dataclasses::PrimaryDistributionRecord & record) const = 0; public: - void Sample(std::shared_ptr rand, std::shared_ptr detector_model, std::shared_ptr interactions, siren::dataclasses::PrimaryDistributionRecord & record) const override; + void Sample(std::shared_ptr rand, std::shared_ptr detector_model, std::shared_ptr interactions, siren::dataclasses::PrimaryDistributionRecord & record) const override; virtual double GenerationProbability(std::shared_ptr detector_model, std::shared_ptr interactions, siren::dataclasses::InteractionRecord const & record) const override = 0; virtual std::vector DensityVariables() const override; virtual std::string Name() const override = 0; @@ -67,4 +67,4 @@ CEREAL_REGISTER_TYPE(siren::distributions::PrimaryEnergyDistribution); CEREAL_REGISTER_POLYMORPHIC_RELATION(siren::distributions::PrimaryInjectionDistribution, siren::distributions::PrimaryEnergyDistribution); CEREAL_REGISTER_POLYMORPHIC_RELATION(siren::distributions::PhysicallyNormalizedDistribution, siren::distributions::PrimaryEnergyDistribution); -#endif // LI_PrimaryEnergyDistribution_H +#endif // SIREN_PrimaryEnergyDistribution_H diff --git a/projects/distributions/public/SIREN/distributions/primary/energy/TabulatedFluxDistribution.h b/projects/distributions/public/SIREN/distributions/primary/energy/TabulatedFluxDistribution.h index 5c4ba08c6..5d4c35fe7 100644 --- a/projects/distributions/public/SIREN/distributions/primary/energy/TabulatedFluxDistribution.h +++ b/projects/distributions/public/SIREN/distributions/primary/energy/TabulatedFluxDistribution.h @@ -1,6 +1,6 @@ #pragma once -#ifndef LI_TabulatedFluxDistribution_H -#define LI_TabulatedFluxDistribution_H +#ifndef SIREN_TabulatedFluxDistribution_H +#define SIREN_TabulatedFluxDistribution_H #include #include @@ -22,7 +22,7 @@ namespace siren { namespace dataclasses { class InteractionRecord; } } namespace siren { namespace detector { class DetectorModel; } } namespace siren { namespace distributions { class PrimaryInjectionDistribution; } } namespace siren { namespace distributions { class WeightableDistribution; } } -namespace siren { namespace utilities { class LI_random; } } +namespace siren { namespace utilities { class SIREN_random; } } namespace siren { namespace distributions { @@ -57,7 +57,7 @@ friend cereal::access; std::vector GetCDF() const; std::vector GetEnergyNodes() const; std::vector GetCDFEnergyNodes() const; - double SampleEnergy(std::shared_ptr rand, std::shared_ptr detector_model, std::shared_ptr interactions, siren::dataclasses::PrimaryDistributionRecord & record) const override; + double SampleEnergy(std::shared_ptr rand, std::shared_ptr detector_model, std::shared_ptr interactions, siren::dataclasses::PrimaryDistributionRecord & record) const override; virtual double GenerationProbability(std::shared_ptr detector_model, std::shared_ptr interactions, siren::dataclasses::InteractionRecord const & record) const override; void SetEnergyBounds(double energyMin, double energyMax); TabulatedFluxDistribution(std::string fluxTableFilename, bool has_physical_normalization=false); @@ -101,5 +101,5 @@ CEREAL_CLASS_VERSION(siren::distributions::TabulatedFluxDistribution, 0); CEREAL_REGISTER_TYPE(siren::distributions::TabulatedFluxDistribution); CEREAL_REGISTER_POLYMORPHIC_RELATION(siren::distributions::PrimaryEnergyDistribution, siren::distributions::TabulatedFluxDistribution); -#endif // LI_TabulatedFluxDistribution_H +#endif // SIREN_TabulatedFluxDistribution_H diff --git a/projects/distributions/public/SIREN/distributions/primary/helicity/PrimaryNeutrinoHelicityDistribution.h b/projects/distributions/public/SIREN/distributions/primary/helicity/PrimaryNeutrinoHelicityDistribution.h index 92c7f1137..5b3e69dac 100644 --- a/projects/distributions/public/SIREN/distributions/primary/helicity/PrimaryNeutrinoHelicityDistribution.h +++ b/projects/distributions/public/SIREN/distributions/primary/helicity/PrimaryNeutrinoHelicityDistribution.h @@ -1,6 +1,6 @@ #pragma once -#ifndef LI_PrimaryNeutrinoHelicityDistribution_H -#define LI_PrimaryNeutrinoHelicityDistribution_H +#ifndef SIREN_PrimaryNeutrinoHelicityDistribution_H +#define SIREN_PrimaryNeutrinoHelicityDistribution_H #include // for shared_ptr #include // for string @@ -18,7 +18,7 @@ namespace siren { namespace interactions { class InteractionCollection; } } namespace siren { namespace dataclasses { class InteractionRecord; } } namespace siren { namespace detector { class DetectorModel; } } -namespace siren { namespace utilities { class LI_random; } } +namespace siren { namespace utilities { class SIREN_random; } } namespace siren { namespace distributions { @@ -26,7 +26,7 @@ namespace distributions { class PrimaryNeutrinoHelicityDistribution : virtual public PrimaryInjectionDistribution { friend cereal::access; public: - virtual void Sample(std::shared_ptr rand, std::shared_ptr detector_model, std::shared_ptr interactions, siren::dataclasses::PrimaryDistributionRecord & record) const override; + virtual void Sample(std::shared_ptr rand, std::shared_ptr detector_model, std::shared_ptr interactions, siren::dataclasses::PrimaryDistributionRecord & record) const override; virtual double GenerationProbability(std::shared_ptr detector_model, std::shared_ptr interactions, siren::dataclasses::InteractionRecord const & record) const override; PrimaryNeutrinoHelicityDistribution(); PrimaryNeutrinoHelicityDistribution(const PrimaryNeutrinoHelicityDistribution &) = default; @@ -61,4 +61,4 @@ CEREAL_CLASS_VERSION(siren::distributions::PrimaryNeutrinoHelicityDistribution, CEREAL_REGISTER_TYPE(siren::distributions::PrimaryNeutrinoHelicityDistribution); CEREAL_REGISTER_POLYMORPHIC_RELATION(siren::distributions::PrimaryInjectionDistribution, siren::distributions::PrimaryNeutrinoHelicityDistribution); -#endif // LI_PrimaryNeutrinoHelicityDistribution_H +#endif // SIREN_PrimaryNeutrinoHelicityDistribution_H diff --git a/projects/distributions/public/SIREN/distributions/primary/mass/PrimaryMass.h b/projects/distributions/public/SIREN/distributions/primary/mass/PrimaryMass.h index 718c71eeb..58059d7c7 100644 --- a/projects/distributions/public/SIREN/distributions/primary/mass/PrimaryMass.h +++ b/projects/distributions/public/SIREN/distributions/primary/mass/PrimaryMass.h @@ -1,6 +1,6 @@ #pragma once -#ifndef LI_PrimaryMass_H -#define LI_PrimaryMass_H +#ifndef SIREN_PrimaryMass_H +#define SIREN_PrimaryMass_H #include // for string #include // for shared_ptr @@ -19,7 +19,7 @@ namespace siren { namespace interactions { class InteractionCollection; } } namespace siren { namespace dataclasses { class InteractionRecord; } } namespace siren { namespace detector { class DetectorModel; } } -namespace siren { namespace utilities { class LI_random; } } +namespace siren { namespace utilities { class SIREN_random; } } namespace siren { namespace distributions { @@ -33,7 +33,7 @@ friend cereal::access; public: PrimaryMass(double primary_mass = 0); double GetPrimaryMass() const; - void Sample(std::shared_ptr rand, std::shared_ptr detector_model, std::shared_ptr interactions, siren::dataclasses::PrimaryDistributionRecord & record) const override; + void Sample(std::shared_ptr rand, std::shared_ptr detector_model, std::shared_ptr interactions, siren::dataclasses::PrimaryDistributionRecord & record) const override; virtual double GenerationProbability(std::shared_ptr detector_model, std::shared_ptr interactions, siren::dataclasses::InteractionRecord const & record) const override; virtual std::vector DensityVariables() const override; virtual std::string Name() const override; @@ -70,4 +70,4 @@ CEREAL_CLASS_VERSION(siren::distributions::PrimaryMass, 0); CEREAL_REGISTER_TYPE(siren::distributions::PrimaryMass); CEREAL_REGISTER_POLYMORPHIC_RELATION(siren::distributions::PrimaryInjectionDistribution, siren::distributions::PrimaryMass); -#endif // LI_PrimaryMass_H +#endif // SIREN_PrimaryMass_H diff --git a/projects/distributions/public/SIREN/distributions/primary/vertex/ColumnDepthPositionDistribution.h b/projects/distributions/public/SIREN/distributions/primary/vertex/ColumnDepthPositionDistribution.h index 55178d834..d0669dafc 100644 --- a/projects/distributions/public/SIREN/distributions/primary/vertex/ColumnDepthPositionDistribution.h +++ b/projects/distributions/public/SIREN/distributions/primary/vertex/ColumnDepthPositionDistribution.h @@ -1,6 +1,6 @@ #pragma once -#ifndef LI_ColumnDepthPositionDistribution_H -#define LI_ColumnDepthPositionDistribution_H +#ifndef SIREN_ColumnDepthPositionDistribution_H +#define SIREN_ColumnDepthPositionDistribution_H #include #include @@ -25,7 +25,7 @@ namespace siren { namespace dataclasses { class InteractionRecord; } } namespace siren { namespace detector { class DetectorModel; } } namespace siren { namespace distributions { class PrimaryInjectionDistribution; } } namespace siren { namespace distributions { class WeightableDistribution; } } -namespace siren { namespace utilities { class LI_random; } } +namespace siren { namespace utilities { class SIREN_random; } } namespace siren { namespace distributions { @@ -40,11 +40,11 @@ friend cereal::access; std::shared_ptr depth_function; std::set target_types; - siren::math::Vector3D SampleFromDisk(std::shared_ptr rand, siren::math::Vector3D const & dir) const; + siren::math::Vector3D SampleFromDisk(std::shared_ptr rand, siren::math::Vector3D const & dir) const; - std::tuple SamplePosition(std::shared_ptr rand, std::shared_ptr detector_model, std::shared_ptr interactions, siren::dataclasses::PrimaryDistributionRecord & record) const override; + std::tuple SamplePosition(std::shared_ptr rand, std::shared_ptr detector_model, std::shared_ptr interactions, siren::dataclasses::PrimaryDistributionRecord & record) const override; public: - std::tuple GetSamplePosition(std::shared_ptr rand, std::shared_ptr detector_model, std::shared_ptr interactions, siren::dataclasses::PrimaryDistributionRecord & record); + std::tuple GetSamplePosition(std::shared_ptr rand, std::shared_ptr detector_model, std::shared_ptr interactions, siren::dataclasses::PrimaryDistributionRecord & record); virtual double GenerationProbability(std::shared_ptr detector_model, std::shared_ptr interactions, siren::dataclasses::InteractionRecord const & record) const override; ColumnDepthPositionDistribution(double radius, double endcap_length, std::shared_ptr depth_function, std::set target_types); std::string Name() const override; @@ -91,4 +91,4 @@ CEREAL_CLASS_VERSION(siren::distributions::ColumnDepthPositionDistribution, 0); CEREAL_REGISTER_TYPE(siren::distributions::ColumnDepthPositionDistribution); CEREAL_REGISTER_POLYMORPHIC_RELATION(siren::distributions::VertexPositionDistribution, siren::distributions::ColumnDepthPositionDistribution); -#endif // LI_ColumnDepthPositionDistribution_H +#endif // SIREN_ColumnDepthPositionDistribution_H diff --git a/projects/distributions/public/SIREN/distributions/primary/vertex/CylinderVolumePositionDistribution.h b/projects/distributions/public/SIREN/distributions/primary/vertex/CylinderVolumePositionDistribution.h index 29130bbd5..be92ac1e8 100644 --- a/projects/distributions/public/SIREN/distributions/primary/vertex/CylinderVolumePositionDistribution.h +++ b/projects/distributions/public/SIREN/distributions/primary/vertex/CylinderVolumePositionDistribution.h @@ -1,6 +1,6 @@ #pragma once -#ifndef LI_CylinderVolumePositionDistribution_H -#define LI_CylinderVolumePositionDistribution_H +#ifndef SIREN_CylinderVolumePositionDistribution_H +#define SIREN_CylinderVolumePositionDistribution_H #include #include @@ -22,7 +22,7 @@ namespace siren { namespace dataclasses { class InteractionRecord; } } namespace siren { namespace detector { class DetectorModel; } } namespace siren { namespace distributions { class PrimaryInjectionDistribution; } } namespace siren { namespace distributions { class WeightableDistribution; } } -namespace siren { namespace utilities { class LI_random; } } +namespace siren { namespace utilities { class SIREN_random; } } namespace siren { namespace distributions { @@ -33,7 +33,7 @@ friend cereal::access; CylinderVolumePositionDistribution() {}; private: siren::geometry::Cylinder cylinder; - std::tuple SamplePosition(std::shared_ptr rand, std::shared_ptr detector_model, std::shared_ptr interactions, siren::dataclasses::PrimaryDistributionRecord & record) const override; + std::tuple SamplePosition(std::shared_ptr rand, std::shared_ptr detector_model, std::shared_ptr interactions, siren::dataclasses::PrimaryDistributionRecord & record) const override; public: virtual double GenerationProbability(std::shared_ptr detector_model, std::shared_ptr interactions, siren::dataclasses::InteractionRecord const & record) const override; CylinderVolumePositionDistribution(siren::geometry::Cylinder); @@ -73,4 +73,4 @@ CEREAL_CLASS_VERSION(siren::distributions::CylinderVolumePositionDistribution, 0 CEREAL_REGISTER_TYPE(siren::distributions::CylinderVolumePositionDistribution); CEREAL_REGISTER_POLYMORPHIC_RELATION(siren::distributions::VertexPositionDistribution, siren::distributions::CylinderVolumePositionDistribution); -#endif // LI_CylinderVolumePositionDistribution_H +#endif // SIREN_CylinderVolumePositionDistribution_H diff --git a/projects/distributions/public/SIREN/distributions/primary/vertex/DecayRangeFunction.h b/projects/distributions/public/SIREN/distributions/primary/vertex/DecayRangeFunction.h index 7cfd2bd19..8901e42fd 100644 --- a/projects/distributions/public/SIREN/distributions/primary/vertex/DecayRangeFunction.h +++ b/projects/distributions/public/SIREN/distributions/primary/vertex/DecayRangeFunction.h @@ -1,6 +1,6 @@ #pragma once -#ifndef LI_DecayRangeFunction_H -#define LI_DecayRangeFunction_H +#ifndef SIREN_DecayRangeFunction_H +#define SIREN_DecayRangeFunction_H #include #include @@ -79,4 +79,4 @@ CEREAL_CLASS_VERSION(siren::distributions::DecayRangeFunction, 0); CEREAL_REGISTER_TYPE(siren::distributions::DecayRangeFunction); CEREAL_REGISTER_POLYMORPHIC_RELATION(siren::distributions::RangeFunction, siren::distributions::DecayRangeFunction); -#endif // LI_DecayRangeFunction_H +#endif // SIREN_DecayRangeFunction_H diff --git a/projects/distributions/public/SIREN/distributions/primary/vertex/DecayRangePositionDistribution.h b/projects/distributions/public/SIREN/distributions/primary/vertex/DecayRangePositionDistribution.h index 39a3b894c..d200d57cf 100644 --- a/projects/distributions/public/SIREN/distributions/primary/vertex/DecayRangePositionDistribution.h +++ b/projects/distributions/public/SIREN/distributions/primary/vertex/DecayRangePositionDistribution.h @@ -1,6 +1,6 @@ #pragma once -#ifndef LI_DecayRangePositionDistribution_H -#define LI_DecayRangePositionDistribution_H +#ifndef SIREN_DecayRangePositionDistribution_H +#define SIREN_DecayRangePositionDistribution_H #include #include @@ -25,7 +25,7 @@ namespace siren { namespace dataclasses { class InteractionRecord; } } namespace siren { namespace detector { class DetectorModel; } } namespace siren { namespace distributions { class PrimaryInjectionDistribution; } } namespace siren { namespace distributions { class WeightableDistribution; } } -namespace siren { namespace utilities { class LI_random; } } +namespace siren { namespace utilities { class SIREN_random; } } namespace siren { namespace distributions { @@ -36,9 +36,9 @@ class DecayRangePositionDistribution : virtual public VertexPositionDistribution double endcap_length; std::shared_ptr range_function; - siren::math::Vector3D SampleFromDisk(std::shared_ptr rand, siren::math::Vector3D const & dir) const; + siren::math::Vector3D SampleFromDisk(std::shared_ptr rand, siren::math::Vector3D const & dir) const; - std::tuple SamplePosition(std::shared_ptr rand, std::shared_ptr detector_model, std::shared_ptr interactions, siren::dataclasses::PrimaryDistributionRecord & record) const override; + std::tuple SamplePosition(std::shared_ptr rand, std::shared_ptr detector_model, std::shared_ptr interactions, siren::dataclasses::PrimaryDistributionRecord & record) const override; public: virtual double GenerationProbability(std::shared_ptr detector_model, std::shared_ptr interactions, siren::dataclasses::InteractionRecord const & record) const override; DecayRangePositionDistribution(); @@ -86,4 +86,4 @@ CEREAL_CLASS_VERSION(siren::distributions::DecayRangePositionDistribution, 0); CEREAL_REGISTER_TYPE(siren::distributions::DecayRangePositionDistribution); CEREAL_REGISTER_POLYMORPHIC_RELATION(siren::distributions::VertexPositionDistribution, siren::distributions::DecayRangePositionDistribution); -#endif // LI_DecayRangePositionDistribution_H +#endif // SIREN_DecayRangePositionDistribution_H diff --git a/projects/distributions/public/SIREN/distributions/primary/vertex/DepthFunction.h b/projects/distributions/public/SIREN/distributions/primary/vertex/DepthFunction.h index 40aee1c1e..af1029ffa 100644 --- a/projects/distributions/public/SIREN/distributions/primary/vertex/DepthFunction.h +++ b/projects/distributions/public/SIREN/distributions/primary/vertex/DepthFunction.h @@ -1,6 +1,6 @@ #pragma once -#ifndef LI_DepthFunction_H -#define LI_DepthFunction_H +#ifndef SIREN_DepthFunction_H +#define SIREN_DepthFunction_H #include // for uint32_t #include // for runtime_error @@ -50,4 +50,4 @@ friend cereal::access; CEREAL_CLASS_VERSION(siren::distributions::DepthFunction, 0); -#endif // LI_DepthFunction_H +#endif // SIREN_DepthFunction_H diff --git a/projects/distributions/public/SIREN/distributions/primary/vertex/LeptonDepthFunction.h b/projects/distributions/public/SIREN/distributions/primary/vertex/LeptonDepthFunction.h index e2de1c357..094f30986 100644 --- a/projects/distributions/public/SIREN/distributions/primary/vertex/LeptonDepthFunction.h +++ b/projects/distributions/public/SIREN/distributions/primary/vertex/LeptonDepthFunction.h @@ -1,6 +1,6 @@ #pragma once -#ifndef LI_LeptonDepthFunction_H -#define LI_LeptonDepthFunction_H +#ifndef SIREN_LeptonDepthFunction_H +#define SIREN_LeptonDepthFunction_H #include #include @@ -85,4 +85,4 @@ friend cereal::access; CEREAL_CLASS_VERSION(siren::distributions::LeptonDepthFunction, 0); CEREAL_REGISTER_POLYMORPHIC_RELATION(siren::distributions::DepthFunction, siren::distributions::LeptonDepthFunction); -#endif // LI_LeptonDepthFunction_H +#endif // SIREN_LeptonDepthFunction_H diff --git a/projects/distributions/public/SIREN/distributions/primary/vertex/OrientedCylinderPositionDistribution.h b/projects/distributions/public/SIREN/distributions/primary/vertex/OrientedCylinderPositionDistribution.h index bacdd485f..a91d85790 100644 --- a/projects/distributions/public/SIREN/distributions/primary/vertex/OrientedCylinderPositionDistribution.h +++ b/projects/distributions/public/SIREN/distributions/primary/vertex/OrientedCylinderPositionDistribution.h @@ -1,6 +1,6 @@ #pragma once -#ifndef LI_OrientedPositionDistribution_H -#define LI_OrientedPositionDistribution_H +#ifndef SIREN_OrientedPositionDistribution_H +#define SIREN_OrientedPositionDistribution_H #include #include @@ -21,7 +21,7 @@ namespace siren { namespace dataclasses { class InteractionRecord; } } namespace siren { namespace detector { class DetectorModel; } } namespace siren { namespace distributions { class PrimaryInjectionDistribution; } } namespace siren { namespace distributions { class WeightableDistribution; } } -namespace siren { namespace utilities { class LI_random; } } +namespace siren { namespace utilities { class SIREN_random; } } namespace siren { namespace distributions { @@ -31,10 +31,10 @@ friend cereal::access; private: double radius; - siren::math::Vector3D SampleFromDisk(std::shared_ptr rand, siren::math::Vector3D const & dir) const; + siren::math::Vector3D SampleFromDisk(std::shared_ptr rand, siren::math::Vector3D const & dir) const; virtual std::tuple GetBounds(std::shared_ptr detector_model, std::shared_ptr interactions, siren::dataclasses::PrimaryDistributionRecord & record, siren::math::Vector3D & point_of_closest_approach) const = 0; virtual void SampleWithinBounds(std::shared_ptr detector_model, std::shared_ptr interactions, siren::dataclasses::PrimaryDistributionRecord & record, std::tuple boundaries) const = 0; - virtual std::tuple SamplePosition(std::shared_ptr rand, std::shared_ptr detector_model, std::shared_ptr interactions, siren::dataclasses::PrimaryDistributionRecord & record) const override; + virtual std::tuple SamplePosition(std::shared_ptr rand, std::shared_ptr detector_model, std::shared_ptr interactions, siren::dataclasses::PrimaryDistributionRecord & record) const override; public: virtual double PositionProbability(std::shared_ptr detector_model, std::shared_ptr interactions, siren::dataclasses::InteractionRecord const & record, std::tuple boundaries) const = 0; virtual double GenerationProbability(std::shared_ptr detector_model, std::shared_ptr interactions, siren::dataclasses::InteractionRecord const & record) const override; @@ -70,4 +70,4 @@ CEREAL_CLASS_VERSION(siren::distributions::OrientedCylinderPositionDistribution, CEREAL_REGISTER_TYPE(siren::distributions::OrientedCylinderPositionDistribution); CEREAL_REGISTER_POLYMORPHIC_RELATION(siren::distributions::VertexPositionDistribution, siren::distributions::OrientedCylinderPositionDistribution); -#endif // LI_OrientedPositionDistribution_H +#endif // SIREN_OrientedPositionDistribution_H diff --git a/projects/distributions/public/SIREN/distributions/primary/vertex/PointSourcePositionDistribution.h b/projects/distributions/public/SIREN/distributions/primary/vertex/PointSourcePositionDistribution.h index 9e4f41ed7..d14279ac3 100644 --- a/projects/distributions/public/SIREN/distributions/primary/vertex/PointSourcePositionDistribution.h +++ b/projects/distributions/public/SIREN/distributions/primary/vertex/PointSourcePositionDistribution.h @@ -1,6 +1,6 @@ #pragma once -#ifndef LI_PointSourcePositionDistribution_H -#define LI_PointSourcePositionDistribution_H +#ifndef SIREN_PointSourcePositionDistribution_H +#define SIREN_PointSourcePositionDistribution_H #include #include @@ -24,7 +24,7 @@ namespace siren { namespace dataclasses { class InteractionRecord; } } namespace siren { namespace detector { class DetectorModel; } } namespace siren { namespace distributions { class PrimaryInjectionDistribution; } } namespace siren { namespace distributions { class WeightableDistribution; } } -namespace siren { namespace utilities { class LI_random; } } +namespace siren { namespace utilities { class SIREN_random; } } namespace siren { namespace distributions { @@ -36,9 +36,9 @@ friend cereal::access; double max_distance; std::set target_types; - siren::math::Vector3D SampleFromDisk(std::shared_ptr rand, siren::math::Vector3D const & dir) const; + siren::math::Vector3D SampleFromDisk(std::shared_ptr rand, siren::math::Vector3D const & dir) const; - std::tuple SamplePosition(std::shared_ptr rand, std::shared_ptr detector_model, std::shared_ptr interactions, siren::dataclasses::PrimaryDistributionRecord & record) const override; + std::tuple SamplePosition(std::shared_ptr rand, std::shared_ptr detector_model, std::shared_ptr interactions, siren::dataclasses::PrimaryDistributionRecord & record) const override; public: virtual double GenerationProbability(std::shared_ptr detector_model, std::shared_ptr interactions, siren::dataclasses::InteractionRecord const & record) const override; PointSourcePositionDistribution(); @@ -85,4 +85,4 @@ CEREAL_CLASS_VERSION(siren::distributions::PointSourcePositionDistribution, 0); CEREAL_REGISTER_TYPE(siren::distributions::PointSourcePositionDistribution); CEREAL_REGISTER_POLYMORPHIC_RELATION(siren::distributions::VertexPositionDistribution, siren::distributions::PointSourcePositionDistribution); -#endif // LI_PointSourcePositionDistribution_H +#endif // SIREN_PointSourcePositionDistribution_H diff --git a/projects/distributions/public/SIREN/distributions/primary/vertex/RangeFunction.h b/projects/distributions/public/SIREN/distributions/primary/vertex/RangeFunction.h index b9b841094..02b1e9c92 100644 --- a/projects/distributions/public/SIREN/distributions/primary/vertex/RangeFunction.h +++ b/projects/distributions/public/SIREN/distributions/primary/vertex/RangeFunction.h @@ -1,6 +1,6 @@ #pragma once -#ifndef LI_RangeFunction_H -#define LI_RangeFunction_H +#ifndef SIREN_RangeFunction_H +#define SIREN_RangeFunction_H #include // for uint32_t #include // for runtime_error @@ -50,4 +50,4 @@ friend cereal::access; CEREAL_CLASS_VERSION(siren::distributions::RangeFunction, 0); -#endif // LI_RangeFunction_H +#endif // SIREN_RangeFunction_H diff --git a/projects/distributions/public/SIREN/distributions/primary/vertex/RangePositionDistribution.h b/projects/distributions/public/SIREN/distributions/primary/vertex/RangePositionDistribution.h index 50dc76d61..665d768b4 100644 --- a/projects/distributions/public/SIREN/distributions/primary/vertex/RangePositionDistribution.h +++ b/projects/distributions/public/SIREN/distributions/primary/vertex/RangePositionDistribution.h @@ -1,6 +1,6 @@ #pragma once -#ifndef LI_RangePositionDistribution_H -#define LI_RangePositionDistribution_H +#ifndef SIREN_RangePositionDistribution_H +#define SIREN_RangePositionDistribution_H #include #include @@ -25,7 +25,7 @@ namespace siren { namespace dataclasses { class InteractionRecord; } } namespace siren { namespace detector { class DetectorModel; } } namespace siren { namespace distributions { class PrimaryInjectionDistribution; } } namespace siren { namespace distributions { class WeightableDistribution; } } -namespace siren { namespace utilities { class LI_random; } } +namespace siren { namespace utilities { class SIREN_random; } } namespace siren { namespace distributions { @@ -38,9 +38,9 @@ friend cereal::access; std::shared_ptr range_function; std::set target_types; - siren::math::Vector3D SampleFromDisk(std::shared_ptr rand, siren::math::Vector3D const & dir) const; + siren::math::Vector3D SampleFromDisk(std::shared_ptr rand, siren::math::Vector3D const & dir) const; - std::tuple SamplePosition(std::shared_ptr rand, std::shared_ptr detector_model, std::shared_ptr interactions, siren::dataclasses::PrimaryDistributionRecord & record) const override; + std::tuple SamplePosition(std::shared_ptr rand, std::shared_ptr detector_model, std::shared_ptr interactions, siren::dataclasses::PrimaryDistributionRecord & record) const override; public: virtual double GenerationProbability(std::shared_ptr detector_model, std::shared_ptr interactions, siren::dataclasses::InteractionRecord const & record) const override; RangePositionDistribution(); @@ -90,4 +90,4 @@ CEREAL_CLASS_VERSION(siren::distributions::RangePositionDistribution, 0); CEREAL_REGISTER_TYPE(siren::distributions::RangePositionDistribution); CEREAL_REGISTER_POLYMORPHIC_RELATION(siren::distributions::VertexPositionDistribution, siren::distributions::RangePositionDistribution); -#endif // LI_RangePositionDistribution_H +#endif // SIREN_RangePositionDistribution_H diff --git a/projects/distributions/public/SIREN/distributions/primary/vertex/VertexPositionDistribution.h b/projects/distributions/public/SIREN/distributions/primary/vertex/VertexPositionDistribution.h index 46bcf5f49..643b3b9a4 100644 --- a/projects/distributions/public/SIREN/distributions/primary/vertex/VertexPositionDistribution.h +++ b/projects/distributions/public/SIREN/distributions/primary/vertex/VertexPositionDistribution.h @@ -1,6 +1,6 @@ #pragma once -#ifndef LI_VertexPositionDistribution_H -#define LI_VertexPositionDistribution_H +#ifndef SIREN_VertexPositionDistribution_H +#define SIREN_VertexPositionDistribution_H #include // for tuple #include // for shared_ptr @@ -21,7 +21,7 @@ namespace siren { namespace interactions { class InteractionCollection; } } namespace siren { namespace dataclasses { class InteractionRecord; } } namespace siren { namespace detector { class DetectorModel; } } -namespace siren { namespace utilities { class LI_random; } } +namespace siren { namespace utilities { class SIREN_random; } } namespace siren { namespace distributions { @@ -31,9 +31,9 @@ friend cereal::access; public: virtual ~VertexPositionDistribution() {}; private: - virtual std::tuple SamplePosition(std::shared_ptr rand, std::shared_ptr detector_model, std::shared_ptr interactions, siren::dataclasses::PrimaryDistributionRecord & record) const = 0; + virtual std::tuple SamplePosition(std::shared_ptr rand, std::shared_ptr detector_model, std::shared_ptr interactions, siren::dataclasses::PrimaryDistributionRecord & record) const = 0; public: - virtual void Sample(std::shared_ptr rand, std::shared_ptr detector_model, std::shared_ptr interactions, siren::dataclasses::PrimaryDistributionRecord & record) const override; + virtual void Sample(std::shared_ptr rand, std::shared_ptr detector_model, std::shared_ptr interactions, siren::dataclasses::PrimaryDistributionRecord & record) const override; virtual double GenerationProbability(std::shared_ptr detector_model, std::shared_ptr interactions, siren::dataclasses::InteractionRecord const & record) const override = 0; virtual std::vector DensityVariables() const override; virtual std::string Name() const override = 0; @@ -69,4 +69,4 @@ CEREAL_CLASS_VERSION(siren::distributions::VertexPositionDistribution, 0); CEREAL_REGISTER_TYPE(siren::distributions::VertexPositionDistribution); CEREAL_REGISTER_POLYMORPHIC_RELATION(siren::distributions::PrimaryInjectionDistribution, siren::distributions::VertexPositionDistribution); -#endif // LI_VertexPositionDistribution_H +#endif // SIREN_VertexPositionDistribution_H diff --git a/projects/distributions/public/SIREN/distributions/secondary/vertex/SecondaryBoundedVertexDistribution.h b/projects/distributions/public/SIREN/distributions/secondary/vertex/SecondaryBoundedVertexDistribution.h index 3752e26a2..48511f20f 100644 --- a/projects/distributions/public/SIREN/distributions/secondary/vertex/SecondaryBoundedVertexDistribution.h +++ b/projects/distributions/public/SIREN/distributions/secondary/vertex/SecondaryBoundedVertexDistribution.h @@ -1,6 +1,6 @@ #pragma once -#ifndef LI_SecondaryBoundedVertexDistribution_H -#define LI_SecondaryBoundedVertexDistribution_H +#ifndef SIREN_SecondaryBoundedVertexDistribution_H +#define SIREN_SecondaryBoundedVertexDistribution_H #include #include @@ -26,7 +26,7 @@ namespace siren { namespace detector { class DetectorModel; } } namespace siren { namespace distributions { class SecondaryInjectionDistribution; } } namespace siren { namespace distributions { class WeightableDistribution; } } namespace siren { namespace geometry { class Geometry; } } -namespace siren { namespace utilities { class LI_random; } } +namespace siren { namespace utilities { class SIREN_random; } } namespace siren { namespace distributions { @@ -44,7 +44,7 @@ friend cereal::access; SecondaryBoundedVertexDistribution(std::shared_ptr fiducial_volume); SecondaryBoundedVertexDistribution(std::shared_ptr fiducial_volume, double max_length); - virtual void SampleVertex(std::shared_ptr rand, std::shared_ptr detector_model, std::shared_ptr interactions, siren::dataclasses::SecondaryDistributionRecord & record) const override; + virtual void SampleVertex(std::shared_ptr rand, std::shared_ptr detector_model, std::shared_ptr interactions, siren::dataclasses::SecondaryDistributionRecord & record) const override; virtual double GenerationProbability(std::shared_ptr detector_model, std::shared_ptr interactions, siren::dataclasses::InteractionRecord const & record) const override; std::string Name() const override; @@ -83,4 +83,4 @@ CEREAL_CLASS_VERSION(siren::distributions::SecondaryBoundedVertexDistribution, 0 CEREAL_REGISTER_TYPE(siren::distributions::SecondaryBoundedVertexDistribution); CEREAL_REGISTER_POLYMORPHIC_RELATION(siren::distributions::SecondaryVertexPositionDistribution, siren::distributions::SecondaryBoundedVertexDistribution); -#endif // LI_SecondaryBoundedVertexDistribution_H +#endif // SIREN_SecondaryBoundedVertexDistribution_H diff --git a/projects/distributions/public/SIREN/distributions/secondary/vertex/SecondaryPhysicalVertexDistribution.h b/projects/distributions/public/SIREN/distributions/secondary/vertex/SecondaryPhysicalVertexDistribution.h index 2da22eca5..51376cfb6 100644 --- a/projects/distributions/public/SIREN/distributions/secondary/vertex/SecondaryPhysicalVertexDistribution.h +++ b/projects/distributions/public/SIREN/distributions/secondary/vertex/SecondaryPhysicalVertexDistribution.h @@ -1,6 +1,6 @@ #pragma once -#ifndef LI_SecondaryPhysicalVertexDistribution_H -#define LI_SecondaryPhysicalVertexDistribution_H +#ifndef SIREN_SecondaryPhysicalVertexDistribution_H +#define SIREN_SecondaryPhysicalVertexDistribution_H #include #include @@ -26,7 +26,7 @@ namespace siren { namespace detector { class DetectorModel; } } namespace siren { namespace distributions { class InjectionDistribution; } } namespace siren { namespace distributions { class WeightableDistribution; } } namespace siren { namespace geometry { class Geometry; } } -namespace siren { namespace utilities { class LI_random; } } +namespace siren { namespace utilities { class SIREN_random; } } namespace siren { namespace distributions { @@ -38,7 +38,7 @@ friend cereal::access; SecondaryPhysicalVertexDistribution(); SecondaryPhysicalVertexDistribution(const SecondaryPhysicalVertexDistribution &) = default; - virtual void SampleVertex(std::shared_ptr rand, std::shared_ptr detector_model, std::shared_ptr interactions, siren::dataclasses::SecondaryDistributionRecord & record) const override; + virtual void SampleVertex(std::shared_ptr rand, std::shared_ptr detector_model, std::shared_ptr interactions, siren::dataclasses::SecondaryDistributionRecord & record) const override; virtual double GenerationProbability(std::shared_ptr detector_model, std::shared_ptr interactions, siren::dataclasses::InteractionRecord const & record) const override; std::string Name() const override; @@ -74,4 +74,4 @@ CEREAL_CLASS_VERSION(siren::distributions::SecondaryPhysicalVertexDistribution, CEREAL_REGISTER_TYPE(siren::distributions::SecondaryPhysicalVertexDistribution); CEREAL_REGISTER_POLYMORPHIC_RELATION(siren::distributions::SecondaryVertexPositionDistribution, siren::distributions::SecondaryPhysicalVertexDistribution); -#endif // LI_SecondaryPhysicalVertexDistribution_H +#endif // SIREN_SecondaryPhysicalVertexDistribution_H diff --git a/projects/distributions/public/SIREN/distributions/secondary/vertex/SecondaryVertexPositionDistribution.h b/projects/distributions/public/SIREN/distributions/secondary/vertex/SecondaryVertexPositionDistribution.h index 21ed1eff5..c31b274e2 100644 --- a/projects/distributions/public/SIREN/distributions/secondary/vertex/SecondaryVertexPositionDistribution.h +++ b/projects/distributions/public/SIREN/distributions/secondary/vertex/SecondaryVertexPositionDistribution.h @@ -1,6 +1,6 @@ #pragma once -#ifndef LI_SecondaryVertexPositionDistribution_H -#define LI_SecondaryVertexPositionDistribution_H +#ifndef SIREN_SecondaryVertexPositionDistribution_H +#define SIREN_SecondaryVertexPositionDistribution_H #include #include // for shared_ptr @@ -21,7 +21,7 @@ namespace siren { namespace interactions { class InteractionCollection; } } namespace siren { namespace dataclasses { class InteractionRecord; } } namespace siren { namespace detector { class DetectorModel; } } -namespace siren { namespace utilities { class LI_random; } } +namespace siren { namespace utilities { class SIREN_random; } } namespace siren { namespace distributions { @@ -31,9 +31,9 @@ friend cereal::access; public: virtual ~SecondaryVertexPositionDistribution() {}; public: - virtual void Sample(std::shared_ptr rand, std::shared_ptr detector_model, std::shared_ptr interactions, siren::dataclasses::SecondaryDistributionRecord & record) const override; + virtual void Sample(std::shared_ptr rand, std::shared_ptr detector_model, std::shared_ptr interactions, siren::dataclasses::SecondaryDistributionRecord & record) const override; - virtual void SampleVertex(std::shared_ptr rand, std::shared_ptr detector_model, std::shared_ptr interactions, siren::dataclasses::SecondaryDistributionRecord & record) const = 0; + virtual void SampleVertex(std::shared_ptr rand, std::shared_ptr detector_model, std::shared_ptr interactions, siren::dataclasses::SecondaryDistributionRecord & record) const = 0; virtual double GenerationProbability(std::shared_ptr detector_model, std::shared_ptr interactions, siren::dataclasses::InteractionRecord const & record) const override = 0; virtual std::vector DensityVariables() const override; @@ -72,4 +72,4 @@ CEREAL_CLASS_VERSION(siren::distributions::SecondaryVertexPositionDistribution, CEREAL_REGISTER_TYPE(siren::distributions::SecondaryVertexPositionDistribution); CEREAL_REGISTER_POLYMORPHIC_RELATION(siren::distributions::SecondaryInjectionDistribution, siren::distributions::SecondaryVertexPositionDistribution); -#endif // LI_SecondaryVertexPositionDistribution_H +#endif // SIREN_SecondaryVertexPositionDistribution_H diff --git a/projects/geometry/CMakeLists.txt b/projects/geometry/CMakeLists.txt index 2e61f54ad..fc37d3e00 100644 --- a/projects/geometry/CMakeLists.txt +++ b/projects/geometry/CMakeLists.txt @@ -10,20 +10,20 @@ LIST (APPEND geometry_SOURCES ${PROJECT_SOURCE_DIR}/projects/geometry/private/MeshBuilder.cxx ${PROJECT_SOURCE_DIR}/projects/geometry/private/Placement.cxx ) -add_library(LI_geometry OBJECT ${geometry_SOURCES}) -set_property(TARGET LI_geometry PROPERTY POSITION_INDEPENDENT_CODE ON) -target_include_directories(LI_geometry PUBLIC +add_library(SIREN_geometry OBJECT ${geometry_SOURCES}) +set_property(TARGET SIREN_geometry PROPERTY POSITION_INDEPENDENT_CODE ON) +target_include_directories(SIREN_geometry PUBLIC $ $ ) -target_link_libraries(LI_geometry +target_link_libraries(SIREN_geometry PRIVATE $ PUBLIC photospline - LI_serialization - LI_math + SIREN_serialization + SIREN_math ) install(DIRECTORY "${PROJECT_SOURCE_DIR}/projects/geometry/public/" diff --git a/projects/geometry/public/SIREN/geometry/Box.h b/projects/geometry/public/SIREN/geometry/Box.h index 2f5e86c5e..d9a0f0530 100644 --- a/projects/geometry/public/SIREN/geometry/Box.h +++ b/projects/geometry/public/SIREN/geometry/Box.h @@ -1,6 +1,6 @@ #pragma once -#ifndef LI_Box_H -#define LI_Box_H +#ifndef SIREN_Box_H +#define SIREN_Box_H #include #include @@ -82,4 +82,4 @@ CEREAL_CLASS_VERSION(siren::geometry::Box, 0); CEREAL_REGISTER_TYPE(siren::geometry::Box) CEREAL_REGISTER_POLYMORPHIC_RELATION(siren::geometry::Geometry, siren::geometry::Box); -#endif // LI_Box_H +#endif // SIREN_Box_H diff --git a/projects/geometry/public/SIREN/geometry/Cylinder.h b/projects/geometry/public/SIREN/geometry/Cylinder.h index 209592f66..6e61f15ab 100644 --- a/projects/geometry/public/SIREN/geometry/Cylinder.h +++ b/projects/geometry/public/SIREN/geometry/Cylinder.h @@ -1,6 +1,6 @@ #pragma once -#ifndef LI_Cylinder_H -#define LI_Cylinder_H +#ifndef SIREN_Cylinder_H +#define SIREN_Cylinder_H #include #include @@ -83,4 +83,4 @@ CEREAL_CLASS_VERSION(siren::geometry::Cylinder, 0); CEREAL_REGISTER_TYPE(siren::geometry::Cylinder) CEREAL_REGISTER_POLYMORPHIC_RELATION(siren::geometry::Geometry, siren::geometry::Cylinder); -#endif // LI_Cylinder_H +#endif // SIREN_Cylinder_H diff --git a/projects/geometry/public/SIREN/geometry/ExtrPoly.h b/projects/geometry/public/SIREN/geometry/ExtrPoly.h index 82c7ec15e..3091164b6 100644 --- a/projects/geometry/public/SIREN/geometry/ExtrPoly.h +++ b/projects/geometry/public/SIREN/geometry/ExtrPoly.h @@ -1,6 +1,6 @@ #pragma once -#ifndef LI_ExtrPoly_H -#define LI_ExtrPoly_H +#ifndef SIREN_ExtrPoly_H +#define SIREN_ExtrPoly_H #include #include @@ -141,4 +141,4 @@ CEREAL_CLASS_VERSION(siren::geometry::ExtrPoly, 0); CEREAL_REGISTER_TYPE(siren::geometry::ExtrPoly) CEREAL_REGISTER_POLYMORPHIC_RELATION(siren::geometry::Geometry, siren::geometry::ExtrPoly); -#endif // LI_ExtrPoly_H +#endif // SIREN_ExtrPoly_H diff --git a/projects/geometry/public/SIREN/geometry/Geometry.h b/projects/geometry/public/SIREN/geometry/Geometry.h index 5d5ce4734..7dec7874f 100644 --- a/projects/geometry/public/SIREN/geometry/Geometry.h +++ b/projects/geometry/public/SIREN/geometry/Geometry.h @@ -27,8 +27,8 @@ ******************************************************************************/ #pragma once -#ifndef LI_Geometry_H -#define LI_Geometry_H +#ifndef SIREN_Geometry_H +#define SIREN_Geometry_H #include #include @@ -216,4 +216,4 @@ CEREAL_CLASS_VERSION(siren::geometry::Geometry, 0); CEREAL_CLASS_VERSION(siren::geometry::Geometry::Intersection, 0); CEREAL_CLASS_VERSION(siren::geometry::Geometry::IntersectionList, 0); -#endif // LI_Geometry_H +#endif // SIREN_Geometry_H diff --git a/projects/geometry/public/SIREN/geometry/GeometryMesh.h b/projects/geometry/public/SIREN/geometry/GeometryMesh.h index 8822440d7..fe65f5b80 100644 --- a/projects/geometry/public/SIREN/geometry/GeometryMesh.h +++ b/projects/geometry/public/SIREN/geometry/GeometryMesh.h @@ -1,6 +1,6 @@ #pragma once -#ifndef LI_GeometryMesh_H -#define LI_GeometryMesh_H +#ifndef SIREN_GeometryMesh_H +#define SIREN_GeometryMesh_H #include #include @@ -84,5 +84,5 @@ CEREAL_CLASS_VERSION(siren::geometry::TriangularMesh, 0); CEREAL_REGISTER_TYPE(siren::geometry::TriangularMesh) CEREAL_REGISTER_POLYMORPHIC_RELATION(siren::geometry::Geometry, siren::geometry::TriangularMesh); -#endif // LI_GeometryMesh_H +#endif // SIREN_GeometryMesh_H diff --git a/projects/geometry/public/SIREN/geometry/MeshBuilder.h b/projects/geometry/public/SIREN/geometry/MeshBuilder.h index 899e2a078..273069a06 100644 --- a/projects/geometry/public/SIREN/geometry/MeshBuilder.h +++ b/projects/geometry/public/SIREN/geometry/MeshBuilder.h @@ -1,6 +1,6 @@ #pragma once -#ifndef LI_MeshBuilder_H -#define LI_MeshBuilder_H +#ifndef SIREN_MeshBuilder_H +#define SIREN_MeshBuilder_H #include #include @@ -185,5 +185,5 @@ std::shared_ptr BuildKDTree(std::vector const & triangles_data, d } // namespace geometry } // namespace siren -#endif // LI_MeshBuilder_H +#endif // SIREN_MeshBuilder_H diff --git a/projects/geometry/public/SIREN/geometry/Placement.h b/projects/geometry/public/SIREN/geometry/Placement.h index 4bc67db10..ecaf89b9a 100644 --- a/projects/geometry/public/SIREN/geometry/Placement.h +++ b/projects/geometry/public/SIREN/geometry/Placement.h @@ -1,6 +1,6 @@ #pragma once -#ifndef LI_Placement_H -#define LI_Placement_H +#ifndef SIREN_Placement_H +#define SIREN_Placement_H #include #include @@ -87,5 +87,5 @@ class Placement CEREAL_CLASS_VERSION(siren::geometry::Placement, 0); -#endif // LI_Placement_H +#endif // SIREN_Placement_H diff --git a/projects/geometry/public/SIREN/geometry/Sphere.h b/projects/geometry/public/SIREN/geometry/Sphere.h index 15676f1ab..b97bf9e0a 100644 --- a/projects/geometry/public/SIREN/geometry/Sphere.h +++ b/projects/geometry/public/SIREN/geometry/Sphere.h @@ -1,6 +1,6 @@ #pragma once -#ifndef LI_Sphere_H -#define LI_Sphere_H +#ifndef SIREN_Sphere_H +#define SIREN_Sphere_H #include #include @@ -80,4 +80,4 @@ CEREAL_CLASS_VERSION(siren::geometry::Sphere, 0); CEREAL_REGISTER_TYPE(siren::geometry::Sphere) CEREAL_REGISTER_POLYMORPHIC_RELATION(siren::geometry::Geometry, siren::geometry::Sphere); -#endif // LI_Sphere_H +#endif // SIREN_Sphere_H diff --git a/projects/injection/CMakeLists.txt b/projects/injection/CMakeLists.txt index 297b258a6..69a373945 100644 --- a/projects/injection/CMakeLists.txt +++ b/projects/injection/CMakeLists.txt @@ -11,26 +11,26 @@ LIST (APPEND injection_SOURCES #${PROJECT_SOURCE_DIR}/projects/injection/private/DecayRangeSIREN.cxx #${PROJECT_SOURCE_DIR}/projects/injection/private/RangedSIREN.cxx ) -add_library(LI_injection OBJECT ${injection_SOURCES}) -set_property(TARGET LI_injection PROPERTY POSITION_INDEPENDENT_CODE ON) -target_include_directories(LI_injection PUBLIC +add_library(SIREN_injection OBJECT ${injection_SOURCES}) +set_property(TARGET SIREN_injection PROPERTY POSITION_INDEPENDENT_CODE ON) +target_include_directories(SIREN_injection PUBLIC $ $ ) -target_link_libraries(LI_injection +target_link_libraries(SIREN_injection PRIVATE $ PUBLIC photospline - LI_serialization - LI_utilities - LI_math - LI_dataclasses - LI_geometry - LI_detector - LI_interactions - LI_distributions + SIREN_serialization + SIREN_utilities + SIREN_math + SIREN_dataclasses + SIREN_geometry + SIREN_detector + SIREN_interactions + SIREN_distributions ) install(DIRECTORY "${PROJECT_SOURCE_DIR}/projects/injection/public/" diff --git a/projects/injection/private/ColumnDepthLeptonInjector.cxx b/projects/injection/private/ColumnDepthLeptonInjector.cxx index e6f768de6..972af241b 100644 --- a/projects/injection/private/ColumnDepthLeptonInjector.cxx +++ b/projects/injection/private/ColumnDepthLeptonInjector.cxx @@ -29,7 +29,7 @@ ColumnDepthSIREN::ColumnDepthSIREN( std::shared_ptr detector_model, std::shared_ptr primary_process, std::vector> secondary_processes, - std::shared_ptr random, + std::shared_ptr random, std::shared_ptr depth_func, double disk_radius, double endcap_length) : diff --git a/projects/injection/private/CylinderVolumeLeptonInjector.cxx b/projects/injection/private/CylinderVolumeLeptonInjector.cxx index 3dd0ecd50..d8ca7cde4 100644 --- a/projects/injection/private/CylinderVolumeLeptonInjector.cxx +++ b/projects/injection/private/CylinderVolumeLeptonInjector.cxx @@ -24,7 +24,7 @@ CylinderVolumeSIREN::CylinderVolumeSIREN( std::shared_ptr detector_model, std::shared_ptr primary_process, std::vector> secondary_processes, - std::shared_ptr random, + std::shared_ptr random, siren::geometry::Cylinder cylinder) : Injector(events_to_inject, detector_model, random), position_distribution(std::make_shared(cylinder)) { diff --git a/projects/injection/private/DecayRangeLeptonInjector.cxx b/projects/injection/private/DecayRangeLeptonInjector.cxx index b02a135d0..521a5e544 100644 --- a/projects/injection/private/DecayRangeLeptonInjector.cxx +++ b/projects/injection/private/DecayRangeLeptonInjector.cxx @@ -28,7 +28,7 @@ DecayRangeSIREN::DecayRangeSIREN( std::shared_ptr detector_model, std::shared_ptr primary_process, std::vector> secondary_processes, - std::shared_ptr random, + std::shared_ptr random, std::shared_ptr range_func, double disk_radius, double endcap_length) : diff --git a/projects/injection/private/Injector.cxx b/projects/injection/private/Injector.cxx index d37f8990f..9f589202e 100644 --- a/projects/injection/private/Injector.cxx +++ b/projects/injection/private/Injector.cxx @@ -44,7 +44,7 @@ Injector::Injector() {} Injector::Injector( unsigned int events_to_inject, std::shared_ptr detector_model, - std::shared_ptr random) : + std::shared_ptr random) : events_to_inject(events_to_inject), random(random), detector_model(detector_model) @@ -54,7 +54,7 @@ Injector::Injector( unsigned int events_to_inject, std::shared_ptr detector_model, std::shared_ptr primary_process, - std::shared_ptr random) : + std::shared_ptr random) : events_to_inject(events_to_inject), random(random), detector_model(detector_model) @@ -67,7 +67,7 @@ Injector::Injector( std::shared_ptr detector_model, std::shared_ptr primary_process, std::vector> secondary_processes, - std::shared_ptr random) : + std::shared_ptr random) : events_to_inject(events_to_inject), random(random), detector_model(detector_model) @@ -129,7 +129,7 @@ siren::dataclasses::InteractionRecord Injector::NewRecord() const { return record; } -void Injector::SetRandom(std::shared_ptr random) { +void Injector::SetRandom(std::shared_ptr random) { this->random = random; } diff --git a/projects/injection/private/RangedLeptonInjector.cxx b/projects/injection/private/RangedLeptonInjector.cxx index 38b87baad..057d2a431 100644 --- a/projects/injection/private/RangedLeptonInjector.cxx +++ b/projects/injection/private/RangedLeptonInjector.cxx @@ -28,7 +28,7 @@ RangedSIREN::RangedSIREN( std::shared_ptr detector_model, std::shared_ptr primary_process, std::vector> secondary_processes, - std::shared_ptr random, + std::shared_ptr random, std::shared_ptr range_func, double disk_radius, double endcap_length) : diff --git a/projects/injection/private/pybindings/injection.cxx b/projects/injection/private/pybindings/injection.cxx index 214a63ccd..f685c7862 100644 --- a/projects/injection/private/pybindings/injection.cxx +++ b/projects/injection/private/pybindings/injection.cxx @@ -56,9 +56,9 @@ PYBIND11_MODULE(injection,m) { // Injection class_>(m, "Injector") - .def(init, std::shared_ptr>()) - .def(init, std::shared_ptr, std::shared_ptr>()) - .def(init, std::shared_ptr, std::vector>, std::shared_ptr>()) + .def(init, std::shared_ptr>()) + .def(init, std::shared_ptr, std::shared_ptr>()) + .def(init, std::shared_ptr, std::vector>, std::shared_ptr>()) .def("SetStoppingCondition",&Injector::SetStoppingCondition) .def("SetPrimaryProcess",&Injector::SetPrimaryProcess) .def("AddSecondaryProcess",&Injector::AddSecondaryProcess) @@ -77,21 +77,21 @@ PYBIND11_MODULE(injection,m) { .def("EventsToInject",&Injector::EventsToInject); // class_, Injector>(m, "RangedSIREN") -// .def(init, std::shared_ptr, std::vector>, std::shared_ptr, std::shared_ptr, double, double>()) +// .def(init, std::shared_ptr, std::vector>, std::shared_ptr, std::shared_ptr, double, double>()) // .def("Name",&RangedSIREN::Name); // class_, Injector>(m, "DecayRangeSIREN") -// .def(init, std::shared_ptr, std::vector>, std::shared_ptr, std::shared_ptr, double, double>()) +// .def(init, std::shared_ptr, std::vector>, std::shared_ptr, std::shared_ptr, double, double>()) // .def("Name",&DecayRangeSIREN::Name); // // class_, Injector>(m, "ColumnDepthSIREN") -// .def(init, std::shared_ptr, std::vector>, std::shared_ptr, std::shared_ptr, double, double>()) +// .def(init, std::shared_ptr, std::vector>, std::shared_ptr, std::shared_ptr, double, double>()) // .def("Name",&ColumnDepthSIREN::Name) // .def("PrimaryInjectionBounds",&ColumnDepthSIREN::PrimaryInjectionBounds) // .def("SecondaryInjectionBounds",&ColumnDepthSIREN::SecondaryInjectionBounds); // // class_, Injector>(m, "CylinderVolumeSIREN") -// .def(init, std::shared_ptr, std::vector>, std::shared_ptr, siren::geometry::Cylinder>()) +// .def(init, std::shared_ptr, std::vector>, std::shared_ptr, siren::geometry::Cylinder>()) // .def("Name",&CylinderVolumeSIREN::Name); // Weighter classes diff --git a/projects/injection/private/test/CCM_HNL_TEST.cxx b/projects/injection/private/test/CCM_HNL_TEST.cxx index a51741d5e..247cba0ab 100644 --- a/projects/injection/private/test/CCM_HNL_TEST.cxx +++ b/projects/injection/private/test/CCM_HNL_TEST.cxx @@ -172,7 +172,7 @@ TEST(Injector, Generation) detector_model->LoadDetectorModel(detector_file); // random class instance - std::shared_ptr random = std::make_shared(); + std::shared_ptr random = std::make_shared(); // let's make the process instances // Injection processes diff --git a/projects/injection/private/test/Injector_TEST.cxx b/projects/injection/private/test/Injector_TEST.cxx index b9662a621..b80463d5e 100644 --- a/projects/injection/private/test/Injector_TEST.cxx +++ b/projects/injection/private/test/Injector_TEST.cxx @@ -283,7 +283,7 @@ TEST(Injector, Generation) std::shared_ptr primary_injector = std::make_shared(primary_type, 0); // Setup power law - std::shared_ptr random = std::make_shared(); + std::shared_ptr random = std::make_shared(); std::vector moyal_exp_params = p_ME_FHC_numu; diff --git a/projects/injection/public/SIREN/injection/ColumnDepthLeptonInjector.h b/projects/injection/public/SIREN/injection/ColumnDepthLeptonInjector.h index 8146d31ea..73d541132 100644 --- a/projects/injection/public/SIREN/injection/ColumnDepthLeptonInjector.h +++ b/projects/injection/public/SIREN/injection/ColumnDepthLeptonInjector.h @@ -1,6 +1,6 @@ #pragma once -#ifndef LI_ColumnDepthSIREN_H -#define LI_ColumnDepthSIREN_H +#ifndef SIREN_ColumnDepthSIREN_H +#define SIREN_ColumnDepthSIREN_H #include #include @@ -31,7 +31,7 @@ namespace siren { namespace interactions { class InteractionCollection; } } namespace siren { namespace dataclasses { class InteractionRecord; } } namespace siren { namespace injection { class PrimaryInjectionProcess; } } namespace siren { namespace math { class Vector3D; } } -namespace siren { namespace utilities { class LI_random; } } +namespace siren { namespace utilities { class SIREN_random; } } namespace siren { namespace injection { @@ -46,7 +46,7 @@ friend cereal::access; std::shared_ptr interactions; ColumnDepthSIREN(); public: - ColumnDepthSIREN(unsigned int events_to_inject, std::shared_ptr detector_model, std::shared_ptr primary_process, std::vector> secondary_processes, std::shared_ptr random, std::shared_ptr depth_func, double disk_radius, double endcap_length); + ColumnDepthSIREN(unsigned int events_to_inject, std::shared_ptr detector_model, std::shared_ptr primary_process, std::vector> secondary_processes, std::shared_ptr random, std::shared_ptr depth_func, double disk_radius, double endcap_length); std::string Name() const override; virtual std::tuple PrimaryInjectionBounds(siren::dataclasses::InteractionRecord const & interaction) const override; @@ -84,4 +84,4 @@ CEREAL_CLASS_VERSION(siren::injection::ColumnDepthSIREN, 0); CEREAL_REGISTER_TYPE(siren::injection::ColumnDepthSIREN); CEREAL_REGISTER_POLYMORPHIC_RELATION(siren::injection::Injector, siren::injection::ColumnDepthSIREN); -#endif // LI_ColumnDepthSIREN_H +#endif // SIREN_ColumnDepthSIREN_H diff --git a/projects/injection/public/SIREN/injection/CylinderVolumeLeptonInjector.h b/projects/injection/public/SIREN/injection/CylinderVolumeLeptonInjector.h index c656cd58f..4cb2bd3d5 100644 --- a/projects/injection/public/SIREN/injection/CylinderVolumeLeptonInjector.h +++ b/projects/injection/public/SIREN/injection/CylinderVolumeLeptonInjector.h @@ -1,6 +1,6 @@ #pragma once -#ifndef LI_CylinderVolumeSIREN_H -#define LI_CylinderVolumeSIREN_H +#ifndef SIREN_CylinderVolumeSIREN_H +#define SIREN_CylinderVolumeSIREN_H #include #include @@ -31,7 +31,7 @@ namespace siren { namespace dataclasses { class InteractionRecord; } } namespace siren { namespace injection { class PrimaryInjectionProcess; } } namespace siren { namespace math { class Vector3D; } } // lines 40-40 -namespace siren { namespace utilities { class LI_random; } } // lines 44-44 +namespace siren { namespace utilities { class SIREN_random; } } // lines 44-44 namespace siren { namespace math { @@ -39,7 +39,7 @@ class Vector3D; } namespace utilities { -class LI_random; +class SIREN_random; } namespace injection { @@ -51,7 +51,7 @@ friend cereal::access; std::shared_ptr interactions; CylinderVolumeSIREN(); public: - CylinderVolumeSIREN(unsigned int events_to_inject, std::shared_ptr detector_model, std::shared_ptr primary_process, std::vector> secondary_processes, std::shared_ptr random, siren::geometry::Cylinder cylinder); + CylinderVolumeSIREN(unsigned int events_to_inject, std::shared_ptr detector_model, std::shared_ptr primary_process, std::vector> secondary_processes, std::shared_ptr random, siren::geometry::Cylinder cylinder); std::string Name() const override; virtual std::tuple PrimaryInjectionBounds(siren::dataclasses::InteractionRecord const & interaction) const override; template @@ -83,4 +83,4 @@ CEREAL_CLASS_VERSION(siren::injection::CylinderVolumeSIREN, 0); CEREAL_REGISTER_TYPE(siren::injection::CylinderVolumeSIREN); CEREAL_REGISTER_POLYMORPHIC_RELATION(siren::injection::Injector, siren::injection::CylinderVolumeSIREN); -#endif // LI_CylinderVolumeSIREN_H +#endif // SIREN_CylinderVolumeSIREN_H diff --git a/projects/injection/public/SIREN/injection/DecayRangeLeptonInjector.h b/projects/injection/public/SIREN/injection/DecayRangeLeptonInjector.h index fc723deb0..26a0c5ec4 100644 --- a/projects/injection/public/SIREN/injection/DecayRangeLeptonInjector.h +++ b/projects/injection/public/SIREN/injection/DecayRangeLeptonInjector.h @@ -1,6 +1,6 @@ #pragma once -#ifndef LI_DecayRangeSIREN_H -#define LI_DecayRangeSIREN_H +#ifndef SIREN_DecayRangeSIREN_H +#define SIREN_DecayRangeSIREN_H #include #include @@ -31,7 +31,7 @@ namespace siren { namespace dataclasses { class InteractionRecord; } } namespace siren { namespace injection { class PrimaryInjectionProcess; } } namespace siren { namespace math { class Vector3D; } } -namespace siren { namespace utilities { class LI_random; } } +namespace siren { namespace utilities { class SIREN_random; } } namespace siren { namespace injection { @@ -46,7 +46,7 @@ friend cereal::access; std::shared_ptr interactions; DecayRangeSIREN(); public: - DecayRangeSIREN(unsigned int events_to_inject, std::shared_ptr detector_model, std::shared_ptr primary_process, std::vector> secondary_processes, std::shared_ptr random, std::shared_ptr range_func, double disk_radius, double endcap_length); + DecayRangeSIREN(unsigned int events_to_inject, std::shared_ptr detector_model, std::shared_ptr primary_process, std::vector> secondary_processes, std::shared_ptr random, std::shared_ptr range_func, double disk_radius, double endcap_length); std::string Name() const override; virtual std::tuple PrimaryInjectionBounds(siren::dataclasses::InteractionRecord const & interaction) const override; template @@ -83,4 +83,4 @@ CEREAL_CLASS_VERSION(siren::injection::DecayRangeSIREN, 0); CEREAL_REGISTER_TYPE(siren::injection::DecayRangeSIREN); CEREAL_REGISTER_POLYMORPHIC_RELATION(siren::injection::Injector, siren::injection::DecayRangeSIREN); -#endif // LI_DecayRangeSIREN_H +#endif // SIREN_DecayRangeSIREN_H diff --git a/projects/injection/public/SIREN/injection/Injector.h b/projects/injection/public/SIREN/injection/Injector.h index ce0dc884f..9b1fc50f3 100644 --- a/projects/injection/public/SIREN/injection/Injector.h +++ b/projects/injection/public/SIREN/injection/Injector.h @@ -1,6 +1,6 @@ #pragma once -#ifndef LI_SIREN_H -#define LI_SIREN_H +#ifndef SIREN_SIREN_H +#define SIREN_SIREN_H #include // for map #include // for set @@ -40,7 +40,7 @@ namespace siren { namespace geometry { class Geometry; } } namespace siren { namespace injection { class PrimaryInjectionProcess; } } namespace siren { namespace injection { class SecondaryInjectionProcess; } } namespace siren { namespace math { class Vector3D; } } -namespace siren { namespace utilities { class LI_random; } } +namespace siren { namespace utilities { class SIREN_random; } } namespace siren { namespace injection { @@ -52,7 +52,7 @@ friend cereal::access; protected: unsigned int events_to_inject = 0; unsigned int injected_events = 0; - std::shared_ptr random; + std::shared_ptr random; std::shared_ptr detector_model; // This funciton returns true if the given datum is the last entry to be saved in a tree std::function, size_t)> stopping_condition; @@ -66,9 +66,9 @@ friend cereal::access; std::map> secondary_position_distribution_map; public: // Constructors - Injector(unsigned int events_to_inject, std::shared_ptr detector_model, std::shared_ptr random); - Injector(unsigned int events_to_inject, std::shared_ptr detector_model, std::shared_ptr primary_process, std::shared_ptr random); - Injector(unsigned int events_to_inject, std::shared_ptr detector_model, std::shared_ptr primary_process, std::vector> secondary_processes, std::shared_ptr random); + Injector(unsigned int events_to_inject, std::shared_ptr detector_model, std::shared_ptr random); + Injector(unsigned int events_to_inject, std::shared_ptr detector_model, std::shared_ptr primary_process, std::shared_ptr random); + Injector(unsigned int events_to_inject, std::shared_ptr detector_model, std::shared_ptr primary_process, std::vector> secondary_processes, std::shared_ptr random); void SetStoppingCondition(std::function, size_t)> f_in) {stopping_condition = f_in;} std::shared_ptr FindPrimaryVertexDistribution(std::shared_ptr process); @@ -79,7 +79,7 @@ friend cereal::access; std::map> GetSecondaryProcessMap() {return secondary_process_map;} void AddSecondaryProcess(std::shared_ptr secondary); virtual siren::dataclasses::InteractionRecord NewRecord() const; // set primary type from primary process; - void SetRandom(std::shared_ptr random); + void SetRandom(std::shared_ptr random); virtual void SampleCrossSection(siren::dataclasses::InteractionRecord & record) const; virtual void SampleCrossSection(siren::dataclasses::InteractionRecord & record, std::shared_ptr interactions) const; @@ -135,5 +135,5 @@ friend cereal::access; CEREAL_CLASS_VERSION(siren::injection::Injector, 0); -#endif // LI_SIREN_H +#endif // SIREN_SIREN_H diff --git a/projects/injection/public/SIREN/injection/Process.h b/projects/injection/public/SIREN/injection/Process.h index aeaedac66..e0a4254e0 100644 --- a/projects/injection/public/SIREN/injection/Process.h +++ b/projects/injection/public/SIREN/injection/Process.h @@ -1,6 +1,6 @@ #pragma once -#ifndef LI_Process_H -#define LI_Process_H +#ifndef SIREN_Process_H +#define SIREN_Process_H #include // for shared_ptr #include // for vector @@ -136,4 +136,4 @@ class SecondaryInjectionProcess : public PhysicalProcess { CEREAL_CLASS_VERSION(siren::injection::Process, 0); -#endif // LI_Process_H +#endif // SIREN_Process_H diff --git a/projects/injection/public/SIREN/injection/RangedLeptonInjector.h b/projects/injection/public/SIREN/injection/RangedLeptonInjector.h index 059b4022f..581aa91ae 100644 --- a/projects/injection/public/SIREN/injection/RangedLeptonInjector.h +++ b/projects/injection/public/SIREN/injection/RangedLeptonInjector.h @@ -1,6 +1,6 @@ #pragma once -#ifndef LI_RangedSIREN_H -#define LI_RangedSIREN_H +#ifndef SIREN_RangedSIREN_H +#define SIREN_RangedSIREN_H #include #include @@ -29,7 +29,7 @@ namespace siren { namespace dataclasses { class InteractionRecord; } } namespace siren { namespace injection { class PrimaryInjectionProcess; } } namespace siren { namespace math { class Vector3D; } } -namespace siren { namespace utilities { class LI_random; } } +namespace siren { namespace utilities { class SIREN_random; } } namespace siren { namespace injection { @@ -44,7 +44,7 @@ friend cereal::access; std::shared_ptr interactions; RangedSIREN(); public: - RangedSIREN(unsigned int events_to_inject, std::shared_ptr detector_model, std::shared_ptr primary_process, std::vector> secondary_processes, std::shared_ptr random, std::shared_ptr range_func, double disk_radius, double endcap_length); + RangedSIREN(unsigned int events_to_inject, std::shared_ptr detector_model, std::shared_ptr primary_process, std::vector> secondary_processes, std::shared_ptr random, std::shared_ptr range_func, double disk_radius, double endcap_length); std::string Name() const override; virtual std::tuple PrimaryInjectionBounds(siren::dataclasses::InteractionRecord const & interaction) const override; @@ -82,4 +82,4 @@ CEREAL_CLASS_VERSION(siren::injection::RangedSIREN, 0); CEREAL_REGISTER_TYPE(siren::injection::RangedSIREN); CEREAL_REGISTER_POLYMORPHIC_RELATION(siren::injection::Injector, siren::injection::RangedSIREN); -#endif // LI_RangedSIREN_H +#endif // SIREN_RangedSIREN_H diff --git a/projects/injection/public/SIREN/injection/TreeWeighter.h b/projects/injection/public/SIREN/injection/TreeWeighter.h index d7c2a0001..14e714b94 100644 --- a/projects/injection/public/SIREN/injection/TreeWeighter.h +++ b/projects/injection/public/SIREN/injection/TreeWeighter.h @@ -1,6 +1,6 @@ #pragma once -#ifndef LI_TreeWeighter_H -#define LI_TreeWeighter_H +#ifndef SIREN_TreeWeighter_H +#define SIREN_TreeWeighter_H #include // for map #include @@ -93,4 +93,4 @@ class LeptonTreeWeighter { CEREAL_CLASS_VERSION(siren::injection::LeptonTreeWeighter, 0); -#endif // LI_TreeWeighter_H +#endif // SIREN_TreeWeighter_H diff --git a/projects/injection/public/SIREN/injection/TreeWeighter.tcc b/projects/injection/public/SIREN/injection/TreeWeighter.tcc index 2064eda33..88360e58c 100644 --- a/projects/injection/public/SIREN/injection/TreeWeighter.tcc +++ b/projects/injection/public/SIREN/injection/TreeWeighter.tcc @@ -1,6 +1,6 @@ #pragma once -#ifndef LI_TreeWeighter_TCC -#define LI_TreeWeighter_TCC +#ifndef SIREN_TreeWeighter_TCC +#define SIREN_TreeWeighter_TCC #include "SIREN/injection/TreeWeighter.h" #include // for ite... @@ -258,4 +258,4 @@ std::vector // for tuple #include // for shared_ptr @@ -66,5 +66,5 @@ class LeptonWeighter { CEREAL_CLASS_VERSION(siren::injection::LeptonWeighter, 0); -#endif // LI_Weighter_H +#endif // SIREN_Weighter_H diff --git a/projects/injection/public/SIREN/injection/WeightingUtils.h b/projects/injection/public/SIREN/injection/WeightingUtils.h index ca79362ce..948351a62 100644 --- a/projects/injection/public/SIREN/injection/WeightingUtils.h +++ b/projects/injection/public/SIREN/injection/WeightingUtils.h @@ -1,6 +1,6 @@ #pragma once -#ifndef LI_WeightingUtils_H -#define LI_WeightingUtils_H +#ifndef SIREN_WeightingUtils_H +#define SIREN_WeightingUtils_H #include // for shared_ptr @@ -16,4 +16,4 @@ double CrossSectionProbability(std::shared_ptr $ ) -target_link_libraries(LI_interactions +target_link_libraries(SIREN_interactions PRIVATE $ pybind11::embed PUBLIC photospline - LI_serialization - LI_utilities - LI_math - LI_dataclasses - LI_detector + SIREN_serialization + SIREN_utilities + SIREN_math + SIREN_dataclasses + SIREN_detector ) install(DIRECTORY "${PROJECT_SOURCE_DIR}/projects/interactions/public/" diff --git a/projects/interactions/private/CrossSection.cxx b/projects/interactions/private/CrossSection.cxx index e06ce36e7..5f8fd83b1 100644 --- a/projects/interactions/private/CrossSection.cxx +++ b/projects/interactions/private/CrossSection.cxx @@ -6,7 +6,7 @@ namespace interactions { CrossSection::CrossSection() {} -void CrossSection::SampleFinalState(dataclasses::InteractionRecord & record, std::shared_ptr rand) const { +void CrossSection::SampleFinalState(dataclasses::InteractionRecord & record, std::shared_ptr rand) const { siren::dataclasses::CrossSectionDistributionRecord csdr(record); this->SampleFinalState(csdr, rand); csdr.Finalize(record); diff --git a/projects/interactions/private/DISFromSpline.cxx b/projects/interactions/private/DISFromSpline.cxx index f9883f129..1518a54bc 100644 --- a/projects/interactions/private/DISFromSpline.cxx +++ b/projects/interactions/private/DISFromSpline.cxx @@ -20,7 +20,7 @@ #include "SIREN/interactions/CrossSection.h" // for CrossSection #include "SIREN/dataclasses/InteractionRecord.h" // for Interactio... #include "SIREN/dataclasses/Particle.h" // for Particle -#include "SIREN/utilities/Random.h" // for LI_random +#include "SIREN/utilities/Random.h" // for SIREN_random #include "SIREN/utilities/Constants.h" // for electronMass namespace siren { @@ -367,7 +367,7 @@ double DISFromSpline::InteractionThreshold(dataclasses::InteractionRecord const return 0; } -void DISFromSpline::SampleFinalState(dataclasses::CrossSectionDistributionRecord & record, std::shared_ptr random) const { +void DISFromSpline::SampleFinalState(dataclasses::CrossSectionDistributionRecord & record, std::shared_ptr random) const { // Uses Metropolis-Hastings Algorithm! // useful for cases where we don't know the supremum of our distribution, and the distribution is multi-dimensional if (differential_cross_section_.get_ndim() != 3) { diff --git a/projects/interactions/private/DarkNewsCrossSection.cxx b/projects/interactions/private/DarkNewsCrossSection.cxx index 27ed63d79..0af088563 100644 --- a/projects/interactions/private/DarkNewsCrossSection.cxx +++ b/projects/interactions/private/DarkNewsCrossSection.cxx @@ -13,7 +13,7 @@ #include "SIREN/dataclasses/InteractionRecord.h" // for Interac... #include "SIREN/dataclasses/InteractionSignature.h" // for Interac... #include "SIREN/dataclasses/Particle.h" // for Particle -#include "SIREN/utilities/Random.h" // for LI_random +#include "SIREN/utilities/Random.h" // for SIREN_random #include "SIREN/utilities/Errors.h" // for PythonImplementationError namespace siren { @@ -124,7 +124,7 @@ std::vector DarkNewsCrossSection::SecondaryHelicities(dataclasses::Inter return std::vector(); } -void DarkNewsCrossSection::SampleFinalState(dataclasses::CrossSectionDistributionRecord & record, std::shared_ptr random) const { +void DarkNewsCrossSection::SampleFinalState(dataclasses::CrossSectionDistributionRecord & record, std::shared_ptr random) const { // Set our upscattering masses and helicities using values from DarkNews record.SetTargetMass(TargetMass(record.target_type)); std::vector secondary_masses = SecondaryMasses(record.signature.secondary_types); diff --git a/projects/interactions/private/DarkNewsDecay.cxx b/projects/interactions/private/DarkNewsDecay.cxx index c56beaafb..6e1c50b24 100644 --- a/projects/interactions/private/DarkNewsDecay.cxx +++ b/projects/interactions/private/DarkNewsDecay.cxx @@ -13,7 +13,7 @@ #include "SIREN/dataclasses/InteractionRecord.h" // for Interac... #include "SIREN/dataclasses/InteractionSignature.h" // for Interac... #include "SIREN/dataclasses/Particle.h" // for Particle -#include "SIREN/utilities/Random.h" // for LI_random +#include "SIREN/utilities/Random.h" // for SIREN_random #include "SIREN/utilities/Errors.h" // for PythonImplementationError @@ -68,13 +68,13 @@ double DarkNewsDecay::FinalStateProbability(dataclasses::InteractionRecord const else return dd/td; } -void DarkNewsDecay::SampleRecordFromDarkNews(dataclasses::CrossSectionDistributionRecord & interaction, std::shared_ptr random) const { +void DarkNewsDecay::SampleRecordFromDarkNews(dataclasses::CrossSectionDistributionRecord & interaction, std::shared_ptr random) const { // Should be implemented on the python side // Not pure virtual in order to allow SampleFinalState to call throw(siren::utilities::PythonImplementationError("DarkNewsDecay::SampleRecordFromDarkNews should be implemented in Python!")); } -void DarkNewsDecay::SampleFinalState(dataclasses::CrossSectionDistributionRecord & interaction, std::shared_ptr random) const { +void DarkNewsDecay::SampleFinalState(dataclasses::CrossSectionDistributionRecord & interaction, std::shared_ptr random) const { SampleRecordFromDarkNews(interaction, random); } diff --git a/projects/interactions/private/DipoleFromTable.cxx b/projects/interactions/private/DipoleFromTable.cxx index 3289d92c8..1004927b5 100644 --- a/projects/interactions/private/DipoleFromTable.cxx +++ b/projects/interactions/private/DipoleFromTable.cxx @@ -30,7 +30,7 @@ #include "SIREN/utilities/Constants.h" // for invGeVs... #include "SIREN/utilities/Errors.h" // for Injecti... #include "SIREN/utilities/Interpolator.h" // for Interpo... -#include "SIREN/utilities/Random.h" // for LI_random +#include "SIREN/utilities/Random.h" // for SIREN_random namespace siren { namespace interactions { @@ -243,7 +243,7 @@ double DipoleFromTable::InteractionThreshold(dataclasses::InteractionRecord cons return hnl_mass + (hnl_mass*hnl_mass)/(2*interaction.target_mass); } -void DipoleFromTable::SampleFinalState(dataclasses::CrossSectionDistributionRecord & record, std::shared_ptr random) const { +void DipoleFromTable::SampleFinalState(dataclasses::CrossSectionDistributionRecord & record, std::shared_ptr random) const { siren::utilities::Interpolator2D const & diff_table = differential.at(record.GetTargetType()); siren::utilities::Interpolator2D const & diff_table_proton = differential.at(siren::dataclasses::ParticleType::HNucleus); int nprotons = siren::detector::MaterialModel::GetProtonCount(record.GetTargetType()); diff --git a/projects/interactions/private/DummyCrossSection.cxx b/projects/interactions/private/DummyCrossSection.cxx index 99d498cce..c4155034f 100644 --- a/projects/interactions/private/DummyCrossSection.cxx +++ b/projects/interactions/private/DummyCrossSection.cxx @@ -13,7 +13,7 @@ #include "SIREN/dataclasses/InteractionRecord.h" // for Interac... #include "SIREN/dataclasses/InteractionSignature.h" // for Interac... #include "SIREN/dataclasses/Particle.h" // for Particle -#include "SIREN/utilities/Random.h" // for LI_random +#include "SIREN/utilities/Random.h" // for SIREN_random namespace siren { namespace interactions { @@ -59,7 +59,7 @@ double DummyCrossSection::InteractionThreshold(dataclasses::InteractionRecord co return 0; } -void DummyCrossSection::SampleFinalState(dataclasses::CrossSectionDistributionRecord & record, std::shared_ptr random) const { +void DummyCrossSection::SampleFinalState(dataclasses::CrossSectionDistributionRecord & record, std::shared_ptr random) const { rk::P4 p1(geom3::Vector3(record.primary_momentum[1], record.primary_momentum[2], record.primary_momentum[3]), record.primary_mass); rk::P4 p2(geom3::Vector3(0, 0, 0), record.target_mass); diff --git a/projects/interactions/private/ElasticScattering.cxx b/projects/interactions/private/ElasticScattering.cxx index 35b2d2c35..6e136e4b3 100644 --- a/projects/interactions/private/ElasticScattering.cxx +++ b/projects/interactions/private/ElasticScattering.cxx @@ -20,7 +20,7 @@ #include "SIREN/dataclasses/Particle.h" // for Particle #include "SIREN/utilities/Constants.h" // for electro... #include "SIREN/utilities/Integration.h" // for romberg... -#include "SIREN/utilities/Random.h" // for LI_random +#include "SIREN/utilities/Random.h" // for SIREN_random namespace siren { namespace interactions { @@ -113,7 +113,7 @@ double ElasticScattering::TotalCrossSection(siren::dataclasses::ParticleType pri return siren::utilities::rombergIntegrate(integrand, 0, ymax); } -void ElasticScattering::SampleFinalState(dataclasses::CrossSectionDistributionRecord & record, std::shared_ptr random) const { +void ElasticScattering::SampleFinalState(dataclasses::CrossSectionDistributionRecord & record, std::shared_ptr random) const { // Uses Metropolis-Hastings Algorithm! // useful for cases where we don't know the supremum of our distribution, and the distribution is multi-dimensional diff --git a/projects/interactions/private/HNLDecay.cxx b/projects/interactions/private/HNLDecay.cxx index f143b2925..e7529477d 100644 --- a/projects/interactions/private/HNLDecay.cxx +++ b/projects/interactions/private/HNLDecay.cxx @@ -301,7 +301,7 @@ double HNLDecay::DifferentialDecayWidth(dataclasses::InteractionRecord const & r return DecayWidth/2. * (1 + alpha*CosThetaGamma); } -void HNLDecay::SampleFinalState(dataclasses::InteractionRecord & record, std::shared_ptr random) const { +void HNLDecay::SampleFinalState(dataclasses::InteractionRecord & record, std::shared_ptr random) const { unsigned int gamma_index = (record.signature.secondary_types[0] == siren::dataclasses::ParticleType::Gamma) ? 0 : 1; unsigned int nu_index = 1 - gamma_index; diff --git a/projects/interactions/private/HNLFromSpline.cxx b/projects/interactions/private/HNLFromSpline.cxx index ac9624d23..1465220de 100644 --- a/projects/interactions/private/HNLFromSpline.cxx +++ b/projects/interactions/private/HNLFromSpline.cxx @@ -23,7 +23,7 @@ #include "SIREN/interactions/CrossSection.h" // for CrossSection #include "SIREN/dataclasses/InteractionRecord.h" // for Interactio... #include "SIREN/dataclasses/Particle.h" // for Particle -#include "SIREN/utilities/Random.h" // for LI_random +#include "SIREN/utilities/Random.h" // for SIREN_random #include "SIREN/utilities/Constants.h" // for electronMass namespace siren { @@ -366,7 +366,7 @@ double HNLFromSpline::InteractionThreshold(dataclasses::InteractionRecord const return 0; } -void HNLFromSpline::SampleFinalState(dataclasses::CrossSectionDistributionRecord & record, std::shared_ptr random) const { +void HNLFromSpline::SampleFinalState(dataclasses::CrossSectionDistributionRecord & record, std::shared_ptr random) const { // Uses Metropolis-Hastings Algorithm! // useful for cases where we don't know the supremum of our distribution, and the distribution is multi-dimensional if (differential_cross_section_.get_ndim() != 3) { diff --git a/projects/interactions/private/NeutrissimoDecay.cxx b/projects/interactions/private/NeutrissimoDecay.cxx index a3f7e6680..3c4f445fb 100644 --- a/projects/interactions/private/NeutrissimoDecay.cxx +++ b/projects/interactions/private/NeutrissimoDecay.cxx @@ -14,7 +14,7 @@ #include "SIREN/dataclasses/Particle.h" // for Particle #include "SIREN/math/Vector3D.h" // for Vector3D #include "SIREN/utilities/Constants.h" // for GeV, pi -#include "SIREN/utilities/Random.h" // for LI_random +#include "SIREN/utilities/Random.h" // for SIREN_random namespace siren { namespace interactions { @@ -132,7 +132,7 @@ double NeutrissimoDecay::DifferentialDecayWidth(dataclasses::InteractionRecord c return DecayWidth/2. * (1 + alpha*CosThetaGamma); } -void NeutrissimoDecay::SampleFinalState(dataclasses::CrossSectionDistributionRecord & record, std::shared_ptr random) const { +void NeutrissimoDecay::SampleFinalState(dataclasses::CrossSectionDistributionRecord & record, std::shared_ptr random) const { siren::dataclasses::InteractionSignature const & signature = record.GetSignature(); diff --git a/projects/interactions/private/pybindings/CrossSection.h b/projects/interactions/private/pybindings/CrossSection.h index 05962907e..13be468d0 100644 --- a/projects/interactions/private/pybindings/CrossSection.h +++ b/projects/interactions/private/pybindings/CrossSection.h @@ -66,7 +66,7 @@ class PyCrossSection : public siren::interactions::CrossSection { ); } - void SampleFinalState(siren::dataclasses::CrossSectionDistributionRecord & record, std::shared_ptr rand) const override { + void SampleFinalState(siren::dataclasses::CrossSectionDistributionRecord & record, std::shared_ptr rand) const override { PYBIND11_OVERRIDE_PURE( void, CrossSection, @@ -150,7 +150,7 @@ void register_CrossSection(pybind11::module_ & m) { .def("TotalCrossSection", (double (CrossSection::*)(siren::dataclasses::ParticleType, double, siren::dataclasses::ParticleType) const)(&CrossSection::TotalCrossSection)) .def("DifferentialCrossSection", &CrossSection::DifferentialCrossSection) .def("InteractionThreshold", &CrossSection::InteractionThreshold) - .def("SampleFinalState", (void (CrossSection::*)(siren::dataclasses::CrossSectionDistributionRecord &, std::shared_ptr) const)(&CrossSection::SampleFinalState)) + .def("SampleFinalState", (void (CrossSection::*)(siren::dataclasses::CrossSectionDistributionRecord &, std::shared_ptr) const)(&CrossSection::SampleFinalState)) .def("GetPossibleTargets", &CrossSection::GetPossibleTargets) .def("GetPossibleTargetsFromPrimary", &CrossSection::GetPossibleTargetsFromPrimary) .def("GetPossiblePrimaries", &CrossSection::GetPossiblePrimaries) diff --git a/projects/interactions/private/pybindings/DarkNewsCrossSection.h b/projects/interactions/private/pybindings/DarkNewsCrossSection.h index 441687f33..0af03d4e1 100644 --- a/projects/interactions/private/pybindings/DarkNewsCrossSection.h +++ b/projects/interactions/private/pybindings/DarkNewsCrossSection.h @@ -69,7 +69,7 @@ class pyCrossSection : public CrossSection { ) } - void SampleFinalState(dataclasses::CrossSectionDistributionRecord & record, std::shared_ptr random) const override { + void SampleFinalState(dataclasses::CrossSectionDistributionRecord & record, std::shared_ptr random) const override { SELF_OVERRIDE_PURE( self, CrossSection, @@ -287,7 +287,7 @@ class pyDarkNewsCrossSection : public DarkNewsCrossSection { ) } - void SampleFinalState(dataclasses::CrossSectionDistributionRecord & record, std::shared_ptr random) const override { + void SampleFinalState(dataclasses::CrossSectionDistributionRecord & record, std::shared_ptr random) const override { SELF_OVERRIDE( self, DarkNewsCrossSection, diff --git a/projects/interactions/private/pybindings/DarkNewsDecay.h b/projects/interactions/private/pybindings/DarkNewsDecay.h index 3d1eb5843..c858b39b8 100644 --- a/projects/interactions/private/pybindings/DarkNewsDecay.h +++ b/projects/interactions/private/pybindings/DarkNewsDecay.h @@ -90,7 +90,7 @@ class pyDecay : public Decay { ) } - void SampleFinalState(dataclasses::CrossSectionDistributionRecord & record, std::shared_ptr random) const override { + void SampleFinalState(dataclasses::CrossSectionDistributionRecord & record, std::shared_ptr random) const override { SELF_OVERRIDE_PURE( self, Decay, @@ -199,7 +199,7 @@ class pyDarkNewsDecay : public DarkNewsDecay { ) } - void SampleRecordFromDarkNews(dataclasses::CrossSectionDistributionRecord & record, std::shared_ptr random) const override { + void SampleRecordFromDarkNews(dataclasses::CrossSectionDistributionRecord & record, std::shared_ptr random) const override { SELF_OVERRIDE( self, DarkNewsDecay, @@ -211,7 +211,7 @@ class pyDarkNewsDecay : public DarkNewsDecay { ) } - void SampleFinalState(dataclasses::CrossSectionDistributionRecord & record, std::shared_ptr random) const override { + void SampleFinalState(dataclasses::CrossSectionDistributionRecord & record, std::shared_ptr random) const override { SELF_OVERRIDE( self, DarkNewsDecay, diff --git a/projects/interactions/private/test/DISFromSpline_TEST.cxx b/projects/interactions/private/test/DISFromSpline_TEST.cxx index 96e0802bb..1a6cf3b73 100644 --- a/projects/interactions/private/test/DISFromSpline_TEST.cxx +++ b/projects/interactions/private/test/DISFromSpline_TEST.cxx @@ -41,7 +41,7 @@ TEST(DISFromSpline, Constructor) double target_mass = dis_xs->GetTargetMass(); event.target_mass = target_mass; - std::shared_ptr rand = std::make_shared(); + std::shared_ptr rand = std::make_shared(); double z = rand->Uniform(-1.0, 1.0); double rho = sqrt(1.0 - z*z); diff --git a/projects/interactions/private/test/DipoleFromTable_TEST.cxx b/projects/interactions/private/test/DipoleFromTable_TEST.cxx index b3d49bab6..fbb9d1791 100644 --- a/projects/interactions/private/test/DipoleFromTable_TEST.cxx +++ b/projects/interactions/private/test/DipoleFromTable_TEST.cxx @@ -55,7 +55,7 @@ TEST(DipoleFromTable, Constructor) event.target_mass = target_mass; event.target_mass = target_mass; - std::shared_ptr rand = std::make_shared(); + std::shared_ptr rand = std::make_shared(); double z = rand->Uniform(-1.0, 1.0); double rho = sqrt(1.0 - z*z); diff --git a/projects/interactions/private/test/ElasticScattering_TEST.cxx b/projects/interactions/private/test/ElasticScattering_TEST.cxx index f8415f900..debc9b439 100644 --- a/projects/interactions/private/test/ElasticScattering_TEST.cxx +++ b/projects/interactions/private/test/ElasticScattering_TEST.cxx @@ -92,7 +92,7 @@ TEST(ElasticScattering, Generation) std::shared_ptr primary_injector = std::make_shared(primary_type, 0); // Setup power law - std::shared_ptr random = std::make_shared(); + std::shared_ptr random = std::make_shared(); // Setup tabulated flux std::shared_ptr tab_pdf = std::make_shared(flux_file, true); diff --git a/projects/interactions/public/SIREN/interactions/CrossSection.h b/projects/interactions/public/SIREN/interactions/CrossSection.h index e579e2e29..2e6c64493 100644 --- a/projects/interactions/public/SIREN/interactions/CrossSection.h +++ b/projects/interactions/public/SIREN/interactions/CrossSection.h @@ -1,6 +1,6 @@ #pragma once -#ifndef LI_CrossSection_H -#define LI_CrossSection_H +#ifndef SIREN_CrossSection_H +#define SIREN_CrossSection_H #include // for shared_ptr #include // for string @@ -19,7 +19,7 @@ namespace siren { namespace dataclasses { class InteractionRecord; } } namespace siren { namespace dataclasses { class CrossSectionDistributionRecord; } } namespace siren { namespace dataclasses { struct InteractionSignature; } } -namespace siren { namespace utilities { class LI_random; } } +namespace siren { namespace utilities { class SIREN_random; } } namespace siren { namespace interactions { @@ -27,7 +27,7 @@ namespace interactions { class CrossSection { friend cereal::access; private: - void SampleFinalState(dataclasses::InteractionRecord &, std::shared_ptr) const; + void SampleFinalState(dataclasses::InteractionRecord &, std::shared_ptr) const; public: CrossSection(); virtual ~CrossSection() {}; @@ -37,7 +37,7 @@ friend cereal::access; virtual double TotalCrossSectionAllFinalStates(dataclasses::InteractionRecord const &) const; virtual double DifferentialCrossSection(dataclasses::InteractionRecord const &) const = 0; virtual double InteractionThreshold(dataclasses::InteractionRecord const &) const = 0; - virtual void SampleFinalState(dataclasses::CrossSectionDistributionRecord &, std::shared_ptr) const = 0; + virtual void SampleFinalState(dataclasses::CrossSectionDistributionRecord &, std::shared_ptr) const = 0; virtual std::vector GetPossibleTargets() const = 0; virtual std::vector GetPossibleTargetsFromPrimary(siren::dataclasses::ParticleType primary_type) const = 0; @@ -58,5 +58,5 @@ friend cereal::access; CEREAL_CLASS_VERSION(siren::interactions::CrossSection, 0); -#endif // LI_CrossSection_H +#endif // SIREN_CrossSection_H diff --git a/projects/interactions/public/SIREN/interactions/DISFromSpline.h b/projects/interactions/public/SIREN/interactions/DISFromSpline.h index 7fdba78e7..8ef0a2531 100644 --- a/projects/interactions/public/SIREN/interactions/DISFromSpline.h +++ b/projects/interactions/public/SIREN/interactions/DISFromSpline.h @@ -1,6 +1,6 @@ #pragma once -#ifndef LI_DISFromSpline_H -#define LI_DISFromSpline_H +#ifndef SIREN_DISFromSpline_H +#define SIREN_DISFromSpline_H #include // for set #include // for map @@ -29,7 +29,7 @@ #include "SIREN/dataclasses/Particle.h" // for Particle namespace siren { namespace dataclasses { class InteractionRecord; } } -namespace siren { namespace utilities { class LI_random; } } +namespace siren { namespace utilities { class SIREN_random; } } namespace siren { namespace interactions { @@ -70,7 +70,7 @@ friend cereal::access; double DifferentialCrossSection(dataclasses::InteractionRecord const &) const override; double DifferentialCrossSection(double energy, double x, double y, double secondary_lepton_mass, double Q2=std::numeric_limits::quiet_NaN()) const; double InteractionThreshold(dataclasses::InteractionRecord const &) const override; - void SampleFinalState(dataclasses::CrossSectionDistributionRecord &, std::shared_ptr random) const override; + void SampleFinalState(dataclasses::CrossSectionDistributionRecord &, std::shared_ptr random) const override; std::vector GetPossibleTargets() const override; std::vector GetPossibleTargetsFromPrimary(siren::dataclasses::ParticleType primary_type) const override; @@ -157,4 +157,4 @@ CEREAL_CLASS_VERSION(siren::interactions::DISFromSpline, 0); CEREAL_REGISTER_TYPE(siren::interactions::DISFromSpline); CEREAL_REGISTER_POLYMORPHIC_RELATION(siren::interactions::CrossSection, siren::interactions::DISFromSpline); -#endif // LI_DISFromSpline_H +#endif // SIREN_DISFromSpline_H diff --git a/projects/interactions/public/SIREN/interactions/DarkNewsCrossSection.h b/projects/interactions/public/SIREN/interactions/DarkNewsCrossSection.h index bff9bc021..135619dec 100644 --- a/projects/interactions/public/SIREN/interactions/DarkNewsCrossSection.h +++ b/projects/interactions/public/SIREN/interactions/DarkNewsCrossSection.h @@ -1,6 +1,6 @@ #pragma once -#ifndef LI_DarkNewsCrossSection_H -#define LI_DarkNewsCrossSection_H +#ifndef SIREN_DarkNewsCrossSection_H +#define SIREN_DarkNewsCrossSection_H #include #include @@ -25,7 +25,7 @@ namespace siren { namespace dataclasses { class InteractionRecord; } } namespace siren { namespace dataclasses { struct InteractionSignature; } } -namespace siren { namespace utilities { class LI_random; } } +namespace siren { namespace utilities { class SIREN_random; } } namespace siren { namespace interactions { @@ -56,7 +56,7 @@ friend cereal::access; virtual double TargetMass(dataclasses::ParticleType const &) const; virtual std::vector SecondaryMasses(std::vector const &) const; virtual std::vector SecondaryHelicities(dataclasses::InteractionRecord const &) const; - virtual void SampleFinalState(dataclasses::CrossSectionDistributionRecord &, std::shared_ptr random) const override; + virtual void SampleFinalState(dataclasses::CrossSectionDistributionRecord &, std::shared_ptr random) const override; virtual std::vector GetPossibleTargets() const override = 0; // Requires Python-side implementation virtual std::vector GetPossibleTargetsFromPrimary(siren::dataclasses::ParticleType primary_type) const override = 0; // Requires Python-side implementation @@ -93,4 +93,4 @@ CEREAL_CLASS_VERSION(siren::interactions::DarkNewsCrossSection, 0); CEREAL_REGISTER_TYPE(siren::interactions::DarkNewsCrossSection); CEREAL_REGISTER_POLYMORPHIC_RELATION(siren::interactions::CrossSection, siren::interactions::DarkNewsCrossSection); -#endif // LI_DarkNewsCrossSection_H +#endif // SIREN_DarkNewsCrossSection_H diff --git a/projects/interactions/public/SIREN/interactions/DarkNewsDecay.h b/projects/interactions/public/SIREN/interactions/DarkNewsDecay.h index 6e7f8ed23..b78b9e3c0 100644 --- a/projects/interactions/public/SIREN/interactions/DarkNewsDecay.h +++ b/projects/interactions/public/SIREN/interactions/DarkNewsDecay.h @@ -1,6 +1,6 @@ #pragma once -#ifndef LI_DarkNewsDecay_H -#define LI_DarkNewsDecay_H +#ifndef SIREN_DarkNewsDecay_H +#define SIREN_DarkNewsDecay_H #include // for set #include // for shared_ptr @@ -26,7 +26,7 @@ namespace siren { namespace dataclasses { class InteractionRecord; } } namespace siren { namespace dataclasses { class CrossSectionDistributionRecord; } } namespace siren { namespace dataclasses { struct InteractionSignature; } } -namespace siren { namespace utilities { class LI_random; } } +namespace siren { namespace utilities { class SIREN_random; } } namespace siren { namespace interactions { @@ -45,8 +45,8 @@ friend cereal::access; virtual double TotalDecayWidth(siren::dataclasses::ParticleType primary) const override; virtual double TotalDecayWidthForFinalState(dataclasses::InteractionRecord const &) const override; virtual double DifferentialDecayWidth(dataclasses::InteractionRecord const &) const override; - virtual void SampleRecordFromDarkNews(dataclasses::CrossSectionDistributionRecord &, std::shared_ptr) const; - virtual void SampleFinalState(dataclasses::CrossSectionDistributionRecord &, std::shared_ptr) const override; + virtual void SampleRecordFromDarkNews(dataclasses::CrossSectionDistributionRecord &, std::shared_ptr) const; + virtual void SampleFinalState(dataclasses::CrossSectionDistributionRecord &, std::shared_ptr) const override; virtual std::vector GetPossibleSignatures() const override = 0; // Requires python-side implementation virtual std::vector GetPossibleSignaturesFromParent(siren::dataclasses::ParticleType primary) const override = 0; // Requires python-side implementation @@ -80,4 +80,4 @@ CEREAL_CLASS_VERSION(siren::interactions::DarkNewsDecay, 0); CEREAL_REGISTER_TYPE(siren::interactions::DarkNewsDecay); CEREAL_REGISTER_POLYMORPHIC_RELATION(siren::interactions::Decay, siren::interactions::DarkNewsDecay); -#endif // LI_DarkNewsDecay_H +#endif // SIREN_DarkNewsDecay_H diff --git a/projects/interactions/public/SIREN/interactions/Decay.h b/projects/interactions/public/SIREN/interactions/Decay.h index 0486f471a..69d960731 100644 --- a/projects/interactions/public/SIREN/interactions/Decay.h +++ b/projects/interactions/public/SIREN/interactions/Decay.h @@ -1,6 +1,6 @@ #pragma once -#ifndef LI_Decay_H -#define LI_Decay_H +#ifndef SIREN_Decay_H +#define SIREN_Decay_H #include // for shared_ptr #include // for string @@ -19,7 +19,7 @@ namespace siren { namespace dataclasses { class InteractionRecord; } } namespace siren { namespace dataclasses { class CrossSectionDistributionRecord; } } namespace siren { namespace dataclasses { struct InteractionSignature; } } -namespace siren { namespace utilities { class LI_random; } } +namespace siren { namespace utilities { class SIREN_random; } } namespace siren { namespace interactions { @@ -38,7 +38,7 @@ friend cereal::access; virtual double TotalDecayLength(siren::dataclasses::InteractionRecord const & record) const; virtual double TotalDecayLengthForFinalState(siren::dataclasses::InteractionRecord const & record) const; virtual double DifferentialDecayWidth(dataclasses::InteractionRecord const &) const = 0; - virtual void SampleFinalState(dataclasses::CrossSectionDistributionRecord &, std::shared_ptr) const = 0; + virtual void SampleFinalState(dataclasses::CrossSectionDistributionRecord &, std::shared_ptr) const = 0; virtual std::vector GetPossibleSignatures() const = 0; virtual std::vector GetPossibleSignaturesFromParent(siren::dataclasses::ParticleType primary) const = 0; virtual double FinalStateProbability(dataclasses::InteractionRecord const & record) const = 0; @@ -55,4 +55,4 @@ friend cereal::access; CEREAL_CLASS_VERSION(siren::interactions::Decay, 0); -#endif // LI_Decay_H +#endif // SIREN_Decay_H diff --git a/projects/interactions/public/SIREN/interactions/DipoleFromTable.h b/projects/interactions/public/SIREN/interactions/DipoleFromTable.h index b8deb53ee..5e7d665a7 100644 --- a/projects/interactions/public/SIREN/interactions/DipoleFromTable.h +++ b/projects/interactions/public/SIREN/interactions/DipoleFromTable.h @@ -1,6 +1,6 @@ #pragma once -#ifndef LI_DipoleFromTable_H -#define LI_DipoleFromTable_H +#ifndef SIREN_DipoleFromTable_H +#define SIREN_DipoleFromTable_H #include // for map #include // for set @@ -26,7 +26,7 @@ namespace siren { namespace dataclasses { class InteractionRecord; } } namespace siren { namespace dataclasses { class CrossSectionDistributionRecord; } } namespace siren { namespace dataclasses { struct InteractionSignature; } } -namespace siren { namespace utilities { class LI_random; } } +namespace siren { namespace utilities { class SIREN_random; } } namespace siren { namespace interactions { @@ -64,7 +64,7 @@ DipoleFromTable() {}; double DifferentialCrossSection(siren::dataclasses::ParticleType primary_type, double primary_energy, siren::dataclasses::ParticleType target_type, double target_mass, double y) const; double DifferentialCrossSection(siren::dataclasses::ParticleType primary_type, double primary_energy, siren::dataclasses::ParticleType target_type, double target_mass, double y, double thresh) const; double InteractionThreshold(dataclasses::InteractionRecord const &) const override; - void SampleFinalState(dataclasses::CrossSectionDistributionRecord &, std::shared_ptr) const override; + void SampleFinalState(dataclasses::CrossSectionDistributionRecord &, std::shared_ptr) const override; std::vector GetPossibleTargets() const override; std::vector GetPossibleTargetsFromPrimary(siren::dataclasses::ParticleType primary_type) const override; @@ -136,4 +136,4 @@ CEREAL_CLASS_VERSION(siren::interactions::DipoleFromTable, 0); CEREAL_REGISTER_TYPE(siren::interactions::DipoleFromTable); CEREAL_REGISTER_POLYMORPHIC_RELATION(siren::interactions::CrossSection, siren::interactions::DipoleFromTable); -#endif // LI_DipoleFromTable_H +#endif // SIREN_DipoleFromTable_H diff --git a/projects/interactions/public/SIREN/interactions/DummyCrossSection.h b/projects/interactions/public/SIREN/interactions/DummyCrossSection.h index ee37a85d4..bc7e29112 100644 --- a/projects/interactions/public/SIREN/interactions/DummyCrossSection.h +++ b/projects/interactions/public/SIREN/interactions/DummyCrossSection.h @@ -1,6 +1,6 @@ #pragma once -#ifndef LI_DummyCrossSection_H -#define LI_DummyCrossSection_H +#ifndef SIREN_DummyCrossSection_H +#define SIREN_DummyCrossSection_H #include #include @@ -24,7 +24,7 @@ namespace siren { namespace dataclasses { class InteractionRecord; } } namespace siren { namespace dataclasses { class CrossSectionDistributionRecord; } } namespace siren { namespace dataclasses { struct InteractionSignature; } } -namespace siren { namespace utilities { class LI_random; } } +namespace siren { namespace utilities { class SIREN_random; } } namespace siren { namespace interactions { @@ -41,7 +41,7 @@ friend cereal::access; double TotalCrossSection(siren::dataclasses::ParticleType primary, double energy, siren::dataclasses::ParticleType target) const; double DifferentialCrossSection(dataclasses::InteractionRecord const &) const override; double InteractionThreshold(dataclasses::InteractionRecord const &) const override; - void SampleFinalState(dataclasses::CrossSectionDistributionRecord &, std::shared_ptr random) const override; + void SampleFinalState(dataclasses::CrossSectionDistributionRecord &, std::shared_ptr random) const override; std::vector GetPossibleTargets() const override; std::vector GetPossibleTargetsFromPrimary(siren::dataclasses::ParticleType primary_type) const override; @@ -78,4 +78,4 @@ CEREAL_CLASS_VERSION(siren::interactions::DummyCrossSection, 0); CEREAL_REGISTER_TYPE(siren::interactions::DummyCrossSection); CEREAL_REGISTER_POLYMORPHIC_RELATION(siren::interactions::CrossSection, siren::interactions::DummyCrossSection); -#endif // LI_DummyCrossSection_H +#endif // SIREN_DummyCrossSection_H diff --git a/projects/interactions/public/SIREN/interactions/ElasticScattering.h b/projects/interactions/public/SIREN/interactions/ElasticScattering.h index 1aa97be81..38cc95b1d 100644 --- a/projects/interactions/public/SIREN/interactions/ElasticScattering.h +++ b/projects/interactions/public/SIREN/interactions/ElasticScattering.h @@ -1,6 +1,6 @@ #pragma once -#ifndef LI_ElasticScattering_H -#define LI_ElasticScattering_H +#ifndef SIREN_ElasticScattering_H +#define SIREN_ElasticScattering_H #include // for set #include @@ -23,7 +23,7 @@ namespace siren { namespace dataclasses { class InteractionRecord; } } namespace siren { namespace dataclasses { class CrossSectionDistributionRecord; } } namespace siren { namespace dataclasses { struct InteractionSignature; } } -namespace siren { namespace utilities { class LI_random; } } +namespace siren { namespace utilities { class SIREN_random; } } namespace siren { namespace interactions { @@ -44,7 +44,7 @@ friend cereal::access; double TotalCrossSection(dataclasses::InteractionRecord const &) const override; double TotalCrossSection(siren::dataclasses::ParticleType primary, double energy, siren::dataclasses::ParticleType target) const; double InteractionThreshold(dataclasses::InteractionRecord const &) const override; - void SampleFinalState(dataclasses::CrossSectionDistributionRecord &, std::shared_ptr) const override; + void SampleFinalState(dataclasses::CrossSectionDistributionRecord &, std::shared_ptr) const override; std::vector GetPossibleTargets() const override; std::vector GetPossibleTargetsFromPrimary(siren::dataclasses::ParticleType primary_type) const override; @@ -83,4 +83,4 @@ CEREAL_CLASS_VERSION(siren::interactions::ElasticScattering, 0); CEREAL_REGISTER_TYPE(siren::interactions::ElasticScattering); CEREAL_REGISTER_POLYMORPHIC_RELATION(siren::interactions::CrossSection, siren::interactions::ElasticScattering); -#endif // LI_ElasticScattering_H +#endif // SIREN_ElasticScattering_H diff --git a/projects/interactions/public/SIREN/interactions/HNLDecay.h b/projects/interactions/public/SIREN/interactions/HNLDecay.h index 26c457eb9..b66714e99 100644 --- a/projects/interactions/public/SIREN/interactions/HNLDecay.h +++ b/projects/interactions/public/SIREN/interactions/HNLDecay.h @@ -1,6 +1,6 @@ #pragma once -#ifndef LI_HNLDecay_H -#define LI_HNLDecay_H +#ifndef SIREN_HNLDecay_H +#define SIREN_HNLDecay_H #include #include @@ -52,7 +52,7 @@ HNLDecay() {}; virtual double TotalDecayWidth(siren::dataclasses::ParticleType primary) const override; virtual double TotalDecayWidthForFinalState(dataclasses::InteractionRecord const &) const override; virtual double DifferentialDecayWidth(dataclasses::InteractionRecord const &) const override; - virtual void SampleFinalState(dataclasses::InteractionRecord &, std::shared_ptr) const override; + virtual void SampleFinalState(dataclasses::InteractionRecord &, std::shared_ptr) const override; virtual std::vector GetPossibleSignatures() const override; virtual std::vector GetPossibleSignaturesFromParent(siren::dataclasses::ParticleType primary) const override; virtual double FinalStateProbability(dataclasses::InteractionRecord const & record) const override; @@ -98,4 +98,4 @@ CEREAL_CLASS_VERSION(siren::interactions::HNLDecay, 0); CEREAL_REGISTER_TYPE(siren::interactions::HNLDecay); CEREAL_REGISTER_POLYMORPHIC_RELATION(siren::interactions::Decay, siren::interactions::HNLDecay); -#endif // LI_HNLDecay_H +#endif // SIREN_HNLDecay_H diff --git a/projects/interactions/public/SIREN/interactions/HNLFromSpline.h b/projects/interactions/public/SIREN/interactions/HNLFromSpline.h index 5d22678c8..3927d749e 100644 --- a/projects/interactions/public/SIREN/interactions/HNLFromSpline.h +++ b/projects/interactions/public/SIREN/interactions/HNLFromSpline.h @@ -1,6 +1,6 @@ #pragma once -#ifndef LI_HNLFromSpline_H -#define LI_HNLFromSpline_H +#ifndef SIREN_HNLFromSpline_H +#define SIREN_HNLFromSpline_H #include // for map #include // for set @@ -30,7 +30,7 @@ #include "photospline/detail/fitsio.h" // for splinet... namespace siren { namespace dataclasses { class InteractionRecord; } } -namespace siren { namespace utilities { class LI_random; } } +namespace siren { namespace utilities { class SIREN_random; } } namespace cereal { class access; } @@ -70,7 +70,7 @@ friend cereal::access; double DifferentialCrossSection(dataclasses::InteractionRecord const &) const override; double DifferentialCrossSection(double energy, double x, double y, double secondary_lepton_mass) const; double InteractionThreshold(dataclasses::InteractionRecord const &) const override; - void SampleFinalState(dataclasses::CrossSectionDistributionRecord &, std::shared_ptr random) const override; + void SampleFinalState(dataclasses::CrossSectionDistributionRecord &, std::shared_ptr random) const override; std::vector GetPossibleTargets() const override; std::vector GetPossibleTargetsFromPrimary(siren::dataclasses::ParticleType primary_type) const override; @@ -156,4 +156,4 @@ CEREAL_CLASS_VERSION(siren::interactions::HNLFromSpline, 0); CEREAL_REGISTER_TYPE(siren::interactions::HNLFromSpline); CEREAL_REGISTER_POLYMORPHIC_RELATION(siren::interactions::CrossSection, siren::interactions::HNLFromSpline); -#endif // LI_HNLFromSpline_H +#endif // SIREN_HNLFromSpline_H diff --git a/projects/interactions/public/SIREN/interactions/InteractionCollection.h b/projects/interactions/public/SIREN/interactions/InteractionCollection.h index a0ada6d27..be1658888 100644 --- a/projects/interactions/public/SIREN/interactions/InteractionCollection.h +++ b/projects/interactions/public/SIREN/interactions/InteractionCollection.h @@ -1,6 +1,6 @@ #pragma once -#ifndef LI_InteractionCollection_H -#define LI_InteractionCollection_H +#ifndef SIREN_InteractionCollection_H +#define SIREN_InteractionCollection_H #include // for map #include // for set @@ -93,4 +93,4 @@ class InteractionCollection { CEREAL_CLASS_VERSION(siren::interactions::InteractionCollection, 0); -#endif // LI_InteractionCollection_H +#endif // SIREN_InteractionCollection_H diff --git a/projects/interactions/public/SIREN/interactions/NeutrissimoDecay.h b/projects/interactions/public/SIREN/interactions/NeutrissimoDecay.h index 5e7cbd651..1906c806c 100644 --- a/projects/interactions/public/SIREN/interactions/NeutrissimoDecay.h +++ b/projects/interactions/public/SIREN/interactions/NeutrissimoDecay.h @@ -1,6 +1,6 @@ #pragma once -#ifndef LI_NeutrissimoDecay_H -#define LI_NeutrissimoDecay_H +#ifndef SIREN_NeutrissimoDecay_H +#define SIREN_NeutrissimoDecay_H #include // for set #include // for shared_ptr @@ -24,7 +24,7 @@ namespace siren { namespace dataclasses { class InteractionRecord; } } namespace siren { namespace dataclasses { class CrossSectionDistributionRecord; } } namespace siren { namespace dataclasses { struct InteractionSignature; } } -namespace siren { namespace utilities { class LI_random; } } +namespace siren { namespace utilities { class SIREN_random; } } namespace siren { namespace interactions { @@ -52,7 +52,7 @@ NeutrissimoDecay() {}; virtual double TotalDecayWidth(siren::dataclasses::ParticleType primary) const override; virtual double TotalDecayWidthForFinalState(dataclasses::InteractionRecord const &) const override; virtual double DifferentialDecayWidth(dataclasses::InteractionRecord const &) const override; - virtual void SampleFinalState(dataclasses::CrossSectionDistributionRecord &, std::shared_ptr) const override; + virtual void SampleFinalState(dataclasses::CrossSectionDistributionRecord &, std::shared_ptr) const override; virtual std::vector GetPossibleSignatures() const override; virtual std::vector GetPossibleSignaturesFromParent(siren::dataclasses::ParticleType primary) const override; virtual double FinalStateProbability(dataclasses::InteractionRecord const & record) const override; @@ -98,4 +98,4 @@ CEREAL_CLASS_VERSION(siren::interactions::NeutrissimoDecay, 0); CEREAL_REGISTER_TYPE(siren::interactions::NeutrissimoDecay); CEREAL_REGISTER_POLYMORPHIC_RELATION(siren::interactions::Decay, siren::interactions::NeutrissimoDecay); -#endif // LI_NeutrissimoDecay_H +#endif // SIREN_NeutrissimoDecay_H diff --git a/projects/math/CMakeLists.txt b/projects/math/CMakeLists.txt index 813988090..db2aa36c4 100644 --- a/projects/math/CMakeLists.txt +++ b/projects/math/CMakeLists.txt @@ -8,24 +8,24 @@ LIST (APPEND math_SOURCES ${PROJECT_SOURCE_DIR}/projects/math/private/EulerAngles.cxx ${PROJECT_SOURCE_DIR}/projects/math/private/Interpolation.cxx ) -add_library(LI_math OBJECT ${math_SOURCES}) -set_property(TARGET LI_math PROPERTY POSITION_INDEPENDENT_CODE ON) -target_include_directories(LI_math PUBLIC +add_library(SIREN_math OBJECT ${math_SOURCES}) +set_property(TARGET SIREN_math PROPERTY POSITION_INDEPENDENT_CODE ON) +target_include_directories(SIREN_math PUBLIC $ $ ) if(${MACOSX}) -target_link_libraries(LI_math +target_link_libraries(SIREN_math PUBLIC photospline delabella_shared PRIVATE $ - LI_serialization + SIREN_serialization ) else() -target_link_libraries(LI_math +target_link_libraries(SIREN_math PUBLIC photospline delabella_shared @@ -33,7 +33,7 @@ target_link_libraries(LI_math -Wl,--whole-archive $ -Wl,--no-whole-archive - LI_serialization + SIREN_serialization ) endif() diff --git a/projects/math/public/SIREN/math/Conversions.h b/projects/math/public/SIREN/math/Conversions.h index 70e4d558f..a72d64336 100644 --- a/projects/math/public/SIREN/math/Conversions.h +++ b/projects/math/public/SIREN/math/Conversions.h @@ -1,6 +1,6 @@ #pragma once -#ifndef LI_Conversions_H -#define LI_Conversions_H +#ifndef SIREN_Conversions_H +#define SIREN_Conversions_H #include @@ -223,5 +223,5 @@ EulerAngles EulerAnglesFromQuaternion(Quaternion const & quaternion, EulerOrder } // namespace math } // namespace siren -#endif // LI_Conversions_H +#endif // SIREN_Conversions_H diff --git a/projects/math/public/SIREN/math/EulerAngles.h b/projects/math/public/SIREN/math/EulerAngles.h index b1cc567af..356f5b7e3 100644 --- a/projects/math/public/SIREN/math/EulerAngles.h +++ b/projects/math/public/SIREN/math/EulerAngles.h @@ -1,6 +1,6 @@ #pragma once -#ifndef LI_EulerAngles_H -#define LI_EulerAngles_H +#ifndef SIREN_EulerAngles_H +#define SIREN_EulerAngles_H #include #include @@ -158,5 +158,5 @@ class EulerAngles CEREAL_CLASS_VERSION(siren::math::EulerAngles, 0); -#endif // LI_EulerAngles_H +#endif // SIREN_EulerAngles_H diff --git a/projects/math/public/SIREN/math/EulerQuaternionConversions.h b/projects/math/public/SIREN/math/EulerQuaternionConversions.h index bf45a94b7..c70426051 100644 --- a/projects/math/public/SIREN/math/EulerQuaternionConversions.h +++ b/projects/math/public/SIREN/math/EulerQuaternionConversions.h @@ -1,6 +1,6 @@ #pragma once -#ifndef LI_EulerQuaternionConversions_H -#define LI_EulerQuaternionConversions_H +#ifndef SIREN_EulerQuaternionConversions_H +#define SIREN_EulerQuaternionConversions_H #include #include @@ -120,5 +120,5 @@ EulerAngles XYZsFromQ(Quaternion const & quaternion) { } // namespace math } // namespace siren -#endif // LI_EulerQuaternionConversions_H +#endif // SIREN_EulerQuaternionConversions_H diff --git a/projects/math/public/SIREN/math/Interpolation.h b/projects/math/public/SIREN/math/Interpolation.h index f23f344f4..c9503ec1c 100644 --- a/projects/math/public/SIREN/math/Interpolation.h +++ b/projects/math/public/SIREN/math/Interpolation.h @@ -1,5 +1,5 @@ -#ifndef LI_Interpolation_H -#define LI_Interpolation_H +#ifndef SIREN_Interpolation_H +#define SIREN_Interpolation_H #include #include @@ -1543,4 +1543,4 @@ CEREAL_CLASS_VERSION(siren::math::TransformIndexer1D, 0); CEREAL_REGISTER_TYPE(siren::math::TransformIndexer1D); CEREAL_REGISTER_POLYMORPHIC_RELATION(siren::math::Indexer1D, siren::math::TransformIndexer1D); -#endif // LI_Interpolation_H +#endif // SIREN_Interpolation_H diff --git a/projects/math/public/SIREN/math/Matrix3D.h b/projects/math/public/SIREN/math/Matrix3D.h index 1446391c4..f2cac9ee3 100644 --- a/projects/math/public/SIREN/math/Matrix3D.h +++ b/projects/math/public/SIREN/math/Matrix3D.h @@ -1,6 +1,6 @@ #pragma once -#ifndef LI_Matrix3D_H -#define LI_Matrix3D_H +#ifndef SIREN_Matrix3D_H +#define SIREN_Matrix3D_H #include #include @@ -125,5 +125,5 @@ class Matrix3D CEREAL_CLASS_VERSION(siren::math::Matrix3D, 0); -#endif // LI_Matrix3D_H +#endif // SIREN_Matrix3D_H diff --git a/projects/math/public/SIREN/math/Polynomial.h b/projects/math/public/SIREN/math/Polynomial.h index 1588a483b..4e16556f0 100644 --- a/projects/math/public/SIREN/math/Polynomial.h +++ b/projects/math/public/SIREN/math/Polynomial.h @@ -1,5 +1,5 @@ -#ifndef LI_Polynomial_H -#define LI_Polynomial_H +#ifndef SIREN_Polynomial_H +#define SIREN_Polynomial_H /****************************************************************************** * * @@ -120,5 +120,5 @@ double NewtonRaphson(std::function f, std::function #include @@ -124,5 +124,5 @@ Quaternion rotation_between(Vector3D const & v0, Vector3D const & v1); CEREAL_CLASS_VERSION(siren::math::Quaternion, 0); -#endif // LI_Quaternion_H +#endif // SIREN_Quaternion_H diff --git a/projects/math/public/SIREN/math/Vector3D.h b/projects/math/public/SIREN/math/Vector3D.h index 6885eae5e..71297fd18 100644 --- a/projects/math/public/SIREN/math/Vector3D.h +++ b/projects/math/public/SIREN/math/Vector3D.h @@ -23,8 +23,8 @@ ******************************************************************************/ #pragma once -#ifndef LI_Vector3D_H -#define LI_Vector3D_H +#ifndef SIREN_Vector3D_H +#define SIREN_Vector3D_H #include #include @@ -197,5 +197,5 @@ Vector3D cross_product(const Vector3D& vec1, const Vector3D& vec2); CEREAL_CLASS_VERSION(siren::math::Vector3D, 0); -#endif // LI_Vector3D_H +#endif // SIREN_Vector3D_H diff --git a/projects/serialization/CMakeLists.txt b/projects/serialization/CMakeLists.txt index e302dc155..f5e385c9f 100644 --- a/projects/serialization/CMakeLists.txt +++ b/projects/serialization/CMakeLists.txt @@ -1,5 +1,5 @@ -add_library(LI_serialization INTERFACE) -target_include_directories(LI_serialization INTERFACE +add_library(SIREN_serialization INTERFACE) +target_include_directories(SIREN_serialization INTERFACE $ $ ) diff --git a/projects/serialization/public/SIREN/serialization/array.h b/projects/serialization/public/SIREN/serialization/array.h index e63eaeb93..e526c589c 100644 --- a/projects/serialization/public/SIREN/serialization/array.h +++ b/projects/serialization/public/SIREN/serialization/array.h @@ -1,6 +1,6 @@ #pragma once -#ifndef LI_serialization_array_H -#define LI_serialization_array_H +#ifndef SIREN_serialization_array_H +#define SIREN_serialization_array_H #include "cereal/cereal.hpp" #include @@ -53,5 +53,5 @@ CEREAL_LOAD_FUNCTION_NAME( Archive & ar, std::array & array ) } // namespace cereal -#endif // LI_serialization_array_H +#endif // SIREN_serialization_array_H diff --git a/projects/utilities/CMakeLists.txt b/projects/utilities/CMakeLists.txt index fe3d9cac5..f0dec7b97 100644 --- a/projects/utilities/CMakeLists.txt +++ b/projects/utilities/CMakeLists.txt @@ -4,9 +4,9 @@ LIST (APPEND utilities_SOURCES ${PROJECT_SOURCE_DIR}/projects/utilities/private/Interpolator.cxx ${PROJECT_SOURCE_DIR}/projects/utilities/private/Random.cxx ) -add_library(LI_utilities OBJECT ${utilities_SOURCES}) -set_property(TARGET LI_utilities PROPERTY POSITION_INDEPENDENT_CODE ON) -target_include_directories(LI_utilities PUBLIC +add_library(SIREN_utilities OBJECT ${utilities_SOURCES}) +set_property(TARGET SIREN_utilities PROPERTY POSITION_INDEPENDENT_CODE ON) +target_include_directories(SIREN_utilities PUBLIC $ $ ) diff --git a/projects/utilities/private/Random.cxx b/projects/utilities/private/Random.cxx index dfb6610ff..dc57b72c1 100644 --- a/projects/utilities/private/Random.cxx +++ b/projects/utilities/private/Random.cxx @@ -6,28 +6,28 @@ namespace siren { namespace utilities { - LI_random::LI_random(void){ + SIREN_random::SIREN_random(void){ // default to boring seed unsigned int seed = 1; configuration = std::default_random_engine(seed); generator = std::uniform_real_distribution( 0.0, 1.0); } - LI_random::LI_random( unsigned int seed ){ + SIREN_random::SIREN_random( unsigned int seed ){ configuration = std::default_random_engine(seed); generator = std::uniform_real_distribution( 0.0, 1.0); } // samples a number betwen the two specified values: (from, to) // defaults to ( 0, 1) - double LI_random::Uniform(double min, double max) { + double SIREN_random::Uniform(double min, double max) { if(max < min) std::swap(min, max); double range = max - min; return range * (this->generator(configuration)) + min; } - double LI_random::PowerLaw(double min, double max, double n) { + double SIREN_random::PowerLaw(double min, double max, double n) { if(max < min) std::swap(min, max); double range = max - min; @@ -39,7 +39,7 @@ namespace utilities { } // reconfigures the generator with a new seed - void LI_random::set_seed( unsigned int new_seed) { + void SIREN_random::set_seed( unsigned int new_seed) { this->configuration = std::default_random_engine(new_seed); } diff --git a/projects/utilities/private/pybindings/utilities.cxx b/projects/utilities/private/pybindings/utilities.cxx index 51eb62166..0feafd28f 100644 --- a/projects/utilities/private/pybindings/utilities.cxx +++ b/projects/utilities/private/pybindings/utilities.cxx @@ -12,9 +12,9 @@ using namespace pybind11; PYBIND11_MODULE(utilities,m) { using namespace siren::utilities; - class_>(m, "LI_random") + class_>(m, "SIREN_random") .def(init<>()) .def(init()) - .def("Uniform",&LI_random::Uniform) - .def("set_seed",&LI_random::set_seed); + .def("Uniform",&SIREN_random::Uniform) + .def("set_seed",&SIREN_random::set_seed); } diff --git a/projects/utilities/public/SIREN/utilities/Constants.h b/projects/utilities/public/SIREN/utilities/Constants.h index ccbb3dc3b..bf7c29190 100644 --- a/projects/utilities/public/SIREN/utilities/Constants.h +++ b/projects/utilities/public/SIREN/utilities/Constants.h @@ -1,6 +1,6 @@ #pragma once -#ifndef LI_Constants_H -#define LI_Constants_H +#ifndef SIREN_Constants_H +#define SIREN_Constants_H #include // pow function @@ -108,5 +108,5 @@ static const double hbarc = 197.3*(1e-9)*(1e-7)*GeV*cm; // [GeV m] } // namespace utilities } // namespace siren -#endif // LI_Constants_H +#endif // SIREN_Constants_H diff --git a/projects/utilities/public/SIREN/utilities/Errors.h b/projects/utilities/public/SIREN/utilities/Errors.h index 93c4b1171..750ba12cf 100644 --- a/projects/utilities/public/SIREN/utilities/Errors.h +++ b/projects/utilities/public/SIREN/utilities/Errors.h @@ -1,5 +1,5 @@ -#ifndef LI_InjectionFailure_H -#define LI_InjectionFailure_H +#ifndef SIREN_InjectionFailure_H +#define SIREN_InjectionFailure_H namespace siren { namespace utilities { diff --git a/projects/utilities/public/SIREN/utilities/Integration.h b/projects/utilities/public/SIREN/utilities/Integration.h index 2bac4b829..3c9026f69 100644 --- a/projects/utilities/public/SIREN/utilities/Integration.h +++ b/projects/utilities/public/SIREN/utilities/Integration.h @@ -1,6 +1,6 @@ #pragma once -#ifndef LI_Integration_H -#define LI_Integration_H +#ifndef SIREN_Integration_H +#define SIREN_Integration_H #include #include @@ -153,4 +153,4 @@ double rombergIntegrate(const FuncType& func, double a, double b, double tol=1e- } } -#endif // LI_Integration_H +#endif // SIREN_Integration_H diff --git a/projects/utilities/public/SIREN/utilities/Interpolator.h b/projects/utilities/public/SIREN/utilities/Interpolator.h index a56a489c3..6ce95541f 100644 --- a/projects/utilities/public/SIREN/utilities/Interpolator.h +++ b/projects/utilities/public/SIREN/utilities/Interpolator.h @@ -1,6 +1,6 @@ #pragma once -#ifndef LI_Interpolator_H -#define LI_Interpolator_H +#ifndef SIREN_Interpolator_H +#define SIREN_Interpolator_H #include #include @@ -713,4 +713,4 @@ CEREAL_CLASS_VERSION(siren::utilities::Indexer1D, 0); CEREAL_CLASS_VERSION(siren::utilities::Interpolator1D, 0); CEREAL_CLASS_VERSION(siren::utilities::Interpolator2D, 0); -#endif // LI_Interpolator_H +#endif // SIREN_Interpolator_H diff --git a/projects/utilities/public/SIREN/utilities/Random.h b/projects/utilities/public/SIREN/utilities/Random.h index de75e9ac5..91ed6594d 100644 --- a/projects/utilities/public/SIREN/utilities/Random.h +++ b/projects/utilities/public/SIREN/utilities/Random.h @@ -1,6 +1,6 @@ #pragma once -#ifndef LI_Random_H -#define LI_Random_H +#ifndef SIREN_Random_H +#define SIREN_Random_H // Ben Smithers // benjamin.smithers@mavs.uta.edu @@ -12,10 +12,10 @@ namespace siren { namespace utilities { - class LI_random{ + class SIREN_random{ public: - LI_random(); - LI_random( unsigned int seed ); + SIREN_random(); + SIREN_random( unsigned int seed ); // this naming convention is used to double Uniform( double from=0.0, double to=1.0); @@ -32,5 +32,5 @@ namespace utilities { } // namespace utilities } // namespace siren -#endif // LI_Random_H +#endif // SIREN_Random_H diff --git a/python/LIController.py b/python/LIController.py index a59c9f254..13c4f556f 100644 --- a/python/LIController.py +++ b/python/LIController.py @@ -33,7 +33,7 @@ def __init__(self, events_to_inject, experiment, seed=0): self.resources_dir = _util.resource_package_dir() # Initialize a random number generator - self.random = _utilities.LI_random(seed) + self.random = _utilities.SIREN_random(seed) # Save number of events to inject self.events_to_inject = events_to_inject