From 5998ee3ace57b7d24ca54b00fac6eb6c9ca8d3d8 Mon Sep 17 00:00:00 2001
From: timmmooney <mooney@aps.anl.gov>
Date: Wed, 29 Jun 2005 17:46:29 +0000
Subject: [PATCH] Added support for orientation matrix, four-circle
diffractometer
---
iocBoot/iocvxWorks/auto_settings.req | 4 ++++
iocBoot/iocvxWorks/st.cmd | 7 +++++++
2 files changed, 11 insertions(+)
diff --git a/iocBoot/iocvxWorks/auto_settings.req b/iocBoot/iocvxWorks/auto_settings.req
index 16cdfda..1f5c2ad 100644
--- a/iocBoot/iocvxWorks/auto_settings.req
+++ b/iocBoot/iocvxWorks/auto_settings.req
@@ -140,3 +140,7 @@ $(P):R_CA
$(P):R_FD
$(P):R_Load
$(P):R_Mem
+
+# orientation matrix
+#file orient_settings.req P=$(P),O=1
+#file orient_xtals_settings.req P=$(P),O=1
diff --git a/iocBoot/iocvxWorks/st.cmd b/iocBoot/iocvxWorks/st.cmd
index 6bc1df2..4ba132c 100644
--- a/iocBoot/iocvxWorks/st.cmd
+++ b/iocBoot/iocvxWorks/st.cmd
@@ -137,6 +137,10 @@ dbLoadRecords("$(DIR)/table.db","P=xxx:,Q=Table1,T=table1,M0X=m1,M0Y=m2,M1Y=m3,M
#dbLoadRecords("$(OPTICS)/opticsApp/Db/hrSeq.db","P=xxx:,N=1,M_PHI1=m9,M_PHI2=m10")
#dbLoadRecords("$(OPTICS)/opticsApp/Db/hrSeq.db","P=xxx:,N=2,M_PHI1=m11,M_PHI2=m12")
+### Orientation matrix, four-circle diffractometer (see seq program 'orient' below)
+#dbLoadRecords("$(OPTICS)/opticsApp/Db/orient.db", "P=xxx:,O=1,PREC=4")
+#dbLoadTemplate("orient_xtals.substitutions")
+
# Load single element Canberra AIM MCA and ICB modules
< canberra_1.cmd
@@ -204,6 +208,9 @@ seq &Keithley2kDMM,("P=xxx:, Dmm=D2, channels=10, model=2000")
# sscan record
#seq &xia_slit, "name=hsc1, P=xxx:, HSC=hsc1:, S=xxx:seriala[6]"
+# Orientation-matrix
+seq &orient, "P=xxx:orient1:,PM=xxx:,mTTH=m9,mTH=m10,mCHI=m11,mPHI=m12"
+
### Start up the autosave task and tell it what to do.
# The task is actually named "save_restore".
# Note that you can reload these sets after creating them: e.g.,
--
GitLab