SwissFEL/dynaPV
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

convert types only before writing DB

Browse Source
This commit is contained in:
augustin_s
2024-11-15 18:08:08 +01:00
parent d128646650
commit 92fb7aa7ca
2 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
SATES20-CPCL-DYNA/cfg/python/data.py
View File

@ -1,6 +1,14 @@
import json import json
DTYPES = {
"float": "ai",
"int": "longin",
"bool": "bi",
"str": "stringin"
}
def load_data(fn): def load_data(fn):
try: try:
with open(fn) as f: with open(fn) as f:
@ -16,6 +24,7 @@ def save_data(data, fn):
def mk_db(data, fn): def mk_db(data, fn):
with open(fn, "w") as f: with open(fn, "w") as f:
for name, dtyp in data.items(): for name, dtyp in data.items():
dtyp = DTYPES[dtyp]
entry = f'record({dtyp}, "$(SYSTEM):{name}") {{}}' entry = f'record({dtyp}, "$(SYSTEM):{name}") {{}}'
f.write(entry) f.write(entry)
f.write("\n") f.write("\n")

10
SATES20-CPCL-DYNA/cfg/python/pvs.py
View File

@ -5,14 +5,6 @@ from log import log
from utils import toggle from utils import toggle
DTYPES = {
"float": "ai",
"int": "longin",
"bool": "bi",
"str": "stringin"
}
FN_ENTRIES = "/ioc/data/SATES20-CPCL-DYNA/entries" FN_ENTRIES = "/ioc/data/SATES20-CPCL-DYNA/entries"
FN_DB_TMPL = "/ioc/data/SATES20-CPCL-DYNA/dynamic.template" FN_DB_TMPL = "/ioc/data/SATES20-CPCL-DYNA/dynamic.template"
@ -30,7 +22,6 @@ def cb_add(value=None, **kwargs):
log.info(f"add: ignoring name={repr(name)}") log.info(f"add: ignoring name={repr(name)}")
return return
dtyp = pv_dtyp.get(as_string=True) dtyp = pv_dtyp.get(as_string=True)
dtyp = DTYPES[dtyp]
log.info(f"add: name={repr(name)} type={repr(dtyp)} {kwargs}") log.info(f"add: name={repr(name)} type={repr(dtyp)} {kwargs}")
data = load_data(FN_ENTRIES) data = load_data(FN_ENTRIES)
data[name] = dtyp data[name] = dtyp
@ -62,7 +53,6 @@ pv_remove = PV("SATES20-DYNA:REMOVE")
pv_remove.add_callback(cb_remove) pv_remove.add_callback(cb_remove)
def mk_printable_data(data): def mk_printable_data(data):
return "\n".join(f"{k} ({v})" for k, v in sorted(data.items())) return "\n".join(f"{k} ({v})" for k, v in sorted(data.items()))