Skip to content

Union logger transformations #2426

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

Open
mads-bertelsen wants to merge 11 commits into
base: main
Choose a base branch
from
Open

Union logger transformations #2426

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
bc58110
Fixing lack of rotation for logger components.
mads-bertelsen Apr 29, 2026
94c12a6
Fixed errors caught by compiler.
mads-bertelsen Apr 29, 2026
85ecb12
Further fixe, now all existing tests runs successfully.
mads-bertelsen Apr 29, 2026
90e3a0c
Update of tests to include:
mads-bertelsen Apr 29, 2026
9c799c3
Fixed typo in expected intensity
mads-bertelsen Apr 30, 2026
790a440
Added check for malloc returning NULL pointer across all loggers and …
mads-bertelsen May 4, 2026
672a808
clang formattet all components
mads-bertelsen May 4, 2026
4189833
Updating NCrystal_process to modern standard as its tests were failin…
mads-bertelsen May 4, 2026
c37a54f
Adding _WIN32 to define flags that change import syntax for windows.
mads-bertelsen May 4, 2026
5e26d07
Updated headers of test instruments.
mads-bertelsen May 11, 2026
9d5a151
Found some uninitialized values and a slight error in malloc size. Pe…
mads-bertelsen May 11, 2026
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
28 changes: 23 additions & 5 deletions ...ps/examples/Tests_union/Unit_test_abs_logger_1D_space/Unit_test_abs_logger_1D_space.instr
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,11 @@
* the amount of absorbed intensity projected onto a axis along its y coordinate.
* Often used for detectors.
*
* Includes conditional component to test record_to_temp functionality
* of investigated abs_logger.
*
* %Example: Detector: abs_logger_1D_I=1.12609e-09
* %Example: Detector: abs_logger_1D_con_I=4.95914e-13
*
* %End
*******************************************************************************/
Expand Down Expand Up @@ -62,26 +66,40 @@ AT (0,0,0) RELATIVE Origin
COMPONENT geometry_center = Arm()
AT (0,0,2.0) RELATIVE source

COMPONENT box = Union_box(xwidth=0.10, yheight=0.15, zdepth=0.03, priority=5, material_string="material")
COMPONENT box_geometry = Union_box(xwidth=0.10, yheight=0.15, zdepth=0.03, priority=5, material_string="material")
AT (-0.03,0,-0.05) RELATIVE geometry_center

COMPONENT sphere = Union_sphere(radius=0.05, priority=6, material_string="material")
COMPONENT sphere_geometry = Union_sphere(radius=0.05, priority=6, material_string="material")
AT (0.03,0,-0.04) RELATIVE geometry_center

COMPONENT cylinder = Union_cylinder(radius=0.045, yheight=0.1, priority=7, material_string="material")
COMPONENT cylinder_geometry = Union_cylinder(radius=0.045, yheight=0.1, priority=7, material_string="material")
AT (-0.03,0,0.02) RELATIVE geometry_center

COMPONENT cone = Union_cone(radius_top=0.02, radius_bottom=0.055, yheight=0.09, priority=8, material_string="material")
COMPONENT cone_geometry = Union_cone(radius_top=0.02, radius_bottom=0.055, yheight=0.09, priority=8, material_string="material")
AT (0.03,0,0.07) RELATIVE geometry_center

// Insert loggers to be tested here
COMPONENT abs_logger_1D = Union_abs_logger_1D_space(
yheight=0.2, n=100,
filename="Union_abs_logger_1D_space.dat")
AT (0,0,0) RELATIVE geometry_center

// This logger will be affected by a conditional, impacts code path
COMPONENT abs_logger_1D_con = Union_abs_logger_1D_space(
yheight=0.2, n=100,
filename="Union_abs_logger_1D_space_con.dat")
AT (0,0,0) RELATIVE geometry_center

// Conditional that takes right part of transmitted beam
COMPONENT PSD_conditional = Union_conditional_PSD(
xwidth=0.1, yheight=0.2,
target_loggers="abs_logger_1D_con")
AT (-0.05,0,1.0) RELATIVE geometry_center

// Master at odd position to ensure that does not impact results
COMPONENT master = Union_master()
AT(0,0,0) RELATIVE geometry_center
AT(3, 0, -1) RELATIVE geometry_center
ROTATED(20, -5, 8) RELATIVE geometry_center

COMPONENT transmission = PSD_monitor(
xwidth=0.1, yheight=0.08, nx=200, ny=200,
Expand Down
28 changes: 22 additions & 6 deletions ...Tests_union/Unit_test_abs_logger_1D_space_event/Unit_test_abs_logger_1D_space_event.instr
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,9 @@
* %Description
* No example value as the produced file contains events.
*
* Includes conditional component to test record_to_temp functionality
* of investigated abs_logger.
*
* %End
*******************************************************************************/

Expand Down Expand Up @@ -58,25 +61,38 @@ AT (0,0,0) RELATIVE Origin
COMPONENT geometry_center = Arm()
AT (0,0,2.0) RELATIVE source

COMPONENT box = Union_box(xwidth=0.10, yheight=0.15, zdepth=0.03, priority=5, material_string="material")
COMPONENT box_geometry = Union_box(xwidth=0.10, yheight=0.15, zdepth=0.03, priority=5, material_string="material")
AT (-0.03,0,-0.05) RELATIVE geometry_center

COMPONENT sphere = Union_sphere(radius=0.05, priority=6, material_string="material")
COMPONENT sphere_geometry = Union_sphere(radius=0.05, priority=6, material_string="material")
AT (0.03,0,-0.04) RELATIVE geometry_center

COMPONENT cylinder = Union_cylinder(radius=0.045, yheight=0.1, priority=7, material_string="material")
COMPONENT cylinder_geometry = Union_cylinder(radius=0.045, yheight=0.1, priority=7, material_string="material")
AT (-0.03,0,0.02) RELATIVE geometry_center

COMPONENT cone = Union_cone(radius_top=0.02, radius_bottom=0.055, yheight=0.09, priority=8, material_string="material")
COMPONENT cone_geometry = Union_cone(radius_top=0.02, radius_bottom=0.055, yheight=0.09, priority=8, material_string="material")
AT (0.03,0,0.07) RELATIVE geometry_center

COMPONENT abs_logger_1D = Union_abs_logger_1D_space_event(
COMPONENT abs_logger_1D_space_event = Union_abs_logger_1D_space_event(
yheight=0.2, n=100, fake_event=1,
filename="Union_abs_logger_1D_space_event.dat")
AT (0,0,0) RELATIVE geometry_center

COMPONENT abs_logger_1D_space_event_con = Union_abs_logger_1D_space_event(
yheight=0.2, n=100, fake_event=1,
filename="Union_abs_logger_1D_space_event_con.dat")
AT (0,0,0) RELATIVE geometry_center

// Conditional that takes right part of transmitted beam
COMPONENT PSD_conditional = Union_conditional_PSD(
xwidth=0.1, yheight=0.2,
target_loggers="abs_logger_1D_space_event_con")
AT (-0.05,0,1.0) RELATIVE geometry_center

// Master at odd position to ensure that does not impact results
COMPONENT master = Union_master()
AT(0,0,0) RELATIVE geometry_center
AT (3, 0, -1) RELATIVE geometry_center
ROTATED (20, -5, 8) RELATIVE geometry_center

COMPONENT transmission = PSD_monitor(
xwidth=0.1, yheight=0.08, nx=200, ny=200,
Expand Down
46 changes: 32 additions & 14 deletions ...les/Tests_union/Unit_test_abs_logger_1D_space_tof/Unit_test_abs_logger_1D_space_tof.instr
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,11 @@
* Tests absorption logger measuring position projected onto a line and the
* time of absorption in a histogram.
*
* Includes conditional component to test record_to_temp functionality
* of investigated abs_logger.
*
* %Example: Detector: abs_logger_1D_space_tof_I=1.12682e-09
* %Example: Detector: abs_logger_1D_space_tof_con_I=5.38067e-13
*
* %End
*******************************************************************************/
Expand Down Expand Up @@ -53,38 +57,52 @@ COMPONENT Origin = Progress_bar()
AT (0,0,0) ABSOLUTE

COMPONENT source = Source_div(
xwidth=0.02, yheight=0.002,
focus_aw=0.01, focus_ah=0.01,
E0=10, dE=0.1)
xwidth=0.02, yheight=0.002,
focus_aw=0.01, focus_ah=0.01,
E0=10, dE=0.1)
AT (0,0,0) RELATIVE Origin

COMPONENT geometry_center = Arm()
AT (0,0,2.0) RELATIVE source

COMPONENT box = Union_box(xwidth=0.10, yheight=0.15, zdepth=0.03, priority=5, material_string="material")
COMPONENT box_geometry = Union_box(xwidth=0.10, yheight=0.15, zdepth=0.03, priority=5, material_string="material")
AT (-0.03,0,-0.05) RELATIVE geometry_center

COMPONENT sphere = Union_sphere(radius=0.05, priority=6, material_string="material")
COMPONENT sphere_geometry = Union_sphere(radius=0.05, priority=6, material_string="material")
AT (0.03,0,-0.04) RELATIVE geometry_center

COMPONENT cylinder = Union_cylinder(radius=0.045, yheight=0.1, priority=7, material_string="material")
COMPONENT cylinder_geometry = Union_cylinder(radius=0.045, yheight=0.1, priority=7, material_string="material")
AT (-0.03,0,0.02) RELATIVE geometry_center

COMPONENT cone = Union_cone(radius_top=0.02, radius_bottom=0.055, yheight=0.09, priority=8, material_string="material")
COMPONENT cone_geometry = Union_cone(radius_top=0.02, radius_bottom=0.055, yheight=0.09, priority=8, material_string="material")
AT (0.03,0,0.07) RELATIVE geometry_center

COMPONENT abs_logger_1D_space_tof = Union_abs_logger_1D_space_tof(
yheight=0.2, n=100,
time_min=0.0013, time_max=0.0022, time_bins=1000,
filename="Union_abs_logger_1D_space_tof.dat")
yheight=0.2, n=100,
time_min=0.0013, time_max=0.0022, time_bins=1000,
filename="Union_abs_logger_1D_space_tof.dat")
AT (0,0,0) RELATIVE geometry_center


COMPONENT abs_logger_1D_space_tof_con = Union_abs_logger_1D_space_tof(
yheight=0.2, n=100,
time_min=0.0013, time_max=0.0022, time_bins=1000,
filename="Union_abs_logger_1D_space_tof_con.dat")
AT (0,0,0) RELATIVE geometry_center

// Conditional that takes right part of transmitted beam
COMPONENT PSD_conditional = Union_conditional_PSD(
xwidth=0.1, yheight=0.2,
target_loggers="abs_logger_1D_space_tof_con")
AT (-0.05,0,1.0) RELATIVE geometry_center

// Master at odd position to ensure that does not impact results
COMPONENT master = Union_master()
AT(0,0,0) RELATIVE geometry_center
AT (3, 0, -1) RELATIVE geometry_center
ROTATED (20, -5, 8) RELATIVE geometry_center

COMPONENT transmission = PSD_monitor(
xwidth=0.1, yheight=0.08, nx=200, ny=200,
filename="PSD.dat", restore_neutron=1)
xwidth=0.1, yheight=0.08, nx=200, ny=200,
filename="PSD.dat", restore_neutron=1)
AT (0,0,1) RELATIVE geometry_center

COMPONENT stop = Union_stop()
Expand Down
61 changes: 48 additions & 13 deletions ..._test_abs_logger_1D_space_tof_to_lambda/Unit_test_abs_logger_1D_space_tof_to_lambda.instr
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,12 @@
* both the standard view with measured and true wavelength on each axis, and the
* relative where they have been normalized and a value of 1 is expected.
*
* %Example: Detector: abs_logger_1D_space_tof_to_lambda_I=9.82157e-12
* %Example: Detector: abs_logger_1D_space_tof_to_lambda_relative_I=1.02297e-11
* Includes conditional component to test record_to_temp functionality
* of investigated abs_logger.
*
* %Example: Detector: abs_logger_1D_space_tof_to_lambda_I=5.40132e-12
* %Example: Detector: abs_logger_1D_space_tof_to_lambda_relative_I=5.41367e-12
* %Example: Detector: abs_logger_1D_space_tof_to_lambda_con_I=8.13732e-13
*
* %End
*******************************************************************************/
Expand Down Expand Up @@ -57,6 +61,10 @@ COMPONENT material = Union_make_material(my_absorption=4.0,
process_string="incoherent,powder")
AT (0,0,0) ABSOLUTE

COMPONENT inc_material = Union_make_material(my_absorption=1.0,
process_string="incoherent")
AT (0,0,0) ABSOLUTE

COMPONENT Origin = Progress_bar()
AT (0,0,0) ABSOLUTE

Expand All @@ -69,46 +77,73 @@ AT (0,0,0) RELATIVE Origin
COMPONENT geometry_center = Arm()
AT (0,0,10.0) RELATIVE source

COMPONENT sphere = Union_sphere(radius=0.02, priority=6, material_string="material")
COMPONENT sphere_geometry = Union_sphere(
radius=0.02, priority=6, material_string="inc_material", p_interact=0.2,
focus_xw=0.1, focus_xh=0.9, target_x=-0.5, target_y=0, target_z=0)
AT (0,0,0) RELATIVE geometry_center

COMPONENT box = Union_box(xwidth=0.10, yheight=0.15, zdepth=0.03, priority=5, material_string="material")
COMPONENT box_geometry = Union_box(
xwidth=0.10, yheight=0.15, zdepth=0.03, priority=5, material_string="inc_material", p_interact=0.2,
focus_xw=0.1, focus_xh=0.9, target_x=-0.5, target_y=0, target_z=0)
AT (-0.03,0,-0.01) RELATIVE geometry_center

COMPONENT cone = Union_cone(radius_top=0.02, radius_bottom=0.055, yheight=0.09, priority=8, material_string="material")
COMPONENT cone_geometry = Union_cone(
radius_top=0.02, radius_bottom=0.055, yheight=0.09, priority=8, material_string="inc_material", p_interact=0.2,
focus_xw=0.1, focus_xh=0.9, target_x=-0.5, target_y=0, target_z=0)
AT (0.03,0,0.02) RELATIVE geometry_center

COMPONENT cylinder = Union_cylinder(radius=0.02, yheight=0.8, priority=7, material_string="material")
AT (-1.0,0,0.0) RELATIVE geometry_center
COMPONENT cylinder_geometry = Union_cylinder(
radius=0.03, yheight=0.8, priority=7, material_string="material")
AT (-0.5,0,0.0) RELATIVE geometry_center

COMPONENT abs_logger_1D_space_tof_to_lambda = Union_abs_logger_1D_space_tof_to_lambda(
yheight=0.8, yn=100,
target_geometry="cylinder",
target_geometry="cylinder_geometry",
ref_component=-5,
source_sample_dist=10.0,
lambda_min=2.0, lambda_max=8.0, lambda_bins=200,
filename="Union_abs_logger_1D_space_tof_to_lambda.dat")
AT (0,0,0) RELATIVE cylinder
AT (0,0,0) RELATIVE cylinder_geometry

COMPONENT abs_logger_1D_space_tof_to_lambda_relative = Union_abs_logger_1D_space_tof_to_lambda(
yheight=0.8, yn=100,
target_geometry="cylinder",
target_geometry="cylinder_geometry",
ref_component=-6,
source_sample_dist=10.0,
lambda_min=2.0, lambda_max=8.0, lambda_bins=200,
filename="Union_abs_logger_1D_space_tof_to_lambda_relative.dat",
relative_measured=1, relative_min=0.95, relative_max=1.05, relative_bins=100)
AT (0,0,0) RELATIVE cylinder
AT (0,0,0) RELATIVE cylinder_geometry

COMPONENT abs_logger_1D_space_tof_to_lambda_con = Union_abs_logger_1D_space_tof_to_lambda(
yheight=0.8, yn=100,
target_geometry="cylinder_geometry",
ref_component=-7,
source_sample_dist=10.0,
lambda_min=2.0, lambda_max=8.0, lambda_bins=200,
filename="Union_abs_logger_1D_space_tof_to_lambda_con.dat")
AT (0,0,0) RELATIVE cylinder_geometry

COMPONENT conditional_direction = Arm()
AT (0,0,0) RELATIVE geometry_center
ROTATED (0,-90,0) RELATIVE geometry_center

// Conditional in direction of cylinder
COMPONENT PSD_conditional = Union_conditional_PSD(
xwidth=0.2, yheight=1.5,
target_loggers="abs_logger_1D_space_tof_to_lambda_con")
AT (0,0,0.6) RELATIVE conditional_direction

// Master at odd position to ensure that does not impact results
COMPONENT master = Union_master()
AT(0,0,0) RELATIVE geometry_center
AT(3,0,-1) RELATIVE geometry_center
ROTATED(20,-5,8) RELATIVE geometry_center

COMPONENT transmission = PSD_monitor(
xwidth=0.1, yheight=0.08, nx=200, ny=200,
filename="PSD.dat", restore_neutron=1)
AT (0,0,1) RELATIVE geometry_center


COMPONENT stop = Union_stop()
AT (0,0,0) ABSOLUTE

Expand Down
Loading
Loading