Skip to content

Prune unused domain types in dream workflows v2 #116

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

Merged
jl-wynen merged 3 commits into from
Dec 20, 2024
Merged

Prune unused domain types in dream workflows v2 #116

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
380e6e1
Prune unused domain types in dream workflows
jl-wynen Dec 16, 2024
d5fd962
Require essreduce>=24.12.0
jl-wynen Dec 19, 2024
87b3fae
Merge branch 'main' into prune-unused-domain-types-v2
jl-wynen Dec 20, 2024
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
2 changes: 1 addition & 1 deletion pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ requires-python = ">=3.10"
# Make sure to list one dependency per line.
dependencies = [
"dask",
"essreduce>=24.11.3",
"essreduce>=24.12.0",
"graphviz",
"numpy",
"plopp",
Expand Down
2 changes: 1 addition & 1 deletion requirements/base.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# --- END OF CUSTOM SECTION ---
# The following was generated by 'tox -e deps', DO NOT EDIT MANUALLY!
dask
essreduce>=24.11.3
essreduce>=24.12.0
graphviz
numpy
plopp
Expand Down
2 changes: 1 addition & 1 deletion requirements/base.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# SHA1:6b89155439eb051cb7a3ca3e31678c9fa96a6f5a
# SHA1:1c545a5dfb8b66d23509534f3ddf41f94ead839c
#
# This file is autogenerated by pip-compile-multi
# To update, run:
Expand Down
6 changes: 5 additions & 1 deletion src/ess/dream/io/geant4.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@
NeXusDetectorName,
Position,
RunType,
SampleRun,
VanadiumRun,
)
from ess.reduce.nexus.types import CalibratedBeamline
from ess.reduce.nexus.workflow import GenericNeXusWorkflow
Expand Down Expand Up @@ -271,7 +273,9 @@ def LoadGeant4Workflow() -> sciline.Pipeline:
"""
Workflow for loading NeXus data.
"""
wf = GenericNeXusWorkflow()
wf = GenericNeXusWorkflow(
run_types=[SampleRun, VanadiumRun], monitor_types=[CaveMonitor]
)
wf.insert(extract_geant4_detector)
wf.insert(load_geant4_csv)
wf.insert(load_mcstas_monitor)
Expand Down
7 changes: 5 additions & 2 deletions src/ess/powder/types.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,17 +30,20 @@
CaveMonitor = reduce_t.Monitor1
MonitorData = reduce_t.MonitorData
MonitorPositionOffset = reduce_t.MonitorPositionOffset
MonitorType = reduce_t.MonitorType
NeXusDetectorName = reduce_t.NeXusDetectorName
NeXusMonitorName = reduce_t.NeXusName
NeXusComponent = reduce_t.NeXusComponent
RunType = reduce_t.RunType
SampleRun = reduce_t.SampleRun
Position = reduce_t.Position
VanadiumRun = reduce_t.VanadiumRun

DetectorBankSizes = reduce_t.DetectorBankSizes

RunType = TypeVar("RunType", SampleRun, VanadiumRun)
# Include Monitor2 because a single constraint is not allowed.
# We will eventually have more than one...
MonitorType = TypeVar("MonitorType", CaveMonitor, reduce_t.Monitor2)


# 2 Workflow parameters

Expand Down