From 8985b2f4b1692542594e84ce98625d44c89d06c3 Mon Sep 17 00:00:00 2001
From: JamesKingWork <james.c.king@stfc.ac.uk>
Date: Fri, 19 Mar 2021 14:24:13 +0000
Subject: [PATCH 1/8] Load new recondense db

---
 HLX503/iocBoot/iocHLX503-IOC-01/st-common.cmd | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/HLX503/iocBoot/iocHLX503-IOC-01/st-common.cmd b/HLX503/iocBoot/iocHLX503-IOC-01/st-common.cmd
index 99e871dd4..c40e6f01a 100644
--- a/HLX503/iocBoot/iocHLX503-IOC-01/st-common.cmd
+++ b/HLX503/iocBoot/iocHLX503-IOC-01/st-common.cmd
@@ -53,7 +53,7 @@ epicsEnvSet "SENSOR$(1KPOTHE3POTLO_SENSOR)_NAME" "1KPOTHE3POTLO"
 ## Load DB Records
 dbLoadRecords("$(ITC503)/db/ITC503.db","P=$(MYPVPREFIX)$(IOCNAME):, PORT=$(DEVICE), RECSIM=$(RECSIM=0), DISABLE=$(DISABLE=0), READ=$(READASCII_NAME), CTRLCHANNEL1_NAME=$(CTRLCHANNEL1_NAME), CTRLCHANNEL2_NAME=$(CTRLCHANNEL2_NAME), CTRLCHANNEL3_NAME=$(CTRLCHANNEL3_NAME), SENSOR1_NAME=$(SENSOR1_NAME), SENSOR2_NAME=$(SENSOR2_NAME), SENSOR3_NAME=$(SENSOR3_NAME), IFNOTHLX503=#")
 dbLoadRecords("$(HLX503)/db/hlx503.db","PVPREFIX=$(MYPVPREFIX),P=$(MYPVPREFIX)$(IOCNAME):,RECSIM=$(RECSIM=0),DISABLE=$(DISABLE=0),MAX_TEMP_FOR_HE3_COOLING=$(MAX_TEMP_FOR_HE3_COOLING),MAX_OPERATING_TEMP_FOR_HELIOX=$(MAX_OPERATING_TEMP_FOR_HELIOX),SORB_CHANNEL=$(SORB_CHANNEL),HE3POTHI_CHANNEL=$(HE3POTHI_CHANNEL),1KPOTHE3POTLO_CHANNEL=$(1KPOTHE3POTLO_CHANNEL),SORB_SENSOR=$(SORB_SENSOR),HE3POTHI_SENSOR=$(HE3POTHI_SENSOR),1KPOTHE3POTLO_SENSOR=$(1KPOTHE3POTLO_SENSOR),READ=$(READASCII_NAME),FILELIST=$(FILELIST_NAME)")
-
+dbLoadRecords("$(HLX503)/db/hlx503_recondense.db", "P=$(MYPVPREFIX)$(IOCNAME):")
 # dbLoadRecords("$(FILELIST)/db/calibration.db", "P=$(MYPVPREFIX)$(IOCNAME):, CALIB_BASE_DIR=$(CALIB_BASE_DIR), SDIR=$(SENS_DIR), CALIBLIST=SENSORFILELISTHE3POT, CONV_TO_PV=TEMP, CONV_FROM_PV=, CONV_TO_DESC=Temperature, CONV_TO_EGU=K, SP_PV=RAMP:_OUT_SP")
 # dbLoadRecords("$(FILELIST)/db/calibration.db", "P=$(MYPVPREFIX)$(IOCNAME):, CALIB_BASE_DIR=$(CALIB_BASE_DIR), SDIR=$(SENS_DIR), CALIBLIST=SENSORFILELISTSORB, CONV_TO_PV=TEMP, CONV_FROM_PV=, CONV_TO_DESC=Temperature, CONV_TO_EGU=K, SP_PV=RAMP:_OUT_SP")
 

From 1d426bfe27b71c213b78228ea4b6d5dfa7b37828 Mon Sep 17 00:00:00 2001
From: JamesKingWork <james.c.king@stfc.ac.uk>
Date: Fri, 19 Mar 2021 16:39:08 +0000
Subject: [PATCH 2/8] HLX503: Add macro for default post-condense temp setpoint
 and pass through macros to hlx503_recondense.db

---
 HLX503/iocBoot/iocHLX503-IOC-01/config.xml    | 1 +
 HLX503/iocBoot/iocHLX503-IOC-01/st-common.cmd | 5 +----
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/HLX503/iocBoot/iocHLX503-IOC-01/config.xml b/HLX503/iocBoot/iocHLX503-IOC-01/config.xml
index df12c43a4..a92dee0fc 100644
--- a/HLX503/iocBoot/iocHLX503-IOC-01/config.xml
+++ b/HLX503/iocBoot/iocHLX503-IOC-01/config.xml
@@ -20,6 +20,7 @@
 
     <macro name="MAX_TEMP_FOR_HE3_COOLING" pattern="^.*$" description="The temperature below which He3 cooling is to be used." hasDefault="NO"/>
     <macro name="MAX_OPERATING_TEMP_FOR_HELIOX" pattern="^.*$" description="The maximum temperature at which the heliox can be operated at." hasDefault="NO"/>
+    <macro name="DEFAULT_POST_CONDENSE_TEMP_SETPOINT" pattern="^.*$" description="The default temperature setpoint to set just after a recondense" hasDefault="YES" defaultValue="0.3"/>
   </macros>
  </config_part>
 </ioc_config>
diff --git a/HLX503/iocBoot/iocHLX503-IOC-01/st-common.cmd b/HLX503/iocBoot/iocHLX503-IOC-01/st-common.cmd
index c40e6f01a..e2dd3b9be 100644
--- a/HLX503/iocBoot/iocHLX503-IOC-01/st-common.cmd
+++ b/HLX503/iocBoot/iocHLX503-IOC-01/st-common.cmd
@@ -53,10 +53,7 @@ epicsEnvSet "SENSOR$(1KPOTHE3POTLO_SENSOR)_NAME" "1KPOTHE3POTLO"
 ## Load DB Records
 dbLoadRecords("$(ITC503)/db/ITC503.db","P=$(MYPVPREFIX)$(IOCNAME):, PORT=$(DEVICE), RECSIM=$(RECSIM=0), DISABLE=$(DISABLE=0), READ=$(READASCII_NAME), CTRLCHANNEL1_NAME=$(CTRLCHANNEL1_NAME), CTRLCHANNEL2_NAME=$(CTRLCHANNEL2_NAME), CTRLCHANNEL3_NAME=$(CTRLCHANNEL3_NAME), SENSOR1_NAME=$(SENSOR1_NAME), SENSOR2_NAME=$(SENSOR2_NAME), SENSOR3_NAME=$(SENSOR3_NAME), IFNOTHLX503=#")
 dbLoadRecords("$(HLX503)/db/hlx503.db","PVPREFIX=$(MYPVPREFIX),P=$(MYPVPREFIX)$(IOCNAME):,RECSIM=$(RECSIM=0),DISABLE=$(DISABLE=0),MAX_TEMP_FOR_HE3_COOLING=$(MAX_TEMP_FOR_HE3_COOLING),MAX_OPERATING_TEMP_FOR_HELIOX=$(MAX_OPERATING_TEMP_FOR_HELIOX),SORB_CHANNEL=$(SORB_CHANNEL),HE3POTHI_CHANNEL=$(HE3POTHI_CHANNEL),1KPOTHE3POTLO_CHANNEL=$(1KPOTHE3POTLO_CHANNEL),SORB_SENSOR=$(SORB_SENSOR),HE3POTHI_SENSOR=$(HE3POTHI_SENSOR),1KPOTHE3POTLO_SENSOR=$(1KPOTHE3POTLO_SENSOR),READ=$(READASCII_NAME),FILELIST=$(FILELIST_NAME)")
-dbLoadRecords("$(HLX503)/db/hlx503_recondense.db", "P=$(MYPVPREFIX)$(IOCNAME):")
-# dbLoadRecords("$(FILELIST)/db/calibration.db", "P=$(MYPVPREFIX)$(IOCNAME):, CALIB_BASE_DIR=$(CALIB_BASE_DIR), SDIR=$(SENS_DIR), CALIBLIST=SENSORFILELISTHE3POT, CONV_TO_PV=TEMP, CONV_FROM_PV=, CONV_TO_DESC=Temperature, CONV_TO_EGU=K, SP_PV=RAMP:_OUT_SP")
-# dbLoadRecords("$(FILELIST)/db/calibration.db", "P=$(MYPVPREFIX)$(IOCNAME):, CALIB_BASE_DIR=$(CALIB_BASE_DIR), SDIR=$(SENS_DIR), CALIBLIST=SENSORFILELISTSORB, CONV_TO_PV=TEMP, CONV_FROM_PV=, CONV_TO_DESC=Temperature, CONV_TO_EGU=K, SP_PV=RAMP:_OUT_SP")
-
+dbLoadRecords("$(HLX503)/db/hlx503_recondense.db", "P=$(MYPVPREFIX)$(IOCNAME):,MAX_TEMP_FOR_HE3_COOLING=$(MAX_TEMP_FOR_HE3_COOLING),MAX_OPERATING_TEMP_FOR_HELIOX=$(MAX_OPERATING_TEMP_FOR_HELIOX),DEFAULT_POST_CONDENSE_TEMP_SETPOINT=$(DEFAULT_POST_CONDENSE_TEMP_SETPOINT=0.3)")
 
 ##ISIS## Stuff that needs to be done after all records are loaded but before iocInit is called 
 < $(IOCSTARTUP)/preiocinit.cmd

From 039676f08af7776691ef3f3810eb659043d6cd85 Mon Sep 17 00:00:00 2001
From: JamesKingWork <james.c.king@stfc.ac.uk>
Date: Mon, 22 Mar 2021 14:30:56 +0000
Subject: [PATCH 3/8] HLX503: Use correct libraries and load snl on IOC start

---
 HLX503/HLX503-IOC-01App/src/build.mak         |  3 +++
 HLX503/iocBoot/iocHLX503-IOC-01/st-common.cmd | 12 +++++++++---
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/HLX503/HLX503-IOC-01App/src/build.mak b/HLX503/HLX503-IOC-01App/src/build.mak
index 6706ab0df..2a68159d5 100644
--- a/HLX503/HLX503-IOC-01App/src/build.mak
+++ b/HLX503/HLX503-IOC-01App/src/build.mak
@@ -35,8 +35,10 @@ $(APPNAME)_DBD += ReadASCII.dbd
 $(APPNAME)_DBD += FileList.dbd
 ## add other dbd here ##
 #$(APPNAME)_DBD += xxx.dbd
+$(APPNAME)_DBD += hlx503.dbd
 
 # Add all the support libraries needed by this IOC
+$(APPNAME)_LIBS += hlx503
 
 ## Add additional libraries here ##
 #$(APPNAME)_LIBS += xxx
@@ -58,6 +60,7 @@ $(APPNAME)_LIBS += pcrecpp pcre
 $(APPNAME)_LIBS += seq pv efsw
 $(APPNAME)_LIBS += FileList ReadASCII
 
+
 # HLX503-IOC-01_registerRecordDeviceDriver.cpp derives from HLX503-IOC-01.dbd
 $(APPNAME)_SRCS += $(APPNAME)_registerRecordDeviceDriver.cpp
 
diff --git a/HLX503/iocBoot/iocHLX503-IOC-01/st-common.cmd b/HLX503/iocBoot/iocHLX503-IOC-01/st-common.cmd
index e2dd3b9be..d5a9cd5d6 100644
--- a/HLX503/iocBoot/iocHLX503-IOC-01/st-common.cmd
+++ b/HLX503/iocBoot/iocHLX503-IOC-01/st-common.cmd
@@ -50,10 +50,12 @@ epicsEnvSet "SENSOR$(1KPOTHE3POTLO_SENSOR)_NAME" "1KPOTHE3POTLO"
 # asynSetTraceIOMask("L0", -1, 0x2)
 # asynSetTraceMask("L0", -1, 0x9)
 
+epicsEnvSet "P" "$(MYPVPREFIX)$(IOCNAME):"
+
 ## Load DB Records
-dbLoadRecords("$(ITC503)/db/ITC503.db","P=$(MYPVPREFIX)$(IOCNAME):, PORT=$(DEVICE), RECSIM=$(RECSIM=0), DISABLE=$(DISABLE=0), READ=$(READASCII_NAME), CTRLCHANNEL1_NAME=$(CTRLCHANNEL1_NAME), CTRLCHANNEL2_NAME=$(CTRLCHANNEL2_NAME), CTRLCHANNEL3_NAME=$(CTRLCHANNEL3_NAME), SENSOR1_NAME=$(SENSOR1_NAME), SENSOR2_NAME=$(SENSOR2_NAME), SENSOR3_NAME=$(SENSOR3_NAME), IFNOTHLX503=#")
-dbLoadRecords("$(HLX503)/db/hlx503.db","PVPREFIX=$(MYPVPREFIX),P=$(MYPVPREFIX)$(IOCNAME):,RECSIM=$(RECSIM=0),DISABLE=$(DISABLE=0),MAX_TEMP_FOR_HE3_COOLING=$(MAX_TEMP_FOR_HE3_COOLING),MAX_OPERATING_TEMP_FOR_HELIOX=$(MAX_OPERATING_TEMP_FOR_HELIOX),SORB_CHANNEL=$(SORB_CHANNEL),HE3POTHI_CHANNEL=$(HE3POTHI_CHANNEL),1KPOTHE3POTLO_CHANNEL=$(1KPOTHE3POTLO_CHANNEL),SORB_SENSOR=$(SORB_SENSOR),HE3POTHI_SENSOR=$(HE3POTHI_SENSOR),1KPOTHE3POTLO_SENSOR=$(1KPOTHE3POTLO_SENSOR),READ=$(READASCII_NAME),FILELIST=$(FILELIST_NAME)")
-dbLoadRecords("$(HLX503)/db/hlx503_recondense.db", "P=$(MYPVPREFIX)$(IOCNAME):,MAX_TEMP_FOR_HE3_COOLING=$(MAX_TEMP_FOR_HE3_COOLING),MAX_OPERATING_TEMP_FOR_HELIOX=$(MAX_OPERATING_TEMP_FOR_HELIOX),DEFAULT_POST_CONDENSE_TEMP_SETPOINT=$(DEFAULT_POST_CONDENSE_TEMP_SETPOINT=0.3)")
+dbLoadRecords("$(ITC503)/db/ITC503.db","P=$(P), PORT=$(DEVICE), RECSIM=$(RECSIM=0), DISABLE=$(DISABLE=0), READ=$(READASCII_NAME), CTRLCHANNEL1_NAME=$(CTRLCHANNEL1_NAME), CTRLCHANNEL2_NAME=$(CTRLCHANNEL2_NAME), CTRLCHANNEL3_NAME=$(CTRLCHANNEL3_NAME), SENSOR1_NAME=$(SENSOR1_NAME), SENSOR2_NAME=$(SENSOR2_NAME), SENSOR3_NAME=$(SENSOR3_NAME), IFNOTHLX503=#")
+dbLoadRecords("$(HLX503)/db/hlx503.db","P=$(P),RECSIM=$(RECSIM=0),DISABLE=$(DISABLE=0),MAX_TEMP_FOR_HE3_COOLING=$(MAX_TEMP_FOR_HE3_COOLING),MAX_OPERATING_TEMP_FOR_HELIOX=$(MAX_OPERATING_TEMP_FOR_HELIOX),SORB_CHANNEL=$(SORB_CHANNEL),HE3POTHI_CHANNEL=$(HE3POTHI_CHANNEL),1KPOTHE3POTLO_CHANNEL=$(1KPOTHE3POTLO_CHANNEL),SORB_SENSOR=$(SORB_SENSOR),HE3POTHI_SENSOR=$(HE3POTHI_SENSOR),1KPOTHE3POTLO_SENSOR=$(1KPOTHE3POTLO_SENSOR),READ=$(READASCII_NAME),FILELIST=$(FILELIST_NAME)")
+dbLoadRecords("$(HLX503)/db/hlx503_recondense.db", "P=$(P),MAX_TEMP_FOR_HE3_COOLING=$(MAX_TEMP_FOR_HE3_COOLING),MAX_OPERATING_TEMP_FOR_HELIOX=$(MAX_OPERATING_TEMP_FOR_HELIOX),DEFAULT_POST_CONDENSE_TEMP_SETPOINT=$(DEFAULT_POST_CONDENSE_TEMP_SETPOINT=0.3)")
 
 ##ISIS## Stuff that needs to be done after all records are loaded but before iocInit is called 
 < $(IOCSTARTUP)/preiocinit.cmd
@@ -66,3 +68,7 @@ iocInit
 
 ##ISIS## Stuff that needs to be done after iocInit is called e.g. sequence programs 
 < $(IOCSTARTUP)/postiocinit.cmd
+
+
+## Start any sequence programs
+seq hlx503, "P=$(P)"

From 082a059c38794e25d0425f5fb7a329a43f20eee9 Mon Sep 17 00:00:00 2001
From: JamesKingWork <james.c.king@stfc.ac.uk>
Date: Tue, 23 Mar 2021 10:37:01 +0000
Subject: [PATCH 4/8] HLX503: Macros for sorb settings in recondense part 1

---
 HLX503/iocBoot/iocHLX503-IOC-01/config.xml    | 5 +++++
 HLX503/iocBoot/iocHLX503-IOC-01/st-common.cmd | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/HLX503/iocBoot/iocHLX503-IOC-01/config.xml b/HLX503/iocBoot/iocHLX503-IOC-01/config.xml
index a92dee0fc..2128eff0c 100644
--- a/HLX503/iocBoot/iocHLX503-IOC-01/config.xml
+++ b/HLX503/iocBoot/iocHLX503-IOC-01/config.xml
@@ -20,7 +20,12 @@
 
     <macro name="MAX_TEMP_FOR_HE3_COOLING" pattern="^.*$" description="The temperature below which He3 cooling is to be used." hasDefault="NO"/>
     <macro name="MAX_OPERATING_TEMP_FOR_HELIOX" pattern="^.*$" description="The maximum temperature at which the heliox can be operated at." hasDefault="NO"/>
+
     <macro name="DEFAULT_POST_CONDENSE_TEMP_SETPOINT" pattern="^.*$" description="The default temperature setpoint to set just after a recondense" hasDefault="YES" defaultValue="0.3"/>
+    <macro name="RECONDENSE_SORB_TEMP_SET" pattern="^.*$" description="The temperature setpoint to set for the sorb in a recondense" hasDefault="YES" defaultValue="33"/>
+    <macro name="RECONDENSE_SORB_P" pattern="^.*$" description="The proportional to set for the sorb in a recodense" hasDefault="YES" defaultValue="1.2"/>
+    <macro name="RECONDENSE_SORB_I" pattern="^.*$" description="The integral to set for the sorb in a recodense" hasDefault="YES" defaultValue="1.2"/>
+    <macro name="RECONDENSE_SORB_D" pattern="^.*$" description="The derivative to set for the sorb in a recodense" hasDefault="YES" defaultValue="1.2"/>
   </macros>
  </config_part>
 </ioc_config>
diff --git a/HLX503/iocBoot/iocHLX503-IOC-01/st-common.cmd b/HLX503/iocBoot/iocHLX503-IOC-01/st-common.cmd
index d5a9cd5d6..4c35d5151 100644
--- a/HLX503/iocBoot/iocHLX503-IOC-01/st-common.cmd
+++ b/HLX503/iocBoot/iocHLX503-IOC-01/st-common.cmd
@@ -55,7 +55,7 @@ epicsEnvSet "P" "$(MYPVPREFIX)$(IOCNAME):"
 ## Load DB Records
 dbLoadRecords("$(ITC503)/db/ITC503.db","P=$(P), PORT=$(DEVICE), RECSIM=$(RECSIM=0), DISABLE=$(DISABLE=0), READ=$(READASCII_NAME), CTRLCHANNEL1_NAME=$(CTRLCHANNEL1_NAME), CTRLCHANNEL2_NAME=$(CTRLCHANNEL2_NAME), CTRLCHANNEL3_NAME=$(CTRLCHANNEL3_NAME), SENSOR1_NAME=$(SENSOR1_NAME), SENSOR2_NAME=$(SENSOR2_NAME), SENSOR3_NAME=$(SENSOR3_NAME), IFNOTHLX503=#")
 dbLoadRecords("$(HLX503)/db/hlx503.db","P=$(P),RECSIM=$(RECSIM=0),DISABLE=$(DISABLE=0),MAX_TEMP_FOR_HE3_COOLING=$(MAX_TEMP_FOR_HE3_COOLING),MAX_OPERATING_TEMP_FOR_HELIOX=$(MAX_OPERATING_TEMP_FOR_HELIOX),SORB_CHANNEL=$(SORB_CHANNEL),HE3POTHI_CHANNEL=$(HE3POTHI_CHANNEL),1KPOTHE3POTLO_CHANNEL=$(1KPOTHE3POTLO_CHANNEL),SORB_SENSOR=$(SORB_SENSOR),HE3POTHI_SENSOR=$(HE3POTHI_SENSOR),1KPOTHE3POTLO_SENSOR=$(1KPOTHE3POTLO_SENSOR),READ=$(READASCII_NAME),FILELIST=$(FILELIST_NAME)")
-dbLoadRecords("$(HLX503)/db/hlx503_recondense.db", "P=$(P),MAX_TEMP_FOR_HE3_COOLING=$(MAX_TEMP_FOR_HE3_COOLING),MAX_OPERATING_TEMP_FOR_HELIOX=$(MAX_OPERATING_TEMP_FOR_HELIOX),DEFAULT_POST_CONDENSE_TEMP_SETPOINT=$(DEFAULT_POST_CONDENSE_TEMP_SETPOINT=0.3)")
+dbLoadRecords("$(HLX503)/db/hlx503_recondense.db", "P=$(P),MAX_TEMP_FOR_HE3_COOLING=$(MAX_TEMP_FOR_HE3_COOLING),MAX_OPERATING_TEMP_FOR_HELIOX=$(MAX_OPERATING_TEMP_FOR_HELIOX),DEFAULT_POST_CONDENSE_TEMP_SETPOINT=$(DEFAULT_POST_CONDENSE_TEMP_SETPOINT=0.3),RECONDENSE_SORB_TEMP_SET=$(RECONDENSE_SORB_TEMP_SET=33.0),RECONDENSE_SORB_P=$(RECONDENSE_SORB_P=1.2),RECONDENSE_SORB_I=$(RECONDENSE_SORB_I=1.2),RECONDENSE_SORB_D=$(RECONDENSE_SORB_D=1.2)")
 
 ##ISIS## Stuff that needs to be done after all records are loaded but before iocInit is called 
 < $(IOCSTARTUP)/preiocinit.cmd

From 062a062d314bbedb1214d8dffe7cde7492763c8b Mon Sep 17 00:00:00 2001
From: JamesKingWork <james.c.king@stfc.ac.uk>
Date: Tue, 23 Mar 2021 15:00:05 +0000
Subject: [PATCH 5/8] HLX503: Create macros for recondense targets and settings

---
 HLX503/iocBoot/iocHLX503-IOC-01/config.xml    | 6 +++++-
 HLX503/iocBoot/iocHLX503-IOC-01/st-common.cmd | 2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/HLX503/iocBoot/iocHLX503-IOC-01/config.xml b/HLX503/iocBoot/iocHLX503-IOC-01/config.xml
index 2128eff0c..ffe80bccd 100644
--- a/HLX503/iocBoot/iocHLX503-IOC-01/config.xml
+++ b/HLX503/iocBoot/iocHLX503-IOC-01/config.xml
@@ -22,10 +22,14 @@
     <macro name="MAX_OPERATING_TEMP_FOR_HELIOX" pattern="^.*$" description="The maximum temperature at which the heliox can be operated at." hasDefault="NO"/>
 
     <macro name="DEFAULT_POST_CONDENSE_TEMP_SETPOINT" pattern="^.*$" description="The default temperature setpoint to set just after a recondense" hasDefault="YES" defaultValue="0.3"/>
-    <macro name="RECONDENSE_SORB_TEMP_SET" pattern="^.*$" description="The temperature setpoint to set for the sorb in a recondense" hasDefault="YES" defaultValue="33"/>
+    <macro name="RECONDENSE_SORB_TEMP_SET" pattern="^.*$" description="The temperature setpoint to set for the sorb in a recondense" hasDefault="YES" defaultValue="33.0"/>
     <macro name="RECONDENSE_SORB_P" pattern="^.*$" description="The proportional to set for the sorb in a recodense" hasDefault="YES" defaultValue="1.2"/>
     <macro name="RECONDENSE_SORB_I" pattern="^.*$" description="The integral to set for the sorb in a recodense" hasDefault="YES" defaultValue="1.2"/>
     <macro name="RECONDENSE_SORB_D" pattern="^.*$" description="The derivative to set for the sorb in a recodense" hasDefault="YES" defaultValue="1.2"/>
+    <macro name="RECONDENSE_SORB_TEMP_FINAL" pattern="^.*$" description="The final temperature of the sorb to wait for in part 3" hasDefault="YES" defaultValue="20.0"/>
+    <macro name="RECONDENSE_HE3POT_TARGET_TEMP_PART1" pattern="^.*$" description="The target temperature of the He3Pot to wait for in part 1" hasDefault="YES" defaultValue="1.5"/>
+    <macro name="RECONDENSE_HE3POT_TARGET_TEMP_PART2" pattern="^.*$" description="The target temperature of the He3Pot to wait for in part 2" hasDefault="YES" defaultValue="1.6"/>
+    <macro name="RECONDENSE_POST_PART2_WAIT_TIME" pattern="^.*$" description="The time in seconds to wait after part 2 of a recondense" hasDefault="YES" defaultValue="10"/>  
   </macros>
  </config_part>
 </ioc_config>
diff --git a/HLX503/iocBoot/iocHLX503-IOC-01/st-common.cmd b/HLX503/iocBoot/iocHLX503-IOC-01/st-common.cmd
index 4c35d5151..9d5242d0d 100644
--- a/HLX503/iocBoot/iocHLX503-IOC-01/st-common.cmd
+++ b/HLX503/iocBoot/iocHLX503-IOC-01/st-common.cmd
@@ -55,7 +55,7 @@ epicsEnvSet "P" "$(MYPVPREFIX)$(IOCNAME):"
 ## Load DB Records
 dbLoadRecords("$(ITC503)/db/ITC503.db","P=$(P), PORT=$(DEVICE), RECSIM=$(RECSIM=0), DISABLE=$(DISABLE=0), READ=$(READASCII_NAME), CTRLCHANNEL1_NAME=$(CTRLCHANNEL1_NAME), CTRLCHANNEL2_NAME=$(CTRLCHANNEL2_NAME), CTRLCHANNEL3_NAME=$(CTRLCHANNEL3_NAME), SENSOR1_NAME=$(SENSOR1_NAME), SENSOR2_NAME=$(SENSOR2_NAME), SENSOR3_NAME=$(SENSOR3_NAME), IFNOTHLX503=#")
 dbLoadRecords("$(HLX503)/db/hlx503.db","P=$(P),RECSIM=$(RECSIM=0),DISABLE=$(DISABLE=0),MAX_TEMP_FOR_HE3_COOLING=$(MAX_TEMP_FOR_HE3_COOLING),MAX_OPERATING_TEMP_FOR_HELIOX=$(MAX_OPERATING_TEMP_FOR_HELIOX),SORB_CHANNEL=$(SORB_CHANNEL),HE3POTHI_CHANNEL=$(HE3POTHI_CHANNEL),1KPOTHE3POTLO_CHANNEL=$(1KPOTHE3POTLO_CHANNEL),SORB_SENSOR=$(SORB_SENSOR),HE3POTHI_SENSOR=$(HE3POTHI_SENSOR),1KPOTHE3POTLO_SENSOR=$(1KPOTHE3POTLO_SENSOR),READ=$(READASCII_NAME),FILELIST=$(FILELIST_NAME)")
-dbLoadRecords("$(HLX503)/db/hlx503_recondense.db", "P=$(P),MAX_TEMP_FOR_HE3_COOLING=$(MAX_TEMP_FOR_HE3_COOLING),MAX_OPERATING_TEMP_FOR_HELIOX=$(MAX_OPERATING_TEMP_FOR_HELIOX),DEFAULT_POST_CONDENSE_TEMP_SETPOINT=$(DEFAULT_POST_CONDENSE_TEMP_SETPOINT=0.3),RECONDENSE_SORB_TEMP_SET=$(RECONDENSE_SORB_TEMP_SET=33.0),RECONDENSE_SORB_P=$(RECONDENSE_SORB_P=1.2),RECONDENSE_SORB_I=$(RECONDENSE_SORB_I=1.2),RECONDENSE_SORB_D=$(RECONDENSE_SORB_D=1.2)")
+dbLoadRecords("$(HLX503)/db/hlx503_recondense.db", "P=$(P),MAX_TEMP_FOR_HE3_COOLING=$(MAX_TEMP_FOR_HE3_COOLING),MAX_OPERATING_TEMP_FOR_HELIOX=$(MAX_OPERATING_TEMP_FOR_HELIOX),DEFAULT_POST_CONDENSE_TEMP_SETPOINT=$(DEFAULT_POST_CONDENSE_TEMP_SETPOINT=0.3),RECONDENSE_SORB_TEMP_SET=$(RECONDENSE_SORB_TEMP_SET=33.0),RECONDENSE_SORB_P=$(RECONDENSE_SORB_P=1.2),RECONDENSE_SORB_I=$(RECONDENSE_SORB_I=1.2),RECONDENSE_SORB_D=$(RECONDENSE_SORB_D=1.2),RECONDENSE_SORB_TEMP_FINAL=$(RECONDENSE_SORB_TEMP_FINAL=20.0),RECONDENSE_HE3POT_TARGET_TEMP_PART1=$(RECONDENSE_HE3POT_TARGET_TEMP_PART1=1.5),RECONDENSE_HE3POT_TARGET_TEMP_PART2=$(RECONDENSE_HE3POT_TARGET_TEMP_PART2=1.6),RECONDENSE_POST_PART2_WAIT_TIME=$(RECONDENSE_POST_PART2_WAIT_TIME=10)")
 
 ##ISIS## Stuff that needs to be done after all records are loaded but before iocInit is called 
 < $(IOCSTARTUP)/preiocinit.cmd

From 221384377143682850bc2d46f767525825f23b80 Mon Sep 17 00:00:00 2001
From: JamesKingWork <james.c.king@stfc.ac.uk>
Date: Thu, 25 Mar 2021 10:33:58 +0000
Subject: [PATCH 6/8] HLX503: Add macros to control timing out for recondensing

---
 HLX503/iocBoot/iocHLX503-IOC-01/config.xml    | 4 +++-
 HLX503/iocBoot/iocHLX503-IOC-01/st-common.cmd | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/HLX503/iocBoot/iocHLX503-IOC-01/config.xml b/HLX503/iocBoot/iocHLX503-IOC-01/config.xml
index ffe80bccd..e67740dda 100644
--- a/HLX503/iocBoot/iocHLX503-IOC-01/config.xml
+++ b/HLX503/iocBoot/iocHLX503-IOC-01/config.xml
@@ -29,7 +29,9 @@
     <macro name="RECONDENSE_SORB_TEMP_FINAL" pattern="^.*$" description="The final temperature of the sorb to wait for in part 3" hasDefault="YES" defaultValue="20.0"/>
     <macro name="RECONDENSE_HE3POT_TARGET_TEMP_PART1" pattern="^.*$" description="The target temperature of the He3Pot to wait for in part 1" hasDefault="YES" defaultValue="1.5"/>
     <macro name="RECONDENSE_HE3POT_TARGET_TEMP_PART2" pattern="^.*$" description="The target temperature of the He3Pot to wait for in part 2" hasDefault="YES" defaultValue="1.6"/>
-    <macro name="RECONDENSE_POST_PART2_WAIT_TIME" pattern="^.*$" description="The time in seconds to wait after part 2 of a recondense" hasDefault="YES" defaultValue="10"/>  
+    <macro name="RECONDENSE_POST_PART2_WAIT_TIME" pattern="^.*$" description="The time in seconds to wait after part 2 of a recondense" hasDefault="YES" defaultValue="10"/> 
+    <macro name="RECONDENSE_PART_TIMEOUT"  pattern="^.*$" description="The time to wait before timing out a part in a recondense. Defaults to 1800 seconds (30 minutes)." hasDefault="YES" defaultValue="1800"/> 
+    <macro name="RECONDENSE_PART_TIMEOUT_ON"  pattern="^.*$" description="Whether to timeout parts of the recondense." hasDefault="YES" defaultValue="YES"/> 
   </macros>
  </config_part>
 </ioc_config>
diff --git a/HLX503/iocBoot/iocHLX503-IOC-01/st-common.cmd b/HLX503/iocBoot/iocHLX503-IOC-01/st-common.cmd
index 9d5242d0d..2e9aa1fe9 100644
--- a/HLX503/iocBoot/iocHLX503-IOC-01/st-common.cmd
+++ b/HLX503/iocBoot/iocHLX503-IOC-01/st-common.cmd
@@ -55,7 +55,7 @@ epicsEnvSet "P" "$(MYPVPREFIX)$(IOCNAME):"
 ## Load DB Records
 dbLoadRecords("$(ITC503)/db/ITC503.db","P=$(P), PORT=$(DEVICE), RECSIM=$(RECSIM=0), DISABLE=$(DISABLE=0), READ=$(READASCII_NAME), CTRLCHANNEL1_NAME=$(CTRLCHANNEL1_NAME), CTRLCHANNEL2_NAME=$(CTRLCHANNEL2_NAME), CTRLCHANNEL3_NAME=$(CTRLCHANNEL3_NAME), SENSOR1_NAME=$(SENSOR1_NAME), SENSOR2_NAME=$(SENSOR2_NAME), SENSOR3_NAME=$(SENSOR3_NAME), IFNOTHLX503=#")
 dbLoadRecords("$(HLX503)/db/hlx503.db","P=$(P),RECSIM=$(RECSIM=0),DISABLE=$(DISABLE=0),MAX_TEMP_FOR_HE3_COOLING=$(MAX_TEMP_FOR_HE3_COOLING),MAX_OPERATING_TEMP_FOR_HELIOX=$(MAX_OPERATING_TEMP_FOR_HELIOX),SORB_CHANNEL=$(SORB_CHANNEL),HE3POTHI_CHANNEL=$(HE3POTHI_CHANNEL),1KPOTHE3POTLO_CHANNEL=$(1KPOTHE3POTLO_CHANNEL),SORB_SENSOR=$(SORB_SENSOR),HE3POTHI_SENSOR=$(HE3POTHI_SENSOR),1KPOTHE3POTLO_SENSOR=$(1KPOTHE3POTLO_SENSOR),READ=$(READASCII_NAME),FILELIST=$(FILELIST_NAME)")
-dbLoadRecords("$(HLX503)/db/hlx503_recondense.db", "P=$(P),MAX_TEMP_FOR_HE3_COOLING=$(MAX_TEMP_FOR_HE3_COOLING),MAX_OPERATING_TEMP_FOR_HELIOX=$(MAX_OPERATING_TEMP_FOR_HELIOX),DEFAULT_POST_CONDENSE_TEMP_SETPOINT=$(DEFAULT_POST_CONDENSE_TEMP_SETPOINT=0.3),RECONDENSE_SORB_TEMP_SET=$(RECONDENSE_SORB_TEMP_SET=33.0),RECONDENSE_SORB_P=$(RECONDENSE_SORB_P=1.2),RECONDENSE_SORB_I=$(RECONDENSE_SORB_I=1.2),RECONDENSE_SORB_D=$(RECONDENSE_SORB_D=1.2),RECONDENSE_SORB_TEMP_FINAL=$(RECONDENSE_SORB_TEMP_FINAL=20.0),RECONDENSE_HE3POT_TARGET_TEMP_PART1=$(RECONDENSE_HE3POT_TARGET_TEMP_PART1=1.5),RECONDENSE_HE3POT_TARGET_TEMP_PART2=$(RECONDENSE_HE3POT_TARGET_TEMP_PART2=1.6),RECONDENSE_POST_PART2_WAIT_TIME=$(RECONDENSE_POST_PART2_WAIT_TIME=10)")
+dbLoadRecords("$(HLX503)/db/hlx503_recondense.db", "P=$(P),MAX_TEMP_FOR_HE3_COOLING=$(MAX_TEMP_FOR_HE3_COOLING),MAX_OPERATING_TEMP_FOR_HELIOX=$(MAX_OPERATING_TEMP_FOR_HELIOX),DEFAULT_POST_CONDENSE_TEMP_SETPOINT=$(DEFAULT_POST_CONDENSE_TEMP_SETPOINT=0.3),RECONDENSE_SORB_TEMP_SET=$(RECONDENSE_SORB_TEMP_SET=33.0),RECONDENSE_SORB_P=$(RECONDENSE_SORB_P=1.2),RECONDENSE_SORB_I=$(RECONDENSE_SORB_I=1.2),RECONDENSE_SORB_D=$(RECONDENSE_SORB_D=1.2),RECONDENSE_SORB_TEMP_FINAL=$(RECONDENSE_SORB_TEMP_FINAL=20.0),RECONDENSE_HE3POT_TARGET_TEMP_PART1=$(RECONDENSE_HE3POT_TARGET_TEMP_PART1=1.5),RECONDENSE_HE3POT_TARGET_TEMP_PART2=$(RECONDENSE_HE3POT_TARGET_TEMP_PART2=1.6),RECONDENSE_POST_PART2_WAIT_TIME=$(RECONDENSE_POST_PART2_WAIT_TIME=10),RECONDENSE_PART_TIMEOUT=$(RECONDENSE_PART_TIMEOUT=1800),RECONDENSE_PART_TIMEOUT_ON=$(RECONDENSE_PART_TIMEOUT_ON=YES)")
 
 ##ISIS## Stuff that needs to be done after all records are loaded but before iocInit is called 
 < $(IOCSTARTUP)/preiocinit.cmd

From ff8da24244e703cf977dbe698bd7df62ac1e709a Mon Sep 17 00:00:00 2001
From: JamesKingWork <james.c.king@stfc.ac.uk>
Date: Fri, 26 Mar 2021 18:24:30 +0000
Subject: [PATCH 7/8] HLX503: Set macro correctly

---
 HLX503/iocBoot/iocHLX503-IOC-01/st-common.cmd | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/HLX503/iocBoot/iocHLX503-IOC-01/st-common.cmd b/HLX503/iocBoot/iocHLX503-IOC-01/st-common.cmd
index 2e9aa1fe9..efa35efcb 100644
--- a/HLX503/iocBoot/iocHLX503-IOC-01/st-common.cmd
+++ b/HLX503/iocBoot/iocHLX503-IOC-01/st-common.cmd
@@ -50,12 +50,17 @@ epicsEnvSet "SENSOR$(1KPOTHE3POTLO_SENSOR)_NAME" "1KPOTHE3POTLO"
 # asynSetTraceIOMask("L0", -1, 0x2)
 # asynSetTraceMask("L0", -1, 0x9)
 
+stringiftest("RECONDENSE_PART_TIMEOUT_ON", "YES", 2)
+$(IFRECONDENSE_PART_TIMEOUT_ON) epicsEnvSet "RECONDENSE_PART_TIMEOUT_ON" "1"
+$(IFNOTRECONDENSE_PART_TIMEOUT_ON) epicsEnvSet "RECONDENSE_PART_TIMEOUT_ON" "0"
+
+
 epicsEnvSet "P" "$(MYPVPREFIX)$(IOCNAME):"
 
 ## Load DB Records
 dbLoadRecords("$(ITC503)/db/ITC503.db","P=$(P), PORT=$(DEVICE), RECSIM=$(RECSIM=0), DISABLE=$(DISABLE=0), READ=$(READASCII_NAME), CTRLCHANNEL1_NAME=$(CTRLCHANNEL1_NAME), CTRLCHANNEL2_NAME=$(CTRLCHANNEL2_NAME), CTRLCHANNEL3_NAME=$(CTRLCHANNEL3_NAME), SENSOR1_NAME=$(SENSOR1_NAME), SENSOR2_NAME=$(SENSOR2_NAME), SENSOR3_NAME=$(SENSOR3_NAME), IFNOTHLX503=#")
 dbLoadRecords("$(HLX503)/db/hlx503.db","P=$(P),RECSIM=$(RECSIM=0),DISABLE=$(DISABLE=0),MAX_TEMP_FOR_HE3_COOLING=$(MAX_TEMP_FOR_HE3_COOLING),MAX_OPERATING_TEMP_FOR_HELIOX=$(MAX_OPERATING_TEMP_FOR_HELIOX),SORB_CHANNEL=$(SORB_CHANNEL),HE3POTHI_CHANNEL=$(HE3POTHI_CHANNEL),1KPOTHE3POTLO_CHANNEL=$(1KPOTHE3POTLO_CHANNEL),SORB_SENSOR=$(SORB_SENSOR),HE3POTHI_SENSOR=$(HE3POTHI_SENSOR),1KPOTHE3POTLO_SENSOR=$(1KPOTHE3POTLO_SENSOR),READ=$(READASCII_NAME),FILELIST=$(FILELIST_NAME)")
-dbLoadRecords("$(HLX503)/db/hlx503_recondense.db", "P=$(P),MAX_TEMP_FOR_HE3_COOLING=$(MAX_TEMP_FOR_HE3_COOLING),MAX_OPERATING_TEMP_FOR_HELIOX=$(MAX_OPERATING_TEMP_FOR_HELIOX),DEFAULT_POST_CONDENSE_TEMP_SETPOINT=$(DEFAULT_POST_CONDENSE_TEMP_SETPOINT=0.3),RECONDENSE_SORB_TEMP_SET=$(RECONDENSE_SORB_TEMP_SET=33.0),RECONDENSE_SORB_P=$(RECONDENSE_SORB_P=1.2),RECONDENSE_SORB_I=$(RECONDENSE_SORB_I=1.2),RECONDENSE_SORB_D=$(RECONDENSE_SORB_D=1.2),RECONDENSE_SORB_TEMP_FINAL=$(RECONDENSE_SORB_TEMP_FINAL=20.0),RECONDENSE_HE3POT_TARGET_TEMP_PART1=$(RECONDENSE_HE3POT_TARGET_TEMP_PART1=1.5),RECONDENSE_HE3POT_TARGET_TEMP_PART2=$(RECONDENSE_HE3POT_TARGET_TEMP_PART2=1.6),RECONDENSE_POST_PART2_WAIT_TIME=$(RECONDENSE_POST_PART2_WAIT_TIME=10),RECONDENSE_PART_TIMEOUT=$(RECONDENSE_PART_TIMEOUT=1800),RECONDENSE_PART_TIMEOUT_ON=$(RECONDENSE_PART_TIMEOUT_ON=YES)")
+dbLoadRecords("$(HLX503)/db/hlx503_recondense.db", "P=$(P),MAX_TEMP_FOR_HE3_COOLING=$(MAX_TEMP_FOR_HE3_COOLING),MAX_OPERATING_TEMP_FOR_HELIOX=$(MAX_OPERATING_TEMP_FOR_HELIOX),DEFAULT_POST_CONDENSE_TEMP_SETPOINT=$(DEFAULT_POST_CONDENSE_TEMP_SETPOINT=0.3),RECONDENSE_SORB_TEMP_SET=$(RECONDENSE_SORB_TEMP_SET=33.0),RECONDENSE_SORB_P=$(RECONDENSE_SORB_P=1.2),RECONDENSE_SORB_I=$(RECONDENSE_SORB_I=1.2),RECONDENSE_SORB_D=$(RECONDENSE_SORB_D=1.2),RECONDENSE_SORB_TEMP_FINAL=$(RECONDENSE_SORB_TEMP_FINAL=20.0),RECONDENSE_HE3POT_TARGET_TEMP_PART1=$(RECONDENSE_HE3POT_TARGET_TEMP_PART1=1.5),RECONDENSE_HE3POT_TARGET_TEMP_PART2=$(RECONDENSE_HE3POT_TARGET_TEMP_PART2=1.6),RECONDENSE_POST_PART2_WAIT_TIME=$(RECONDENSE_POST_PART2_WAIT_TIME=10),RECONDENSE_PART_TIMEOUT=$(RECONDENSE_PART_TIMEOUT=1800),RECONDENSE_PART_TIMEOUT_ON=$(RECONDENSE_PART_TIMEOUT_ON=1)")
 
 ##ISIS## Stuff that needs to be done after all records are loaded but before iocInit is called 
 < $(IOCSTARTUP)/preiocinit.cmd

From 9b210a5f76dd7ff34ba4c9ab273922715a114523 Mon Sep 17 00:00:00 2001
From: JamesKingWork <54139864+JamesKingWork@users.noreply.github.com>
Date: Thu, 8 Apr 2021 11:39:41 +0100
Subject: [PATCH 8/8] Run correctly for recsim

---
 HLX503/iocBoot/iocHLX503-IOC-01/st-common.cmd | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/HLX503/iocBoot/iocHLX503-IOC-01/st-common.cmd b/HLX503/iocBoot/iocHLX503-IOC-01/st-common.cmd
index efa35efcb..9db34cc7d 100644
--- a/HLX503/iocBoot/iocHLX503-IOC-01/st-common.cmd
+++ b/HLX503/iocBoot/iocHLX503-IOC-01/st-common.cmd
@@ -10,8 +10,9 @@ epicsEnvSet "STREAM_PROTOCOL_PATH" "$(ITC503)/data"
 epicsEnvSet "STREAM_PROTOCOL_PATH" "$(ITC503)/data"
 epicsEnvSet "READASCII_NAME" "READASCII"
 epicsEnvSet "FILELIST_NAME" "FILELIST"
-$(IFNOTDEVSIM) epicsEnvSet "CALIB_BASE_DIR" "$(ICPCONFIGBASE)/$(INSTRUMENT)"
+$(IFNOTRECSIM) $(IFNOTDEVSIM) epicsEnvSet "CALIB_BASE_DIR" "$(ICPCONFIGBASE)/$(INSTRUMENT)"
 $(IFDEVSIM) epicsEnvSet "CALIB_BASE_DIR" "$(HLX503)"
+$(IFRECSIM) epicsEnvSet "CALIB_BASE_DIR" "$(HLX503)"
 epicsEnvSet "TPAR_DIR" "configurations/hlx503"
 epicsEnvSet "TPAR_PAT" ".*"
 FileListConfigure("$(FILELIST_NAME)", "$(CALIB_BASE_DIR)/$(TPAR_DIR)", "$(TPAR_PAT)", 0)