From 272d9e14a313b2c6cf72c8318d5c4bc538a81395 Mon Sep 17 00:00:00 2001
From: Dominic Oram <dominic.oram@stfc.ac.uk>
Date: Fri, 17 Nov 2017 14:31:22 +0000
Subject: [PATCH 1/5] Removed unused code

---
 GALIL/iocBoot/iocGALIL-IOC-01/galil.cmd     | 13 +----------
 GALIL/iocBoot/iocGALIL-IOC-01/galildb.cmd   | 17 +++++++-------
 GALIL/iocBoot/iocGALIL-IOC-01/motorsim.cmd  | 26 ---------------------
 GALIL/iocBoot/iocGALIL-IOC-01/st-common.cmd |  4 ----
 ISISDAE/iocBoot/iocISISDAE-IOC-01/st.cmd    |  1 +
 5 files changed, 10 insertions(+), 51 deletions(-)

diff --git a/GALIL/iocBoot/iocGALIL-IOC-01/galil.cmd b/GALIL/iocBoot/iocGALIL-IOC-01/galil.cmd
index 711bb63c3..cb9c8a9ac 100644
--- a/GALIL/iocBoot/iocGALIL-IOC-01/galil.cmd
+++ b/GALIL/iocBoot/iocGALIL-IOC-01/galil.cmd
@@ -1,57 +1,46 @@
 
-## GALILNUMCRATES, IFDCM01, IFDCM02 etc. macros set in st.cmd 
+## IFDCM01, IFDCM02 etc. macros set in st.cmd 
 
 $(IFSIM) < motorsim.cmd
 
 # Calculate Galil controller ID within the driver - it starts at 0 whereas GALILCRATE starts at 1
-calc("GCID", "0", 2, 2)
 
 $(IFDMC01) epicsEnvSet("GALILCRATE","01")
 $(IFDMC01) < galildb.cmd 
 $(IFDMC01) $(IFNOTSIM) < $(GALILCONFIG)/galil1.cmd
-$(IFDMC01) calc("GCID", "$(GCID) + 1", 2, 2)
 
 $(IFDMC02) epicsEnvSet("GALILCRATE","02")
 $(IFDMC02) < galildb.cmd 
 $(IFDMC02) $(IFNOTSIM) < $(GALILCONFIG)/galil2.cmd
-$(IFDMC02) calc("GCID", "$(GCID) + 1", 2, 2)
 
 $(IFDMC03) epicsEnvSet("GALILCRATE","03")
 $(IFDMC03) < galildb.cmd 
 $(IFDMC03) $(IFNOTSIM) < $(GALILCONFIG)/galil3.cmd
-$(IFDMC03) calc("GCID", "$(GCID) + 1", 2, 2)
 
 $(IFDMC04) epicsEnvSet("GALILCRATE","04")
 $(IFDMC04) < galildb.cmd 
 $(IFDMC04) $(IFNOTSIM) < $(GALILCONFIG)/galil4.cmd
-$(IFDMC04) calc("GCID", "$(GCID) + 1", 2, 2)
 
 $(IFDMC05) epicsEnvSet("GALILCRATE","05")
 $(IFDMC05) < galildb.cmd 
 $(IFDMC05) $(IFNOTSIM) < $(GALILCONFIG)/galil5.cmd
-$(IFDMC05) calc("GCID", "$(GCID) + 1", 2, 2)
 
 $(IFDMC06) epicsEnvSet("GALILCRATE","06")
 $(IFDMC06) < galildb.cmd 
 $(IFDMC06) $(IFNOTSIM) < $(GALILCONFIG)/galil6.cmd
-$(IFDMC06) calc("GCID", "$(GCID) + 1", 2, 2)
 
 $(IFDMC07) epicsEnvSet("GALILCRATE","07")
 $(IFDMC07) < galildb.cmd 
 $(IFDMC07) $(IFNOTSIM) < $(GALILCONFIG)/galil7.cmd
-$(IFDMC07) calc("GCID", "$(GCID) + 1", 2, 2)
 
 $(IFDMC08) epicsEnvSet("GALILCRATE","08")
 $(IFDMC08) < galildb.cmd 
 $(IFDMC08) $(IFNOTSIM) < $(GALILCONFIG)/galil8.cmd
-$(IFDMC08) calc("GCID", "$(GCID) + 1", 2, 2)
 
 $(IFDMC09) epicsEnvSet("GALILCRATE","09")
 $(IFDMC09) < galildb.cmd 
 $(IFDMC09) $(IFNOTSIM) < $(GALILCONFIG)/galil9.cmd
-$(IFDMC09) calc("GCID", "$(GCID) + 1", 2, 2)
 
 $(IFDMC10) epicsEnvSet("GALILCRATE","10")
 $(IFDMC10) < galildb.cmd 
 $(IFDMC10) $(IFNOTSIM) < $(GALILCONFIG)/galil10.cmd
-$(IFDMC10) calc("GCID", "$(GCID) + 1", 2, 2)
diff --git a/GALIL/iocBoot/iocGALIL-IOC-01/galildb.cmd b/GALIL/iocBoot/iocGALIL-IOC-01/galildb.cmd
index 1cc1108d9..db311bad7 100644
--- a/GALIL/iocBoot/iocGALIL-IOC-01/galildb.cmd
+++ b/GALIL/iocBoot/iocGALIL-IOC-01/galildb.cmd
@@ -2,21 +2,20 @@
 
 ## GALILCRATE is the galil crate number - 01, 02, ...
 
-dbLoadRecords("$(TOP)/db/galil_motor.db", "P=$(MYPVPREFIX)MOT,CCP=$(GALILCRATE),IFSIM=$(IFSIM),IFNOTSIM=$(IFNOTSIM)")
+dbLoadRecords("$(TOP)/db/galil_motor.db", "P=$(MYPVPREFIX)MOT,CCP=$(GALILCRATE)")
 
 #Load extra functionality, untop of motorRecord features for axis/motors (eg. runtime gear ratio changes between master & slaves)
-$(IFNOTSIM) dbLoadRecords("$(TOP)/db/galil_ctrl_extras.db", "P=$(MYPVPREFIX)MOT,CCP=$(GALILCRATE),IFSIM=$(IFSIM),IFNOTSIM=$(IFNOTSIM)")
-$(IFNOTSIM) dbLoadRecords("$(TOP)/db/galil_motor_extras.db", "P=$(MYPVPREFIX)MOT,CCP=$(GALILCRATE),IFSIM=$(IFSIM),IFNOTSIM=$(IFNOTSIM)")
+$(IFNOTSIM) dbLoadRecords("$(TOP)/db/galil_ctrl_extras.db", "P=$(MYPVPREFIX)MOT,CCP=$(GALILCRATE)")
+$(IFNOTSIM) dbLoadRecords("$(TOP)/db/galil_motor_extras.db", "P=$(MYPVPREFIX)MOT,CCP=$(GALILCRATE)")
 
 #Load digital IO databases
-$(IFNOTSIM) dbLoadRecords("$(TOP)/db/galil_digital_ports.db", "P=$(MYPVPREFIX)MOT,CCP=$(GALILCRATE),IFSIM=$(IFSIM),IFNOTSIM=$(IFNOTSIM)")
+$(IFNOTSIM) dbLoadRecords("$(TOP)/db/galil_digital_ports.db", "P=$(MYPVPREFIX)MOT,CCP=$(GALILCRATE)")
 
 #Load analog IO databases
-$(IFNOTSIM) dbLoadRecords("$(TOP)/db/galil_analog_ports.db", "P=$(MYPVPREFIX)MOT,CCP=$(GALILCRATE),IFSIM=$(IFSIM),IFNOTSIM=$(IFNOTSIM)")
+$(IFNOTSIM) dbLoadRecords("$(TOP)/db/galil_analog_ports.db", "P=$(MYPVPREFIX)MOT,CCP=$(GALILCRATE)")
 
 #Load user defined functions
-#dbLoadRecords("$(TOP)/db/galil_userdef_records.db", "P=$(MYPVPREFIX)MOT,CC=$(GCID),CCP=$(GALILCRATE),IFSIM=$(IFSIM),IFNOTSIM=$(IFNOTSIM)")
-$(IFNOTSIM) dbLoadRecords("$(TOP)/db/galil_userdef_records8.db", "P=$(MYPVPREFIX)MOT,CCP=$(GALILCRATE),IFSIM=$(IFSIM),IFNOTSIM=$(IFNOTSIM)")
+$(IFNOTSIM) dbLoadRecords("$(TOP)/db/galil_userdef_records8.db", "P=$(MYPVPREFIX)MOT,CCP=$(GALILCRATE)")
 
-$(IFNOTSIM) dbLoadRecords("$(TOP)/db/galil_profileMoveController.db", "P=$(MYPVPREFIX)MOT:,CC=$(GCID),CCP=$(GALILCRATE),IFSIM=$(IFSIM),IFNOTSIM=$(IFNOTSIM)")
-$(IFNOTSIM) dbLoadRecords("$(TOP)/db/galil_profileMoveAxis.db", "P=$(MYPVPREFIX)MOT:,CC=$(GCID),CCP=$(GALILCRATE),IFSIM=$(IFSIM),IFNOTSIM=$(IFNOTSIM)")
+$(IFNOTSIM) dbLoadRecords("$(TOP)/db/galil_profileMoveController.db", "P=$(MYPVPREFIX)MOT:,CCP=$(GALILCRATE)")
+$(IFNOTSIM) dbLoadRecords("$(TOP)/db/galil_profileMoveAxis.db", "P=$(MYPVPREFIX)MOT:,CCP=$(GALILCRATE)")
diff --git a/GALIL/iocBoot/iocGALIL-IOC-01/motorsim.cmd b/GALIL/iocBoot/iocGALIL-IOC-01/motorsim.cmd
index 40644194d..fee4e7521 100644
--- a/GALIL/iocBoot/iocGALIL-IOC-01/motorsim.cmd
+++ b/GALIL/iocBoot/iocGALIL-IOC-01/motorsim.cmd
@@ -8,29 +8,3 @@ motorSimConfigAxis("Galil", 4, 32000, -32000,  0, 0)
 motorSimConfigAxis("Galil", 5, 32000, -32000,  0, 0) 
 motorSimConfigAxis("Galil", 6, 32000, -32000,  0, 0) 
 motorSimConfigAxis("Galil", 7, 32000, -32000,  0, 0) 
-
-# Setup the Asyn layer (portname, low-level driver drvet name, card, number of axes on card)
-# number crates from 0
-# Create simulated motors: ( start card , start axis , low limit, high limit, home posn, # cards, # axes to setup)
-#motorSimCreate( 0, 0, -32000, 32000, 0, $(GALILNUMCRATES), 8 )
-#$(IFDMC01) drvAsynMotorConfigure("motorSim$(GCID)", "motorSim", $(GCID), 8)
-#$(IFDMC01) drvAsynMotorConfigure("Galil", "motorSim", $(GCID), 8)#calc("GCID", "0", 2, 2)
-#$(IFDMC01) calc("GCID", "$(GCID) + 1", 2, 2)
-#$(IFDMC02) drvAsynMotorConfigure("motorSim$(GCID)", "motorSim", $(GCID), 8)
-#$(IFDMC02) calc("GCID", "$(GCID) + 1", 2, 2)
-#$(IFDMC03) drvAsynMotorConfigure("motorSim$(GCID)", "motorSim", $(GCID), 8)
-#$(IFDMC03) calc("GCID", "$(GCID) + 1", 2, 2)
-#$(IFDMC04) drvAsynMotorConfigure("motorSim$(GCID)", "motorSim", $(GCID), 8)
-#$(IFDMC04) calc("GCID", "$(GCID) + 1", 2, 2)
-#$(IFDMC05) drvAsynMotorConfigure("motorSim$(GCID)", "motorSim", $(GCID), 8)
-#$(IFDMC05) calc("GCID", "$(GCID) + 1", 2, 2)
-#$(IFDMC06) drvAsynMotorConfigure("motorSim$(GCID)", "motorSim", $(GCID), 8)
-#$(IFDMC06) calc("GCID", "$(GCID) + 1", 2, 2)
-#$(IFDMC07) drvAsynMotorConfigure("motorSim$(GCID)", "motorSim", $(GCID), 8)
-#$(IFDMC07) calc("GCID", "$(GCID) + 1", 2, 2)
-#$(IFDMC08) drvAsynMotorConfigure("motorSim$(GCID)", "motorSim", $(GCID), 8)
-#$(IFDMC08) calc("GCID", "$(GCID) + 1", 2, 2)
-#$(IFDMC09) drvAsynMotorConfigure("motorSim$(GCID)", "motorSim", $(GCID), 8)
-#$(IFDMC09) calc("GCID", "$(GCID) + 1", 2, 2)
-#$(IFDMC10) drvAsynMotorConfigure("motorSim$(GCID)", "motorSim", $(GCID), 8)
-#$(IFDMC10) calc("GCID", "$(GCID) + 1", 2, 2)
diff --git a/GALIL/iocBoot/iocGALIL-IOC-01/st-common.cmd b/GALIL/iocBoot/iocGALIL-IOC-01/st-common.cmd
index 674a41d88..35a185fb9 100644
--- a/GALIL/iocBoot/iocGALIL-IOC-01/st-common.cmd
+++ b/GALIL/iocBoot/iocGALIL-IOC-01/st-common.cmd
@@ -18,9 +18,6 @@ set_requestfile_path("${MOTOR}/motorApp/Db", "")
 ## as all Galils cd to GALIL-IOC-01 need to add this explicitly so info generated req files are found
 set_requestfile_path("${TOP}/iocBoot/iocGALIL-IOC-01", "")
 
-# how many galil crates we have
-# GALILNUMCRATES set in icpconfig
-
 # this defines macros we can use for conditional loading later
 stringtest("IFDMC01", "$(GALILADDR01=)")
 stringtest("IFDMC02", "$(GALILADDR02=)")
@@ -33,7 +30,6 @@ stringtest("IFDMC08", "$(GALILADDR08=)")
 stringtest("IFDMC09", "$(GALILADDR09=)")
 stringtest("IFDMC10", "$(GALILADDR10=)")
 
-
 epicsEnvSet("GALILCONFIG","$(ICPCONFIGROOT)/galil")
 
 ## uncomment to see every command sent to every galil, of define in st.cmd for just one galil
diff --git a/ISISDAE/iocBoot/iocISISDAE-IOC-01/st.cmd b/ISISDAE/iocBoot/iocISISDAE-IOC-01/st.cmd
index d7dcd3fb4..a4ad378ae 100644
--- a/ISISDAE/iocBoot/iocISISDAE-IOC-01/st.cmd
+++ b/ISISDAE/iocBoot/iocISISDAE-IOC-01/st.cmd
@@ -67,6 +67,7 @@ $(IFPARALLEL=) dbLoadRecords("$(ISISDAE)/db/dae3_parallel.db","P=$(MYPVPREFIX),
 
 dbLoadRecords("$(ISISDAE)/db/isisdae.db","S=$(MYPVPREFIX), P=$(MYPVPREFIX), Q=$(Q), WIRINGLIST=WLIST, DETECTORLIST=DLIST, SPECTRALIST=SLIST, PERIODLIST=PLIST, TCBLIST=TLIST, BEGINRUNA=$(BEGINRUN_DAE3=$(MYPVPREFIX)$(Q)_BEGINRUN1), ENDRUNA=$(ENDRUN_DAE3=$(MYPVPREFIX)$(Q)_ENDRUN1)")
 dbLoadRecords("$(ISISDAE)/db/dae_diag.db","P=$(MYPVPREFIX),Q=DAE:")
+dbLoadRecords("$(ISISDAE)/db/dae3_pull.db","P=$(MYPVPREFIX),Q=DAE:,O=IN:DEMO:")
 
 ##ISIS## Stuff that needs to be done after all records are loaded but before iocInit is called 
 < $(IOCSTARTUP)/preiocinit.cmd

From 8a4bcff1a5e0489a8fd5653b41cacdb90db35fdb Mon Sep 17 00:00:00 2001
From: Dominic Oram <dominic.oram@stfc.ac.uk>
Date: Fri, 17 Nov 2017 16:52:05 +0000
Subject: [PATCH 2/5] Changed to new way of doing motors moving/stop all

---
 GALIL/iocBoot/iocGALIL-IOC-01/st-common.cmd | 2 +-
 INSTETC/INSTETC-IOC-01App/Db/INSTETC.db     | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/GALIL/iocBoot/iocGALIL-IOC-01/st-common.cmd b/GALIL/iocBoot/iocGALIL-IOC-01/st-common.cmd
index 35a185fb9..4cc99aabb 100644
--- a/GALIL/iocBoot/iocGALIL-IOC-01/st-common.cmd
+++ b/GALIL/iocBoot/iocGALIL-IOC-01/st-common.cmd
@@ -58,7 +58,7 @@ $(IFNOTTESTDEVSIM) < $(GALILCONFIG)/motorExtensions.cmd
 $(IFTESTDEVSIM) < $(MOTOREXT)/settings/motorExtensions.cmd
 
 ## motor util package
-dbLoadRecords("$(MOTOR)/db/motorUtil.db","P=$(MYPVPREFIX)$(IOCNAME):,PVPREFIX=$(MYPVPREFIX),IFDMC01=$(IFDMC01),IFDMC02=$(IFDMC02),IFDMC03=$(IFDMC03),IFDMC04=$(IFDMC04),IFDMC05=$(IFDMC05),IFDMC06=$(IFDMC06),IFDMC07=$(IFDMC07),IFDMC08=$(IFDMC08),IFDMC09=$(IFDMC09),IFDMC10=$(IFDMC10)")
+dbLoadRecords("$(MOTOR)/db/motorUtil.db","P=$(MYPVPREFIX)$(IOCNAME):,$(IFIOC)= ,PVPREFIX=$(MYPVPREFIX)")
 
 ##ISIS## Stuff that needs to be done after all records are loaded but before iocInit is called 
 < $(IOCSTARTUP)/preiocinit.cmd
diff --git a/INSTETC/INSTETC-IOC-01App/Db/INSTETC.db b/INSTETC/INSTETC-IOC-01App/Db/INSTETC.db
index 378c74aba..849dd9223 100644
--- a/INSTETC/INSTETC-IOC-01App/Db/INSTETC.db
+++ b/INSTETC/INSTETC-IOC-01App/Db/INSTETC.db
@@ -10,13 +10,13 @@ record (longin, "$(P)CS:MOT:STOP:ALL")
 }
 
 ## Are any motors moving
-## A-H set by galils, I from _MOVING1
+## A-J set by galils, L from _MOVING1
 record(calc, "$(P)CS:MOT:MOVING") 
 {
 	field(DESC, "IOCs with motion to complete")
     field(VAL, "0")
 	field(SCAN, "Passive")
-	field(CALC, "(A+B+C+D+E+F+G+H+I) > 0 ? 1 : 0")
+	field(CALC, "(A+B+C+D+E+F+G+H+I+J+L) > 0 ? 1 : 0")
 	field(ASG, "NOTRAPW")
     info(archive, "VAL")
 }
@@ -27,7 +27,7 @@ record(calcout, "$(P)CS:MOT:_MOVING1")
     field(VAL, "0")
 	field(SCAN, "Passive")
 	field(CALC, "(A+B+C+D+E+F+G+H+I+J) > 0 ? 1 : 0")
-	field(OUT, "$(P)CS:MOT:MOVING.I PP")
+	field(OUT, "$(P)CS:MOT:MOVING.L PP")
 	field(OOPT, "Every Time")
 	field(DOPT, "Use CALC")
 	field(ASG, "NOTRAPW")

From c3abe0353a547141abbcb131a7916c5e2f5b83eb Mon Sep 17 00:00:00 2001
From: Dominic Oram <dominic.oram@stfc.ac.uk>
Date: Wed, 29 Nov 2017 16:32:02 +0000
Subject: [PATCH 3/5] Simplified cmd and autosave logic

---
 .../iocGALIL-IOC-01/GALIL_01_positions.req    | 11 +----
 .../iocGALIL-IOC-01/GALIL_01_settings.req     | 11 +----
 GALIL/iocBoot/iocGALIL-IOC-01/config.xml      | 12 +----
 GALIL/iocBoot/iocGALIL-IOC-01/galil.cmd       | 46 -------------------
 GALIL/iocBoot/iocGALIL-IOC-01/galildb.cmd     | 20 ++++----
 GALIL/iocBoot/iocGALIL-IOC-01/st-axis.cmd     |  5 ++
 GALIL/iocBoot/iocGALIL-IOC-01/st-common.cmd   | 31 ++++++-------
 .../iocGALIL-IOC-02/GALIL_02_positions.req    | 11 +----
 .../iocGALIL-IOC-02/GALIL_02_settings.req     | 11 +----
 .../iocGALIL-IOC-03/GALIL_03_positions.req    | 11 +----
 .../iocGALIL-IOC-03/GALIL_03_settings.req     | 11 +----
 .../iocGALIL-IOC-04/GALIL_04_positions.req    | 11 +----
 .../iocGALIL-IOC-04/GALIL_04_settings.req     | 11 +----
 .../iocGALIL-IOC-05/GALIL_05_positions.req    | 11 +----
 .../iocGALIL-IOC-05/GALIL_05_settings.req     | 11 +----
 .../iocGALIL-IOC-06/GALIL_06_positions.req    | 11 +----
 .../iocGALIL-IOC-06/GALIL_06_settings.req     | 11 +----
 .../iocGALIL-IOC-07/GALIL_07_positions.req    | 11 +----
 .../iocGALIL-IOC-07/GALIL_07_settings.req     | 11 +----
 .../iocGALIL-IOC-08/GALIL_08_positions.req    | 11 +----
 .../iocGALIL-IOC-08/GALIL_08_settings.req     | 11 +----
 .../iocGALIL-IOC-09/GALIL_09_positions.req    | 11 +----
 .../iocGALIL-IOC-09/GALIL_09_settings.req     | 11 +----
 .../iocGALIL-IOC-10/GALIL_10_positions.req    | 11 +----
 .../iocGALIL-IOC-10/GALIL_10_settings.req     | 11 +----
 25 files changed, 52 insertions(+), 282 deletions(-)
 delete mode 100644 GALIL/iocBoot/iocGALIL-IOC-01/galil.cmd
 create mode 100644 GALIL/iocBoot/iocGALIL-IOC-01/st-axis.cmd

diff --git a/GALIL/iocBoot/iocGALIL-IOC-01/GALIL_01_positions.req b/GALIL/iocBoot/iocGALIL-IOC-01/GALIL_01_positions.req
index 0f3e98f73..f9427ef36 100644
--- a/GALIL/iocBoot/iocGALIL-IOC-01/GALIL_01_positions.req
+++ b/GALIL/iocBoot/iocGALIL-IOC-01/GALIL_01_positions.req
@@ -1,10 +1 @@
-$(IFDMC01)file "GALIL_controller_positions.req" P=$(P),CCP=01
-$(IFDMC02)file "GALIL_controller_positions.req" P=$(P),CCP=02
-$(IFDMC03)file "GALIL_controller_positions.req" P=$(P),CCP=03
-$(IFDMC04)file "GALIL_controller_positions.req" P=$(P),CCP=04
-$(IFDMC05)file "GALIL_controller_positions.req" P=$(P),CCP=05
-$(IFDMC06)file "GALIL_controller_positions.req" P=$(P),CCP=06
-$(IFDMC07)file "GALIL_controller_positions.req" P=$(P),CCP=07
-$(IFDMC08)file "GALIL_controller_positions.req" P=$(P),CCP=08
-$(IFDMC09)file "GALIL_controller_positions.req" P=$(P),CCP=09
-$(IFDMC10)file "GALIL_controller_positions.req" P=$(P),CCP=10
+file "GALIL_controller_positions.req" "P=$(P),CCP=$(CCP)"
diff --git a/GALIL/iocBoot/iocGALIL-IOC-01/GALIL_01_settings.req b/GALIL/iocBoot/iocGALIL-IOC-01/GALIL_01_settings.req
index 504013089..163ad8bd3 100644
--- a/GALIL/iocBoot/iocGALIL-IOC-01/GALIL_01_settings.req
+++ b/GALIL/iocBoot/iocGALIL-IOC-01/GALIL_01_settings.req
@@ -1,10 +1 @@
-$(IFDMC01)file "GALIL_controller_settings.req" P=$(P),CCP=01
-$(IFDMC02)file "GALIL_controller_settings.req" P=$(P),CCP=02
-$(IFDMC03)file "GALIL_controller_settings.req" P=$(P),CCP=03
-$(IFDMC04)file "GALIL_controller_settings.req" P=$(P),CCP=04
-$(IFDMC05)file "GALIL_controller_settings.req" P=$(P),CCP=05
-$(IFDMC06)file "GALIL_controller_settings.req" P=$(P),CCP=06
-$(IFDMC07)file "GALIL_controller_settings.req" P=$(P),CCP=07
-$(IFDMC08)file "GALIL_controller_settings.req" P=$(P),CCP=08
-$(IFDMC09)file "GALIL_controller_settings.req" P=$(P),CCP=09
-$(IFDMC10)file "GALIL_controller_settings.req" P=$(P),CCP=10
+file "GALIL_controller_settings.req" "P=$(P),CCP=$(CCP)"
diff --git a/GALIL/iocBoot/iocGALIL-IOC-01/config.xml b/GALIL/iocBoot/iocGALIL-IOC-01/config.xml
index 5e5f261ca..8c7600edc 100644
--- a/GALIL/iocBoot/iocGALIL-IOC-01/config.xml
+++ b/GALIL/iocBoot/iocGALIL-IOC-01/config.xml
@@ -4,16 +4,8 @@
 <ioc_desc>Galil motor controller</ioc_desc>
 <ioc_details>Galil Motor Details</ioc_details>
 <macros>
-<macro name="GALILADDR01" pattern="^[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+$" description="IP address of Galil controller 1 (MTR01* PVs)" />
-<macro name="GALILADDR02" pattern="^[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+$" description="IP address of Galil controller 2 (MTR02* PVs)" />
-<macro name="GALILADDR03" pattern="^[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+$" description="IP address of Galil controller 3 (MTR03* PVs)" />
-<macro name="GALILADDR04" pattern="^[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+$" description="IP address of Galil controller 4 (MTR04* PVs)" />
-<macro name="GALILADDR05" pattern="^[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+$" description="IP address of Galil controller 5 (MTR05* PVs)" />
-<macro name="GALILADDR06" pattern="^[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+$" description="IP address of Galil controller 6 (MTR06* PVs)" />
-<macro name="GALILADDR07" pattern="^[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+$" description="IP address of Galil controller 7 (MTR07* PVs)" />
-<macro name="GALILADDR08" pattern="^[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+$" description="IP address of Galil controller 8 (MTR08* PVs)" />
-<macro name="GALILADDR09" pattern="^[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+$" description="IP address of Galil controller 9 (MTR09* PVs)" />
-<macro name="GALILADDR10" pattern="^[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+$" description="IP address of Galil controller 10 (MTR10* PVs)" />
+<macro name="GALILADDR" pattern="^[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+$" description="IP address of Galil controller (MTR01* PVs)" />
+<macro name="MTRCTRL" pattern="^[0-9]{1,2}$" description="Controller number used in motor address assignment" />
 </macros>
 <pvsets>
 <pvset name="Motor Limits" description="Motor high and low limits" />
diff --git a/GALIL/iocBoot/iocGALIL-IOC-01/galil.cmd b/GALIL/iocBoot/iocGALIL-IOC-01/galil.cmd
deleted file mode 100644
index cb9c8a9ac..000000000
--- a/GALIL/iocBoot/iocGALIL-IOC-01/galil.cmd
+++ /dev/null
@@ -1,46 +0,0 @@
-
-## IFDCM01, IFDCM02 etc. macros set in st.cmd 
-
-$(IFSIM) < motorsim.cmd
-
-# Calculate Galil controller ID within the driver - it starts at 0 whereas GALILCRATE starts at 1
-
-$(IFDMC01) epicsEnvSet("GALILCRATE","01")
-$(IFDMC01) < galildb.cmd 
-$(IFDMC01) $(IFNOTSIM) < $(GALILCONFIG)/galil1.cmd
-
-$(IFDMC02) epicsEnvSet("GALILCRATE","02")
-$(IFDMC02) < galildb.cmd 
-$(IFDMC02) $(IFNOTSIM) < $(GALILCONFIG)/galil2.cmd
-
-$(IFDMC03) epicsEnvSet("GALILCRATE","03")
-$(IFDMC03) < galildb.cmd 
-$(IFDMC03) $(IFNOTSIM) < $(GALILCONFIG)/galil3.cmd
-
-$(IFDMC04) epicsEnvSet("GALILCRATE","04")
-$(IFDMC04) < galildb.cmd 
-$(IFDMC04) $(IFNOTSIM) < $(GALILCONFIG)/galil4.cmd
-
-$(IFDMC05) epicsEnvSet("GALILCRATE","05")
-$(IFDMC05) < galildb.cmd 
-$(IFDMC05) $(IFNOTSIM) < $(GALILCONFIG)/galil5.cmd
-
-$(IFDMC06) epicsEnvSet("GALILCRATE","06")
-$(IFDMC06) < galildb.cmd 
-$(IFDMC06) $(IFNOTSIM) < $(GALILCONFIG)/galil6.cmd
-
-$(IFDMC07) epicsEnvSet("GALILCRATE","07")
-$(IFDMC07) < galildb.cmd 
-$(IFDMC07) $(IFNOTSIM) < $(GALILCONFIG)/galil7.cmd
-
-$(IFDMC08) epicsEnvSet("GALILCRATE","08")
-$(IFDMC08) < galildb.cmd 
-$(IFDMC08) $(IFNOTSIM) < $(GALILCONFIG)/galil8.cmd
-
-$(IFDMC09) epicsEnvSet("GALILCRATE","09")
-$(IFDMC09) < galildb.cmd 
-$(IFDMC09) $(IFNOTSIM) < $(GALILCONFIG)/galil9.cmd
-
-$(IFDMC10) epicsEnvSet("GALILCRATE","10")
-$(IFDMC10) < galildb.cmd 
-$(IFDMC10) $(IFNOTSIM) < $(GALILCONFIG)/galil10.cmd
diff --git a/GALIL/iocBoot/iocGALIL-IOC-01/galildb.cmd b/GALIL/iocBoot/iocGALIL-IOC-01/galildb.cmd
index db311bad7..20acb92ac 100644
--- a/GALIL/iocBoot/iocGALIL-IOC-01/galildb.cmd
+++ b/GALIL/iocBoot/iocGALIL-IOC-01/galildb.cmd
@@ -1,21 +1,21 @@
-## GALILCRATE set prior to call
+## MTRCTRL set prior to call
 
-## GALILCRATE is the galil crate number - 01, 02, ...
+## MTRCTRL is the galil crate number - 01, 02, ...
 
-dbLoadRecords("$(TOP)/db/galil_motor.db", "P=$(MYPVPREFIX)MOT,CCP=$(GALILCRATE)")
+dbLoadRecords("$(TOP)/db/galil_motor.db", "P=$(MYPVPREFIX)MOT,CCP=$(MTRCTRL)")
 
 #Load extra functionality, untop of motorRecord features for axis/motors (eg. runtime gear ratio changes between master & slaves)
-$(IFNOTSIM) dbLoadRecords("$(TOP)/db/galil_ctrl_extras.db", "P=$(MYPVPREFIX)MOT,CCP=$(GALILCRATE)")
-$(IFNOTSIM) dbLoadRecords("$(TOP)/db/galil_motor_extras.db", "P=$(MYPVPREFIX)MOT,CCP=$(GALILCRATE)")
+$(IFNOTSIM) dbLoadRecords("$(TOP)/db/galil_ctrl_extras.db", "P=$(MYPVPREFIX)MOT,CCP=$(MTRCTRL)")
+$(IFNOTSIM) dbLoadRecords("$(TOP)/db/galil_motor_extras.db", "P=$(MYPVPREFIX)MOT,CCP=$(MTRCTRL)")
 
 #Load digital IO databases
-$(IFNOTSIM) dbLoadRecords("$(TOP)/db/galil_digital_ports.db", "P=$(MYPVPREFIX)MOT,CCP=$(GALILCRATE)")
+$(IFNOTSIM) dbLoadRecords("$(TOP)/db/galil_digital_ports.db", "P=$(MYPVPREFIX)MOT,CCP=$(MTRCTRL)")
 
 #Load analog IO databases
-$(IFNOTSIM) dbLoadRecords("$(TOP)/db/galil_analog_ports.db", "P=$(MYPVPREFIX)MOT,CCP=$(GALILCRATE)")
+$(IFNOTSIM) dbLoadRecords("$(TOP)/db/galil_analog_ports.db", "P=$(MYPVPREFIX)MOT,CCP=$(MTRCTRL)")
 
 #Load user defined functions
-$(IFNOTSIM) dbLoadRecords("$(TOP)/db/galil_userdef_records8.db", "P=$(MYPVPREFIX)MOT,CCP=$(GALILCRATE)")
+$(IFNOTSIM) dbLoadRecords("$(TOP)/db/galil_userdef_records8.db", "P=$(MYPVPREFIX)MOT,CCP=$(MTRCTRL)")
 
-$(IFNOTSIM) dbLoadRecords("$(TOP)/db/galil_profileMoveController.db", "P=$(MYPVPREFIX)MOT:,CCP=$(GALILCRATE)")
-$(IFNOTSIM) dbLoadRecords("$(TOP)/db/galil_profileMoveAxis.db", "P=$(MYPVPREFIX)MOT:,CCP=$(GALILCRATE)")
+$(IFNOTSIM) dbLoadRecords("$(TOP)/db/galil_profileMoveController.db", "P=$(MYPVPREFIX)MOT:,CCP=$(MTRCTRL)")
+$(IFNOTSIM) dbLoadRecords("$(TOP)/db/galil_profileMoveAxis.db", "P=$(MYPVPREFIX)MOT:,CCP=$(MTRCTRL)")
diff --git a/GALIL/iocBoot/iocGALIL-IOC-01/st-axis.cmd b/GALIL/iocBoot/iocGALIL-IOC-01/st-axis.cmd
new file mode 100644
index 000000000..699064d68
--- /dev/null
+++ b/GALIL/iocBoot/iocGALIL-IOC-01/st-axis.cmd
@@ -0,0 +1,5 @@
+epicsEnvSet("AMOTOR", "motor$(MN)")
+epicsEnvSet("AMOTORNAME", "MTR$(MTRCTRL)0$(MN)")
+epicsEnvSet("AMOTORPV", "MOT:$(AMOTORNAME)")
+
+dbLoadRecords("$(AXIS)/db/axis.db", "P=$(MYPVPREFIX),AXIS=$(IOCNAME):AXIS$(MN),mAXIS=$(AMOTORPV)")
diff --git a/GALIL/iocBoot/iocGALIL-IOC-01/st-common.cmd b/GALIL/iocBoot/iocGALIL-IOC-01/st-common.cmd
index 4cc99aabb..c8891c682 100644
--- a/GALIL/iocBoot/iocGALIL-IOC-01/st-common.cmd
+++ b/GALIL/iocBoot/iocGALIL-IOC-01/st-common.cmd
@@ -18,25 +18,25 @@ set_requestfile_path("${MOTOR}/motorApp/Db", "")
 ## as all Galils cd to GALIL-IOC-01 need to add this explicitly so info generated req files are found
 set_requestfile_path("${TOP}/iocBoot/iocGALIL-IOC-01", "")
 
-# this defines macros we can use for conditional loading later
-stringtest("IFDMC01", "$(GALILADDR01=)")
-stringtest("IFDMC02", "$(GALILADDR02=)")
-stringtest("IFDMC03", "$(GALILADDR03=)")
-stringtest("IFDMC04", "$(GALILADDR04=)")
-stringtest("IFDMC05", "$(GALILADDR05=)")
-stringtest("IFDMC06", "$(GALILADDR06=)")
-stringtest("IFDMC07", "$(GALILADDR07=)")
-stringtest("IFDMC08", "$(GALILADDR08=)")
-stringtest("IFDMC09", "$(GALILADDR09=)")
-stringtest("IFDMC10", "$(GALILADDR10=)")
+# Make sure controller number is 2 digits long
+calc("MTRCTRL", "$(MTRCTRL=01)", 2, 2)
 
 epicsEnvSet("GALILCONFIG","$(ICPCONFIGROOT)/galil")
 
 ## uncomment to see every command sent to every galil, of define in st.cmd for just one galil
 #epicsEnvSet("GALIL_DEBUG_FILE", "galil_debug.txt")
 
-# configure galil and motors
-< galil.cmd
+# create simulated motor if required
+$(IFSIM) < motorsim.cmd
+
+# load the galil db files
+< galildb.cmd
+
+# configure the galil
+$(IFNOTSIM) < $(GALILCONFIG)/galil$(MTRCTRL).cmd
+
+# load the generic ISIS axis db for each axis
+iocshCmdLoop("< st-axis.cmd", "MN=\$(I)", "I", 1, 8)
 
 # configure jaws
 < $(GALILCONFIG)/jaws.cmd
@@ -68,7 +68,6 @@ dbLoadRecords("$(MOTOR)/db/motorUtil.db","P=$(MYPVPREFIX)$(IOCNAME):,$(IFIOC)= ,
 #asynSetTraceFile("Galil",-1,"galil.trace")
 #asynSetTraceIOMask("Galil",-1,0x2)
 
-
 iocInit()
 
 ## motor util package
@@ -79,10 +78,10 @@ motorUtilInit("$(MYPVPREFIX)$(IOCNAME):")
 < $(IOCSTARTUP)/postiocinit.cmd
 
 # Save motor positions every 5 seconds
-$(IFNOTTESTDEVSIM) create_monitor_set("$(IOCNAME)_positions.req", 5, "P=$(MYPVPREFIX)MOT:,IFDMC01=$(IFDMC01),IFDMC02=$(IFDMC02),IFDMC03=$(IFDMC03),IFDMC04=$(IFDMC04),IFDMC05=$(IFDMC05),IFDMC06=$(IFDMC06),IFDMC07=$(IFDMC07),IFDMC08=$(IFDMC08),IFDMC09=$(IFDMC09),IFDMC10=$(IFDMC10)")
+$(IFNOTTESTDEVSIM) create_monitor_set("$(IOCNAME)_positions.req", 5, "P=$(MYPVPREFIX)MOT:,CCP=$(MTRCTRL)")
 
 # Save motor settings every 30 seconds
-$(IFNOTTESTDEVSIM) create_monitor_set("$(IOCNAME)_settings.req", 30, "P=$(MYPVPREFIX)MOT:,IFDMC01=$(IFDMC01),IFDMC02=$(IFDMC02),IFDMC03=$(IFDMC03),IFDMC04=$(IFDMC04),IFDMC05=$(IFDMC05),IFDMC06=$(IFDMC06),IFDMC07=$(IFDMC07),IFDMC08=$(IFDMC08),IFDMC09=$(IFDMC09),IFDMC10=$(IFDMC10)")
+$(IFNOTTESTDEVSIM) create_monitor_set("$(IOCNAME)_settings.req", 30, "P=$(MYPVPREFIX)MOT:,CCP=$(MTRCTRL)")
 
 ## Start any sequence programs
 #seq sncxxx,"user=icsHost"
diff --git a/GALIL/iocBoot/iocGALIL-IOC-02/GALIL_02_positions.req b/GALIL/iocBoot/iocGALIL-IOC-02/GALIL_02_positions.req
index 0f3e98f73..7febb6e20 100644
--- a/GALIL/iocBoot/iocGALIL-IOC-02/GALIL_02_positions.req
+++ b/GALIL/iocBoot/iocGALIL-IOC-02/GALIL_02_positions.req
@@ -1,10 +1 @@
-$(IFDMC01)file "GALIL_controller_positions.req" P=$(P),CCP=01
-$(IFDMC02)file "GALIL_controller_positions.req" P=$(P),CCP=02
-$(IFDMC03)file "GALIL_controller_positions.req" P=$(P),CCP=03
-$(IFDMC04)file "GALIL_controller_positions.req" P=$(P),CCP=04
-$(IFDMC05)file "GALIL_controller_positions.req" P=$(P),CCP=05
-$(IFDMC06)file "GALIL_controller_positions.req" P=$(P),CCP=06
-$(IFDMC07)file "GALIL_controller_positions.req" P=$(P),CCP=07
-$(IFDMC08)file "GALIL_controller_positions.req" P=$(P),CCP=08
-$(IFDMC09)file "GALIL_controller_positions.req" P=$(P),CCP=09
-$(IFDMC10)file "GALIL_controller_positions.req" P=$(P),CCP=10
+file "GALIL_controller_positions.req" P=$(P),CCP=$(CCP)
diff --git a/GALIL/iocBoot/iocGALIL-IOC-02/GALIL_02_settings.req b/GALIL/iocBoot/iocGALIL-IOC-02/GALIL_02_settings.req
index 504013089..28518c08f 100644
--- a/GALIL/iocBoot/iocGALIL-IOC-02/GALIL_02_settings.req
+++ b/GALIL/iocBoot/iocGALIL-IOC-02/GALIL_02_settings.req
@@ -1,10 +1 @@
-$(IFDMC01)file "GALIL_controller_settings.req" P=$(P),CCP=01
-$(IFDMC02)file "GALIL_controller_settings.req" P=$(P),CCP=02
-$(IFDMC03)file "GALIL_controller_settings.req" P=$(P),CCP=03
-$(IFDMC04)file "GALIL_controller_settings.req" P=$(P),CCP=04
-$(IFDMC05)file "GALIL_controller_settings.req" P=$(P),CCP=05
-$(IFDMC06)file "GALIL_controller_settings.req" P=$(P),CCP=06
-$(IFDMC07)file "GALIL_controller_settings.req" P=$(P),CCP=07
-$(IFDMC08)file "GALIL_controller_settings.req" P=$(P),CCP=08
-$(IFDMC09)file "GALIL_controller_settings.req" P=$(P),CCP=09
-$(IFDMC10)file "GALIL_controller_settings.req" P=$(P),CCP=10
+file "GALIL_controller_settings.req" P=$(P),CCP=$(CCP)
diff --git a/GALIL/iocBoot/iocGALIL-IOC-03/GALIL_03_positions.req b/GALIL/iocBoot/iocGALIL-IOC-03/GALIL_03_positions.req
index 0f3e98f73..7febb6e20 100644
--- a/GALIL/iocBoot/iocGALIL-IOC-03/GALIL_03_positions.req
+++ b/GALIL/iocBoot/iocGALIL-IOC-03/GALIL_03_positions.req
@@ -1,10 +1 @@
-$(IFDMC01)file "GALIL_controller_positions.req" P=$(P),CCP=01
-$(IFDMC02)file "GALIL_controller_positions.req" P=$(P),CCP=02
-$(IFDMC03)file "GALIL_controller_positions.req" P=$(P),CCP=03
-$(IFDMC04)file "GALIL_controller_positions.req" P=$(P),CCP=04
-$(IFDMC05)file "GALIL_controller_positions.req" P=$(P),CCP=05
-$(IFDMC06)file "GALIL_controller_positions.req" P=$(P),CCP=06
-$(IFDMC07)file "GALIL_controller_positions.req" P=$(P),CCP=07
-$(IFDMC08)file "GALIL_controller_positions.req" P=$(P),CCP=08
-$(IFDMC09)file "GALIL_controller_positions.req" P=$(P),CCP=09
-$(IFDMC10)file "GALIL_controller_positions.req" P=$(P),CCP=10
+file "GALIL_controller_positions.req" P=$(P),CCP=$(CCP)
diff --git a/GALIL/iocBoot/iocGALIL-IOC-03/GALIL_03_settings.req b/GALIL/iocBoot/iocGALIL-IOC-03/GALIL_03_settings.req
index 504013089..28518c08f 100644
--- a/GALIL/iocBoot/iocGALIL-IOC-03/GALIL_03_settings.req
+++ b/GALIL/iocBoot/iocGALIL-IOC-03/GALIL_03_settings.req
@@ -1,10 +1 @@
-$(IFDMC01)file "GALIL_controller_settings.req" P=$(P),CCP=01
-$(IFDMC02)file "GALIL_controller_settings.req" P=$(P),CCP=02
-$(IFDMC03)file "GALIL_controller_settings.req" P=$(P),CCP=03
-$(IFDMC04)file "GALIL_controller_settings.req" P=$(P),CCP=04
-$(IFDMC05)file "GALIL_controller_settings.req" P=$(P),CCP=05
-$(IFDMC06)file "GALIL_controller_settings.req" P=$(P),CCP=06
-$(IFDMC07)file "GALIL_controller_settings.req" P=$(P),CCP=07
-$(IFDMC08)file "GALIL_controller_settings.req" P=$(P),CCP=08
-$(IFDMC09)file "GALIL_controller_settings.req" P=$(P),CCP=09
-$(IFDMC10)file "GALIL_controller_settings.req" P=$(P),CCP=10
+file "GALIL_controller_settings.req" P=$(P),CCP=$(CCP)
diff --git a/GALIL/iocBoot/iocGALIL-IOC-04/GALIL_04_positions.req b/GALIL/iocBoot/iocGALIL-IOC-04/GALIL_04_positions.req
index 0f3e98f73..7febb6e20 100644
--- a/GALIL/iocBoot/iocGALIL-IOC-04/GALIL_04_positions.req
+++ b/GALIL/iocBoot/iocGALIL-IOC-04/GALIL_04_positions.req
@@ -1,10 +1 @@
-$(IFDMC01)file "GALIL_controller_positions.req" P=$(P),CCP=01
-$(IFDMC02)file "GALIL_controller_positions.req" P=$(P),CCP=02
-$(IFDMC03)file "GALIL_controller_positions.req" P=$(P),CCP=03
-$(IFDMC04)file "GALIL_controller_positions.req" P=$(P),CCP=04
-$(IFDMC05)file "GALIL_controller_positions.req" P=$(P),CCP=05
-$(IFDMC06)file "GALIL_controller_positions.req" P=$(P),CCP=06
-$(IFDMC07)file "GALIL_controller_positions.req" P=$(P),CCP=07
-$(IFDMC08)file "GALIL_controller_positions.req" P=$(P),CCP=08
-$(IFDMC09)file "GALIL_controller_positions.req" P=$(P),CCP=09
-$(IFDMC10)file "GALIL_controller_positions.req" P=$(P),CCP=10
+file "GALIL_controller_positions.req" P=$(P),CCP=$(CCP)
diff --git a/GALIL/iocBoot/iocGALIL-IOC-04/GALIL_04_settings.req b/GALIL/iocBoot/iocGALIL-IOC-04/GALIL_04_settings.req
index 504013089..28518c08f 100644
--- a/GALIL/iocBoot/iocGALIL-IOC-04/GALIL_04_settings.req
+++ b/GALIL/iocBoot/iocGALIL-IOC-04/GALIL_04_settings.req
@@ -1,10 +1 @@
-$(IFDMC01)file "GALIL_controller_settings.req" P=$(P),CCP=01
-$(IFDMC02)file "GALIL_controller_settings.req" P=$(P),CCP=02
-$(IFDMC03)file "GALIL_controller_settings.req" P=$(P),CCP=03
-$(IFDMC04)file "GALIL_controller_settings.req" P=$(P),CCP=04
-$(IFDMC05)file "GALIL_controller_settings.req" P=$(P),CCP=05
-$(IFDMC06)file "GALIL_controller_settings.req" P=$(P),CCP=06
-$(IFDMC07)file "GALIL_controller_settings.req" P=$(P),CCP=07
-$(IFDMC08)file "GALIL_controller_settings.req" P=$(P),CCP=08
-$(IFDMC09)file "GALIL_controller_settings.req" P=$(P),CCP=09
-$(IFDMC10)file "GALIL_controller_settings.req" P=$(P),CCP=10
+file "GALIL_controller_settings.req" P=$(P),CCP=$(CCP)
diff --git a/GALIL/iocBoot/iocGALIL-IOC-05/GALIL_05_positions.req b/GALIL/iocBoot/iocGALIL-IOC-05/GALIL_05_positions.req
index 0f3e98f73..7febb6e20 100644
--- a/GALIL/iocBoot/iocGALIL-IOC-05/GALIL_05_positions.req
+++ b/GALIL/iocBoot/iocGALIL-IOC-05/GALIL_05_positions.req
@@ -1,10 +1 @@
-$(IFDMC01)file "GALIL_controller_positions.req" P=$(P),CCP=01
-$(IFDMC02)file "GALIL_controller_positions.req" P=$(P),CCP=02
-$(IFDMC03)file "GALIL_controller_positions.req" P=$(P),CCP=03
-$(IFDMC04)file "GALIL_controller_positions.req" P=$(P),CCP=04
-$(IFDMC05)file "GALIL_controller_positions.req" P=$(P),CCP=05
-$(IFDMC06)file "GALIL_controller_positions.req" P=$(P),CCP=06
-$(IFDMC07)file "GALIL_controller_positions.req" P=$(P),CCP=07
-$(IFDMC08)file "GALIL_controller_positions.req" P=$(P),CCP=08
-$(IFDMC09)file "GALIL_controller_positions.req" P=$(P),CCP=09
-$(IFDMC10)file "GALIL_controller_positions.req" P=$(P),CCP=10
+file "GALIL_controller_positions.req" P=$(P),CCP=$(CCP)
diff --git a/GALIL/iocBoot/iocGALIL-IOC-05/GALIL_05_settings.req b/GALIL/iocBoot/iocGALIL-IOC-05/GALIL_05_settings.req
index 504013089..28518c08f 100644
--- a/GALIL/iocBoot/iocGALIL-IOC-05/GALIL_05_settings.req
+++ b/GALIL/iocBoot/iocGALIL-IOC-05/GALIL_05_settings.req
@@ -1,10 +1 @@
-$(IFDMC01)file "GALIL_controller_settings.req" P=$(P),CCP=01
-$(IFDMC02)file "GALIL_controller_settings.req" P=$(P),CCP=02
-$(IFDMC03)file "GALIL_controller_settings.req" P=$(P),CCP=03
-$(IFDMC04)file "GALIL_controller_settings.req" P=$(P),CCP=04
-$(IFDMC05)file "GALIL_controller_settings.req" P=$(P),CCP=05
-$(IFDMC06)file "GALIL_controller_settings.req" P=$(P),CCP=06
-$(IFDMC07)file "GALIL_controller_settings.req" P=$(P),CCP=07
-$(IFDMC08)file "GALIL_controller_settings.req" P=$(P),CCP=08
-$(IFDMC09)file "GALIL_controller_settings.req" P=$(P),CCP=09
-$(IFDMC10)file "GALIL_controller_settings.req" P=$(P),CCP=10
+file "GALIL_controller_settings.req" P=$(P),CCP=$(CCP)
diff --git a/GALIL/iocBoot/iocGALIL-IOC-06/GALIL_06_positions.req b/GALIL/iocBoot/iocGALIL-IOC-06/GALIL_06_positions.req
index 0f3e98f73..7febb6e20 100644
--- a/GALIL/iocBoot/iocGALIL-IOC-06/GALIL_06_positions.req
+++ b/GALIL/iocBoot/iocGALIL-IOC-06/GALIL_06_positions.req
@@ -1,10 +1 @@
-$(IFDMC01)file "GALIL_controller_positions.req" P=$(P),CCP=01
-$(IFDMC02)file "GALIL_controller_positions.req" P=$(P),CCP=02
-$(IFDMC03)file "GALIL_controller_positions.req" P=$(P),CCP=03
-$(IFDMC04)file "GALIL_controller_positions.req" P=$(P),CCP=04
-$(IFDMC05)file "GALIL_controller_positions.req" P=$(P),CCP=05
-$(IFDMC06)file "GALIL_controller_positions.req" P=$(P),CCP=06
-$(IFDMC07)file "GALIL_controller_positions.req" P=$(P),CCP=07
-$(IFDMC08)file "GALIL_controller_positions.req" P=$(P),CCP=08
-$(IFDMC09)file "GALIL_controller_positions.req" P=$(P),CCP=09
-$(IFDMC10)file "GALIL_controller_positions.req" P=$(P),CCP=10
+file "GALIL_controller_positions.req" P=$(P),CCP=$(CCP)
diff --git a/GALIL/iocBoot/iocGALIL-IOC-06/GALIL_06_settings.req b/GALIL/iocBoot/iocGALIL-IOC-06/GALIL_06_settings.req
index 504013089..28518c08f 100644
--- a/GALIL/iocBoot/iocGALIL-IOC-06/GALIL_06_settings.req
+++ b/GALIL/iocBoot/iocGALIL-IOC-06/GALIL_06_settings.req
@@ -1,10 +1 @@
-$(IFDMC01)file "GALIL_controller_settings.req" P=$(P),CCP=01
-$(IFDMC02)file "GALIL_controller_settings.req" P=$(P),CCP=02
-$(IFDMC03)file "GALIL_controller_settings.req" P=$(P),CCP=03
-$(IFDMC04)file "GALIL_controller_settings.req" P=$(P),CCP=04
-$(IFDMC05)file "GALIL_controller_settings.req" P=$(P),CCP=05
-$(IFDMC06)file "GALIL_controller_settings.req" P=$(P),CCP=06
-$(IFDMC07)file "GALIL_controller_settings.req" P=$(P),CCP=07
-$(IFDMC08)file "GALIL_controller_settings.req" P=$(P),CCP=08
-$(IFDMC09)file "GALIL_controller_settings.req" P=$(P),CCP=09
-$(IFDMC10)file "GALIL_controller_settings.req" P=$(P),CCP=10
+file "GALIL_controller_settings.req" P=$(P),CCP=$(CCP)
diff --git a/GALIL/iocBoot/iocGALIL-IOC-07/GALIL_07_positions.req b/GALIL/iocBoot/iocGALIL-IOC-07/GALIL_07_positions.req
index 0f3e98f73..7febb6e20 100644
--- a/GALIL/iocBoot/iocGALIL-IOC-07/GALIL_07_positions.req
+++ b/GALIL/iocBoot/iocGALIL-IOC-07/GALIL_07_positions.req
@@ -1,10 +1 @@
-$(IFDMC01)file "GALIL_controller_positions.req" P=$(P),CCP=01
-$(IFDMC02)file "GALIL_controller_positions.req" P=$(P),CCP=02
-$(IFDMC03)file "GALIL_controller_positions.req" P=$(P),CCP=03
-$(IFDMC04)file "GALIL_controller_positions.req" P=$(P),CCP=04
-$(IFDMC05)file "GALIL_controller_positions.req" P=$(P),CCP=05
-$(IFDMC06)file "GALIL_controller_positions.req" P=$(P),CCP=06
-$(IFDMC07)file "GALIL_controller_positions.req" P=$(P),CCP=07
-$(IFDMC08)file "GALIL_controller_positions.req" P=$(P),CCP=08
-$(IFDMC09)file "GALIL_controller_positions.req" P=$(P),CCP=09
-$(IFDMC10)file "GALIL_controller_positions.req" P=$(P),CCP=10
+file "GALIL_controller_positions.req" P=$(P),CCP=$(CCP)
diff --git a/GALIL/iocBoot/iocGALIL-IOC-07/GALIL_07_settings.req b/GALIL/iocBoot/iocGALIL-IOC-07/GALIL_07_settings.req
index 504013089..28518c08f 100644
--- a/GALIL/iocBoot/iocGALIL-IOC-07/GALIL_07_settings.req
+++ b/GALIL/iocBoot/iocGALIL-IOC-07/GALIL_07_settings.req
@@ -1,10 +1 @@
-$(IFDMC01)file "GALIL_controller_settings.req" P=$(P),CCP=01
-$(IFDMC02)file "GALIL_controller_settings.req" P=$(P),CCP=02
-$(IFDMC03)file "GALIL_controller_settings.req" P=$(P),CCP=03
-$(IFDMC04)file "GALIL_controller_settings.req" P=$(P),CCP=04
-$(IFDMC05)file "GALIL_controller_settings.req" P=$(P),CCP=05
-$(IFDMC06)file "GALIL_controller_settings.req" P=$(P),CCP=06
-$(IFDMC07)file "GALIL_controller_settings.req" P=$(P),CCP=07
-$(IFDMC08)file "GALIL_controller_settings.req" P=$(P),CCP=08
-$(IFDMC09)file "GALIL_controller_settings.req" P=$(P),CCP=09
-$(IFDMC10)file "GALIL_controller_settings.req" P=$(P),CCP=10
+file "GALIL_controller_settings.req" P=$(P),CCP=$(CCP)
diff --git a/GALIL/iocBoot/iocGALIL-IOC-08/GALIL_08_positions.req b/GALIL/iocBoot/iocGALIL-IOC-08/GALIL_08_positions.req
index 0f3e98f73..7febb6e20 100644
--- a/GALIL/iocBoot/iocGALIL-IOC-08/GALIL_08_positions.req
+++ b/GALIL/iocBoot/iocGALIL-IOC-08/GALIL_08_positions.req
@@ -1,10 +1 @@
-$(IFDMC01)file "GALIL_controller_positions.req" P=$(P),CCP=01
-$(IFDMC02)file "GALIL_controller_positions.req" P=$(P),CCP=02
-$(IFDMC03)file "GALIL_controller_positions.req" P=$(P),CCP=03
-$(IFDMC04)file "GALIL_controller_positions.req" P=$(P),CCP=04
-$(IFDMC05)file "GALIL_controller_positions.req" P=$(P),CCP=05
-$(IFDMC06)file "GALIL_controller_positions.req" P=$(P),CCP=06
-$(IFDMC07)file "GALIL_controller_positions.req" P=$(P),CCP=07
-$(IFDMC08)file "GALIL_controller_positions.req" P=$(P),CCP=08
-$(IFDMC09)file "GALIL_controller_positions.req" P=$(P),CCP=09
-$(IFDMC10)file "GALIL_controller_positions.req" P=$(P),CCP=10
+file "GALIL_controller_positions.req" P=$(P),CCP=$(CCP)
diff --git a/GALIL/iocBoot/iocGALIL-IOC-08/GALIL_08_settings.req b/GALIL/iocBoot/iocGALIL-IOC-08/GALIL_08_settings.req
index 504013089..28518c08f 100644
--- a/GALIL/iocBoot/iocGALIL-IOC-08/GALIL_08_settings.req
+++ b/GALIL/iocBoot/iocGALIL-IOC-08/GALIL_08_settings.req
@@ -1,10 +1 @@
-$(IFDMC01)file "GALIL_controller_settings.req" P=$(P),CCP=01
-$(IFDMC02)file "GALIL_controller_settings.req" P=$(P),CCP=02
-$(IFDMC03)file "GALIL_controller_settings.req" P=$(P),CCP=03
-$(IFDMC04)file "GALIL_controller_settings.req" P=$(P),CCP=04
-$(IFDMC05)file "GALIL_controller_settings.req" P=$(P),CCP=05
-$(IFDMC06)file "GALIL_controller_settings.req" P=$(P),CCP=06
-$(IFDMC07)file "GALIL_controller_settings.req" P=$(P),CCP=07
-$(IFDMC08)file "GALIL_controller_settings.req" P=$(P),CCP=08
-$(IFDMC09)file "GALIL_controller_settings.req" P=$(P),CCP=09
-$(IFDMC10)file "GALIL_controller_settings.req" P=$(P),CCP=10
+file "GALIL_controller_settings.req" P=$(P),CCP=$(CCP)
diff --git a/GALIL/iocBoot/iocGALIL-IOC-09/GALIL_09_positions.req b/GALIL/iocBoot/iocGALIL-IOC-09/GALIL_09_positions.req
index 0f3e98f73..7febb6e20 100644
--- a/GALIL/iocBoot/iocGALIL-IOC-09/GALIL_09_positions.req
+++ b/GALIL/iocBoot/iocGALIL-IOC-09/GALIL_09_positions.req
@@ -1,10 +1 @@
-$(IFDMC01)file "GALIL_controller_positions.req" P=$(P),CCP=01
-$(IFDMC02)file "GALIL_controller_positions.req" P=$(P),CCP=02
-$(IFDMC03)file "GALIL_controller_positions.req" P=$(P),CCP=03
-$(IFDMC04)file "GALIL_controller_positions.req" P=$(P),CCP=04
-$(IFDMC05)file "GALIL_controller_positions.req" P=$(P),CCP=05
-$(IFDMC06)file "GALIL_controller_positions.req" P=$(P),CCP=06
-$(IFDMC07)file "GALIL_controller_positions.req" P=$(P),CCP=07
-$(IFDMC08)file "GALIL_controller_positions.req" P=$(P),CCP=08
-$(IFDMC09)file "GALIL_controller_positions.req" P=$(P),CCP=09
-$(IFDMC10)file "GALIL_controller_positions.req" P=$(P),CCP=10
+file "GALIL_controller_positions.req" P=$(P),CCP=$(CCP)
diff --git a/GALIL/iocBoot/iocGALIL-IOC-09/GALIL_09_settings.req b/GALIL/iocBoot/iocGALIL-IOC-09/GALIL_09_settings.req
index 504013089..28518c08f 100644
--- a/GALIL/iocBoot/iocGALIL-IOC-09/GALIL_09_settings.req
+++ b/GALIL/iocBoot/iocGALIL-IOC-09/GALIL_09_settings.req
@@ -1,10 +1 @@
-$(IFDMC01)file "GALIL_controller_settings.req" P=$(P),CCP=01
-$(IFDMC02)file "GALIL_controller_settings.req" P=$(P),CCP=02
-$(IFDMC03)file "GALIL_controller_settings.req" P=$(P),CCP=03
-$(IFDMC04)file "GALIL_controller_settings.req" P=$(P),CCP=04
-$(IFDMC05)file "GALIL_controller_settings.req" P=$(P),CCP=05
-$(IFDMC06)file "GALIL_controller_settings.req" P=$(P),CCP=06
-$(IFDMC07)file "GALIL_controller_settings.req" P=$(P),CCP=07
-$(IFDMC08)file "GALIL_controller_settings.req" P=$(P),CCP=08
-$(IFDMC09)file "GALIL_controller_settings.req" P=$(P),CCP=09
-$(IFDMC10)file "GALIL_controller_settings.req" P=$(P),CCP=10
+file "GALIL_controller_settings.req" P=$(P),CCP=$(CCP)
diff --git a/GALIL/iocBoot/iocGALIL-IOC-10/GALIL_10_positions.req b/GALIL/iocBoot/iocGALIL-IOC-10/GALIL_10_positions.req
index 0f3e98f73..7febb6e20 100644
--- a/GALIL/iocBoot/iocGALIL-IOC-10/GALIL_10_positions.req
+++ b/GALIL/iocBoot/iocGALIL-IOC-10/GALIL_10_positions.req
@@ -1,10 +1 @@
-$(IFDMC01)file "GALIL_controller_positions.req" P=$(P),CCP=01
-$(IFDMC02)file "GALIL_controller_positions.req" P=$(P),CCP=02
-$(IFDMC03)file "GALIL_controller_positions.req" P=$(P),CCP=03
-$(IFDMC04)file "GALIL_controller_positions.req" P=$(P),CCP=04
-$(IFDMC05)file "GALIL_controller_positions.req" P=$(P),CCP=05
-$(IFDMC06)file "GALIL_controller_positions.req" P=$(P),CCP=06
-$(IFDMC07)file "GALIL_controller_positions.req" P=$(P),CCP=07
-$(IFDMC08)file "GALIL_controller_positions.req" P=$(P),CCP=08
-$(IFDMC09)file "GALIL_controller_positions.req" P=$(P),CCP=09
-$(IFDMC10)file "GALIL_controller_positions.req" P=$(P),CCP=10
+file "GALIL_controller_positions.req" P=$(P),CCP=$(CCP)
diff --git a/GALIL/iocBoot/iocGALIL-IOC-10/GALIL_10_settings.req b/GALIL/iocBoot/iocGALIL-IOC-10/GALIL_10_settings.req
index 504013089..28518c08f 100644
--- a/GALIL/iocBoot/iocGALIL-IOC-10/GALIL_10_settings.req
+++ b/GALIL/iocBoot/iocGALIL-IOC-10/GALIL_10_settings.req
@@ -1,10 +1 @@
-$(IFDMC01)file "GALIL_controller_settings.req" P=$(P),CCP=01
-$(IFDMC02)file "GALIL_controller_settings.req" P=$(P),CCP=02
-$(IFDMC03)file "GALIL_controller_settings.req" P=$(P),CCP=03
-$(IFDMC04)file "GALIL_controller_settings.req" P=$(P),CCP=04
-$(IFDMC05)file "GALIL_controller_settings.req" P=$(P),CCP=05
-$(IFDMC06)file "GALIL_controller_settings.req" P=$(P),CCP=06
-$(IFDMC07)file "GALIL_controller_settings.req" P=$(P),CCP=07
-$(IFDMC08)file "GALIL_controller_settings.req" P=$(P),CCP=08
-$(IFDMC09)file "GALIL_controller_settings.req" P=$(P),CCP=09
-$(IFDMC10)file "GALIL_controller_settings.req" P=$(P),CCP=10
+file "GALIL_controller_settings.req" P=$(P),CCP=$(CCP)

From cbafb1ded77e8c7709ad9cffe5633d715887947d Mon Sep 17 00:00:00 2001
From: Dominic Oram <dominic.oram@stfc.ac.uk>
Date: Wed, 29 Nov 2017 17:22:08 +0000
Subject: [PATCH 4/5] Update st.cmd

Removed accidentally added code
---
 ISISDAE/iocBoot/iocISISDAE-IOC-01/st.cmd | 1 -
 1 file changed, 1 deletion(-)

diff --git a/ISISDAE/iocBoot/iocISISDAE-IOC-01/st.cmd b/ISISDAE/iocBoot/iocISISDAE-IOC-01/st.cmd
index a4ad378ae..d7dcd3fb4 100644
--- a/ISISDAE/iocBoot/iocISISDAE-IOC-01/st.cmd
+++ b/ISISDAE/iocBoot/iocISISDAE-IOC-01/st.cmd
@@ -67,7 +67,6 @@ $(IFPARALLEL=) dbLoadRecords("$(ISISDAE)/db/dae3_parallel.db","P=$(MYPVPREFIX),
 
 dbLoadRecords("$(ISISDAE)/db/isisdae.db","S=$(MYPVPREFIX), P=$(MYPVPREFIX), Q=$(Q), WIRINGLIST=WLIST, DETECTORLIST=DLIST, SPECTRALIST=SLIST, PERIODLIST=PLIST, TCBLIST=TLIST, BEGINRUNA=$(BEGINRUN_DAE3=$(MYPVPREFIX)$(Q)_BEGINRUN1), ENDRUNA=$(ENDRUN_DAE3=$(MYPVPREFIX)$(Q)_ENDRUN1)")
 dbLoadRecords("$(ISISDAE)/db/dae_diag.db","P=$(MYPVPREFIX),Q=DAE:")
-dbLoadRecords("$(ISISDAE)/db/dae3_pull.db","P=$(MYPVPREFIX),Q=DAE:,O=IN:DEMO:")
 
 ##ISIS## Stuff that needs to be done after all records are loaded but before iocInit is called 
 < $(IOCSTARTUP)/preiocinit.cmd

From 22e103c1e65632ba004f2a5c278dc516b80546cb Mon Sep 17 00:00:00 2001
From: Dominic Oram <dominic.oram@stfc.ac.uk>
Date: Wed, 29 Nov 2017 17:46:21 +0000
Subject: [PATCH 5/5] Update st-axis.cmd

---
 GALIL/iocBoot/iocGALIL-IOC-01/st-axis.cmd | 1 -
 1 file changed, 1 deletion(-)

diff --git a/GALIL/iocBoot/iocGALIL-IOC-01/st-axis.cmd b/GALIL/iocBoot/iocGALIL-IOC-01/st-axis.cmd
index 699064d68..74470d00e 100644
--- a/GALIL/iocBoot/iocGALIL-IOC-01/st-axis.cmd
+++ b/GALIL/iocBoot/iocGALIL-IOC-01/st-axis.cmd
@@ -1,4 +1,3 @@
-epicsEnvSet("AMOTOR", "motor$(MN)")
 epicsEnvSet("AMOTORNAME", "MTR$(MTRCTRL)0$(MN)")
 epicsEnvSet("AMOTORPV", "MOT:$(AMOTORNAME)")