Skip to content

Commit

Permalink
Add new PyChop version for ARCS and SEQUOIA
Browse files Browse the repository at this point in the history
  • Loading branch information
Rastislav Turanyi committed Jan 17, 2025
1 parent 42fb663 commit 24ab899
Show file tree
Hide file tree
Showing 2 changed files with 101 additions and 40 deletions.
57 changes: 41 additions & 16 deletions src/resolution_functions/instrument_data/arcs.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,12 @@ version:
default_chopper_frequency: 300
allowed_chopper_frequencies: [60, 601, 60]
frequency_matrix: [[1]]
moderator:
moderator: &moderator
type: 1
scaling_function: null
scaling_parameters: null
measured_wavelength: null
measured_width: null
parameters: [119.63, 33.618, .037, .17, 172.42] # Parameters for time profile
detector:
type: 2
phi: 0.0
Expand All @@ -34,8 +33,8 @@ version:
Fermi:
distance: 11.61 # m
aperture_distance: 9.342 # m
configurations: &configurations
chopper_package:
configurations:
chopper_package: &configurations
default_option: 'ARCS-100-1.5-AST'
SEQ-100-2.0-AST:
pslit: 2.03e-3 # m
Expand All @@ -62,22 +61,48 @@ version:
radius: 50.0e-3 # m
rho: 1.5350 # m
tjit: 0.0 # Jitter time (us)
ARCS-100-1.5-SMI:
pslit: 1.52e-3 # m
radius: 50.0e-3 # m
rho: 0.5800 # m
tjit: 0.0 # Jitter time (us)
ARCS-700-1.5-SMI:
pslit: 1.52e-3 # m
radius: 50.0e-3 # m
rho: 1.5350 # m
tjit: 0.0 # Jitter time (us)
default_model: 'PyChop_fit'
models:
PyChop_fit: "PyChop_fit_v1"
PyChop_fit: "PyChop_fit_v2"
PyChop_fit_v1:
function: "pychop_fit_fermi"
citation: [""]
parameters:
<<: *constants
configurations: *configurations
moderator:
<<: *moderator
parameters: [ 119.63, 33.618, .037, .17, 172.42 ] # Parameters for time profile
configurations:
chopper_package:
<<: *configurations
ARCS-100-1.5-SMI:
pslit: 1.52e-3 # m
radius: 50.0e-3 # m
rho: 0.5800 # m
tjit: 0.0 # Jitter time (us)
ARCS-700-1.5-SMI:
pslit: 1.52e-3 # m
radius: 50.0e-3 # m
rho: 1.5350 # m
tjit: 0.0 # Jitter time (us)
PyChop_fit_v2:
function: "pychop_fit_fermi"
citation: [ "" ]
parameters:
<<: *constants
moderator:
<<: *moderator
parameters: [281., 79.0, .087, .4, 172.] # Parameters for time profile
configurations:
chopper_package:
<<: *configurations
ARCS-100-1.5-SMI:
pslit: 1.5e-3 # m
radius: 50.0e-3 # m
rho: 0.6400 # m
tjit: 0.0 # Jitter time (us)
ARCS-700-1.5-SMI:
pslit: 1.5e-3 # m
radius: 50.0e-3 # m
rho: 1.5350 # m
tjit: 0.0 # Jitter time (us)
84 changes: 60 additions & 24 deletions src/resolution_functions/instrument_data/sequoia.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,48 +13,30 @@ version:
default_chopper_frequency: 300
allowed_chopper_frequencies: [60, 601, 60]
frequency_matrix: [[1]]
moderator:
moderator: &moderator
type: 1
scaling_function: null
measured_wavelength: null
parameters: [119.63, 33.618, .037, .17, 172.42] # Parameters for time profile
detector:
type: 2
phi: 0.0
depth: 0.025 # Detector depth (m)
sample:
type: 0 # Sample type: 0==flat plate, 1==ellipse, 2==annulus, 3==sphere, 4==solid cylinder
thickness: 2.0e-3 # Thickness (m)
sample: &sample
width: 4.8e-2 # Width (m)
height: 4.8e-2 # Height (m)
gamma: 0.0 # Angle of x-axis to ki (degrees)
choppers:
Fermi:
distance: 18.01 # m
aperture_distance: 17.0 # m
configurations: &configurations
chopper_package:
configurations:
chopper_package: &configurations
default_option: 'ARCS-100-1.5-AST'
Fine:
pslit: 1.087e-3 # m
radius: 49.0e-3 # m
rho: 1.300 # m
tjit: 0.0 # Jitter time (us)
Sloppy:
pslit: 1.812e-3 # m
radius: 49.0e-3 # m
rho: 0.92 # m
tjit: 0.0 # Jitter time (us)
SEQ-100-2.0-AST:
pslit: 2.03e-3 # m
radius: 50.0e-3 # m
rho: 0.5800 # m
tjit: 0.0 # Jitter time (us)
SEQ-700-3.5-AST:
pslit: 3.56e-3 # m
radius: 50.0e-3 # m
rho: 1.5350 # m
tjit: 0.0 # Jitter time (us)
ARCS-100-1.5-AST:
pslit: 1.52e-3 # m
radius: 50.0e-3 # m
Expand Down Expand Up @@ -82,10 +64,64 @@ version:
tjit: 0.0 # Jitter time (us)
default_model: 'PyChop_fit'
models:
PyChop_fit: "PyChop_fit_v1"
PyChop_fit: "PyChop_fit_v2"
PyChop_fit_v1:
function: "pychop_fit_fermi"
citation: [""]
parameters:
<<: *constants
configurations: *configurations
moderator:
<<: *moderator
parameters: [ 119.63, 33.618, .037, .17, 172.42 ] # Parameters for time profile
sample:
<<: *sample
type: 0 # Sample type: 0==flat plate, 1==ellipse, 2==annulus, 3==sphere, 4==solid cylinder
thickness: 2.0e-3 # Thickness (m)
configurations:
chopper_package:
<<: *configurations
Fine:
pslit: 1.087e-3 # m
radius: 49.0e-3 # m
rho: 1.300 # m
tjit: 0.0 # Jitter time (us)
Sloppy:
pslit: 1.812e-3 # m
radius: 49.0e-3 # m
rho: 0.92 # m
tjit: 0.0 # Jitter time (us)
SEQ-700-3.5-AST:
pslit: 3.56e-3 # m
radius: 50.0e-3 # m
rho: 1.5350 # m
tjit: 0.0 # Jitter time (us)
PyChop_fit_v2:
function: "pychop_fit_fermi"
citation: [""]
parameters:
<<: *constants
moderator:
<<: *moderator
parameters: [30.13, 10.0, .07, .08, 50.42] # Parameters for time profile
sample:
<<: *sample
type: 2 # Sample type: 0==flat plate, 1==ellipse, 2==annulus, 3==sphere, 4==solid cylinder
thickness: 4.8e-2 # Thickness (m)
configurations:
chopper_package:
<<: *configurations
High-Resolution:
pslit: 2.03e-3 # m
radius: 50.0e-3 # m
rho: 0.580 # m
tjit: 0.0 # Jitter time (us)
High-Flux:
pslit: 4.56e-3 # m
radius: 50.0e-3 # m
rho: 1.535 # m
tjit: 0.0 # Jitter time (us)
SEQ-700-3.5-AST:
pslit: 4.56e-3 # m
radius: 50.0e-3 # m
rho: 1.5350 # m
tjit: 0.0 # Jitter time (us)

0 comments on commit 24ab899

Please sign in to comment.