Conversation
| < $(IOCSTARTUP)/init.cmd | ||
|
|
||
| epicsEnvSet("PORT", "fserv") | ||
| epicsEnvSet("EDITOR_TPAR_FILE_DIR", $(EDITOR_TPAR_FILE_DIR="C:/Instrument/Settings") |
There was a problem hiding this comment.
EDITOR_TPAR_FILE_DIR now has a default applied from config.xml, so i think this line should be removed?
There was a problem hiding this comment.
Additionally I think there's not enough closing brackets on this line...
| 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)") |
There was a problem hiding this comment.
TPAR_CURRENT_FILE doesn't seem to be a config.xml macro, should it be?
There was a problem hiding this comment.
I don't really want it to ever change and I don't think scientists should be. I'm happy to make it a macro at least that can be overwritten in globals.txt, but i dont think it wants to be in config.xml
There was a problem hiding this comment.
im being stupid - it alreayd is a macro
| ## Simple string PVs | ||
| 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") |
There was a problem hiding this comment.
OXF13 default now applied by config.xml instead?
There was a problem hiding this comment.
true - will remove. I don't think i'd pulled lowri's changes when doing this branch so hadn't thought to take all of these macros + defaults out of st.cmd
| 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") | ||
| ## Simple string PVs | ||
| dbLoadRecords("$(TOP)/db/muon_tpar.db","P=$(MYPVPREFIX)$(IOCNAME):,TPAR_FILE=current.tpar,TPAR_FILE_PV_NAME=TPAR_FILE") |
There was a problem hiding this comment.
If the TPAR_CURRENT_FILE macro is kept this should then be $(TPAR_CURRENT_FILE) or $(TPAR_CURRENT_FILE=current.tpar) depending on config.xml
3 participants
Description of work
Add your own description here
To test
Which ticket does this PR fix?
Acceptance criteria
List the acceptance criteria for the PR
galil-oldbranch based) and new (masterbranch based) drivers? If so have all appropriate PRs been created **Code Review
Functional Tests
..._0nwheren>1) run correctlymacLib: macroto find instances ofmacLib: macro [macro name] is undefined...Final steps