From e5f36eee9f52575140109e8c8cb93d514a54a65d Mon Sep 17 00:00:00 2001 From: Jack Harper Date: Fri, 31 Jul 2026 08:53:37 +0100 Subject: [PATCH 1/2] muon tpar improvements --- MUONTPAR/iocBoot/iocMUONTPAR-IOC-01/st.cmd | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/MUONTPAR/iocBoot/iocMUONTPAR-IOC-01/st.cmd b/MUONTPAR/iocBoot/iocMUONTPAR-IOC-01/st.cmd index df01c2cc2..f6b3e43e8 100644 --- a/MUONTPAR/iocBoot/iocMUONTPAR-IOC-01/st.cmd +++ b/MUONTPAR/iocBoot/iocMUONTPAR-IOC-01/st.cmd @@ -12,10 +12,12 @@ MUONTPAR_IOC_01_registerRecordDeviceDriver pdbbase ##ISIS## Run IOC initialisation < $(IOCSTARTUP)/init.cmd -epicsEnvSet("PORT", "fserv") epicsEnvSet("EDITOR_TPAR_FILE_DIR", $(EDITOR_TPAR_FILE_DIR="C:/Instrument/Settings") -FileContentsServerConfigure($(PORT), "$(EDITOR_TPAR_FILE_DIR)") +epicsEnvSet("PORT1", "fservtpar") +epicsEnvSet("PORT2", "fservtparbooster") +FileContentsServerConfigure($(PORT1), "$(EDITOR_TPAR_FILE_DIR)", "$(TPAR_FILE=)", "$(TPAR_CURRENT_FILE=current.tpar)") +FileContentsServerConfigure($(PORT2), "$(EDITOR_TPAR_FILE_DIR)", "$(BOOSTER_TPAR_FILE=)", "$(BOOSTER_TPAR_CURRENT_FILE=current_booster.tpar)") ## Load record instances @@ -23,10 +25,15 @@ FileContentsServerConfigure($(PORT), "$(EDITOR_TPAR_FILE_DIR)") < $(IOCSTARTUP)/dbload.cmd ## Load our record instances +## Simple string PVs dbLoadRecords("$(TOP)/db/muon_tpar.db","P=$(MYPVPREFIX)$(IOCNAME):,TPAR_FILE=$(TPAR_FILE=),TPAR_FILE_PV_NAME=TPAR_FILE") dbLoadRecords("$(TOP)/db/muon_tpar.db","P=$(MYPVPREFIX)$(IOCNAME):,TPAR_FILE=$(BOOSTER_TPAR_FILE=),TPAR_FILE_PV_NAME=BOOSTER_TPAR_FILE") dbLoadRecords("$(TOP)/db/muon_tpar.db","P=$(MYPVPREFIX)$(IOCNAME):,TPAR_FILE=$(BOOSTER_TYPE=OXF13),TPAR_FILE_PV_NAME=BOOSTER_TYPE") -dbLoadRecords("$(FILESERVER)/db/FileContentsServer.db","P=$(MYPVPREFIX)$(IOCNAME):,PORT=$(PORT)") + +## FileContentsServer dbs for TPAR file editing +dbLoadRecords("$(FILESERVER)/db/FileContentsServer.db","P=$(MYPVPREFIX)$(IOCNAME):,PORT=$(PORT1)") +dbLoadRecords("$(FILESERVER)/db/FileContentsServer.db","P=$(MYPVPREFIX)$(IOCNAME):BOOSTER:,PORT=$(PORT2)") + ##ISIS## Stuff that needs to be done after all records are loaded but before iocInit is called < $(IOCSTARTUP)/preiocinit.cmd From cd0e4202392311b8aa3c1eaa14e07c23afd7a7ff Mon Sep 17 00:00:00 2001 From: Jack Harper Date: Fri, 31 Jul 2026 14:03:05 +0100 Subject: [PATCH 2/2] make PV show current tpar filenames so scripts work as usual --- MUONTPAR/iocBoot/iocMUONTPAR-IOC-01/st.cmd | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/MUONTPAR/iocBoot/iocMUONTPAR-IOC-01/st.cmd b/MUONTPAR/iocBoot/iocMUONTPAR-IOC-01/st.cmd index f6b3e43e8..5ba25eafb 100644 --- a/MUONTPAR/iocBoot/iocMUONTPAR-IOC-01/st.cmd +++ b/MUONTPAR/iocBoot/iocMUONTPAR-IOC-01/st.cmd @@ -26,8 +26,8 @@ FileContentsServerConfigure($(PORT2), "$(EDITOR_TPAR_FILE_DIR)", "$(BOOSTER_TPAR ## Load our record instances ## Simple string PVs -dbLoadRecords("$(TOP)/db/muon_tpar.db","P=$(MYPVPREFIX)$(IOCNAME):,TPAR_FILE=$(TPAR_FILE=),TPAR_FILE_PV_NAME=TPAR_FILE") -dbLoadRecords("$(TOP)/db/muon_tpar.db","P=$(MYPVPREFIX)$(IOCNAME):,TPAR_FILE=$(BOOSTER_TPAR_FILE=),TPAR_FILE_PV_NAME=BOOSTER_TPAR_FILE") +dbLoadRecords("$(TOP)/db/muon_tpar.db","P=$(MYPVPREFIX)$(IOCNAME):,TPAR_FILE=current.tpar,TPAR_FILE_PV_NAME=TPAR_FILE") +dbLoadRecords("$(TOP)/db/muon_tpar.db","P=$(MYPVPREFIX)$(IOCNAME):,TPAR_FILE=current_booster.tpar,TPAR_FILE_PV_NAME=BOOSTER_TPAR_FILE") dbLoadRecords("$(TOP)/db/muon_tpar.db","P=$(MYPVPREFIX)$(IOCNAME):,TPAR_FILE=$(BOOSTER_TYPE=OXF13),TPAR_FILE_PV_NAME=BOOSTER_TYPE") ## FileContentsServer dbs for TPAR file editing