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

Jump to bottom

Merge/alexwenym #29

Merged
merged 45 commits into from
Sep 21, 2023
Merged

Merge/alexwenym #29

merged 45 commits into from
Sep 21, 2023

Conversation

austinschneider
Copy link
Collaborator

Fixes to get ranged injection with ATLAS working

austinschneider and others added 25 commits June 24, 2023 09:45
@austinschneider @pweigel
ATALS, QOL changes, and Column Depth fixes (#27)
efef21f 
* atlas notebook, added some pybindings

* updates to SNe Ranged injection

* incremental changes for atlas injection, columndepth debug ongoing

* added some pybindings to help debug classes Path and ColumnDepthPositionDistribution

* Fix column depth unit conversions. Fix unsigned integer overflow in bounds clipping. Fix spacing.

* Special case for constructing 180deg rotation Quaternion for a rotation between opposing directions.

* Include what you use

* Convert from detector coordinates to earth coordinates before checking bounds

* Removed extra files, some may need to be added to resources later

* TreeWeighter constructor w/o secondary processes

* Delete Doxyfile

Removing unnecessary file

---------

Co-authored-by: Alex Wen <[email protected]>
Co-authored-by: Alex Wen <[email protected]>
Co-authored-by: Alex Wen <[email protected]>
Co-authored-by: Alex Wen <[email protected]>
Co-authored-by: Philip Weigel <[email protected]>
@austinschneider
Add Placement pybindings
296ddb0
@austinschneider
Add Quaternion python bindings
45355ba
@austinschneider
EarthModel pybindings
eacd64b
@austinschneider
Default constructor for EarthSector. Fix name collision for static an…
07725e5 
…d non-static methods in EarthModel
@austinschneider
Move detector pybindings into separate files. Add DensityDistribution…
1d59b21 
… pybindings
@austinschneider
pybindings for Axis1D and Distribution1D
3f886b1
@austinschneider
pybindings for CartesianAxis1D
f9a6d31
@austinschneider
Axis1D has pure virtual functions
e7d5b6f
@austinschneider
Add Axis1D and Distribution1D subclasses
4325129
@austinschneider
Polynomial and Exponential cartesian axis distributions
5ed3d9e
@austinschneider
Remove non-existent comparison operators
31f30b5
@austinschneider
Add pybindings for ConstantDensityDistribution
48ed293
Fix pybindings name for ConstantDistribution1D
199549b
@austinschneider
Add EarthSector python printout
9d648ae
@austinschneider
MaterialModel bindings. Remove unnecessary LeptonDepthFunction method
7fc8919
@austinschneider
MaterialModel pybindings
01286b5
@austinschneider
DummyCrossSection
060e65e
@austinschneider
Sketch helper class for CrossSection pybindings
60b3d2e
@austinschneider
Reindent
75b2278
@austinschneider
CrossSection pybindings
e84ba32
@austinschneider
Re-organize crosssections pybindings
2964333
@austinschneider
pybindings for DummyCrossSection
dce1eed
@austinschneider
More realistic total cross section for DummyCrossSection
1fa38c8
@austinschneider
Add interaction probability to pybindings
da64274
@nickkamp1 nickkamp1 self-requested a review September 6, 2023 20:17
@austinschneider
Copy link
Collaborator Author

The main code changes in this PR look good already.
The main items tackled are:

  • Handling a co-linear edge case for 180deg rotations in LI::math::rotation_between, which produces a Quaternion from two Vector3D objects
  • Fixing an unsigned integer underflow in EarthModel::GetOuterBounds
  • Additional pybindings for the detector module
  • pybindings for Quaternion
  • Coordinate system transformation fixes in DecayRangePositionDistribution::GenerationProbability, and ColumnDepthPositionDistribution::GenerationProbability
  • Add a constructor to TreeWeighter that does not require secondary processes

However, there are a couple things that we should clean up before merging:

  • The jupyter notebooks, python scripts, and makefiles in the resources folder should be deleted
    • It is fine if we have some dedicated examples, but we should put these into an examples folder, and it is probably best to do this in a separate PR
  • The extra .dat detector definitions need to be cleaned up
    • We can similarly put these into a separate PR

nickkamp1 and others added 17 commits September 13, 2023 15:52
@nickkamp1
starting to add HNL classes
e02e098
@austinschneider
Use a specific python version if specified
71782f0
@austinschneider
Remove parts of interface that depend on rk
2f1fc9b
@austinschneider
Explicitly label rk static lib. Export cmake project for rk
2cda60e
@austinschneider
Use rk_static in testing. Use photosplines internal install directive…
58aed0f 
…s so we can export it as a cmake project.
@austinschneider
Incude cassert (previously included via rk)
e076689
@austinschneider
Export cmake project. Specify public asnd private link libs. Remove u…
854037d 
…nneeded dependencies. Guard include dirs at install
@austinschneider
Install cereal so other libraries can use it
a4aca90
@austinschneider
Install delabella so other libraries can use it
5281bdc
@austinschneider
Use a single export name for rk
ee71758
@austinschneider
Use a single export name for delabella
d05f2fc
@austinschneider
Move around includes
7290d77
@austinschneider
Rearranging includes to enforce "include what you use"
9614f0b
@austinschneider
Move around includes to comply with IWYU
596943c
@austinschneider
Delete resources/DipoleInjection/inject_HNLs_CCM.ipynb
0a0336d
@austinschneider
Delete resources/DipoleInjection/Makefile
f910404
@austinschneider
Rename Makefile_original to Makefile
740dbb5
@austinschneider
Copy link
Collaborator Author

The first round of build system changes are now done, and the include statements have been rearranged to adhere to the "include what you use" paradigm. Hopefully this improves the build times a little bit.

I also cleaned up some of the files that we don't want to make it into the main branch.

There are still further build system changes that need to be completed, but I believe this is stable enough to merge into the main branch (provided that the build tests pass).

@nickkamp1 if you could review the changes soon I think we can go ahead and do a squash merge.

nickkamp1
nickkamp1 approved these changes Sep 21, 2023
View reviewed changes
Copy link
Collaborator

@nickkamp1 nickkamp1 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The changes look good, and I am able to build the libraries and pybindings without issue. Approving PR

@nickkamp1 nickkamp1 merged commit 4c35379 into main Sep 21, 2023
14 checks passed
@austinschneider austinschneider deleted the merge/alexwenym branch January 10, 2024 21:22
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@nickkamp1 nickkamp1 nickkamp1 approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@austinschneider @nickkamp1