Moved substitutions files to separate directory

iocBoot/iocxxx/common.iocsh

-##########################  ############################################################################
-# environment variable      description
-##########################  ############################################################################
-# PREFIX		    prefix used for all PVs in this IOC
-# EPICS_DB_INCLUDE_PATH     search path for database files
-# EPICS_CA_MAX_ARRAY_BYTES  Specify largest array CA will transport
-# IOCBOOT		    absolute directory path in which this file is located
-##########################  ############################################################################
+# prefix used for all PVs in this IOC
+epicsEnvSet("PREFIX", "xxx:")
+
 #For devIocStats
 epicsEnvSet("ENGINEER", "engineer")
 epicsEnvSet("LOCATION", "location")
 epicsEnvSet("GROUP", "group")
 
-epicsEnvSet("PREFIX", "xxx:")
-
-### For alive
-epicsEnvSet("IOCBOOT", $(TOP)/iocBoot/$(IOC))
-
+# search path for database files
 epicsEnvSet("EPICS_DB_INCLUDE_PATH", "$(DEVIOCSTATS)/db")
 
 # set the protocol path for streamDevice
 epicsEnvSet("STREAM_PROTOCOL_PATH", ".")
 
-# save_restore.cmd needs the full path to the startup directory, which
-# envPaths currently does not provide
-epicsEnvSet(STARTUP,$(TOP)/iocBoot/$(IOC))
-
 # Specify largest array CA will transport
 # Note for N doubles, need N*8 bytes+some overhead
 epicsEnvSet EPICS_CA_MAX_ARRAY_BYTES 64010
@@ -46,9 +33,9 @@ dbLoadRecords("$(STD)/stdApp/Db/ramp_tweak.db","P=$(PREFIX),Q=rt1")
 # < $(PLATFORM)/areaDetector.cmd
 
 # Motors
-dbLoadTemplate("$(PLATFORM)/motor.substitutions", "P=$(PREFIX)")
-#dbLoadTemplate("common/softMotor.substitutions", "P=$(PREFIX)")
-#dbLoadTemplate("common/pseudoMotor.substitutions", "P=$(PREFIX)")
+dbLoadTemplate("substitutions/motor.substitutions", "P=$(PREFIX)")
+#dbLoadTemplate("substitutions/softMotor.substitutions", "P=$(PREFIX)")
+#dbLoadTemplate("substitutions/pseudoMotor.substitutions", "P=$(PREFIX)")
 
 # Allstop, alldone
 iocshLoad("$(MOTOR)/iocsh/allstop.iocsh", "P=$(PREFIX)")
@@ -87,9 +74,6 @@ dbLoadTemplate("$(PLATFORM)/scanParms.substitutions")
 # Soft scaler for testing
 #iocshLoad("$(STD)/iocsh/softScaler.iocsh", "P=$(PREFIX), INSTANCE=scaler1")
 
-# Soft function generator
-#dbLoadRecords("$(CALC)/calcApp/Db/FuncGen.db","P=$(PREFIX),Q=fgen,OUT=$(PREFIX)m7.VAL")
-
 # 4-step measurement
 dbLoadRecords("$(STD)/stdApp/Db/4step.db", "P=$(PREFIX),Q=4step:")
 
@@ -103,9 +87,9 @@ dbLoadRecords("$(STD)/stdApp/Db/pvHistory.db","P=$(PREFIX),N=1,MAXSAMPLES=1440")
 dbLoadRecords("$(STD)/stdApp/Db/timer.db","P=$(PREFIX),N=1")
 
 # Slow feedback
-dbLoadTemplate("common/pid_slow.substitutions")
-dbLoadTemplate("$(PLATFORM)/async_pid_slow.substitutions")
-#dbLoadTemplate("common/fb_epid.substitutions")
+#dbLoadTemplate("substitutions/pid_slow.substitutions")
+#dbLoadTemplate("substitutions/async_pid_slow.substitutions")
+#dbLoadTemplate("substitutions/fb_epid.substitutions")
 
 # Miscellaneous PV's, such as burtResult
 dbLoadRecords("$(STD)/stdApp/Db/misc.db","P=$(PREFIX)")

iocBoot/iocxxx/common/optics.iocsh

@@ -47,7 +47,7 @@ dbLoadRecords("$(DIR)/table.db","P=$(PREFIX),Q=Table1,T=table1,M0X=m1,M0Y=m2,M1Y
 #iocshLoad("$(OPTICS)/iocsh/ml_mono.iocsh", "PREFIX=$(PREFIX), M_THETA=m1, M_THETA2=m2, M_Y=m3, M_Z=m4, YOFF=35., GEOM=1")
 
 ### Orientation matrix, four-circle diffractometer (see seq program 'orient' below)
-#iocshLoad("$(OPTICS)/iocsh/orient.iocsh", "PREFIX=$(PREFIX), INSTANCE=1, M_TTH=m9, M_TH=m10, M_CHI=m11, M_PHI=m12, SUB=common/orient_xtals.substitutions")
+#iocshLoad("$(OPTICS)/iocsh/orient.iocsh", "PREFIX=$(PREFIX), INSTANCE=1, M_TTH=m9, M_TH=m10, M_CHI=m11, M_PHI=m12, SUB=substitutions/orient_xtals.substitutions")
 
 # Coarse/Fine stage
 #dbLoadRecords("$(OPTICS)/opticsApp/Db/CoarseFineMotor.db","P=$(PREFIX)cf1:,PM=$(PREFIX),CM=m7,FM=m8")
@@ -56,4 +56,4 @@ dbLoadRecords("$(DIR)/table.db","P=$(PREFIX),Q=Table1,T=table1,M0X=m1,M0Y=m2,M1Y
 #iocshLoad("$(OPTICS)/iocsh/pf4filters.iocsh", "PREFIX=$(PREFIX), INSTANCE=pf4")
 
 ### Load database records for alternative PF4-filter support
-#iocshLoad("$(OPTICS)/iocsh/filterDrive.iocsh", "PREFIX=$(PREFIX), INSTANCE=filter, KEV=$(PREFIX)userCalc1.A, NUM_FILTERS=16, SUB=common/filter.substitutions")
+#iocshLoad("$(OPTICS)/iocsh/filterDrive.iocsh", "PREFIX=$(PREFIX), INSTANCE=filter, KEV=$(PREFIX)userCalc1.A, NUM_FILTERS=16, SUB=substitutions/filter.substitutions")

iocBoot/iocxxx/softioc/motor.substitutions

-file "$(MOTOR)/db/motor.db"
-{
-pattern
-{N, M,       DTYP,         C, S, DESC,          EGU,    DIR,	VELO, VBAS, ACCL, BDST, BVEL, BACC, MRES, PREC, DHLM, DLLM, INIT}
-{1, "m$(N)", "MM4000",     0, 0, "motor $(N)", degrees, Pos, 10,    0.,   1.,   0,    1,    .2,   1e-3, 3,    100,  -100, ""}
-{2, "m$(N)", "MM4000",     0, 1, "motor $(N)", degrees, Pos, 60,    0.,   1.5,  0,    1,    .2,   1e-3, 3,    100,  -100, ""}
-{3, "m$(N)", "MM4000",     0, 2, "motor $(N)", degrees, Pos, 60,    0.,   1.,   0,    1,    .2,   1e-3, 3,    100,  -100, ""}
-{4, "m$(N)", "ACS MCB-4B", 0, 0, "motor $(N)", steps,   Pos, 1000., 1,   .2,    0,    1,    .2,   1,    1,    1e6,  -1e6, ""}
-{5, "m$(N)", "ACS MCB-4B", 0, 1, "motor $(N)", degrees, Pos, 1000., 1,   .2,    0,    1,    .2,   1,    1,    100,  -100, ""}
-{6, "m$(N)", "ACS MCB-4B", 0, 2, "motor $(N)", degrees, Pos, 1000., 1,   .2,    0,    1,    .2,   1,    1,    100,  -100, ""}
-{7, "m$(N)", "ACS MCB-4B", 0, 3, "motor $(N)", degrees, Pos, 1000., 1,   .2,    0,    1,    .2,   1,    1,    100,  -100, ""}
-}

iocBoot/iocxxx/vxWorks/dac128V.cmd

@@ -8,6 +8,6 @@
 # slot        = IPAC slot (0,1,2,3, etc.)
 initDAC128V("DAC1", 0, 3)
 
-dbLoadTemplate("vxWorks/dac128V.substitutions", "P=$(PREFIX)")
+dbLoadTemplate("substitutions/dac128V.substitutions", "P=$(PREFIX)")
 
 # END dac128V.cmd -------------------------------------------------------------

iocBoot/iocxxx/vxWorks/ipUnidig.cmd

@@ -23,6 +23,6 @@
 initIpUnidig("Unidig1", 0, 1, 2000, 116, 0xfffffb, 0xfffffb)
 
 # IP-Unidig binary I/O
-dbLoadTemplate("vxWorks/ipUnidig.substitutions", "P=$(PREFIX), PORT=Unidig1")
+dbLoadTemplate("substitutions/ipUnidig.substitutions", "P=$(PREFIX), PORT=Unidig1")
 
 # END ipUnidig.cmd ------------------------------------------------------------