Merge pull request #86 from aps-8id-dys/revert-84-81-xpcs_mesh+DM

Revert "Add DM workflow controls to xpcs mesh plan"
aps-8id-dys · Oct 17, 2024 · 07b7f19 · 07b7f19
2 parents 66c5a7a + 812eb1e
commit 07b7f19
Show file tree

Hide file tree

Showing 10 changed files with 284 additions and 606 deletions.
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -7,7 +7,7 @@ repos:
       - id: check-yaml
       - id: check-toml
       - id: check-ast
-      # - id: check-docstring-first  # let variables have docstrings
+      - id: check-docstring-first
       - id: check-merge-conflict
       - id: check-added-large-files
       - id: mixed-line-ending

diff --git a/src/instrument/devices/aps_source.py b/src/instrument/devices/aps_source.py
diff --git a/src/instrument/devices/tetramm_picoammeter.py b/src/instrument/devices/tetramm_picoammeter.py
@@ -55,11 +55,9 @@ def __init__(self, *args, port_name="TetrAMM", **kwargs):
         self.current4.mean_value.kind = "hinted"
 
     def trigger(self):
-        """
-        TetrAMMs are operated in continuous mode.
-
-        The subsequent '.read()' will return the current values.
-        """
+        '''
+        Tetramms are operated in continuous mode. Will just accept the current value.
+        '''
         if self._staged != Staged.yes:
             raise RuntimeError(
                 "This detector is not ready to trigger."
@@ -69,7 +67,7 @@ def trigger(self):
         self._status = self._status_type(self)
         self._acquisition_signal.put(1, wait=False)
         self.generate_datum(self._image_name, ttime.time(), {})
-        self._status.set_finished()  # <-- done immediately
+        self._status.set_finished()
         return self._status
 
 

diff --git a/src/instrument/devices/xpcs_support.py b/src/instrument/devices/xpcs_support.py
diff --git a/src/instrument/plans/__init__.py b/src/instrument/plans/__init__.py
@@ -1,5 +1,5 @@
 """
-Custom Plans
+Custom Plan Definitions & Instatiations
 """
 
 # flake8: noqa
@@ -9,7 +9,6 @@
 from .demo_sim_1d import demo_sim_1d
 
 ## beamline specific plans
-# from .bdp_demo import xpcs_bdp_demo_plan, xpcs_setup_user
-from .each_session import xpcs_setup_user
+from .bdp_demo import xpcs_bdp_demo_plan, xpcs_setup_user
 from .mesh_plans import xpcs_mesh
 from .select_sample_env import select_sample_env
diff --git a/src/instrument/plans/bdp_demo.py b/src/instrument/plans/bdp_demo.py
@@ -303,10 +303,9 @@ def xpcs_bdp_demo_plan(
         # instrument metadata (expected by nxwriter)
         # values from pete7.hdf
         # TODO: set from actual instrument values
-        absolute_cross_section_scale=1,  # ok as-is
-        bcx=0,  # used by analysis?
+        absolute_cross_section_scale=1,
+        bcx=0,
         bcy=0,
-        #! good as hard constants now, might be replaced by QMAP
         ccdx=1,
         ccdx0=1,
         ccdy=1,

diff --git a/src/instrument/plans/each_session.py b/src/instrument/plans/each_session.py