Skip to content

Commit

Permalink
LI_ --> SIREN_
Browse files Browse the repository at this point in the history
  • Loading branch information
austinschneider committed Mar 10, 2024
1 parent 82aa3f7 commit 8575ec5
Show file tree
Hide file tree
Showing 163 changed files with 627 additions and 627 deletions.
100 changes: 50 additions & 50 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -99,31 +99,31 @@ 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
PRIVATE
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()

Expand All @@ -137,46 +137,46 @@ 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})
endif()
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})
Expand Down
8 changes: 4 additions & 4 deletions cmake/pyproject.cmake
Original file line number Diff line number Diff line change
@@ -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})
14 changes: 7 additions & 7 deletions projects/dataclasses/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
$<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/projects/dataclasses/public/>
$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/SIREN/dataclasses/>
)

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/"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#ifndef LI_DecaySignature_H
#define LI_DecaySignature_H
#ifndef SIREN_DecaySignature_H
#define SIREN_DecaySignature_H

#include <cstdint> // for uint32_t
#include <vector> // for vector
Expand Down Expand Up @@ -41,4 +41,4 @@ struct DecaySignature {

CEREAL_CLASS_VERSION(siren::dataclasses::DecaySignature, 0);

#endif // LI_DecaySignature_H
#endif // SIREN_DecaySignature_H
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#pragma once
#ifndef LI_InteractionRecord_H
#define LI_InteractionRecord_H
#ifndef SIREN_InteractionRecord_H
#define SIREN_InteractionRecord_H

#include <array> // for array
#include <iosfwd> // for ostream
Expand Down Expand Up @@ -349,4 +349,4 @@ class SecondaryDistributionRecord {

CEREAL_CLASS_VERSION(siren::dataclasses::InteractionRecord, 0);

#endif // LI_InteractionRecord_H
#endif // SIREN_InteractionRecord_H
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#pragma once
#ifndef LI_InteractionSignature_H
#define LI_InteractionSignature_H
#ifndef SIREN_InteractionSignature_H
#define SIREN_InteractionSignature_H

#include <iosfwd> // for ostream
#include <vector> // for vector
Expand Down Expand Up @@ -43,4 +43,4 @@ struct InteractionSignature {

CEREAL_CLASS_VERSION(siren::dataclasses::InteractionSignature, 0);

#endif // LI_InteractionSignature_H
#endif // SIREN_InteractionSignature_H
Original file line number Diff line number Diff line change
@@ -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"

Expand Down Expand Up @@ -62,5 +62,5 @@ struct InteractionTree {
} // namespace dataclasses
} // namespace siren

#endif // LI_InteractionTree_H
#endif // SIREN_InteractionTree_H

6 changes: 3 additions & 3 deletions projects/dataclasses/public/SIREN/dataclasses/Particle.h
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -80,4 +80,4 @@ bool isNeutrino(ParticleType p);

CEREAL_CLASS_VERSION(siren::dataclasses::Particle, 0);

#endif // LI_Particle_H
#endif // SIREN_Particle_H
6 changes: 3 additions & 3 deletions projects/dataclasses/public/SIREN/dataclasses/ParticleID.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#ifndef LI_ParticleID_H
#define LI_ParticleID_H
#ifndef SIREN_ParticleID_H
#define SIREN_ParticleID_H

#include <cstdint> // for uint32_t
#include <ostream> // for ostream
Expand Down Expand Up @@ -62,4 +62,4 @@ class ParticleID {

CEREAL_CLASS_VERSION(siren::dataclasses::ParticleID, 0);

#endif // LI_ParticleID_H
#endif // SIREN_ParticleID_H
6 changes: 3 additions & 3 deletions projects/dataclasses/public/SIREN/dataclasses/ParticleType.h
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#pragma once
#ifndef LI_ParticleType_H
#define LI_ParticleType_H
#ifndef SIREN_ParticleType_H
#define SIREN_ParticleType_H

#include <map>
#include <string>
Expand Down Expand Up @@ -88,4 +88,4 @@ namespace cereal {
}
}

#endif // LI_ParticleType_H
#endif // SIREN_ParticleType_H
18 changes: 9 additions & 9 deletions projects/detector/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
$<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/projects/detector/public/>
$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/SIREN/detector/>
)

target_link_libraries(LI_detector
target_link_libraries(SIREN_detector
PRIVATE
$<BUILD_INTERFACE:rk_static>
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/"
Expand Down
6 changes: 3 additions & 3 deletions projects/detector/private/test/FakeDetectorModel.h
Original file line number Diff line number Diff line change
@@ -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 <cmath>
#include <math.h>
Expand Down Expand Up @@ -760,5 +760,5 @@ class FakeLegacyDetectorModelTest : public FakeLegacyDetectorModelFile, public F
}
};

#endif // LI_TEST_FakeDetectorModel_H
#endif // SIREN_TEST_FakeDetectorModel_H

6 changes: 3 additions & 3 deletions projects/detector/private/test/FakeMaterialModel.h
Original file line number Diff line number Diff line change
@@ -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 <cmath>
#include <math.h>
Expand Down Expand Up @@ -286,5 +286,5 @@ class FakeMaterialModelTest : public FakeMaterialModelFile, public ::testing::Te
}
};

#endif // LI_TEST_FakeMaterialModel_H
#endif // SIREN_TEST_FakeMaterialModel_H

6 changes: 3 additions & 3 deletions projects/detector/public/SIREN/detector/Axis1D.h
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#pragma once
#ifndef LI_Axis1D_H
#define LI_Axis1D_H
#ifndef SIREN_Axis1D_H
#define SIREN_Axis1D_H

#include <memory> // for shared_ptr
#include <cstdint> // for uint32_t
Expand Down Expand Up @@ -58,4 +58,4 @@ friend cereal::access;

CEREAL_CLASS_VERSION(siren::detector::Axis1D, 0);

#endif // LI_Axis1D_H
#endif // SIREN_Axis1D_H
6 changes: 3 additions & 3 deletions projects/detector/public/SIREN/detector/CartesianAxis1D.h
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#pragma once
#ifndef LI_CartesianAxis1D_H
#define LI_CartesianAxis1D_H
#ifndef SIREN_CartesianAxis1D_H
#define SIREN_CartesianAxis1D_H

#include <memory> // for shared_ptr
#include <cstdint> // for uint32_t
Expand Down Expand Up @@ -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
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#pragma once
#ifndef LI_CartesianAxisDensityDistribution_H
#define LI_CartesianAxisDensityDistribution_H
#ifndef SIREN_CartesianAxisDensityDistribution_H
#define SIREN_CartesianAxisDensityDistribution_H
#include <memory>
#include <string>
#include <exception>
Expand Down Expand Up @@ -157,4 +157,4 @@ class DensityDistribution1D<CartesianAxis1D, DistributionT, typename std::enable
} // namespace detector
} // namespace siren

#endif // LI_CartesianAxisDensityDistribution.h
#endif // SIREN_CartesianAxisDensityDistribution.h
Loading

0 comments on commit 8575ec5

Please sign in to comment.