-
Notifications
You must be signed in to change notification settings - Fork 12
Adds photon mass attenuation calculations #2048
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.
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
Merged
Merged
Changes from 50 commits
Commits
Show all changes
57 commits
Select commit
Hold shift + click to select a range
6333d02
Initial commit of transmission conversions
Matt-Carre 1040280
added docstrings
Matt-Carre a09a197
added docstrings
Matt-Carre cb6df54
initial commit
Matt-Carre ef61984
initial commit
Matt-Carre 0691886
adds roll_off back
Matt-Carre 7e8a3f5
adds pydantic validation
Matt-Carre 64c844c
Added pydantic validation
Matt-Carre 4d48090
changes to NonNegativeFloat (accepting 0) where relevant
Matt-Carre da51855
changes to NonNegativeFloat (accepting 0) where relevant, considering…
Matt-Carre e5c341d
fixes linting. going to move tests next update.
Matt-Carre 5215f96
labels tests
Matt-Carre 1eb350b
Merge branch '2040_attenuation_transmission' into 2039_photon_mass_calc
Matt-Carre 3d6a920
Merge branch '2040_attenuation_transmission' into 2041_interconversio…
Matt-Carre 273cbff
added test labels
Matt-Carre c9ef824
split tests
Matt-Carre 3d48b32
Merge branch '2040_attenuation_transmission' into 2039_photon_mass_calc
Matt-Carre 7d94b52
split tests
Matt-Carre c32281d
merged in 2040
Matt-Carre 10f65f8
adds specific output
Matt-Carre 1a01d56
Merge branch 'main' into 2041_interconversion_depth_attenuation
Matt-Carre 8896dd1
Merge branch 'main' into 2040_attenuation_transmission
Matt-Carre 436c253
Merge branch 'main' into 2039_photon_mass_calc
Matt-Carre 9c5f36b
Merge branch 'main' into 2041_interconversion_depth_attenuation
Matt-Carre a280aca
Merge branch 'main' into 2039_photon_mass_calc
Matt-Carre a4fed4d
Merge branch 'main' into 2040_attenuation_transmission
Matt-Carre 47a46e4
Merge branch 'main' into 2039_photon_mass_calc
Matt-Carre d4edcc1
Merge branch 'main' into 2041_interconversion_depth_attenuation
Matt-Carre 0e3b3a9
Merge branch 'main' into 2040_attenuation_transmission
Matt-Carre 915a226
rejoined tests
Matt-Carre 90c2c1a
Merge branch '2039_photon_mass_calc' of github.com:DiamondLightSource…
Matt-Carre 1651348
Merge branch '2040_attenuation_transmission' of github.com:DiamondLig…
Matt-Carre c243228
rejoins tests
Matt-Carre 3516fcb
Merge branch '2040_attenuation_transmission' into 2041_interconversio…
Matt-Carre 788ad00
rejoined tests
Matt-Carre 7763449
Merge branch '2041_interconversion_depth_attenuation' of github.com:D…
Matt-Carre 3ce2471
updates based on review
Matt-Carre f1c30c5
renames test
Matt-Carre 1fd5e87
fixed more comments
Matt-Carre 7aa9941
fixed more comments
Matt-Carre b5e6663
adds bools to bad input
Matt-Carre e85d2ac
Merge branch '2041_interconversion_depth_attenuation' into 2039_photo…
Matt-Carre 36b6243
fixes tests
Matt-Carre c7ffa7e
removed file
Matt-Carre 87717e4
Merge branch 'main' into 2039_photon_mass_calc
Matt-Carre ef4ec39
adds validation to guard against bools
Matt-Carre 3574eb1
Merge branch '2039_photon_mass_calc' of github.com:DiamondLightSource…
Matt-Carre 2104f29
fixes based on comments
Matt-Carre b9f0586
Merge branch 'main' into 2039_photon_mass_calc
Matt-Carre 3e29077
Merge branch 'main' into 2039_photon_mass_calc
Matt-Carre 58c8e78
Merge branch 'main' into 2039_photon_mass_calc
Matt-Carre cb0a165
Merge branch 'main' into 2039_photon_mass_calc
Matt-Carre 0fba9cc
Merge branch 'main' into 2039_photon_mass_calc
Matt-Carre ac891f9
removes 'arbitrary' from element tests
Matt-Carre 6734d07
Merge branch 'main' into 2039_photon_mass_calc
Matt-Carre aa583c6
Merge branch '2039_photon_mass_calc' of github.com:DiamondLightSource…
Matt-Carre f8fb92e
Merge branch 'main' into 2039_photon_mass_calc
Matt-Carre File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
22 changes: 22 additions & 0 deletions
22
src/dodal/common/general_maths/material_absorption_maths.py
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,22 @@ | ||
| from pydantic import StrictFloat, validate_call | ||
|
|
||
|
|
||
| @validate_call | ||
| def photon_mass_attenuation_per_unit_length( | ||
| energy_kev: StrictFloat, | ||
| photon_absorption_factor_per_unit_length: StrictFloat, | ||
| energy_dependence_exponent: StrictFloat, | ||
| ) -> float: | ||
| """Calculates mass attenuation per unit length. | ||
|
|
||
| Args: | ||
| energy_kev (StrictFloat): energy | ||
| photon_absorption_factor_per_unit_length (StrictFloat): photon absorption factor per | ||
| unit length | ||
| energy_dependence_exponent (StrictFloat): energy dependence exponent | ||
|
|
||
| Returns: | ||
| (float): mass attenuation per unit length. | ||
| """ | ||
| roll_off = energy_kev**energy_dependence_exponent | ||
| return photon_absorption_factor_per_unit_length * roll_off | ||
62 changes: 62 additions & 0 deletions
62
src/dodal/common/general_maths/transmission_interconversion.py
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,62 @@ | ||
| import math | ||
|
Matt-Carre marked this conversation as resolved.
|
||
|
|
||
| from pydantic import StrictFloat, validate_call | ||
|
|
||
| _CANONICAL_BARNETT_CONVERSION = -1.0e3 | ||
| _REVERSE_BARNETT_CONVERSION = -1.0e-3 | ||
|
|
||
|
|
||
| @validate_call | ||
| def attenuation_from_natural_log_of_transmission(ln_t: StrictFloat) -> float: | ||
| """Converts from natural log of transmission fraction into Barnett attenuation units | ||
| . | ||
|
|
||
| Args: | ||
| ln_t (StrictFloat): natural log of transmission fraction | ||
|
|
||
| Returns: | ||
| (float): Barnett attenuation units | ||
| """ | ||
| return _CANONICAL_BARNETT_CONVERSION * ln_t | ||
|
|
||
|
|
||
| @validate_call | ||
| def attenuation_from_transmission(transmission_as_fraction: StrictFloat) -> float: | ||
| """Converts from transmission fraction into Barnett attenuation units. | ||
|
|
||
| Args: | ||
| transmission_as_fraction (StrictFloat): transmission fraction | ||
|
|
||
| Returns: | ||
| (float): Barnett attenuation units. | ||
| """ | ||
| ln_t = math.log(transmission_as_fraction) | ||
| return attenuation_from_natural_log_of_transmission(ln_t) | ||
|
|
||
|
|
||
| @validate_call | ||
| def natural_log_of_transmission_from_attenuation(attenuation_bn: StrictFloat) -> float: | ||
| """Converts from Barnett attenuation units into natural log of transmission fraction | ||
| . | ||
|
|
||
| Args: | ||
| attenuation_bn (StrictFloat): Barnett attenuation units | ||
|
|
||
| Returns: | ||
| (float): natural log of transmission fraction | ||
| """ | ||
| return _REVERSE_BARNETT_CONVERSION * attenuation_bn | ||
|
|
||
|
|
||
| @validate_call | ||
| def transmission_from_attenutation(attenuation_bn: StrictFloat) -> float: | ||
| """Converts from Barnett attenuation units into transmission fraction. | ||
|
|
||
| Args: | ||
| attenuation_bn (StrictFloat): Barnett attenuation units | ||
|
|
||
| Returns: | ||
| (float): transmission fraction | ||
| """ | ||
| ln_t = natural_log_of_transmission_from_attenuation(attenuation_bn) | ||
| return math.exp(ln_t) | ||
51 changes: 51 additions & 0 deletions
51
tests/common/general_maths/test_material_absorption_maths.py
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,51 @@ | ||
| import math | ||
|
|
||
| import pytest | ||
| from pydantic import ValidationError | ||
|
|
||
| from dodal.common.general_maths.material_absorption_maths import ( | ||
| photon_mass_attenuation_per_unit_length, | ||
| ) | ||
|
|
||
|
|
||
| # happy path | ||
| @pytest.mark.parametrize( | ||
| "energy_kev,photon_absorption_factor_per_unit_length,energy_dependence_exponent," | ||
| "result", | ||
| [ | ||
| (5.042, 1.98e2, -2.717, 2.44170544), # Arbitrary Energy | ||
| (8.3328, 2.5706e3, -2.83, 6.3708311), # Arbitrary Nickel | ||
|
Collaborator
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Nit: the wording "arbitrary {element}" is extremely unclear. |
||
| (11.9187, 1.48e3, -2.93, 1.03970725), # Arbitrary Gold-Three | ||
| (25.514, 6.48e3, -2.41, 2.63778077), # Arbitrary Silver | ||
| ], | ||
| ) | ||
| def test_photon_mass_attenuation_per_unit_length( | ||
| energy_kev, | ||
| photon_absorption_factor_per_unit_length, | ||
| energy_dependence_exponent, | ||
| result, | ||
| ): | ||
| assert photon_mass_attenuation_per_unit_length( | ||
| energy_kev, photon_absorption_factor_per_unit_length, energy_dependence_exponent | ||
| ) == pytest.approx(result, 5.0e-8) | ||
|
|
||
|
|
||
| # inauspicious path | ||
| @pytest.mark.parametrize("bad_input", ["a", [], None, math.sin, object(), False]) | ||
| def test_photon_mass_attenuation_per_unit_length_errors_with_invalid_energy(bad_input): | ||
| with pytest.raises(ValidationError): | ||
| photon_mass_attenuation_per_unit_length(bad_input, 1.0, 1.0) | ||
|
|
||
|
|
||
| @pytest.mark.parametrize("bad_input", ["a", [], None, math.sin, object(), False]) | ||
| def test_photon_mass_attenuation_per_unit_length_errors_with_invalid_factor(bad_input): | ||
| with pytest.raises(ValidationError): | ||
| photon_mass_attenuation_per_unit_length(3500.0, bad_input, 1.0) | ||
|
|
||
|
|
||
| @pytest.mark.parametrize("bad_input", ["a", [], None, math.sin, object(), False]) | ||
| def test_photon_mass_attenuation_per_unit_length_errors_with_invalid_exponent( | ||
| bad_input, | ||
| ): | ||
| with pytest.raises(ValidationError): | ||
| photon_mass_attenuation_per_unit_length(3500.0, 1.0, bad_input) | ||
123 changes: 123 additions & 0 deletions
123
tests/common/general_maths/test_transmission_interconversion.py
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,123 @@ | ||
| import math | ||
|
|
||
| import pytest | ||
| from pydantic import ValidationError | ||
|
|
||
| from dodal.common.general_maths.transmission_interconversion import ( | ||
| attenuation_from_natural_log_of_transmission, | ||
| attenuation_from_transmission, | ||
| natural_log_of_transmission_from_attenuation, | ||
| transmission_from_attenutation, | ||
| ) | ||
|
|
||
|
|
||
| @pytest.mark.parametrize( | ||
| "attenuation_bn,result", | ||
| [ | ||
| (0, 1), # tests transparency from zero attenuation (canonical) | ||
| ( | ||
| 1e3, | ||
| 0.3678794, | ||
| ), # tests transmission from canonical attenuation is 1/e (canonical) | ||
| ( | ||
| 145.1, | ||
| 0.8649358, | ||
| ), # tests transmission from arbitrary weak attenuation is weak attenuation | ||
| ( | ||
| 7221.9, | ||
| 7.3041331435179e-4, | ||
| ), # tests transmission from arbitrary strong attenuation is strong attenuation | ||
| ], | ||
| ) | ||
| def test_transmission_from_attenutation(attenuation_bn, result): | ||
| assert transmission_from_attenutation(attenuation_bn) == pytest.approx(result) | ||
|
|
||
|
|
||
| @pytest.mark.parametrize( | ||
| "attenuation_bn,result", | ||
| [ | ||
| (0, 0), # tests natural log of transparency from attenuation (canonical) | ||
| ( | ||
| 1e3, | ||
| -1, | ||
| ), # tests natural log of transmission from canonical transmission is negative | ||
| # unity (canonical) | ||
| ( | ||
| 712.6, | ||
| -0.7126, | ||
| ), # tests attenuation from natural log arbitrary high transmission | ||
| ( | ||
| 8034.1, | ||
| -8.0341, | ||
| ), # tests attenuation from natural log arbitrary low transmission | ||
| ], | ||
| ) | ||
| def test_natural_log_of_transmission_from_attenuation(attenuation_bn, result): | ||
| assert natural_log_of_transmission_from_attenuation( | ||
| attenuation_bn | ||
| ) == pytest.approx(result) | ||
|
|
||
|
|
||
| @pytest.mark.parametrize( | ||
| "transmission_as_fraction,result", | ||
| [ | ||
| (1, 0), # tests attenuation from transparency is zero (canonical) | ||
| (0.37, 994.25227334), # tests attenuation from 37% is close to 1000 | ||
| ( | ||
| 0.871, | ||
| 138.1133, | ||
| ), # tests attenuation from arbitrary high transmission | ||
| ( | ||
| 4.2e-4, | ||
| 7775.2558, | ||
| ), # tests attenuation from arbitrary high attenuation | ||
| ], | ||
| ) | ||
| def test_attenuation_from_transmission(transmission_as_fraction, result): | ||
| assert attenuation_from_transmission(transmission_as_fraction) == pytest.approx( | ||
| result | ||
| ) | ||
|
|
||
|
|
||
| @pytest.mark.parametrize( | ||
| "ln_t,result", | ||
| [ | ||
| (-1, 1000), # tests negative unity log of transmission is 1000 (canonical) | ||
| (0, 0), # tests natural log of transparency is zero (canonical) | ||
| ( | ||
| -0.4367, | ||
| 436.7, | ||
| ), # tests log from arbitrary high transmission | ||
| ( | ||
| -5.9017, | ||
| 5901.7, | ||
| ), # tests log from arbitrary low transmission | ||
| ], | ||
| ) | ||
| def test_attenuation_from_natural_log_of_transmission(ln_t, result): | ||
| assert attenuation_from_natural_log_of_transmission(ln_t) == pytest.approx(result) | ||
|
|
||
|
|
||
| # inauspicious: | ||
| @pytest.mark.parametrize("bad_input", ["a", [], None, math.sin, object(), False]) | ||
| def test_natural_log_of_transmission_from_attenuation_raises_error(bad_input): | ||
| with pytest.raises(ValidationError): | ||
| natural_log_of_transmission_from_attenuation(bad_input) | ||
|
|
||
|
|
||
| @pytest.mark.parametrize("bad_input", ["a", [], None, math.sin, object(), False]) | ||
| def test_transmission_from_attenutation_raises_error(bad_input): | ||
| with pytest.raises(ValidationError): | ||
| transmission_from_attenutation(bad_input) | ||
|
|
||
|
|
||
| @pytest.mark.parametrize("bad_input", ["a", [], None, math.sin, object(), False]) | ||
| def test_attenuation_from_transmission_raises_error(bad_input): | ||
| with pytest.raises(ValidationError): | ||
| attenuation_from_transmission(bad_input) | ||
|
|
||
|
|
||
| @pytest.mark.parametrize("bad_input", ["a", [], None, math.sin, object(), False]) | ||
| def test_attenuation_from_natural_log_of_transmission_raises_error(bad_input): | ||
| with pytest.raises(ValidationError): | ||
| attenuation_from_natural_log_of_transmission(bad_input) |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.