From 060cefdb6fd0699ea28ceb10864bf4523d9b8960 Mon Sep 17 00:00:00 2001
From: timmmooney <mooney@aps.anl.gov>
Date: Thu, 5 Oct 2006 18:19:48 +0000
Subject: [PATCH] userCalc enables added (commented out)

---
 iocBoot/iocCygwin/auto_settings.req | 11 +++++++++--
 iocBoot/iocLinux/auto_settings.req  | 17 +++++++++++------
 2 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/iocBoot/iocCygwin/auto_settings.req b/iocBoot/iocCygwin/auto_settings.req
index 51ac155..fd3b2da 100644
--- a/iocBoot/iocCygwin/auto_settings.req
+++ b/iocBoot/iocCygwin/auto_settings.req
@@ -30,18 +30,25 @@ file scan_settings.req P=$(P),S=scanH
 ##$(P)KohzuMode2MO.VAL
 ##$(P)Kohzu_yOffsetAO.VAL
 
+### user calcs.  Disabled on startup unless the xxxEnable PV is
+### autosaved.
 file userCalcs10_settings.req P=$(P)
 file userCalcN_settings.req P=$(P),N=I_Detector
-
-file saveData_settings.req P=$(P)
+#$(P)userCalcEnable
 
 file userTransforms10_settings.req P=$(P)
+#$(P)userTranEnable
 
 file userStringCalcs10_settings.req P=$(P)
+#$(P)userStringCalcEnable
 
 file userArrayCalcs10_settings.req P=$(P)
+#$(P)userArrayCalcEnable
 
 file userStringSeqs10_settings.req P=$(P)
+#$(P)userStringSeqEnable
+
+file saveData_settings.req P=$(P)
 
 # 4-step measurement
 file auto_4step_settings.req P=$(P),Q=4step
diff --git a/iocBoot/iocLinux/auto_settings.req b/iocBoot/iocLinux/auto_settings.req
index 204684b..e546555 100644
--- a/iocBoot/iocLinux/auto_settings.req
+++ b/iocBoot/iocLinux/auto_settings.req
@@ -30,20 +30,25 @@ file scan_settings.req P=$(P),S=scanH
 ##$(P)KohzuMode2MO.VAL
 ##$(P)Kohzu_yOffsetAO.VAL
 
+### user calcs.  Disabled on startup unless the xxxEnable PV is
+### autosaved.
 file userCalcs10_settings.req P=$(P)
 file userCalcN_settings.req P=$(P),N=I_Detector
-
-file saveData_settings.req P=$(P)
+#$(P)userCalcEnable
 
 file userTransforms10_settings.req P=$(P)
+#$(P)userTranEnable
 
 file userStringCalcs10_settings.req P=$(P)
+#$(P)userStringCalcEnable
 
-# string-sequence records
-file sseq_settings.req P=$(P),S=Sseq1
-file sseq_settings.req P=$(P),S=Sseq2
-file sseq_settings.req P=$(P),S=Sseq3
+file userArrayCalcs10_settings.req P=$(P)
+#$(P)userArrayCalcEnable
 
+file userStringSeqs10_settings.req P=$(P)
+#$(P)userStringSeqEnable
+
+file saveData_settings.req P=$(P)
 
 # 4-step measurement
 file auto_4step_settings.req P=$(P),Q=4step
-- 
GitLab