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

Adding some channels. The diffractometer_extras_pvs still need more work

Browse Source
This commit is contained in:
vonka_j
2025-04-28 11:57:26 +02:00
parent 505c0ae6d4
commit d57b964b33
2 changed files with 79 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
channels/bs_channels.py
View File

@ -505,6 +505,23 @@ diffractometer_1_bs = [
ID_dm2 = "SARES32-GPS"
diffractometer_2_bs = [
ID_dm2 + ":ROT2THETA-BS",
ID_dm2 + ":ROTTHETA-BS",
ID_dm2 + ":TRX-BS",
ID_dm2 + ":TRY-BS",
ID_dm2 + ":TRZ-BS",
ID_dm2 + ":TD-BS",
ID_dm2 + ":TRXBASE-BS",
ID_dm2 + ":TRYBASE-BS",
ID_dm2 + ":TRYBASE-Avg-BS",
ID_dm2 + "::CALC1",
ID_dm2 + "::CALC2",
ID_dm2 + "::CALC3",
ID_dm2 + "::CALC4",
]
@ -529,7 +546,8 @@ bs_channels = (
+ channels_EVR
+ channels_digitizer
# + channels_Xeye
# + diffractometer_1_bs
+ diffractometer_1_bs
+ diffractometer_2_bs
# + camera_channels
)

69
channels/pv_channels.py
View File

@ -183,7 +183,10 @@ pvs_OATT053 = [
"SARFE10-OATT053:MOTOR_3", # motor Motor 3
"SARFE10-OATT053:MOTOR_4", # motor Motor 4
"SARFE10-OATT053:MOTOR_5", # motor Motor 5
"SARFE10-OATT053:MOTOR_6", # motor Motor 6
"SARFE10-OATT053:MOTOR_6", # motor Motor 6
"SAROP31-OATA053:UsrRec.TC1", # current transmission
"SAROP31-OATA053:UsrRec.TR1", # resulting transmission
"SAROP31-OATA053:UsrRec.TD", # setpoint transmission
]
@ -791,30 +794,77 @@ pvs_diffractometer_2 = [
ID_dm2 + ":ROTX-PosAct",
ID_dm2 + ":ROTZ-PosAct",
ID_dm2 + ":m0s012-Drv01-TrqAct", # TRYBASE Mot 1 torque
ID_dm2 + ":m0s012-Drv01-TrqAct", # TRYBASE Mot 2 torque
ID_dm2 + ":m0s013-Drv01-TrqAct", # TRYBASE Mot 2 torque
ID_dm2 + ":m0s014-Drv01-TrqAct", # TRYBASE Mot 3 torque
ID_dm2 + ":m0s015-Drv01-TrqAct", # TRYBASE Mot 4 torque
ID_dm2 + ":m0s027-Drv01-TrqAct", # TD Mot torque
ID_dm2 + ":m0s011-Drv01-TrqAct", # TRXBASE Mot torque
ID_dm2 + ":m0s030-Drv01-TrqAct", # TRX Mot torque
ID_dm2 + ":m1s030-Drv01-TrqAct", # TRX Mot torque
ID_dm2 + ":m1s031-Drv01-TrqAct", # TRY Mot torque
ID_dm2 + ":m1s029-Drv01-TrqAct", # TRZ Mot torque
ID_dm2 + ":m0s032-Drv01-TrqAct", # ROTX Mot torque
ID_dm2 + ":m0s033-Drv01-TrqAct", # ROTZ Mot torque
ID_dm2 + ":m0s010-Drv01-TrqAct", # ROT2THETA Mot torque
ID_dm2 + ":m0s028-Drv01-TrqAct", # ROTTHETA Mot torque
]
# TODO:
# the variables are not correct yet because of the change of the slaves and small errors.
ECMC_dm1 = "SARES31-CPCL-ECMC01"
ECMC_dm2 = "SARES32-CPLC-ECMC02"
pvs_diffractometer_extras = [
ECMC_dm1 + ":m0s016-Enc01-PosAct", # TRYBASE Mot 1 motor encoder
ECMC_dm1 + ":m0s017-Enc01-PosAct", # TRYBASE Mot 2 motor encoder
ECMC_dm1 + ":m0s018-Enc01-PosAct", # TRYBASE Mot 3 motor encoder
ECMC_dm1 + ":m0s019-Enc01-PosAct", # TRYBASE Mot 4 motor encoder
ECMC_dm1 + ":m0s031-Enc01-PosAct", # TD Mot motor encoder
ECMC_dm1 + ":m0s015-Enc01-PosAct", # TRXBASE Mot motor encoder
ECMC_dm1 + ":m0s034-Enc01-PosAct", # TRX Mot motor encoder
ECMC_dm1 + ":m0s014-Enc01-PosAct", # ROT2THETA Mot motor encoder
ECMC_dm1 + ":m0s032-Enc01-PosAct", # ROTTHETA Mot motor encoder
####
# ECMC_dm2 + ":m0s012-Enc01-PosAct", # TRYBASE Mot 1 motor encoder
# ECMC_dm2 + ":m0s013-Enc01-PosAct", # TRYBASE Mot 2 motor encoder
# ECMC_dm2 + ":m0s014-Enc01-PosAct", # TRYBASE Mot 3 motor encoder
# ECMC_dm2 + ":m0s015-Enc01-PosAct", # TRYBASE Mot 4 motor encoder
# ECMC_dm2 + ":m0s027-Enc01-PosAct", # TD Mot motor encoder
# ECMC_dm2 + ":m0s011-Enc01-PosAct", # TRXBASE Mot motor encoder
# ECMC_dm2 + ":m0s030-Enc01-PosAct", # TRX Mot motor encoder
# ECMC_dm2 + ":m0s032-Enc01-PosAct", # ROTX Mot motor encoder
# ECMC_dm2 + ":m0s033-Enc01-PosAct", # ROTZ Mot motor encoder
# ECMC_dm2 + ":m0s010-Enc01-PosAct", # ROT2THETA Mot motor encoder
# ECMC_dm2 + ":m0s028-Enc01-PosAct", # ROTTHETA Mot motor encoder
ECMC_dm1 + ":m1s016-Drv01-TrqAct", # TRYBASE Mot 1 torque
ECMC_dm1 + ":m1s017-Drv01-TrqAct", # TRYBASE Mot 2 torque
ECMC_dm1 + ":m1s018-Drv01-TrqAct", # TRYBASE Mot 3 torque
ECMC_dm1 + ":m1s019-Drv01-TrqAct", # TRYBASE Mot 4 torque
ECMC_dm1 + ":m1s031-Drv01-TrqAct", # TD Mot torque
ECMC_dm1 + ":m1s015-Drv01-TrqAct", # TRXBASE Mot torque
ECMC_dm1 + ":m1s034-Drv01-TrqAct", # TRX Mot torque
ECMC_dm1 + ":m1s035-Drv01-TrqAct", # TRY Mot torque
ECMC_dm1 + ":m1s033-Drv01-TrqAct", # TRZ Mot torque
ECMC_dm1 + ":m1s014-Drv01-TrqAct", # ROT2THETA Mot torque
ECMC_dm1 + ":m1s032-Drv01-TrqAct", # ROTTHETA Mot torque
]
###############################
# DilSc
ID_DilSc_LakeShore = "SARES31-DIL-LS1"
pvs_DilSc_Lakeshore = [
ID_DilSc_LakeShore + "A_KELVIN",
ID_DilSc_LakeShore + "7_KELVIN",
ID_DilSc_LakeShore + "8_KELVIN",
ID_DilSc_LakeShore + ":A_KELVIN",
ID_DilSc_LakeShore + ":7_KELVIN",
ID_DilSc_LakeShore + ":8_KELVIN",
ID_DilSc_LakeShore + "A_RES",
ID_DilSc_LakeShore + "7_RES",
ID_DilSc_LakeShore + "8_RES",
ID_DilSc_LakeShore + ":A_RES",
ID_DilSc_LakeShore + ":7_RES",
ID_DilSc_LakeShore + ":8_RES",
]
@ -891,6 +941,7 @@ pv_channels = (
# + pvs_smaract_xyz
+ pvs_diffractometer_1
+ pvs_diffractometer_2
+ pvs_diffractometer_extras
+ pvs_DilSc_Lakeshore
+ pvs_huber_z
+ pvs_JJ_slits