Merge pull request #108 from scipp/dream-high-flux

Add dream high-resolution config

Author: nvaytet

src/tof/facilities/ess/dream.py

@@ -4,6 +4,8 @@
 Pre-configured chopper and detector parameters for Dream.
 """
 
+import copy
+
 from ...chopper import Chopper
 from ...detector import Detector
 from ...model import make_beamline
@@ -73,6 +75,19 @@
 }
 
 
+dream_high_resolution = copy.deepcopy(dream_high_flux)
+dream_high_resolution["PSC1"]["frequency"]["value"] = 15 * 14.0
+dream_high_resolution["PSC1"]["phase"]["value"] = 25 - 180
+dream_high_resolution["PSC2"]["frequency"]["value"] = 14 * 14.0
+dream_high_resolution["PSC2"]["phase"]["value"] = 100.5
+dream_high_resolution["OC"]["frequency"]["value"] = 14.0
+dream_high_resolution["OC"]["phase"]["value"] = 297.0 - 180.0 - 90.0
+dream_high_resolution["BC"]["frequency"]["value"] = 112.0
+dream_high_resolution["BC"]["phase"]["value"] = 200.0 - 180.0
+dream_high_resolution["T0"]["frequency"]["value"] = 28.0
+dream_high_resolution["T0"]["phase"]["value"] = 270.0 - 180.0
+
+
 def dream(
     high_flux=False, high_resolution=False
 ) -> dict[str, list[Chopper] | list[Detector]]:
@@ -81,6 +96,5 @@ def dream(
     if high_flux:
         return make_beamline(dream_high_flux)
     if high_resolution:
-        # TODO: Add high-resolution configuration
-        raise NotImplementedError("High-resolution configuration not yet implemented.")
+        return make_beamline(dream_high_resolution)
     raise ValueError("Either high_flux or high_resolution must be True.")

src/tof/facilities/ess/odin.py

@@ -157,10 +157,10 @@
 
 
 odin_pulse_skipping = copy.deepcopy(odin_non_pulse_skipping)
-odin_pulse_skipping["BP_1"]["frequency"] = {"value": 7.0, "unit": "Hz"}
-odin_pulse_skipping["BP_1"]["phase"] = {"value": 31.080, "unit": "deg"}
-odin_pulse_skipping["BP_2"]["frequency"] = {"value": 7.0, "unit": "Hz"}
-odin_pulse_skipping["BP_2"]["phase"] = {"value": 44.224, "unit": "deg"}
+odin_pulse_skipping["BP_1"]["frequency"]["value"] = 7.0
+odin_pulse_skipping["BP_1"]["phase"]["value"] = 31.080
+odin_pulse_skipping["BP_2"]["frequency"]["value"] = 7.0
+odin_pulse_skipping["BP_2"]["phase"]["value"] = 44.224
 
 
 def odin(

tests/facilities/ess_test.py

@@ -0,0 +1,35 @@
+# SPDX-License-Identifier: BSD-3-Clause
+# Copyright (c) 2025 Scipp contributors (https://github.com/scipp)
+
+
+import pytest
+
+import tof
+
+
+@pytest.mark.parametrize("mode", ['high_flux', 'high_resolution'])
+def test_run_dream_model(mode):
+    source = tof.Source(facility='ess', neutrons=100_000, pulses=2)
+
+    match mode:
+        case 'high_flux':
+            params = {"high_flux": True}
+        case 'high_resolution':
+            params = {"high_resolution": True}
+
+    dream_params = tof.facilities.ess.dream(**params)
+    model = tof.Model(source=source, **dream_params)
+    results = model.run()
+    assert len(results.choppers) > 0
+    assert len(results.detectors) > 0
+
+
+@pytest.mark.parametrize("pulse_skipping", [True, False])
+@pytest.mark.parametrize("facility", ['ess', 'ess-odin'])
+def test_run_odin_model(pulse_skipping, facility):
+    source = tof.Source(facility=facility, neutrons=100_000, pulses=2)
+    odin_params = tof.facilities.ess.odin(pulse_skipping=pulse_skipping)
+    model = tof.Model(source=source, **odin_params)
+    results = model.run()
+    assert len(results.choppers) > 0
+    assert len(results.detectors) > 0