update tests and a notebook

Author: nvaytet

packages/essreduce/docs/user-guide/unwrap/analytical-unwrap.ipynb

@@ -347,7 +347,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "lut_wf = FastLookupTableWorkflow()\n",
+    "lut_wf = LookupTableWorkflow(use_simulation=False)\n",
     "lut_wf[DiskChoppers[AnyRun]] = disk_choppers\n",
     "lut_wf[SourcePosition] = source_position\n",
     "lut_wf[LtotalRange] = (\n",
@@ -961,7 +961,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "lut_wf = FastLookupTableWorkflow()\n",
+    "lut_wf = LookupTableWorkflow(use_simulation=False)\n",
     "lut_wf[DiskChoppers[AnyRun]] = odin_choppers\n",
     "lut_wf[SourcePosition] = source_position\n",
     "lut_wf[LtotalRange] = (\n",
@@ -1075,7 +1075,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.12.12"
+   "version": "3.12.7"
   }
  },
  "nbformat": 4,

packages/essreduce/src/ess/reduce/unwrap/__init__.py

@@ -11,7 +11,6 @@
     BeamlineComponentReading,
     ChopperFrameSequence,
     DistanceResolution,
-    FastLookupTableWorkflow,
     LookupTableWorkflow,
     LtotalRange,
     NumberOfSimulatedNeutrons,
@@ -45,7 +44,6 @@
     "DiskChoppers",
     "DistanceResolution",
     "ErrorLimitedLookupTable",
-    "FastLookupTableWorkflow",
     "GenericUnwrapWorkflow",
     "LookupTable",
     "LookupTableFilename",

packages/essreduce/tests/unwrap/lut_test.py

@@ -6,14 +6,14 @@
 
 from ess.reduce import unwrap
 from ess.reduce.nexus.types import AnyRun
-from ess.reduce.unwrap import FastLookupTableWorkflow, LookupTableWorkflow
+from ess.reduce.unwrap import LookupTableWorkflow
 
 sl = pytest.importorskip("sciline")
 
 
 @pytest.mark.parametrize("engine", ["analytical", "tof"])
 def test_lut_workflow_computes_table(engine):
-    wf = FastLookupTableWorkflow() if engine == "analytical" else LookupTableWorkflow()
+    wf = LookupTableWorkflow(use_simulation=(engine == "tof"))
     wf[unwrap.DiskChoppers[AnyRun]] = {}
     wf[unwrap.SourcePosition] = sc.vector([0, 0, 0], unit='m')
     wf[unwrap.PulseStride] = 1
@@ -45,7 +45,7 @@ def test_lut_workflow_computes_table(engine):
 
 @pytest.mark.parametrize("engine", ["analytical", "tof"])
 def test_lut_workflow_pulse_skipping(engine):
-    wf = FastLookupTableWorkflow() if engine == "analytical" else LookupTableWorkflow()
+    wf = LookupTableWorkflow(use_simulation=(engine == "tof"))
     wf[unwrap.DiskChoppers[AnyRun]] = {}
     wf[unwrap.SourcePosition] = sc.vector([0, 0, 0], unit='m')
     if engine == "tof":
@@ -70,7 +70,7 @@ def test_lut_workflow_pulse_skipping(engine):
 
 @pytest.mark.parametrize("engine", ["analytical", "tof"])
 def test_lut_workflow_non_exact_distance_range(engine):
-    wf = FastLookupTableWorkflow() if engine == "analytical" else LookupTableWorkflow()
+    wf = LookupTableWorkflow(use_simulation=(engine == "tof"))
     wf[unwrap.DiskChoppers[AnyRun]] = {}
     wf[unwrap.SourcePosition] = sc.vector([0, 0, 0], unit='m')
     if engine == "tof":
@@ -154,7 +154,7 @@ def _make_choppers():
 
 @pytest.mark.parametrize("engine", ["analytical", "tof"])
 def test_lut_workflow_computes_table_with_choppers(engine):
-    wf = FastLookupTableWorkflow() if engine == "analytical" else LookupTableWorkflow()
+    wf = LookupTableWorkflow(use_simulation=(engine == "tof"))
     wf[unwrap.DiskChoppers[AnyRun]] = _make_choppers()
     wf[unwrap.SourcePosition] = sc.vector([0, 0, 0], unit='m')
     if engine == "tof":
@@ -190,7 +190,7 @@ def test_lut_workflow_computes_table_with_choppers(engine):
 
 @pytest.mark.parametrize("engine", ["analytical", "tof"])
 def test_lut_workflow_computes_table_with_choppers_full_beamline_range(engine):
-    wf = FastLookupTableWorkflow() if engine == "analytical" else LookupTableWorkflow()
+    wf = LookupTableWorkflow(use_simulation=(engine == "tof"))
     wf[unwrap.DiskChoppers[AnyRun]] = _make_choppers()
     wf[unwrap.SourcePosition] = sc.vector([0, 0, 0], unit='m')
     if engine == "tof":
@@ -242,7 +242,7 @@ def test_lut_workflow_computes_table_with_choppers_full_beamline_range(engine):
 
 @pytest.mark.parametrize("engine", ["analytical", "tof"])
 def test_lut_workflow_raises_for_distance_before_source(engine):
-    wf = FastLookupTableWorkflow() if engine == "analytical" else LookupTableWorkflow()
+    wf = LookupTableWorkflow(use_simulation=(engine == "tof"))
     wf[unwrap.DiskChoppers[AnyRun]] = {}
     wf[unwrap.SourcePosition] = sc.vector([0, 0, 10], unit='m')
     if engine == "tof":

packages/essreduce/tests/unwrap/unwrap_test.py

@@ -15,18 +15,13 @@
     RawMonitor,
     SampleRun,
 )
-from ess.reduce.unwrap import (
-    FastLookupTableWorkflow,
-    GenericUnwrapWorkflow,
-    LookupTableWorkflow,
-    fakes,
-)
+from ess.reduce.unwrap import GenericUnwrapWorkflow, LookupTableWorkflow, fakes
 
 sl = pytest.importorskip("sciline")
 
 
 def make_lut_workflow(engine, choppers, pulse_stride, neutrons=None, seed=None):
-    lut_wf = LookupTableWorkflow() if engine == "tof" else FastLookupTableWorkflow()
+    lut_wf = LookupTableWorkflow(use_simulation=(engine == "tof"))
     lut_wf[unwrap.DiskChoppers[AnyRun]] = choppers
     lut_wf[unwrap.SourcePosition] = fakes.source_position()
     lut_wf[unwrap.NumberOfSimulatedNeutrons] = neutrons

packages/essreduce/tests/unwrap/wfm_test.py

@@ -8,12 +8,7 @@
 
 from ess.reduce import unwrap
 from ess.reduce.nexus.types import AnyRun, NeXusDetectorName, RawDetector, SampleRun
-from ess.reduce.unwrap import (
-    FastLookupTableWorkflow,
-    GenericUnwrapWorkflow,
-    LookupTableWorkflow,
-    fakes,
-)
+from ess.reduce.unwrap import GenericUnwrapWorkflow, LookupTableWorkflow, fakes
 
 sl = pytest.importorskip("sciline")
 
@@ -113,12 +108,12 @@ def dream_source_position() -> sc.Variable:
 
 
 def make_workflows(choppers, source_position) -> dict[str, sl.Pipeline]:
-    lut_wf = FastLookupTableWorkflow()
+    lut_wf = LookupTableWorkflow(use_simulation=False)
     lut_wf[unwrap.DiskChoppers[AnyRun]] = choppers
     lut_wf[unwrap.SourcePosition] = source_position
     lut_wf[unwrap.PulseStride] = 1
 
-    tof_wf = LookupTableWorkflow()
+    tof_wf = LookupTableWorkflow(use_simulation=True)
     tof_wf[unwrap.DiskChoppers[AnyRun]] = choppers
     tof_wf[unwrap.SourcePosition] = source_position
     tof_wf[unwrap.NumberOfSimulatedNeutrons] = 300_000