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

No more manager! #73

Merged
merged 176 commits into from
May 27, 2024
Merged

No more manager! #73

merged 176 commits into from
May 27, 2024

Conversation

freddieknets
Copy link
Collaborator

Description

This pull request collects lots of changes that were scattered over different branches (with the most important one being the slimming down of the manager). All changes will be detailed in the upcoming release notes.

Mandatory:

  • I have added tests to cover my changes
  • All the tests are passing, including my new ones
  • I described my changes in this PR description

Optional:

  • The code I wrote follows good style practices (see PEP 8 and PEP 20).
  • I have updated the docs in relation to my changes, if applicable
  • I have tested also GPU contexts

freddieknets and others added 30 commits July 5, 2023 19:43
@freddieknets
Adapted buffer and io_buffer in manager to work correctly. Made impac…
b34682e 
…t table more robust; works correctly for BlackAbsorber.
@freddieknets
Spelling mistake in Beryllium
b9f83a2
@freddieknets
Added ds parameter to table, and fixed interaction_type property.
c9674bc
@freddieknets
Absorbed logging now correctly with ds.
46e1af5
@freddieknets
Amorphous layer temporarily not supported (adapted tests as well). Pr…
81ac616 
…epared small details for recording of crystals.
@freddieknets
Removed nam from crystal code.
69944e4
@freddieknets
Moved imapcts table to separate folder with own C code.
decf6ec
@freddieknets
Moved material into interact.
635db18
@freddieknets
Some cleaning in scatter_cry and crystal.
15bb799
@freddieknets
Moved calculation of bend/bending angle, and scatter length, to python.
1dd89d0
@freddieknets
some further cleaning of crystal function
7fc554d
@freddieknets
More cleaning in function crystal.
17f36d8
@freddieknets
Refactored LocalParticle inside function interact.
7f70d01
@freddieknets
Cleaned up calcionloss_cry.
4622561
@freddieknets
Removed _scatter_length as it was wrong.
d87755a
@freddieknets
Adapted MoveAM to work with ScatteringParameters.
45e1d6d
@freddieknets
First implementation of channeling transport function, and some renam…
7471b09 
…ing of variables.
@freddieknets
Use new channeling transport function implemenation for dechanneling …
6e56387 
…as well.
@freddieknets
Forgot to track new file crystal_properties.h
762d908
@freddieknets
New file structure for impact table.
ae92beb
@freddieknets
Cleaned up movech - not yet tested.
849b6dd
@freddieknets
Fixed typos (tests pass), and factored constants out into separate file.
72c0971
@freddieknets
Some further cleaning.
547c45f
@freddieknets
Cleaned scatter.
72063c7
@freddieknets
Bunch of cleaning.
687537f
@freddieknets
Homogenised calcionloss.
c7657cd
@freddieknets
First introduction of continous transport funtions Amorphous and Chan…
a84645a 
…nel.
@freddieknets
Changed structs by reference.
4ed96c6
@freddieknets
First try to make general EverestData struct (no crystals yet) -- doe…
f440e76 
…s not worj.
@freddieknets
Quick fix with EverestData definition -- still does not work.
5b508ee
@freddieknets
Finally, crystal geometry
0235538
@freddieknets
Added eta to channeling efficiency and prohibit two-sided crystal (ho…
026f7b8 
…wever this currently makes test_elements fail)
@freddieknets
Added a few more checks in BaseCollimator and adapted test_elements.
8108ad2
@freddieknets
New geometry code in C based on segments and objects: much more modular
d350706
@freddieknets
Updated test for new geometry (still need tests with vlimit)
29f2fc0
@freddieknets
Two bugfixes: 1.e12 where it should have been 1.e-12, and a memory is…
51c9d4f 
…sue when expanding an array (in calculate_overlap) -> this was solved by the realisation that the array will always be allocated large enough in our case anyway
@freddieknets
Added test for geometry
ba6ee1d
@freddieknets
Introduced BlackCrystal, applied new geometry to BlackAbsorber and Bl…
1bea7a5 
…ackCrystal, and made jaw= and gap= sign-dependent when setting a single-sided collimator.
@freddieknets
Updated tests for BlackAbsorber
1f52de0
@freddieknets
EverestCollimator uses new-style geometry; EverestCrystal in the works.
c2419e3
@freddieknets
Quick bugfix of typo in crystals (but geometry update not yet complet…
983ba38 
…e for EverestCrystal)
@freddieknets
First step to get EverestCrystal working with new geometry - WIP
f8a0de1
@freddieknets
Quick bugfix: angle should be after transformation.
a44dce2
@freddieknets
EverestCrystal tests pass. However, currently the crystal rotates aro…
3dc6bf9 
…und the front corner -> not done consistently.
@freddieknets
Redefinition of crystals: tilt around inner front corner.
df1d0f8
@freddieknets
Forgot to rename jaw_L into jaw in collimator jsons in test
ae7d504
@freddieknets
Moving to inner upstream corner (for rotation) means s=0
86d9cce
@freddieknets
Moved eta into EverestColl struct (instead of being hardcoded) and re…
6c04670 
…moved some superflous geometry from struct (though some is left for now)
@freddieknets
Bugfix of typo (xdim instead of width)
87e575e
@freddieknets
Adapted BlackCrystal to new tilt rotation logic
d8f34aa
@freddieknets
Made sure elements can be initialised without argument
52bfc7c
@freddieknets
Updated geometry elements tests
d0f2122
@freddieknets
Fix: inside Rc scale with sart(eta)
5af22a6
@freddieknets
Reshuffled class dependencies to better separate geometry from scatte…
59dc939 
…ring
@freddieknets
Reorganised CrystalGeometry struct vd EverestCollData struct
23470b8
@freddieknets
Updated references after bugfix with sqrt(eta) inside Rc
47d6438
@freddieknets
trying to make tests more robust
6705049
@freddieknets freddieknets changed the base branch from main to release/v0.4.0 May 27, 2024 18:14
@freddieknets freddieknets merged commit 862c223 into release/v0.4.0 May 27, 2024
@freddieknets freddieknets deleted the NoMoreManager branch May 27, 2024 18:15
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
1 participant
@freddieknets