Automatic backup triggered by new deployment

csaxs_bec/bec_ipython_client/plugins/cSAXS/test.yaml

@@ -0,0 +1,32 @@
+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

@@ -1746,6 +1746,7 @@ 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:
@@ -2145,16 +2146,18 @@ 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(self.client.username):>{padding}}\n",
+            f"{'e-account:':<{padding}}{str(account):>{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}}{dev.mokev.read()['mokev']['value']:>{padding}.4f}\n",
+            f"{'Current photon energy:':<{padding}}To be implemented\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",
@@ -2163,18 +2166,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"~/Data10/documentation/tomo_scan_ID_{self.tomo_id}.pdf")
+        user_target = os.path.expanduser(f"~/data/raw/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}", "LamNI", self.sample_name]
+            ["BEC", "tomo_parameters", f"dataset_id_{dataset_id}", "flOMNI", self.sample_name]
         )
         self.client.logbook.send_logbook_message(msg)
 

csaxs_bec/device_configs/bl_endstation.yaml

@@ -589,237 +589,3 @@ xbimtry:
     init_position: 0
     # bl_smar_stage to use csaxs reference method. assign number according to axis channel
     bl_smar_stage: 1
-
-
-
-################### XBOX related ###################
-# we assue the epics settings for resolution, velocity etc. are correct
-# we do not overwrite from here
-
-aptrx:
-  description: Aperture pinhole X
-  deviceClass: ophyd_devices.devices.psi_motor.EpicsUserMotorVME
-  deviceConfig:
-    prefix: X12SA-ES1-PIN1:TRX1
-  deviceTags:
-    - cSAXS_ES
-  onFailure: buffer
-  enabled: true
-  readoutPriority: baseline
-  softwareTrigger: false
-
-aptry:
-  description: Aperture pinhole Y
-  deviceClass: ophyd_devices.devices.psi_motor.EpicsUserMotorVME
-  deviceConfig:
-    prefix: X12SA-ES1-PIN1:TRY1
-  deviceTags:
-    - cSAXS_ES
-  onFailure: buffer
-  enabled: true
-  readoutPriority: baseline
-  softwareTrigger: false
-
-ebtrx:
-  description: Exposure box aperture X
-  deviceClass: ophyd_devices.devices.psi_motor.EpicsUserMotorVME
-  deviceConfig:
-    prefix: X12SA-ES1-EB:TRX1
-  deviceTags:
-    - cSAXS_ES
-  onFailure: buffer
-  enabled: true
-  readoutPriority: baseline
-  softwareTrigger: false
-
-ebtry:
-  description: Exposure box aperture Y
-  deviceClass: ophyd_devices.devices.psi_motor.EpicsUserMotorVME
-  deviceConfig:
-    prefix: X12SA-ES1-EB:TRY1
-  deviceTags:
-    - cSAXS_ES
-  onFailure: buffer
-  enabled: true
-  readoutPriority: baseline
-  softwareTrigger: false
-
-ebtrz:
-  description: Exposure box aperture Z
-  deviceClass: ophyd_devices.devices.psi_motor.EpicsUserMotorVME
-  deviceConfig:
-    prefix: X12SA-ES1-EB:TRZ1
-  deviceTags:
-    - cSAXS_ES
-  onFailure: buffer
-  enabled: true
-  readoutPriority: baseline
-  softwareTrigger: false
-
-ebsupport:
-  description: Exposure box granite support Y
-  deviceClass: ophyd_devices.devices.psi_motor.EpicsUserMotorVME
-  deviceConfig:
-    prefix: X12SA-EH1-EB:TRY1
-  deviceTags:
-    - cSAXS_ES
-  onFailure: buffer
-  enabled: true
-  readoutPriority: baseline
-  softwareTrigger: false
-
-fttrx1:
-  description: FTS1 translation X
-  deviceClass: ophyd_devices.devices.psi_motor.EpicsUserMotorVME
-  deviceConfig:
-    prefix: X12SA-ES1-FTS1:TRX1
-  deviceTags:
-    - cSAXS_ES
-  onFailure: buffer
-  enabled: true
-  readoutPriority: baseline
-  softwareTrigger: false
-
-fttry1:
-  description: FTS1 translation Y
-  deviceClass: ophyd_devices.devices.psi_motor.EpicsUserMotorVME
-  deviceConfig:
-    prefix: X12SA-ES1-FTS1:TRY1
-  deviceTags:
-    - cSAXS_ES
-  onFailure: buffer
-  enabled: true
-  readoutPriority: baseline
-  softwareTrigger: false
-
-fttrx2:
-  description: FTS2 translation X
-  deviceClass: ophyd_devices.devices.psi_motor.EpicsUserMotorVME
-  deviceConfig:
-    prefix: X12SA-ES1-FTS2:TRX1
-  deviceTags:
-    - cSAXS_ES
-  onFailure: buffer
-  enabled: true
-  readoutPriority: baseline
-  softwareTrigger: false
-
-fttry2:
-  description: FTS2 translation Y
-  deviceClass: ophyd_devices.devices.psi_motor.EpicsUserMotorVME
-  deviceConfig:
-    prefix: X12SA-ES1-FTS2:TRY1
-  deviceTags:
-    - cSAXS_ES
-  onFailure: buffer
-  enabled: true
-  readoutPriority: baseline
-  softwareTrigger: false
-
-fttrz:
-  description: FTS1 translation Z
-  deviceClass: ophyd_devices.devices.psi_motor.EpicsUserMotorVME
-  deviceConfig:
-    prefix: X12SA-ES1-FTS1:TRZ1
-  deviceTags:
-    - cSAXS_ES
-  onFailure: buffer
-  enabled: true
-  readoutPriority: baseline
-  softwareTrigger: false
-
-bs1x:
-  description: Beamstop 1 X
-  deviceClass: ophyd_devices.devices.psi_motor.EpicsUserMotorVME
-  deviceConfig:
-    prefix: X12SA-ES1-BS1:TRX1
-  deviceTags:
-    - cSAXS_ES
-  onFailure: buffer
-  enabled: true
-  readoutPriority: baseline
-  softwareTrigger: false
-
-bs1y:
-  description: Beamstop 1 Y
-  deviceClass: ophyd_devices.devices.psi_motor.EpicsUserMotorVME
-  deviceConfig:
-    prefix: X12SA-ES1-BS1:TRY1
-  deviceTags:
-    - cSAXS_ES
-  onFailure: buffer
-  enabled: true
-  readoutPriority: baseline
-  softwareTrigger: false
-
-bs2x:
-  description: Beamstop 2 X
-  deviceClass: ophyd_devices.devices.psi_motor.EpicsUserMotorVME
-  deviceConfig:
-    prefix: X12SA-ES1-BS2:TRX1
-  deviceTags:
-    - cSAXS_ES
-  onFailure: buffer
-  enabled: true
-  readoutPriority: baseline
-  softwareTrigger: false
-
-bs2y:
-  description: Beamstop 2 Y
-  deviceClass: ophyd_devices.devices.psi_motor.EpicsUserMotorVME
-  deviceConfig:
-    prefix: X12SA-ES1-BS2:TRY1
-  deviceTags:
-    - cSAXS_ES
-  onFailure: buffer
-  enabled: true
-  readoutPriority: baseline
-  softwareTrigger: false
-
-dttrx:
-  description: Detector table X
-  deviceClass: ophyd_devices.devices.psi_motor.EpicsUserMotorVME
-  deviceConfig:
-    prefix: X12SA-ES1-DETT:TRX1
-  deviceTags:
-    - cSAXS_ES
-  onFailure: buffer
-  enabled: true
-  readoutPriority: baseline
-  softwareTrigger: false
-
-dttry:
-  description: Detector table Y
-  deviceClass: ophyd_devices.devices.psi_motor.EpicsUserMotorVME
-  deviceConfig:
-    prefix: X12SA-ES1-DETT:TRY1
-  deviceTags:
-    - cSAXS_ES
-  onFailure: buffer
-  enabled: true
-  readoutPriority: baseline
-  softwareTrigger: false
-
-dttrz:
-  description: Detector table Z
-  deviceClass: ophyd_devices.devices.psi_motor.EpicsUserMotorVME
-  deviceConfig:
-    prefix: X12SA-ES1-DETT:TRZ1
-  deviceTags:
-    - cSAXS_ES
-  onFailure: buffer
-  enabled: true
-  readoutPriority: baseline
-  softwareTrigger: false
-
-dettrx:
-  description: Detector 1 X
-  deviceClass: ophyd_devices.devices.psi_motor.EpicsUserMotorVME
-  deviceConfig:
-    prefix: X12SA-ES1-DET1:TRX1
-  deviceTags:
-    - cSAXS_ES
-  onFailure: buffer
-  enabled: true
-  readoutPriority: baseline
-  softwareTrigger: false

csaxs_bec/device_configs/bl_optics_hutch.yaml

@@ -68,106 +68,91 @@ ccmx:
   - cSAXS
   - optics
 
-# ccm_energy:
-#   readoutPriority: baseline
-#   deviceClass: ophyd_devices.devices.simple_positioner.PSIPositionerBase
-#     prefix: "X12SA-OP-CCM1:"
-#     override_suffixes:
-#       user_readback: "ENERGY-GET"
-#       user_setpoint: "ENERGY-SET"
-#       velocity: "ROTY:VELO"
-#   deviceTags:
-#   - user motors
-#   enabled: true
-#   readOnly: false
-
 
 
 ##########################################################################
 ######################## SMARACT STAGES ##################################
 ##########################################################################
 
-# xbpm2x:
-#   description: X-ray beam position monitor 1 in OPbox
-#   deviceClass: csaxs_bec.devices.smaract.smaract_ophyd.SmaractMotor
-#   deviceConfig:
-#     axis_Id: A
-#     host: x12sa-eb-smaract-mcs-03.psi.ch
-#     limits:
-#     - -200
-#     - 200
-#     port: 5000
-#     sign: 1
-#   enabled: true
-#   onFailure: buffer
-#   readOnly: false
-#   readoutPriority: baseline
-#   connectionTimeout: 20
-#   userParameter:
-#     # bl_smar_stage to use csaxs reference method. assign number according to axis channel
-#     bl_smar_stage: 0
+xbpm2x:
+  description: X-ray beam position monitor 1 in OPbox
+  deviceClass: csaxs_bec.devices.smaract.smaract_ophyd.SmaractMotor
+  deviceConfig:
+    axis_Id: A
+    host: x12sa-eb-smaract-mcs-03.psi.ch
+    limits:
+    - -200
+    - 200
+    port: 5000
+    sign: 1
+  enabled: true
+  onFailure: buffer
+  readOnly: false
+  readoutPriority: baseline
+  connectionTimeout: 20
+  userParameter:
+    # bl_smar_stage to use csaxs reference method. assign number according to axis channel
+    bl_smar_stage: 0
 
-# xbpm2y:
-#   description: X-ray beam position monitor 1 in OPbox
-#   deviceClass: csaxs_bec.devices.smaract.smaract_ophyd.SmaractMotor
-#   deviceConfig:
-#     axis_Id: B
-#     host: x12sa-eb-smaract-mcs-03.psi.ch
-#     limits:
-#     - -200
-#     - 200
-#     port: 5000
-#     sign: 1
-#   enabled: true
-#   onFailure: buffer
-#   readOnly: false
-#   readoutPriority: baseline
-#   connectionTimeout: 20
-#   userParameter:
-#     # bl_smar_stage to use csaxs reference method. assign number according to axis channel
-#     bl_smar_stage: 1
-
-# cu_foilx:
-#   description: Cu foil in OPbox
-#   deviceClass: csaxs_bec.devices.smaract.smaract_ophyd.SmaractMotor
-#   deviceConfig:
-#     axis_Id: C
-#     host: x12sa-eb-smaract-mcs-03.psi.ch
-#     limits:
-#     - -200
-#     - 200
-#     port: 5000
-#     sign: 1
-#   enabled: true
-#   onFailure: buffer
-#   readOnly: false
-#   readoutPriority: baseline
-#   connectionTimeout: 20
-#   userParameter:
-#     # bl_smar_stage to use csaxs reference method. assign number according to axis channel
-#     bl_smar_stage: 2
-
-# scinx:
-#   description: scintillator in OPbox
-#   deviceClass: csaxs_bec.devices.smaract.smaract_ophyd.SmaractMotor
-#   deviceConfig:
-#     axis_Id: D
-#     host: x12sa-eb-smaract-mcs-03.psi.ch
-#     limits:
-#     - -200
-#     - 200
-#     port: 5000
-#     sign: 1
-#   enabled: true
-#   onFailure: buffer
-#   readOnly: false
-#   readoutPriority: baseline
-#   connectionTimeout: 20
-#   userParameter:
-#     # bl_smar_stage to use csaxs reference method. assign number according to axis channel
-#     bl_smar_stage: 3
+xbpm2y:
+  description: X-ray beam position monitor 1 in OPbox
+  deviceClass: csaxs_bec.devices.smaract.smaract_ophyd.SmaractMotor
+  deviceConfig:
+    axis_Id: B
+    host: x12sa-eb-smaract-mcs-03.psi.ch
+    limits:
+    - -200
+    - 200
+    port: 5000
+    sign: 1
+  enabled: true
+  onFailure: buffer
+  readOnly: false
+  readoutPriority: baseline
+  connectionTimeout: 20
+  userParameter:
+    # bl_smar_stage to use csaxs reference method. assign number according to axis channel
+    bl_smar_stage: 1
 
+cu_foilx:
+  description: Cu foil in OPbox
+  deviceClass: csaxs_bec.devices.smaract.smaract_ophyd.SmaractMotor
+  deviceConfig:
+    axis_Id: C
+    host: x12sa-eb-smaract-mcs-03.psi.ch
+    limits:
+    - -200
+    - 200
+    port: 5000
+    sign: 1
+  enabled: true
+  onFailure: buffer
+  readOnly: false
+  readoutPriority: baseline
+  connectionTimeout: 20
+  userParameter:
+    # bl_smar_stage to use csaxs reference method. assign number according to axis channel
+    bl_smar_stage: 2
 
+scinx:
+  description: scintillator in OPbox
+  deviceClass: csaxs_bec.devices.smaract.smaract_ophyd.SmaractMotor
+  deviceConfig:
+    axis_Id: D
+    host: x12sa-eb-smaract-mcs-03.psi.ch
+    limits:
+    - -200
+    - 200
+    port: 5000
+    sign: 1
+  enabled: true
+  onFailure: buffer
+  readOnly: false
+  readoutPriority: baseline
+  connectionTimeout: 20
+  userParameter:
+    # bl_smar_stage to use csaxs reference method. assign number according to axis channel
+    bl_smar_stage: 3
 
 
 # dmm1_trx_readback_example: # This is the same template as for i.e. bpm4i