Skip to content

Fix tosca_book model #37

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

Draft
RastislavTuranyi wants to merge 2 commits into
base: main
Choose a base branch
from
Draft

Fix tosca_book model #37

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3601ab7
Fix implementation bugs and some equation mistakes
Feb 13, 2025
e5dde5c
Move delta theta b outside cotangent
Feb 20, 2025
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
47 changes: 26 additions & 21 deletions src/resolution_functions/models/tosca_book.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,9 @@
from jaxtyping import Float


FWHM2SIGMA = 1 / (2 * np.sqrt(2 * np.log(2)))


@dataclass(init=True, repr=True, frozen=True, slots=True, kw_only=True)
class ToscaBookModelData(ModelData):
"""
Expand Down Expand Up @@ -111,26 +114,30 @@ class ToscaBookModel(InstrumentModel):
data_class = ToscaBookModelData

REDUCED_PLANCK_SQUARED = 4.18019
NEUTRON_MASS = 1

def __init__(self, model_data: ToscaBookModelData, **_):
super().__init__(model_data)
da = model_data.average_secondary_flight_path * np.sin(np.deg2rad(model_data.average_bragg_angle_graphite))

self.time_dependent_term_factor = model_data.water_moderator_constant ** 2 * self.REDUCED_PLANCK_SQUARED
self.final_energy_term_factor = (2 * model_data.average_final_energy *
model_data.change_average_bragg_angle_graphite /
np.tan(np.deg2rad(model_data.average_bragg_angle_graphite)))
self.time_dependent_term_factor += (2 * model_data.average_final_energy *
(model_data.sample_thickness ** 2 +
4 * model_data.graphite_thickness ** 2 +
model_data.detector_thickness ** 2) ** 0.5 / da) ** 2
self.time_dependent_term_factor = np.sqrt(self.time_dependent_term_factor)
theta = np.deg2rad(model_data.average_bragg_angle_graphite)
da = 0.5 * model_data.average_secondary_flight_path * np.sin(theta)
dt = (model_data.sample_thickness ** 2 +
4 * model_data.graphite_thickness ** 2 +
model_data.detector_thickness ** 2) ** 0.5

self.time_dependent_term_factor = (0.5 * model_data.water_moderator_constant ** 2
* self.REDUCED_PLANCK_SQUARED / self.NEUTRON_MASS)

self.final_energy_factor = (2 * model_data.average_final_energy * dt / da) ** 2
angle_contrib = model_data.change_average_bragg_angle_graphite / np.tan(theta)
self.final_energy_factor += (2 * model_data.average_final_energy * angle_contrib) ** 2
self.final_energy_factor **= 0.5

self.final_flight_factor = 2 * dt / np.sin(theta)

self.average_final_energy = model_data.average_final_energy
self.primary_flight_path = model_data.primary_flight_path
self.primary_flight_path_uncertainty = model_data.primary_flight_path_uncertainty
self.average_secondary_flight_path = model_data.average_secondary_flight_path
self.average_bragg_angle = model_data.average_bragg_angle_graphite
self.time_channel_uncertainty2 = model_data.time_channel_uncertainty ** 2

def get_characteristics(self, energy_transfer: Float[np.ndarray, 'energy_transfer']
Expand All @@ -153,21 +160,19 @@ def get_characteristics(self, energy_transfer: Float[np.ndarray, 'energy_transfe
"""
ei = energy_transfer + self.average_final_energy

time_dependent_term = (2 / NEUTRON_MASS) ** 0.5 * ei ** 1.5 / self.primary_flight_path
time_dependent_term *= self.time_dependent_term_factor / (
2 * NEUTRON_MASS * ei) + self.time_channel_uncertainty2
time_term = 2 * (2 / self.NEUTRON_MASS) ** 0.5 * ei ** 1.5 / self.primary_flight_path
time_term *= (self.time_dependent_term_factor / ei + self.time_channel_uncertainty2) ** 0.5

incident_flight_term = 2 * ei / self.primary_flight_path * self.primary_flight_path_uncertainty

final_energy_term = (self.time_dependent_term_factor *
(1 + self.average_secondary_flight_path / self.primary_flight_path *
final_energy_term = (self.final_energy_factor *
(-1 - self.average_secondary_flight_path / self.primary_flight_path *
(ei / self.average_final_energy) ** 1.5))

final_flight_term = (2 / self.average_secondary_flight_path *
np.sqrt(ei ** 3 / self.average_final_energy) *
2 * self.primary_flight_path / np.sin(self.average_bragg_angle))
final_flight_term = (self.final_flight_factor * 2 / self.primary_flight_path *
np.sqrt(ei ** 3 / self.average_final_energy))

result = np.sqrt(time_dependent_term ** 2 + incident_flight_term ** 2 +
result = np.sqrt(time_term ** 2 + incident_flight_term ** 2 +
final_energy_term ** 2 + final_flight_term ** 2)
return {'sigma': result}

Expand Down