Skip to content
Snippets Groups Projects
Commit dd26928b authored by Vadim Gubaidulin's avatar Vadim Gubaidulin
Browse files

Merge branch 'main' of gitlab.synchrotron-soleil.fr:PA/operation/pythoncontrol

parents e533a95f 269a333d
No related branches found
No related tags found
No related merge requests found
......@@ -42,6 +42,7 @@ def growth_damp_measurement(file,
tuneZ = DeviceProxy("ans/rf/bbfdataviewer.2-tunez")
phc_C02 = DeviceProxy("ans-c02/dg/phc-emit")
phc_C16 = DeviceProxy("ans-c16/dg/phc-emit")
dcct= DeviceProxy("ANS/DG/DCCT-CTRL")
# total_current = np.round(np.sum(remplissage.bunchescurrent),1)
file["filling_pattern_before"] = remplissage.bunchescurrent
......@@ -51,6 +52,7 @@ def growth_damp_measurement(file,
file["emitX_C16_before"] = phc_C16.EmittanceH
file["emitZ_C02_before"] = phc_C02.EmittanceV
file["emitZ_C16_before"] = phc_C16.EmittanceV
file["dcct_current"] = dcct.current
growth_damp_core(file, **kwargs)
......@@ -100,6 +102,7 @@ def growth_damp_core(file,
tuneZ = DeviceProxy("ans/rf/bbfdataviewer.2-tunez")
fbt = get_fbt_device()
selected = fbt.selectedBunchNumberADC0
check_feedback_stoped()
if datasize != 4:
......@@ -131,7 +134,6 @@ def growth_damp_core(file,
# Measurement
delay.activateChannelA = True
fbt.acquiredataonce()
sleep(0.5 + window_width*1e-6) # value to be tuned
delay.activateChannelA = False
# Save data from buffer
......@@ -150,6 +152,8 @@ def growth_damp_core(file,
tuneZ.init()
tuneX.init()
fbt.selectedBunchNumberADC0 = selected
def _avg_mean(signal, window):
N=len(signal)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment