Skip to content

Improve: SI Tune Feedback - Separate planes #1267

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
VitorSouzaLNLS wants to merge 10 commits into
base: dev/enh/si-tune-fb
Choose a base branch
from
Open

Improve: SI Tune Feedback - Separate planes #1267

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
711ea4a
BUG: (DEV.TUNE) Fix typos in "acquistion"s
vellosok75 Aug 5, 2026
f39c141
update version
vellosok75 Aug 5, 2026
34a7a77
ENH (TUNEFB): Separate planes
VitorSouzaLNLS Aug 10, 2026
4dd3342
FIX (TUNEFB): Fix/change/remove forgotten "self._tune_source"
VitorSouzaLNLS Aug 10, 2026
b6c0e71
MNT (TUNEFB): Avoid driver rejections
VitorSouzaLNLS Aug 10, 2026
73dd51c
ENH (TUNEFB): Do not update reference when opening the loop
VitorSouzaLNLS Aug 10, 2026
9164ea8
MNT (TUNEFB): Remove "return True" from "cmd_set_newref". Let this ch…
VitorSouzaLNLS Aug 13, 2026
2b138ac
Merge branch 'dev/enh/si-tune-fb' into dev/enh/si-tune-fb-separate-pl…
VitorSouzaLNLS Aug 13, 2026
03fbbfe
Merge pull request #1263 from lnls-sirius/fix-tune-typos
vellosok75 Aug 13, 2026
5159fda
Merge branch 'master' into dev/enh/si-tune-fb-separate-planes
VitorSouzaLNLS Aug 14, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion siriuspy/siriuspy/VERSION
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.104.0
2.104.1
8 changes: 4 additions & 4 deletions siriuspy/siriuspy/devices/tune.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,8 +89,8 @@ def center_frequency(self, value):
self['FreqOff-SP'] = value

@property
def aquisition_enabled(self):
"""Aquisition enabled state."""
def acquisition_enabled(self):
"""Acquisition enabled state."""
return self['SpecAnaGetSpec-Sts']

@property
Expand Down Expand Up @@ -410,12 +410,12 @@ def tuney_wfm(self):
return self.dev_tune_proc_v.tune_wfm

@property
def aquisition_enabledx(self):
def acquisition_enabledx(self):
"""Tune X acquisition enabled status."""
return self.dev_tune_frac_h.acquisition_enabled

@property
def aquisition_enabledy(self):
def acquisition_enabledy(self):
"""Tune Y acquisition enabled status."""
return self.dev_tune_frac_v.acquisition_enabled

Expand Down
102 changes: 88 additions & 14 deletions siriuspy/siriuspy/opticscorr/csdev.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -402,64 +402,128 @@ def get_tune_database(acc):
'lolim': 0.0001,
'hilim': 0.4999,
}
pvs_database['MaxTuneErr-SP'] = {
pvs_database['MaxTuneXErr-SP'] = {
'type': 'float',
'value': _ct.DEF_MAX_TUNE_ERR,
'unit': 'Tune',
'prec': 6,
'lolim': 0.001,
'hilim': 0.4999,
'lolim': 0.000001,
'hilim': 0.499999,
}
pvs_database['MaxTuneErr-RB'] = {
pvs_database['MaxTuneXErr-RB'] = {
'type': 'float',
'value': _ct.DEF_MAX_TUNE_ERR,
'unit': 'Tune',
'prec': 6,
'lolim': 0.001,
'hilim': 0.4999,
'lolim': 0.000001,
'hilim': 0.499999,
}
pvs_database['MaxTuneYErr-SP'] = {
'type': 'float',
'value': _ct.DEF_MAX_TUNE_ERR,
'unit': 'Tune',
'prec': 6,
'lolim': 0.000001,
'hilim': 0.499999,
}
pvs_database['MaxTuneYErr-RB'] = {
'type': 'float',
'value': _ct.DEF_MAX_TUNE_ERR,
'unit': 'Tune',
'prec': 6,
'lolim': 0.000001,
'hilim': 0.499999,
}
# SI Tune FeedBack: PID PVs
pvs_database['LoopPIDKp-SP'] = {
pvs_database['LoopPIDKpX-SP'] = {
'type': 'float',
'value': _ct.DEF_PID_KP,
'unit': 'frac',
'prec': 4,
'lolim': -100,
'hilim': 100,
}
pvs_database['LoopPIDKpX-RB'] = {
'type': 'float',
'value': _ct.DEF_PID_KP,
'unit': 'frac',
'prec': 4,
'lolim': -100,
'hilim': 100,
}
pvs_database['LoopPIDKiX-SP'] = {
'type': 'float',
'value': _ct.DEF_PID_KI,
'unit': 'frac.Hz',
'prec': 4,
'lolim': -100,
'hilim': 100,
}
pvs_database['LoopPIDKiX-RB'] = {
'type': 'float',
'value': _ct.DEF_PID_KI,
'unit': 'frac.Hz',
'prec': 4,
'lolim': -100,
'hilim': 100,
}
pvs_database['LoopPIDKdX-SP'] = {
'type': 'float',
'value': _ct.DEF_PID_KD,
'unit': 'frac.s',
'prec': 4,
'lolim': -100,
'hilim': 100,
}
pvs_database['LoopPIDKdX-RB'] = {
'type': 'float',
'value': _ct.DEF_PID_KD,
'unit': 'frac.s',
'prec': 4,
'lolim': -100,
'hilim': 100,
}
pvs_database['LoopPIDKpY-SP'] = {
'type': 'float',
'value': _ct.DEF_PID_KP,
'unit': 'frac',
'prec': 4,
'lolim': -100,
'hilim': 100,
}
pvs_database['LoopPIDKp-RB'] = {
pvs_database['LoopPIDKpY-RB'] = {
'type': 'float',
'value': _ct.DEF_PID_KP,
'unit': 'frac',
'prec': 4,
'lolim': -100,
'hilim': 100,
}
pvs_database['LoopPIDKi-SP'] = {
pvs_database['LoopPIDKiY-SP'] = {
'type': 'float',
'value': _ct.DEF_PID_KI,
'unit': 'frac.Hz',
'prec': 4,
'lolim': -100,
'hilim': 100,
}
pvs_database['LoopPIDKi-RB'] = {
pvs_database['LoopPIDKiY-RB'] = {
'type': 'float',
'value': _ct.DEF_PID_KI,
'unit': 'frac.Hz',
'prec': 4,
'lolim': -100,
'hilim': 100,
}
pvs_database['LoopPIDKd-SP'] = {
pvs_database['LoopPIDKdY-SP'] = {
'type': 'float',
'value': _ct.DEF_PID_KD,
'unit': 'frac.s',
'prec': 4,
'lolim': -100,
'hilim': 100,
}
pvs_database['LoopPIDKd-RB'] = {
pvs_database['LoopPIDKdY-RB'] = {
'type': 'float',
'value': _ct.DEF_PID_KD,
'unit': 'frac.s',
Expand All @@ -469,12 +533,22 @@ def get_tune_database(acc):
}

# SI Tune FeedBack: Tune measurement PV selection
pvs_database['TuneSrc-Sel'] = {
pvs_database['TuneXSrc-Sel'] = {
'type': 'enum',
'enums': _ct.TuneSrc._fields,
'value': _ct.DEF_TUNESRC,
}
pvs_database['TuneXSrc-Sts'] = {
'type': 'enum',
'enums': _ct.TuneSrc._fields,
'value': _ct.DEF_TUNESRC,
}
pvs_database['TuneYSrc-Sel'] = {
'type': 'enum',
'enums': _ct.TuneSrc._fields,
'value': _ct.DEF_TUNESRC,
}
pvs_database['TuneSrc-Sts'] = {
pvs_database['TuneYSrc-Sts'] = {
'type': 'enum',
'enums': _ct.TuneSrc._fields,
'value': _ct.DEF_TUNESRC,
Expand Down
Loading
Loading