diff --git a/sims/run/generate_configs.py b/sims/run/generate_configs.py index b55c332..75f0eee 100644 --- a/sims/run/generate_configs.py +++ b/sims/run/generate_configs.py @@ -44,7 +44,8 @@ def get_defaults(): cry_width=102, cry_depth=54, N=1, - acceptance_angle=0.05651551, + # will be set when buliding end station + acceptance_angle=0, thickness=1, ), "scan": SimScanConfig(start=min_tth, stop=max_tth, delta=1e-4), @@ -71,7 +72,7 @@ def convert_cycler(cycle: Cycler) -> list[CompleteConfig]: if __name__ == "__main__": - cycle = cycler("source.E_hwhm", np.array([.1, 1, 2, 5]) * 1.4e-4) + cycle = cycler("source.E_hwhm", np.array([0.1, 1, 2, 5]) * 1.4e-4) configs = convert_cycler(cycle) config_path = Path("configs") config_path.mkdir(exist_ok=True) diff --git a/src/bad_tools/xrt/endstation.py b/src/bad_tools/xrt/endstation.py index f03815f..480c875 100644 --- a/src/bad_tools/xrt/endstation.py +++ b/src/bad_tools/xrt/endstation.py @@ -1,5 +1,5 @@ import functools -from dataclasses import dataclass +from dataclasses import dataclass, replace from typing import Self import numpy as np @@ -31,8 +31,9 @@ def from_configs( sim: SimConfig, ) -> Self: crystalSi01 = rmats.CrystalSi(t=analyzer.thickness) - theta_b = _bragg(crystalSi01, source.E_incident) + analyzer = replace(analyzer, acceptance_angle=np.rad2deg(theta_b)) + arm_tth = np.deg2rad(15) beamLine = raycing.BeamLine()