fix: flomni async readout

csaxs_bec/bec_ipython_client/plugins/cSAXS/test.yaml

@@ -1,32 +0,0 @@
-bpm1_settings:
-  readoutPriority: baseline
-  deviceClass: ...
-  deviceConfig:
-    gain_lsb: galil_rio_1.digital_out.ch0
-    gain_mid: galil_rio_1.digital_out.ch1
-    gain_msb: galil_rio_1.digital_out.ch2
-    coupling: galil_rio_1.digital_out.ch3
-    speed_mode: galil_rio_1.digital_out.ch4
-  enabled: true
-  readOnly: false
-  softwareTrigger: true
-  needs:
-    - galil_rio_1
-
-bpm1:
-  readoutPriority: baseline
-  deviceClass: ...
-  deviceConfig:
-    blade_t: galil_rio_1.analog_in.ch0
-    blade_r: galil_rio_1.analog_in.ch1
-    blade_b: galil_rio_1.analog_in.ch2
-    blade_l: galil_rio_1.analog_in.ch3
-  enabled: true
-  readOnly: false
-  softwareTrigger: true
-  needs:
-    - galil_rio_1
-
-
-
-    

csaxs_bec/bec_ipython_client/plugins/flomni/flomni.py

@@ -778,9 +778,7 @@ class FlomniSampleTransferMixin:
             dev.ftransy.controller.socket_put_confirmed("confirm=1")
         else:
             print("Stopping.")
-            raise FlomniError(
-                "User abort sample transfer."
-            )
+            exit
 
     def ftransfer_gripper_is_open(self) -> bool:
         status = bool(float(dev.ftransy.controller.socket_put_and_receive("MG @OUT[9]").strip()))
@@ -803,8 +801,7 @@ class FlomniSampleTransferMixin:
     def ftransfer_gripper_move(self, position: int):
         self.check_position_is_valid(position)
 
-        #this is not used for sample stage position!
-        self._ftransfer_shiftx = -0.15
+        self._ftransfer_shiftx = -0.2
         self._ftransfer_shiftz = -0.5
 
         fsamx_pos = dev.fsamx.readback.get()
@@ -824,7 +821,7 @@ class FlomniSampleTransferMixin:
         self.check_tray_in()
 
         if position == 0:
-            umv(dev.ftransx, 11, dev.ftransz, 3.5950)
+            umv(dev.ftransx, 10.715 + 0.2, dev.ftransz, 3.5950)
         if position == 1:
             umv(
                 dev.ftransx,
@@ -1540,7 +1537,7 @@ class Flomni(
 
         umv(dev.fsamroy, 0)
         self.OMNYTools.printgreenbold(
-            "\n\nAlignment scan finished. Please run SPEC_ptycho_align and load the new fit by flomni.read_alignment_offset() ."
+            "\n\nAlignment scan finished. Please run SPEC_ptycho_align and load the new fit."
         )
 
     def _write_subtomo_to_scilog(self, subtomo_number):
@@ -1716,9 +1713,9 @@ class Flomni(
             )
             if self.OMNYTools.yesno("Shall I continue?", "n"):
                 print("OK")
-            else:
-                print("Stopping.")
-                return
+        else:
+            print("Stopping.")
+            return
 
         self.flomnigui_show_progress()
 
@@ -1746,7 +1743,6 @@ class Flomni(
             #     self.write_pdf_report()
             # else:
             self.tomo_id = 0
-            self.write_pdf_report()
 
         with scans.dataset_id_on_hold:
             if self.tomo_type == 1:
@@ -2146,18 +2142,16 @@ class Flomni(
         fovxy = f"{self.fovx:.2f}/{self.fovy:.2f}"
         stitching = f"{self.stitch_x:.2f}/{self.stitch_y:.2f}"
         dataset_id = str(self.client.queue.next_dataset_number)
-        account = bec.active_account
         content = [
             f"{'Sample Name:':<{padding}}{self.sample_name:>{padding}}\n",
             f"{'Measurement ID:':<{padding}}{str(self.tomo_id):>{padding}}\n",
             f"{'Dataset ID:':<{padding}}{dataset_id:>{padding}}\n",
             f"{'Sample Info:':<{padding}}{'Sample Info':>{padding}}\n",
-            f"{'e-account:':<{padding}}{str(account):>{padding}}\n",
+            f"{'e-account:':<{padding}}{str(self.client.username):>{padding}}\n",
             f"{'Number of projections:':<{padding}}{int(180 / self.tomo_angle_stepsize * 8):>{padding}}\n",
             f"{'First scan number:':<{padding}}{self.client.queue.next_scan_number:>{padding}}\n",
             f"{'Last scan number approx.:':<{padding}}{self.client.queue.next_scan_number + int(180 / self.tomo_angle_stepsize * 8) + 10:>{padding}}\n",
-            f"{'Current photon energy:':<{padding}}To be implemented\n",
-            #f"{'Current photon energy:':<{padding}}{dev.mokev.read()['mokev']['value']:>{padding}.4f}\n",
+            f"{'Current photon energy:':<{padding}}{dev.mokev.read()['mokev']['value']:>{padding}.4f}\n",
             f"{'Exposure time:':<{padding}}{self.tomo_countingtime:>{padding}.2f}\n",
             f"{'Fermat spiral step size:':<{padding}}{self.tomo_shellstep:>{padding}.2f}\n",
             f"{'FOV:':<{padding}}{fovxy:>{padding}}\n",
@@ -2166,18 +2160,18 @@ class Flomni(
             f"{'Angular step within sub-tomogram:':<{padding}}{self.tomo_angle_stepsize:>{padding}.2f}\n",
         ]
         content = "".join(content)
-        user_target = os.path.expanduser(f"~/data/raw/documentation/tomo_scan_ID_{self.tomo_id}.pdf")
+        user_target = os.path.expanduser(f"~/Data10/documentation/tomo_scan_ID_{self.tomo_id}.pdf")
         with PDFWriter(user_target) as file:
             file.write(header)
             file.write(content)
-        # subprocess.run(
-        #     "xterm /work/sls/spec/local/XOMNY/bin/upload/upload_last_pon.sh &", shell=True
-        # )
+        subprocess.run(
+            "xterm /work/sls/spec/local/XOMNY/bin/upload/upload_last_pon.sh &", shell=True
+        )
         # status = subprocess.run(f"cp /tmp/spec-e20131-specES1.pdf {user_target}", shell=True)
         msg = bec.logbook.LogbookMessage()
         logo_path = os.path.join(os.path.dirname(os.path.abspath(__file__)), "LamNI_logo.png")
         msg.add_file(logo_path).add_text("".join(content).replace("\n", "</p><p>")).add_tag(
-            ["BEC", "tomo_parameters", f"dataset_id_{dataset_id}", "flOMNI", self.sample_name]
+            ["BEC", "tomo_parameters", f"dataset_id_{dataset_id}", "LamNI", self.sample_name]
         )
         self.client.logbook.send_logbook_message(msg)
 

csaxs_bec/bec_ipython_client/plugins/flomni/flomni_optics_mixin.py

@@ -50,6 +50,8 @@ class FlomniOpticsMixin:
             # move both axes to the desired "in" positions
             umv(dev.feyex, feyex_in, dev.feyey, feyey_in)
 
+        self.xrayeye_update_frame()
+
     def _ffzp_in(self):
         foptx_in = self._get_user_param_safe("foptx", "in")
         fopty_in = self._get_user_param_safe("fopty", "in")

csaxs_bec/bec_ipython_client/plugins/flomni/x_ray_eye_align.py

@@ -253,8 +253,6 @@ class XrayEyeAlign:
 
         umv(dev.rtx, 0)
         print("You are ready to remove the xray eye and start ptychography scans.")
-        print("Fine alignment: flomni.tomo_parameters() , then flomni.tomo_alignment_scan()")
-        print("After that, run the fit in Matlab and load the new fit flomni.read_alignment_offset()")
 
     def write_output(self):
         file = os.path.expanduser("~/Data10/specES1/internal/xrayeye_alignmentvalues")

csaxs_bec/devices/epics/mcs_card/mcs_card_csaxs.py

@@ -317,6 +317,8 @@ class MCSCardCSAXS(PSIDeviceBase, MCSCard):
         try:
             scan_done = bool(value == self._num_total_triggers)
             self.progress.put(value=value, max_value=self._num_total_triggers, done=scan_done)
+            if scan_done:
+                self._scan_done_event.set()
         except Exception:
             content = traceback.format_exc()
             logger.info(f"Device {self.name}  error: {content}")
@@ -391,7 +393,6 @@ class MCSCardCSAXS(PSIDeviceBase, MCSCard):
         self._current_data_index = 0
 
         # NOTE Make sure that the signal that omits mca callbacks is cleared
-        # DO NOT REMOVE!!
         self._omit_mca_callbacks.clear()
 
         # For a fly scan we need to start the mcs card ourselves
@@ -562,9 +563,8 @@ class MCSCardCSAXS(PSIDeviceBase, MCSCard):
 
     def on_stop(self) -> None:
         """Hook called when the device is stopped. In addition, any status that is registered through cancel_on_stop will be cancelled here."""
-        with suppress_mca_callbacks(self):
-            self.stop_all.put(1)
-            self.erase_all.put(1)
+        self.stop_all.put(1)
+        self.erase_all.put(1)
 
     def mcs_recovery(self, timeout: int = 1) -> None:
         """

tests/tests_devices/test_mcs_card.py

@@ -217,16 +217,6 @@ def test_mcs_card_csaxs_complete_and_stop(mock_mcs_csaxs: MCSCardCSAXS):
     assert not mcs._start_monitor_async_data_emission.is_set()
 
 
-def test_mcs_on_stop(mock_mcs_csaxs: MCSCardCSAXS):
-    """Test that on stop sets the omit_mca_callbacks flag. Also test that on stage clears the omit_mca_callbacks flag."""
-    mcs = mock_mcs_csaxs
-    assert mcs._omit_mca_callbacks.is_set() is False
-    mcs.stop()
-    assert mcs._omit_mca_callbacks.is_set() is True
-    mcs.stage()
-    assert mcs._omit_mca_callbacks.is_set() is False
-
-
 def test_mcs_recovery(mock_mcs_csaxs: MCSCardCSAXS):
     mcs = mock_mcs_csaxs
     # Simulate ongoing acquisition