This commit is contained in:
gobbo_a
2026-02-09 15:06:52 +01:00
parent 4f6a49c538
commit f841fbc0ea
163 changed files with 576 additions and 49654 deletions
+1 -3
View File
@@ -1,7 +1,5 @@
dEph = caget("SARUN:USER-DELTA")
Eph1 = caget("SARUN:FELPHOTENE")
Eph2 = Eph1 + dEph
Eph2 = caget("SARUN:USER-ENERGY")
#do_elog = True
do_elog = False
+1 -3
View File
@@ -1,7 +1,5 @@
dEph = caget("SATUN:USER-DELTA")
Eph1 = caget("SATUN:FELPHOTENE")
Eph2 = Eph1 + dEph
Eph2 = caget("SATUN:USER-ENERGY")
undlist = ("SATUN06","SATUN07","SATUN08","SATUN09","SATUN10","SATUN11","SATUN12","SATUN13",
"SATUN15","SATUN16","SATUN17","SATUN18","SATUN19","SATUN20","SATUN21","SATUN22")
+2 -4
View File
@@ -1,7 +1,5 @@
dEph = caget("SATUN:USER-DELTA")
Eph1 = caget("SATUN06-UIND030:FELPHOTENE")
Eph2 = Eph1 + dEph
Eph1 = caget("SATUN:FELPHOTENE")
Eph2 = caget("SATUN:USER-ENERGY")
undlist = ("SATUN06","SATUN07","SATUN08","SATUN09","SATUN10","SATUN11","SATUN12","SATUN13")
+2 -4
View File
@@ -1,7 +1,5 @@
dEph = caget("SATUN:USER-DELTA")
Eph1 = caget("SATUN15-UIND030:FELPHOTENE")
Eph2 = Eph1 + dEph
Eph1 = caget("SATUN:FELPHOTENE")
Eph2 = caget("SATUN:USER-ENERGY")
undlist = ("SATUN15","SATUN16","SATUN17","SATUN18","SATUN19","SATUN20","SATUN21","SATUN22")
+1 -1
View File
@@ -22,7 +22,7 @@ if scan == "AR_K":
caput("SARFE10-PBPG050:ENERGY", machine_ene * 1000)
caput("SARFE10-PBPG050:ENERGY-SELECT", "USER")
x_channel = und + "-UIND030:K_SET" # use UPHS for pos ok -> UPHS slower (exception for SARUN15)
x_ok_channel = und + "-UPHS060:GAP-POS-OK" if und is not "SARUN15" else "SARUN15-UIND030:GAP-POS-OK"
x_ok_channel = "SARUN15-UIND030:GAP-POS-OK" if und == "SARUN15" else und + "-UPHS060:GAP-POS-OK"
y_channel = "SARFE10-PBIG050-EVR0:CALCI"
elif scan == "AT_K":
gd_state_init["SATFE10-PEPG046:ENERGY-SELECT"] = caget("SATFE10-PEPG046:ENERGY-SELECT")