Skip to content
New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Dev/renaming #41

Merged
merged 19 commits into from
Jan 11, 2024
Merged

Dev/renaming #41

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
9e30dd7
rename CrossSectionCollection to InteractionCollection
nickkamp1 Jan 10, 2024
89c7621
rename project crosssections to interactions
nickkamp1 Jan 10, 2024
9114314
update interactions project name in CMakeLists.txt
nickkamp1 Jan 10, 2024
2fa3017
renamed InjectorBase to Injector
nickkamp1 Jan 10, 2024
b702541
EarthModel to DetectorModel and EarthSector to DetectorSector and ear…
nickkamp1 Jan 10, 2024
62b22e7
PyDarkNewsCrossSectionCollection to PyDarkNewsInteractionCollection
nickkamp1 Jan 10, 2024
eba1917
rename CrossSectionCollection to InteractionCollection
nickkamp1 Jan 10, 2024
7cd2089
rename project crosssections to interactions
nickkamp1 Jan 10, 2024
b21d859
update interactions project name in CMakeLists.txt
nickkamp1 Jan 10, 2024
993bb6f
renamed InjectorBase to Injector
nickkamp1 Jan 10, 2024
3d277ab
EarthModel to DetectorModel and EarthSector to DetectorSector and ear…
nickkamp1 Jan 10, 2024
e9148f9
PyDarkNewsCrossSectionCollection to PyDarkNewsInteractionCollection
nickkamp1 Jan 10, 2024
6886efa
Remove duplicate members
austinschneider Jan 10, 2024
413fec5
fix merge conflicts
nickkamp1 Jan 10, 2024
44b9b6b
rename Process:GetCrossSections to GetInteractions
nickkamp1 Jan 10, 2024
c6cba2f
updated process pybindings to reflect interactions rather than cross_…
nickkamp1 Jan 10, 2024
5a191b6
fix __init__ for renaming
nickkamp1 Jan 10, 2024
5fa9e8e
change cross_sections -> interactions in distributions headers
austinschneider Jan 10, 2024
6b7f14d
Rename cross_sections to interactions where applicable
austinschneider Jan 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ add_subdirectory(projects/math)
add_subdirectory(projects/dataclasses)
add_subdirectory(projects/geometry)
add_subdirectory(projects/detector)
add_subdirectory(projects/crosssections)
add_subdirectory(projects/interactions)
add_subdirectory(projects/distributions)
add_subdirectory(projects/injection)

Expand All @@ -98,7 +98,7 @@ target_link_libraries(LeptonInjector
LI_dataclasses
LI_geometry
LI_detector
LI_crosssections
LI_interactions
LI_distributions
LI_injection
)
Expand All @@ -114,7 +114,7 @@ target_link_libraries(LeptonInjector
LI_dataclasses
LI_geometry
LI_detector
LI_crosssections
LI_interactions
LI_distributions
LI_injection
)
Expand All @@ -136,7 +136,7 @@ if(DEFINED SKBUILD)
LI_dataclasses
LI_geometry
LI_detector
LI_crosssections
LI_interactions
LI_distributions
LI_injection
EXPORT ${PROJECT_NAME}Config
Expand All @@ -151,7 +151,7 @@ if(DEFINED SKBUILD)
LI_dataclasses
LI_geometry
LI_detector
LI_crosssections
LI_interactions
LI_distributions
LI_injection
EXPORT ${PROJECT_NAME}Config
Expand All @@ -167,7 +167,7 @@ else()
LI_dataclasses
LI_geometry
LI_detector
LI_crosssections
LI_interactions
LI_distributions
LI_injection
EXPORT ${PROJECT_NAME}Config
Expand Down Expand Up @@ -213,7 +213,7 @@ if(DEFINED SKBUILD)
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/leptoninjector)
install(TARGETS detector
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/leptoninjector)
install(TARGETS crosssections
install(TARGETS interactions
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/leptoninjector)
install(TARGETS distributions
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/leptoninjector)
Expand Down
55 changes: 0 additions & 55 deletions projects/crosssections/CMakeLists.txt
View file
Open in desktop

This file was deleted.

36 changes: 0 additions & 36 deletions projects/crosssections/private/pybindings/CrossSectionCollection.h
View file
Open in desktop

This file was deleted.

4 changes: 2 additions & 2 deletions projects/detector/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ LIST (APPEND detector_SOURCES
${PROJECT_SOURCE_DIR}/projects/detector/private/ExponentialDistribution1D.cxx

${PROJECT_SOURCE_DIR}/projects/detector/private/DensityDistribution.cxx
${PROJECT_SOURCE_DIR}/projects/detector/private/EarthModel.cxx
${PROJECT_SOURCE_DIR}/projects/detector/private/DetectorModel.cxx
${PROJECT_SOURCE_DIR}/projects/detector/private/MaterialModel.cxx
${PROJECT_SOURCE_DIR}/projects/detector/private/Path.cxx
)
Expand Down Expand Up @@ -46,7 +46,7 @@ install(DIRECTORY "${PROJECT_SOURCE_DIR}/projects/detector/public/"
package_add_test(UnitTest_Axis ${PROJECT_SOURCE_DIR}/projects/detector/private/test/Axis_TEST.cxx)
package_add_test(UnitTest_DensityDistribution ${PROJECT_SOURCE_DIR}/projects/detector/private/test/DensityDistribution_TEST.cxx)
package_add_test(UnitTest_Distribution1D ${PROJECT_SOURCE_DIR}/projects/detector/private/test/Distribution1D_TEST.cxx)
package_add_test(UnitTest_EarthModel ${PROJECT_SOURCE_DIR}/projects/detector/private/test/EarthModel_TEST.cxx)
package_add_test(UnitTest_DetectorModel ${PROJECT_SOURCE_DIR}/projects/detector/private/test/DetectorModel_TEST.cxx)
package_add_test(UnitTest_MaterialModel ${PROJECT_SOURCE_DIR}/projects/detector/private/test/MaterialModel_TEST.cxx)
package_add_test(UnitTest_Path ${PROJECT_SOURCE_DIR}/projects/detector/private/test/Path_TEST.cxx)

Expand Down
Loading
Loading