slic/cristallina
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

before LiErF4 beamtime

Browse Source
This commit is contained in:
steppke_a
2024-06-19 17:15:31 +02:00
parent 561fbaee6f
commit 59d203b86a
3 changed files with 35 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
channels/bs_channels.py
View File

@ -200,7 +200,7 @@ channels_PSSS059_LB = [
"SARFE10-PSSS059-LB:SPECTRUM_Y", "SARFE10-PSSS059-LB:SPECTRUM_Y",
"SARFE10-PSSS059-LB:SPECTRUM_Y_SUM", "SARFE10-PSSS059-LB:SPECTRUM_Y_SUM",
"SARFE10-PSSS059-LB:processing_parameters", "SARFE10-PSSS059-LB:processing_parameters",
"SARFE10-PSSS059-LB:FPICTURE", # "SARFE10-PSSS059-LB:FPICTURE", # only in special circumstances
"SARFE10-PSSS059-LB:FIT-BRT", "SARFE10-PSSS059-LB:FIT-BRT",
] ]
@ -228,6 +228,8 @@ channels_PBPS113 = [
"SAROP31-PBPS113:XPOS", "SAROP31-PBPS113:XPOS",
"SAROP31-PBPS113:YPOS", "SAROP31-PBPS113:YPOS",
] ]
# purpose?
channels_PBPS113_waveforms = [ channels_PBPS113_waveforms = [
"SAROP31-PBPS113:Lnk9Ch0-WF-DATA", "SAROP31-PBPS113:Lnk9Ch0-WF-DATA",
"SAROP31-PBPS113:Lnk9Ch1-WF-DATA", "SAROP31-PBPS113:Lnk9Ch1-WF-DATA",
@ -346,6 +348,7 @@ bs_channels = (
# + channels_Xeye # + channels_Xeye
+ channels_PBPS053 + channels_PBPS053
+ channels_PSSS059 + channels_PSSS059
+ channels_PSSS059_LB
+ channels_PBPS113 + channels_PBPS113
# + channels_PBPS113_waveforms # + channels_PBPS113_waveforms
# + channels_PPRM113 # + channels_PPRM113

33
channels/pv_channels.py
View File

@ -121,7 +121,7 @@ pvs_OAPU044 = [
# Beam position monitor PBPS053 # Beam position monitor PBPS053
pvs_PBPS053 = [ pvs_PBPS053 = [
"SARFE10-PBPS053:MOTOR_X1", "SARFE10-PBPS053:MOTOR_X1",
"SARFE10-PBPS053:MOTOR_X2", # "SARFE10-PBPS053:MOTOR_X2", # Not available, disabled
"SARFE10-PBPS053:MOTOR_PROBE", "SARFE10-PBPS053:MOTOR_PROBE",
] ]
@ -344,8 +344,9 @@ pvs_OATA150 = [
#################### ####################
# Pulse picker OPPI151 # Pulse picker OPPI151
pvs_OPPI151 = [ pvs_OPPI151 = [
"SAROP31-OPPI151:MOTOR_X.RBV", # "SAROP31-OPPI151:MOTOR_X.RBV", # Not available
"SAROP31-OPPI151:MOTOR_Y.RBV", # "SAROP31-OPPI151:MOTOR_Y.RBV", # Not available
"SAROP31-OPPI151:TC1", # Pulse picker temperature
] ]
@ -455,6 +456,28 @@ pvs_diffractometer_1 = [
"SARES30-CPCL-ECMC02:TRX-PosAct", "SARES30-CPCL-ECMC02:TRX-PosAct",
"SARES30-CPCL-ECMC02:TRZ-PosAct", "SARES30-CPCL-ECMC02:TRZ-PosAct",
"SARES30-CPCL-ECMC02:TD-PosAct", "SARES30-CPCL-ECMC02:TD-PosAct",
"SARES30-CPCL-ECMC02:m1s012-Drv01-TrqAct", # TRYBASE Mot 1 torque
"SARES30-CPCL-ECMC02:m1s013-Drv01-TrqAct", # TRYBASE Mot 2 torque
"SARES30-CPCL-ECMC02:m1s014-Drv01-TrqAct", # TRYBASE Mot 3 torque
"SARES30-CPCL-ECMC02:m1s015-Drv01-TrqAct", # TRYBASE Mot 4 torque
"SARES30-CPCL-ECMC02:m1s027-Drv01-TrqAct", # TD Mot torque
"SARES30-CPCL-ECMC02:m1s011-Drv01-TrqAct", # TRXBASE Mot torque
"SARES30-CPCL-ECMC02:m1s030-Drv01-TrqAct", # TRX Mot torque
"SARES30-CPCL-ECMC02:m1s031-Drv01-TrqAct", # TRY Mot torque
"SARES30-CPCL-ECMC02:m1s029-Drv01-TrqAct", # TRZ Mot torque
"SARES30-CPCL-ECMC02:m1s010-Drv01-TrqAct", # ROT2THETA Mot torque
"SARES30-CPCL-ECMC02:m1s028-Drv01-TrqAct", # ROTTHETA Mot torque
]
pvs_huber_z= [
"SARES30-MOBI2:MOT_Z.RBV",
]
pvs_JJ_slits = [
"SARES30-MOBI2:MOT_X.RBV",
"SARES30-MOBI2:MOT_Y.RBV",
"SARES30-MOBI2:MOT_W.RBV",
"SARES30-MOBI2:MOT_H.RBV",
] ]
pvs_swissmx = [ pvs_swissmx = [
@ -493,7 +516,9 @@ pv_channels = (
# + pvs_newport_300 # + pvs_newport_300
# + pvs_smaract_xyz # + pvs_smaract_xyz
+ pvs_diffractometer_1 + pvs_diffractometer_1
+ pvs_swissmx + pvs_huber_z
+ pvs_JJ_slits
# + pvs_swissmx
# + pvs_Bernina # + pvs_Bernina
) )

3
pgroups.py
View File

@ -34,5 +34,6 @@ pgroup_scratch = "p19150" # Scratch
# pgroup = "p21741" # CrQ - DilSc - SAXS LiHoF4 # pgroup = "p21741" # CrQ - DilSc - SAXS LiHoF4
#pgroup = "p21735" # Cr-MX Aller 2024-06-04 #pgroup = "p21735" # Cr-MX Aller 2024-06-04
pgroup = "p21736" # Cr-MX Weik 2024-06-07 # pgroup = "p21736" # Cr-MX Weik 2024-06-07
pgroup = "p21977" # CrQ - Dilsc - LiErF4