Combine `collection` and `ldrd20-31` profiles to use with `blop` #12

mrakitin · 2024-03-11T21:11:38Z

This is a PR to add the startup files from the https://github.com/NSLS-II-XPD/profile_collection_ldrd20-31 repo to here, with updated numbering.

mrakitin · 2024-03-31T22:50:49Z

I think it worked OK. We'll merge the qserver-related changes from the https://github.com/NSLS-II-XPD/profile_collection/tree/minimal branch via a separate PR.

mrakitin · 2024-03-31T22:54:37Z

I think we should keep this PR branch separate from master as the listed equipment will be added and removed, so it may not be compatible with the main setup all the time. Maybe we could add checks if the devices are connected and then use them in the namespace.

mrakitin

We really need to apply black/isort formatting to this repo and enforce it via CI on every commit. Let's do it in a separate PR after this PR is merged (assuming we can use it with and without portable equipment).

Some suggestions are below meanwhile.

mrakitin · 2024-03-31T23:11:53Z

startup/25-QEPro.py

+    tiled_client = from_profile("xpd-ldrd20-31")
+except (NameError, ModuleNotFoundError):
+    pass
+qepro = QEPro('XF:28ID2-ES{QEPro:Spec-1}:', name='QEPro', )


TODO: make instantiation conditional based on the fact is the equipment is at the beamline or not. try..except will work.

mrakitin · 2024-03-31T23:12:34Z

startup/25-QEPro.py

+
+try:
+    from tiled.client import from_profile
+    tiled_client = from_profile("xpd-ldrd20-31")


@cheng-hung, do we need it here? Are you using it elsewhere? We probably should move it to 00-startup.py.

mrakitin · 2024-03-31T23:13:01Z

startup/26-pump_ultra.py

+
+
+


Suggested change

mrakitin · 2024-03-31T23:13:19Z

startup/26-pump_ultra.py

+
+
+


Suggested change

mrakitin · 2024-03-31T23:13:36Z

startup/26-pump_ultra.py

+
+
+


Suggested change

mrakitin · 2024-03-31T23:15:54Z

startup/27-pump_dds.py

+dds1 = syrng_DDS('XF:28IDC-ES:1{Pump:Syrng-DDS:1', name='DDS1')
+
+dds1_p1 = syrng_DDS_ax('XF:28IDC-ES:1{Pump:Syrng-DDS:1-Ax:A}', name='DDS1_p1', parent=dds1,
+                        read_attrs=['status',
+                                    'read_target_vol', 'read_target_vol_unit',
+                                    'read_infused', 'read_infused_unit',
+                                    'read_withdrawn', 'read_withdrawn_unit',
+                                    'read_infuse_rate', 'read_infuse_rate_unit',
+                                    'read_withdraw_rate', 'read_withdraw_rate_unit'])
+
+dds1_p2 = syrng_DDS_ax('XF:28IDC-ES:1{Pump:Syrng-DDS:1-Ax:B}', name='DDS1_p2', parent=dds1,
+                        read_attrs=['status',
+                                    'read_target_vol', 'read_target_vol_unit',
+                                    'read_infused', 'read_infused_unit',
+                                    'read_withdrawn', 'read_withdrawn_unit',
+                                    'read_infuse_rate', 'read_infuse_rate_unit',
+                                    'read_withdraw_rate', 'read_withdraw_rate_unit'])
+
+
+
+
+dds2 = syrng_DDS('XF:28IDC-ES:1{Pump:Syrng-DDS:2', name='DDS2')
+
+dds2_p1 = syrng_DDS_ax('XF:28IDC-ES:1{Pump:Syrng-DDS:2-Ax:A}', name='DDS2_p1', parent=dds2,
+                     read_attrs=['status',
+                                 'read_target_vol', 'read_target_vol_unit',
+                                 'read_infused', 'read_infused_unit',
+                                 'read_withdrawn', 'read_withdrawn_unit',
+                                 'read_infuse_rate', 'read_infuse_rate_unit',
+                                 'read_withdraw_rate', 'read_withdraw_rate_unit'])
+
+dds2_p2 = syrng_DDS_ax('XF:28IDC-ES:1{Pump:Syrng-DDS:2-Ax:B}', name='DDS2_p2', parent=dds2,
+                     read_attrs=['status',
+                                 'read_target_vol', 'read_target_vol_unit',
+                                 'read_infused', 'read_infused_unit',
+                                 'read_withdrawn', 'read_withdrawn_unit',
+                                 'read_infuse_rate', 'read_infuse_rate_unit',
+                                 'read_withdraw_rate', 'read_withdraw_rate_unit'])
+


All of these devices should be instantiated conditionally.

mrakitin · 2024-03-31T23:16:29Z

startup/28-Lights_shutter.py

+LED = EpicsSignal('XF:28IDC-ES:1{Light:Flu-LED:1}Cmd', name='LED_M365LP1', string=True, kind='hinted')
+# 0: 'Low'; 1: 'High'
+
+deuterium = EpicsSignal('XF:28IDC-ES:1{Light:Abs-Dut:1}Cmd', name='Deuterium', string=True, kind='Config')
+# 0: 'Low'; 1: 'High'
+
+halogen = EpicsSignal('XF:28IDC-ES:1{Light:Abs-Hal:1}Cmd', name='Halogen', string=True, kind='Config')
+# 0: 'Low'; 1: 'High'
+
+UV_shutter = EpicsSignal('XF:28IDC-ES:1{Light:Abs-Sht:1}Cmd', name='UV_shutter', string=True, kind='hinted')
+# 0: 'Low' --> shutter close.; 1: 'High' --> Shutter open.


Conditional instantiation, please.

mrakitin · 2024-03-31T23:18:33Z

startup/32-data_export.py

+
+
+
+def _exprot_rate_agent(metadata_dic, rate_label_dic, agent_data):


Suggested change

def _exprot_rate_agent(metadata_dic, rate_label_dic, agent_data):

def _export_rate_agent(metadata_dic, rate_label_dic, agent_data):

Check where it's used and fix the name there as well.

mrakitin · 2024-03-31T23:20:03Z

startup/33-plot_helper.py

+            plt.figure(num=i)
+
+
+class plot_uvvis(open_figures):


Class name should use the PascalCase style.

Suggested change

class plot_uvvis(open_figures):

class PlotUvvis(open_figures):

mrakitin · 2024-03-31T23:24:18Z

startup/33-plot_helper.py

All classes' names in this module should be corrected. See https://peps.python.org/pep-0008/#class-names for guidance.

mrakitin commented Mar 31, 2024

View reviewed changes

mrakitin assigned cheng-hung Mar 31, 2024

mrakitin force-pushed the blop-ldrd branch from 0765a57 to 2fe109a Compare May 17, 2024 21:00

XPD_Operator and others added 9 commits May 17, 2024 19:01

Add data analysis, export, plot to startup

b104d67

Fixes from 03/19/2024

9b8c329

Test startup files for Qserver

12557cb

Changes to make the profile work with qserver

4024686

CLN: cleanup the code after self-review on GH

593b9a2

Update starup for Qserver/databroker

5bf3e87

Sync local changes

b852025

Clean up

ec57a90

Better compatibility with qserver (fixing docstings format)

f683113

mrakitin force-pushed the blop-ldrd branch from 2fe109a to f683113 Compare May 17, 2024 23:01

XPD_Operator added 7 commits June 3, 2024 06:41

Update startup and plans for LDRD commissioning

6a76395

pass proposal numbers from start_beamtime

c2faba6

Add detectors into md

274db43

Add detectors into md

1760831

Change stream name in plans

81c7c72

update xray_uvvis_plan2

2fd082c

update for LDRD workflow

d1dbf5a

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Combine `collection` and `ldrd20-31` profiles to use with `blop` #12

Combine `collection` and `ldrd20-31` profiles to use with `blop` #12

mrakitin commented Mar 11, 2024

mrakitin commented Mar 31, 2024

mrakitin commented Mar 31, 2024

mrakitin left a comment

mrakitin Mar 31, 2024

mrakitin Mar 31, 2024

mrakitin Mar 31, 2024

mrakitin Mar 31, 2024

mrakitin Mar 31, 2024

mrakitin Mar 31, 2024

mrakitin Mar 31, 2024

mrakitin Mar 31, 2024

mrakitin Mar 31, 2024

mrakitin Mar 31, 2024




		def _exprot_rate_agent(metadata_dic, rate_label_dic, agent_data):

	def _exprot_rate_agent(metadata_dic, rate_label_dic, agent_data):
	def _export_rate_agent(metadata_dic, rate_label_dic, agent_data):

	class plot_uvvis(open_figures):
	class PlotUvvis(open_figures):

Combine collection and ldrd20-31 profiles to use with blop #12

Are you sure you want to change the base?

Combine collection and ldrd20-31 profiles to use with blop #12

Conversation

mrakitin commented Mar 11, 2024

mrakitin commented Mar 31, 2024

mrakitin commented Mar 31, 2024

mrakitin left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Combine `collection` and `ldrd20-31` profiles to use with `blop` #12

Combine `collection` and `ldrd20-31` profiles to use with `blop` #12