From e39842cc961bd09a56850a276dc8b5fcdea9ad75 Mon Sep 17 00:00:00 2001 From: anacso17 Date: Thu, 9 Dec 2021 16:55:52 -0300 Subject: [PATCH 1/3] MNT: add prefix to PVs using SiriusPVName standard --- as-ap-currinfo/as_ap_currinfo/as_ap_currinfo.py | 2 +- as-ap-currinfo/as_ap_currinfo/lifetime/lifetime.py | 3 ++- as-ap-machshift/as_ap_machshift/as_ap_machshift.py | 3 ++- as-ap-opticscorr/as_ap_opticscorr/chrom/chrom.py | 3 ++- as-ap-opticscorr/as_ap_opticscorr/tune/tune.py | 3 ++- as-ap-posang/as_ap_posang/as_ap_posang.py | 3 ++- as-ap-sofb/as_ap_sofb/as_ap_sofb.py | 10 +++++----- as-ps-diag/as_ps_diag/as_ps_diag.py | 7 ++++--- as-ps/as_ps/as_ps.py | 2 +- as-pu-conv/as_pu_conv/as_pu_conv.py | 2 +- as-pu-diag/as_pu_diag/as_pu_diag.py | 2 +- as-rf-diag/as_rf_diag/as_rf_diag.py | 2 +- as-ti-control/as_ti_control/as_ti_control.py | 7 ++++--- li-ap-diag/li_ap_diag/li_ap_diag.py | 2 +- li-ap-energy/li_ap_energy/li_ap_energy.py | 3 ++- li-ps-conv/li_ps_conv/li_ps_conv.py | 2 +- si-ap-manaca/si_ap_manaca/si_ap_manaca.py | 3 ++- si-id-conv/si_id_conv/si_id_conv.py | 2 +- 18 files changed, 35 insertions(+), 26 deletions(-) diff --git a/as-ap-currinfo/as_ap_currinfo/as_ap_currinfo.py b/as-ap-currinfo/as_ap_currinfo/as_ap_currinfo.py index f5c5067a..426a6ab5 100644 --- a/as-ap-currinfo/as_ap_currinfo/as_ap_currinfo.py +++ b/as-ap-currinfo/as_ap_currinfo/as_ap_currinfo.py @@ -95,7 +95,7 @@ def run(acc): # define IOC, init pvs database and create app object _version = _util.get_last_commit_hash() - _ioc_prefix = _vaca_prefix + _ioc_prefix = _vaca_prefix + ('-' if _vaca_prefix else '') if acc == 'BO': _ioc_prefix += acc + '-Glob:AP-CurrInfo:' _log.debug('Creating App Object.') diff --git a/as-ap-currinfo/as_ap_currinfo/lifetime/lifetime.py b/as-ap-currinfo/as_ap_currinfo/lifetime/lifetime.py index 07ef9d7d..f2aa8036 100644 --- a/as-ap-currinfo/as_ap_currinfo/lifetime/lifetime.py +++ b/as-ap-currinfo/as_ap_currinfo/lifetime/lifetime.py @@ -74,7 +74,8 @@ def run(): # define IOC, init pvs database and create app object _version = _util.get_last_commit_hash() - _ioc_prefix = _vaca_prefix + 'SI-Glob:AP-CurrInfo:' + _ioc_prefix = _vaca_prefix + ('-' if _vaca_prefix else '') + _ioc_prefix += 'SI-Glob:AP-CurrInfo:' app = _SILifetimeApp() dbase = app.pvs_database dbase['VersionLifetime-Cte']['value'] = _version diff --git a/as-ap-machshift/as_ap_machshift/as_ap_machshift.py b/as-ap-machshift/as_ap_machshift/as_ap_machshift.py index d1d3064b..cdaba1f6 100644 --- a/as-ap-machshift/as_ap_machshift/as_ap_machshift.py +++ b/as-ap-machshift/as_ap_machshift/as_ap_machshift.py @@ -69,7 +69,8 @@ def run(): # define IOC, init pvs database and create app object _version = _util.get_last_commit_hash() - _ioc_prefix = _vaca_prefix + 'AS-Glob:AP-MachShift:' + _ioc_prefix = _vaca_prefix + ('-' if _vaca_prefix else '') + _ioc_prefix += 'AS-Glob:AP-MachShift:' app = _App() dbase = app.pvs_database dbase['Version-Cte']['value'] = _version diff --git a/as-ap-opticscorr/as_ap_opticscorr/chrom/chrom.py b/as-ap-opticscorr/as_ap_opticscorr/chrom/chrom.py index 06711a82..f6afb14b 100644 --- a/as-ap-opticscorr/as_ap_opticscorr/chrom/chrom.py +++ b/as-ap-opticscorr/as_ap_opticscorr/chrom/chrom.py @@ -72,7 +72,8 @@ def run(acc): # define IOC, init pvs database and create app object _version = _util.get_last_commit_hash() - _ioc_prefix = _vaca_prefix + acc.upper() + '-Glob:AP-ChromCorr:' + _ioc_prefix = _vaca_prefix + ('-' if _vaca_prefix else '') + _ioc_prefix += acc.upper() + '-Glob:AP-ChromCorr:' app = _App(acc) dbase = app.pvs_database dbase['Version-Cte']['value'] = _version diff --git a/as-ap-opticscorr/as_ap_opticscorr/tune/tune.py b/as-ap-opticscorr/as_ap_opticscorr/tune/tune.py index cff40d1e..779ca56e 100644 --- a/as-ap-opticscorr/as_ap_opticscorr/tune/tune.py +++ b/as-ap-opticscorr/as_ap_opticscorr/tune/tune.py @@ -68,7 +68,8 @@ def run(acc): # define IOC, init pvs database and create app object _version = _util.get_last_commit_hash() - _ioc_prefix = _vaca_prefix + acc.upper() + '-Glob:AP-TuneCorr:' + _ioc_prefix = _vaca_prefix + ('-' if _vaca_prefix else '') + _ioc_prefix += acc.upper() + '-Glob:AP-TuneCorr:' app = _App(acc) dbase = app.pvs_database dbase['Version-Cte']['value'] = _version diff --git a/as-ap-posang/as_ap_posang/as_ap_posang.py b/as-ap-posang/as_ap_posang/as_ap_posang.py index af75c984..af9cbfb0 100644 --- a/as-ap-posang/as_ap_posang/as_ap_posang.py +++ b/as-ap-posang/as_ap_posang/as_ap_posang.py @@ -67,7 +67,8 @@ def run(transport_line, correctors_type='ch-sept'): # define IOC, init pvs database and create app object _version = _util.get_last_commit_hash() - _ioc_prefix = _vaca_prefix + transport_line.upper() + '-Glob:AP-PosAng:' + _ioc_prefix = _vaca_prefix + ('-' if _vaca_prefix else '') + _ioc_prefix += transport_line.upper() + '-Glob:AP-PosAng:' app = _App(transport_line, corrs_type=correctors_type) dbase = app.pvs_database dbase['Version-Cte']['value'] = _version diff --git a/as-ap-sofb/as_ap_sofb/as_ap_sofb.py b/as-ap-sofb/as_ap_sofb/as_ap_sofb.py index 03a3cd72..c4e6476c 100755 --- a/as-ap-sofb/as_ap_sofb/as_ap_sofb.py +++ b/as-ap-sofb/as_ap_sofb/as_ap_sofb.py @@ -106,11 +106,12 @@ def run(acc='SI', debug=False): app = _SOFB(acc=acc) db = app.csorb.get_ioc_database() db.update({'Version-Cte': {'type': 'string', 'value': __version__}}) - ioc_prefix = acc.upper() + '-Glob:AP-SOFB:' + ioc_prefix = _vaca_prefix + ('-' if _vaca_prefix else '') + ioc_prefix += acc.upper() + '-Glob:AP-SOFB:' ioc_name = acc.lower() + '-ap-sofb' # check if IOC is already running running = _util.check_pv_online( - pvname=_vaca_prefix + ioc_prefix + sorted(db.keys())[0], + pvname=ioc_prefix + sorted(db.keys())[0], use_prefix=False, timeout=0.5) # add PV Properties-Cte with list of all IOC PVs: db = _csdev.add_pvslist_cte(db) @@ -118,14 +119,13 @@ def run(acc='SI', debug=False): _log.error('Another ' + ioc_name + ' is already running!') return _util.print_ioc_banner( - ioc_name, db, 'SOFB for ' + acc, __version__, - _vaca_prefix + ioc_prefix) + ioc_name, db, 'SOFB for ' + acc, __version__, ioc_prefix) # create a new simple pcaspy server and driver to respond client's requests _log.info('Creating Server.') server = _pcaspy.SimpleServer() _attribute_access_security_group(server, db) _log.info('Setting Server Database.') - server.createPV(_vaca_prefix + ioc_prefix, db) + server.createPV(ioc_prefix, db) _log.info('Creating Driver.') driver = _PCASDriver(app) diff --git a/as-ps-diag/as_ps_diag/as_ps_diag.py b/as-ps-diag/as_ps_diag/as_ps_diag.py index 84d246fb..534ffa4d 100755 --- a/as-ps-diag/as_ps_diag/as_ps_diag.py +++ b/as-ps-diag/as_ps_diag/as_ps_diag.py @@ -104,7 +104,8 @@ def run(section='', sub_section='', device='', debug=False): _log.warning('No devices found. Aborting.') _sys.exit(0) - prefix = _vaca_prefix + _version = _util.get_last_commit_hash() + prefix = _vaca_prefix + ('-' if _vaca_prefix else '') pvdb = dict() for psname in psnames: _log.debug('{:32s}'.format(psname)) @@ -140,8 +141,8 @@ def run(section='', sub_section='', device='', debug=False): _util.print_ioc_banner( 'AS PS Diagnostic', pvdb, - 'IOC that provides current sp/mon diagnostics for the power supplies.', - '0.2', prefix) + 'IOC that provides power supplies diagnostics.', + _version, prefix) # initiate a new thread responsible for listening for client connections server_thread = _pcaspy_tools.ServerThread(server) diff --git a/as-ps/as_ps/as_ps.py b/as-ps/as_ps/as_ps.py index 007dbba5..95e8d3f8 100644 --- a/as-ps/as_ps/as_ps.py +++ b/as-ps/as_ps/as_ps.py @@ -21,7 +21,7 @@ STOP_EVENT = False # _multiprocessing.Event() PCAS_DRIVER = None -_PREFIX = _VACA_PREFIX +_PREFIX = _VACA_PREFIX + ('-' if _VACA_PREFIX else '') _COMMIT_HASH = __version__ diff --git a/as-pu-conv/as_pu_conv/as_pu_conv.py b/as-pu-conv/as_pu_conv/as_pu_conv.py index c88dfd53..b955dc48 100644 --- a/as-pu-conv/as_pu_conv/as_pu_conv.py +++ b/as-pu-conv/as_pu_conv/as_pu_conv.py @@ -21,7 +21,7 @@ STOP_EVENT = False # _multiprocessing.Event() PCAS_DRIVER = None -_PREFIX = _VACA_PREFIX +_PREFIX = _VACA_PREFIX + ('-' if _VACA_PREFIX else '') _COMMIT_HASH = _util.get_last_commit_hash() diff --git a/as-pu-diag/as_pu_diag/as_pu_diag.py b/as-pu-diag/as_pu_diag/as_pu_diag.py index c1b31c87..c9c1046f 100755 --- a/as-pu-diag/as_pu_diag/as_pu_diag.py +++ b/as-pu-diag/as_pu_diag/as_pu_diag.py @@ -95,7 +95,7 @@ def run(debug=False): _log.warning('No devices found. Aborting.') _sys.exit(0) - prefix = _vaca_prefix + prefix = _vaca_prefix + ('-' if _vaca_prefix else '') pvdb = dict() for puname in punames: _log.debug('{:32s}'.format(puname)) diff --git a/as-rf-diag/as_rf_diag/as_rf_diag.py b/as-rf-diag/as_rf_diag/as_rf_diag.py index fd7c11d5..61ceb043 100755 --- a/as-rf-diag/as_rf_diag/as_rf_diag.py +++ b/as-rf-diag/as_rf_diag/as_rf_diag.py @@ -87,7 +87,7 @@ def run(debug=False): # create PV database devices = _Const.ALL_DEVICES - prefix = _vaca_prefix + prefix = _vaca_prefix + ('-' if _vaca_prefix else '') pvdb = dict() for dev in devices: _log.debug('{:32s}'.format(dev)) diff --git a/as-ti-control/as_ti_control/as_ti_control.py b/as-ti-control/as_ti_control/as_ti_control.py index 3b8873d6..25ff73ab 100644 --- a/as-ti-control/as_ti_control/as_ti_control.py +++ b/as-ti-control/as_ti_control/as_ti_control.py @@ -125,22 +125,23 @@ def run(section='as', wait=5, debug=False): db[ioc_prefix + 'Version-Cte'] = {'type': 'string', 'value': __version__} # add PV Properties-Cte with list of all IOC PVs: db = _csdev.add_pvslist_cte(db, prefix=ioc_prefix) + prefix = _vaca_prefix + ('-' if _vaca_prefix else '') # check if IOC is already running running = _util.check_pv_online( - pvname=_vaca_prefix + sorted(db.keys())[0], + pvname=prefix + sorted(db.keys())[0], use_prefix=False, timeout=0.5) if running: _log.error('Another ' + ioc_name + ' is already running!') return _util.print_ioc_banner( - ioc_name, db, 'High Level Timing IOC.', __version__, _vaca_prefix) + ioc_name, db, 'High Level Timing IOC.', __version__, prefix) _log.info('Creating Server.') server = _pcaspy.SimpleServer() _attribute_access_security_group(server, db) _log.info('Setting Server Database.') - server.createPV(_vaca_prefix, db) + server.createPV(prefix, db) _log.info('Waiting 5s for PVs to connect...') app.wait_for_connection(5) diff --git a/li-ap-diag/li_ap_diag/li_ap_diag.py b/li-ap-diag/li_ap_diag/li_ap_diag.py index ce5b6faa..6a79f8cc 100755 --- a/li-ap-diag/li_ap_diag/li_ap_diag.py +++ b/li-ap-diag/li_ap_diag/li_ap_diag.py @@ -87,7 +87,7 @@ def run(debug=False): # create PV database devices = _Const.ALL_DEVICES - prefix = _vaca_prefix + prefix = _vaca_prefix + ('-' if _vaca_prefix else '') pvdb = dict() for dev in devices: _log.debug('{:32s}'.format(dev)) diff --git a/li-ap-energy/li_ap_energy/li_ap_energy.py b/li-ap-energy/li_ap_energy/li_ap_energy.py index 048a4e91..a96765b7 100644 --- a/li-ap-energy/li_ap_energy/li_ap_energy.py +++ b/li-ap-energy/li_ap_energy/li_ap_energy.py @@ -75,7 +75,8 @@ def run(debug=False): """Start the IOC.""" _util.configure_log_file(debug=debug) _log.info('Starting...') - ioc_prefix = _vaca_prefix + 'LI-Glob:AP-MeasEnergy:' + ioc_prefix = _vaca_prefix + ('-' if _vaca_prefix else '') + ioc_prefix += 'LI-Glob:AP-MeasEnergy:' # define abort function _signal.signal(_signal.SIGINT, _stop_now) diff --git a/li-ps-conv/li_ps_conv/li_ps_conv.py b/li-ps-conv/li_ps_conv/li_ps_conv.py index 7043f5c7..6d8de5aa 100644 --- a/li-ps-conv/li_ps_conv/li_ps_conv.py +++ b/li-ps-conv/li_ps_conv/li_ps_conv.py @@ -21,7 +21,7 @@ STOP_EVENT = False # _multiprocessing.Event() PCAS_DRIVER = None -_PREFIX = _VACA_PREFIX +_PREFIX = _VACA_PREFIX + ('-' if _VACA_PREFIX else '') _COMMIT_HASH = _util.get_last_commit_hash() diff --git a/si-ap-manaca/si_ap_manaca/si_ap_manaca.py b/si-ap-manaca/si_ap_manaca/si_ap_manaca.py index 20584dd3..d9de8223 100644 --- a/si-ap-manaca/si_ap_manaca/si_ap_manaca.py +++ b/si-ap-manaca/si_ap_manaca/si_ap_manaca.py @@ -75,7 +75,8 @@ def run(debug=False): """Start the IOC.""" _util.configure_log_file(debug=debug) _log.info('Starting...') - ioc_prefix = _vaca_prefix + _csmanaca.PREFIX_IOC + ioc_prefix = _vaca_prefix + ('-' if _vaca_prefix else '') + ioc_prefix += _csmanaca.PREFIX_IOC # define abort function _signal.signal(_signal.SIGINT, _stop_now) diff --git a/si-id-conv/si_id_conv/si_id_conv.py b/si-id-conv/si_id_conv/si_id_conv.py index 1f363c97..25ebee15 100644 --- a/si-id-conv/si_id_conv/si_id_conv.py +++ b/si-id-conv/si_id_conv/si_id_conv.py @@ -22,7 +22,7 @@ STOP_EVENT = False # _multiprocessing.Event() PCAS_DRIVER = None -_PREFIX = _VACA_PREFIX +_PREFIX = _VACA_PREFIX + ('-' if _VACA_PREFIX else '') _COMMIT_HASH = _util.get_last_commit_hash() From 32729f5a634486174be7144f5033811ec6a63060 Mon Sep 17 00:00:00 2001 From: anacso17 Date: Thu, 9 Dec 2021 19:30:34 -0300 Subject: [PATCH 2/3] diag.MNT: adapt to new siriuspy App --- as-ps-diag/as_ps_diag/as_ps_diag.py | 2 +- as-pu-diag/as_pu_diag/as_pu_diag.py | 2 +- as-rf-diag/as_rf_diag/as_rf_diag.py | 2 +- li-ap-diag/li_ap_diag/li_ap_diag.py | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/as-ps-diag/as_ps_diag/as_ps_diag.py b/as-ps-diag/as_ps_diag/as_ps_diag.py index 534ffa4d..77b60025 100755 --- a/as-ps-diag/as_ps_diag/as_ps_diag.py +++ b/as-ps-diag/as_ps_diag/as_ps_diag.py @@ -122,7 +122,7 @@ def run(section='', sub_section='', device='', debug=False): raise ValueError('Another instance of this IOC is already running!') # create app - app = _App(prefix, psnames) + app = _App(psnames) # create a new simple pcaspy server _log.info("Creating server with %d devices and '%s' prefix", diff --git a/as-pu-diag/as_pu_diag/as_pu_diag.py b/as-pu-diag/as_pu_diag/as_pu_diag.py index c9c1046f..a9dd82bf 100755 --- a/as-pu-diag/as_pu_diag/as_pu_diag.py +++ b/as-pu-diag/as_pu_diag/as_pu_diag.py @@ -112,7 +112,7 @@ def run(debug=False): raise ValueError('Another instance of this IOC is already running!') # create app - app = _App(prefix, punames) + app = _App(punames) # create a new simple pcaspy server _log.info("Creating server with %d devices and '%s' prefix", diff --git a/as-rf-diag/as_rf_diag/as_rf_diag.py b/as-rf-diag/as_rf_diag/as_rf_diag.py index 61ceb043..752ffabd 100755 --- a/as-rf-diag/as_rf_diag/as_rf_diag.py +++ b/as-rf-diag/as_rf_diag/as_rf_diag.py @@ -104,7 +104,7 @@ def run(debug=False): raise ValueError('Another instance of this IOC is already running!') # create app - app = _App(prefix, devices) + app = _App(devices) # create a new simple pcaspy server _log.info("Creating server with %d devices and '%s' prefix", diff --git a/li-ap-diag/li_ap_diag/li_ap_diag.py b/li-ap-diag/li_ap_diag/li_ap_diag.py index 6a79f8cc..f16127ed 100755 --- a/li-ap-diag/li_ap_diag/li_ap_diag.py +++ b/li-ap-diag/li_ap_diag/li_ap_diag.py @@ -104,7 +104,7 @@ def run(debug=False): raise ValueError('Another instance of this IOC is already running!') # create app - app = _App(prefix, devices) + app = _App(devices) # create a new simple pcaspy server _log.info("Creating server with %d devices and '%s' prefix", From 262739e054ae6055ed47026d6e2f69a988290909 Mon Sep 17 00:00:00 2001 From: anacso17 Date: Tue, 14 Dec 2021 15:56:52 -0300 Subject: [PATCH 3/3] Update version to 3.24.1 --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index 954e2288..455cf2c7 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -3.24.0 +3.24.1