Skip to content
Snippets Groups Projects
Commit 75376cdb authored by mooney's avatar mooney
Browse files

Support for orientation matrix, four-circle diffractometer

parent 6743f3fd
No related branches found
No related tags found
No related merge requests found
...@@ -50,3 +50,6 @@ file auto_4step_settings.req P=$(P),Q=4step ...@@ -50,3 +50,6 @@ file auto_4step_settings.req P=$(P),Q=4step
file userAve10_settings.req P=$(P) file userAve10_settings.req P=$(P)
# orientation matrix
#file orient_settings.req P=$(P),O=1
#file orient_xtals_settings.req P=$(P),O=1
file "$(OPTICS)/opticsApp/Db/orient_xtals.db"
{
pattern
{P, O, PREC, N, xtal, a, b, c, alpha, beta, gamma}
{xxx:, 1, 4, 1, Silicon, 5.431, 5.431, 5.431, 90, 90, 90}
{xxx:, 1, 4, 2, "Beryllium hcp", 2.2858, 2.2858, 3.5843, 90, 90, 120}
{xxx:, 1, 4, 3, VO2, 5.743, 4.517, 5.375, 90, 122.6, 90}
{xxx:, 1, 4, 4, undefined, 1, 1, 1, 90, 90, 90}
{xxx:, 1, 4, 5, undefined, 1, 1, 1, 90, 90, 90}
{xxx:, 1, 4, 6, undefined, 1, 1, 1, 90, 90, 90}
{xxx:, 1, 4, 7, undefined, 1, 1, 1, 90, 90, 90}
{xxx:, 1, 4, 8, undefined, 1, 1, 1, 90, 90, 90}
{xxx:, 1, 4, 9, undefined, 1, 1, 1, 90, 90, 90}
{xxx:, 1, 4, 10, undefined, 1, 1, 1, 90, 90, 90}
}
...@@ -96,6 +96,10 @@ dbLoadRecords("$(OPTICS)/opticsApp/Db/table.db","P=xxx:,Q=Table1,T=table1,M0X=m1 ...@@ -96,6 +96,10 @@ dbLoadRecords("$(OPTICS)/opticsApp/Db/table.db","P=xxx:,Q=Table1,T=table1,M0X=m1
#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=1,M_PHI1=m9,M_PHI2=m10")
#dbLoadRecords("$(OPTICS)/opticsApp/Db/hrSeq.db","P=xxx:,N=2,M_PHI1=m11,M_PHI2=m12") #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 # Load single element Canberra AIM MCA and ICB modules
#< canberra_1.cmd #< canberra_1.cmd
...@@ -154,6 +158,9 @@ seq &Keithley2kDMM,("P=xxx:, Dmm=D1, channels=22, model=2700") ...@@ -154,6 +158,9 @@ seq &Keithley2kDMM,("P=xxx:, Dmm=D1, channels=22, model=2700")
# sscan record # sscan record
#seq &xia_slit, "name=hsc1, P=xxx:, HSC=hsc1:, S=xxx:seriala[6]" #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. ### Start up the autosave task and tell it what to do.
# The task is actually named "save_restore". # The task is actually named "save_restore".
# Note that you can reload these sets after creating them: e.g., # Note that you can reload these sets after creating them: e.g.,
......
...@@ -50,3 +50,6 @@ file auto_4step_settings.req P=$(P),Q=4step ...@@ -50,3 +50,6 @@ file auto_4step_settings.req P=$(P),Q=4step
file userAve10_settings.req P=$(P) file userAve10_settings.req P=$(P)
# orientation matrix
#file orient_settings.req P=$(P),O=1
#file orient_xtals_settings.req P=$(P),O=1
file "$(OPTICS)/opticsApp/Db/orient_xtals.db"
{
pattern
{P, O, PREC, N, xtal, a, b, c, alpha, beta, gamma}
{xxx:, 1, 4, 1, Silicon, 5.431, 5.431, 5.431, 90, 90, 90}
{xxx:, 1, 4, 2, "Beryllium hcp", 2.2858, 2.2858, 3.5843, 90, 90, 120}
{xxx:, 1, 4, 3, VO2, 5.743, 4.517, 5.375, 90, 122.6, 90}
{xxx:, 1, 4, 4, undefined, 1, 1, 1, 90, 90, 90}
{xxx:, 1, 4, 5, undefined, 1, 1, 1, 90, 90, 90}
{xxx:, 1, 4, 6, undefined, 1, 1, 1, 90, 90, 90}
{xxx:, 1, 4, 7, undefined, 1, 1, 1, 90, 90, 90}
{xxx:, 1, 4, 8, undefined, 1, 1, 1, 90, 90, 90}
{xxx:, 1, 4, 9, undefined, 1, 1, 1, 90, 90, 90}
{xxx:, 1, 4, 10, undefined, 1, 1, 1, 90, 90, 90}
}
...@@ -96,6 +96,10 @@ dbLoadRecords("$(OPTICS)/opticsApp/Db/table.db","P=xxx:,Q=Table1,T=table1,M0X=m1 ...@@ -96,6 +96,10 @@ dbLoadRecords("$(OPTICS)/opticsApp/Db/table.db","P=xxx:,Q=Table1,T=table1,M0X=m1
#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=1,M_PHI1=m9,M_PHI2=m10")
#dbLoadRecords("$(OPTICS)/opticsApp/Db/hrSeq.db","P=xxx:,N=2,M_PHI1=m11,M_PHI2=m12") #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 # Load single element Canberra AIM MCA and ICB modules
#< canberra_1.cmd #< canberra_1.cmd
...@@ -154,6 +158,9 @@ seq &Keithley2kDMM,("P=xxx:, Dmm=D1, channels=22, model=2700") ...@@ -154,6 +158,9 @@ seq &Keithley2kDMM,("P=xxx:, Dmm=D1, channels=22, model=2700")
# sscan record # sscan record
#seq &xia_slit, "name=hsc1, P=xxx:, HSC=hsc1:, S=xxx:seriala[6]" #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. ### Start up the autosave task and tell it what to do.
# The task is actually named "save_restore". # The task is actually named "save_restore".
# Note that you can reload these sets after creating them: e.g., # Note that you can reload these sets after creating them: e.g.,
......
...@@ -46,3 +46,6 @@ file sseq_settings.req P=$(P),S=Sseq1 ...@@ -46,3 +46,6 @@ file sseq_settings.req P=$(P),S=Sseq1
file sseq_settings.req P=$(P),S=Sseq2 file sseq_settings.req P=$(P),S=Sseq2
file sseq_settings.req P=$(P),S=Sseq3 file sseq_settings.req P=$(P),S=Sseq3
# orientation matrix
#file orient_settings.req P=$(P),O=1
#file orient_xtals_settings.req P=$(P),O=1
file "$(OPTICS)/opticsApp/Db/orient_xtals.db"
{
pattern
{P, O, PREC, N, xtal, a, b, c, alpha, beta, gamma}
{xxx:, 1, 4, 1, Silicon, 5.431, 5.431, 5.431, 90, 90, 90}
{xxx:, 1, 4, 2, "Beryllium hcp", 2.2858, 2.2858, 3.5843, 90, 90, 120}
{xxx:, 1, 4, 3, VO2, 5.743, 4.517, 5.375, 90, 122.6, 90}
{xxx:, 1, 4, 4, undefined, 1, 1, 1, 90, 90, 90}
{xxx:, 1, 4, 5, undefined, 1, 1, 1, 90, 90, 90}
{xxx:, 1, 4, 6, undefined, 1, 1, 1, 90, 90, 90}
{xxx:, 1, 4, 7, undefined, 1, 1, 1, 90, 90, 90}
{xxx:, 1, 4, 8, undefined, 1, 1, 1, 90, 90, 90}
{xxx:, 1, 4, 9, undefined, 1, 1, 1, 90, 90, 90}
{xxx:, 1, 4, 10, undefined, 1, 1, 1, 90, 90, 90}
}
...@@ -84,6 +84,10 @@ dbLoadTemplate("scanParms.substitutions") ...@@ -84,6 +84,10 @@ dbLoadTemplate("scanParms.substitutions")
# 4-bounce high-resolution monochromator # 4-bounce high-resolution monochromator
#dbLoadRecords("$(OPTICS)/opticsApp/Db/hrSeq.db","P=xxx:,N=1,M_PHI1=m1,M_PHI2=m2") #dbLoadRecords("$(OPTICS)/opticsApp/Db/hrSeq.db","P=xxx:,N=1,M_PHI1=m1,M_PHI2=m2")
### 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")
### Stuff for user programming ### ### Stuff for user programming ###
dbLoadRecords("$(CALC)/calcApp/Db/userCalcs10.db","P=xxx:") dbLoadRecords("$(CALC)/calcApp/Db/userCalcs10.db","P=xxx:")
dbLoadRecords("$(CALC)/calcApp/Db/userStringCalcs10.db","P=xxx:") dbLoadRecords("$(CALC)/calcApp/Db/userStringCalcs10.db","P=xxx:")
...@@ -121,6 +125,9 @@ iocInit ...@@ -121,6 +125,9 @@ iocInit
#seq &kohzuCtl, "P=xxx:, M_THETA=m1, M_Y=m2, M_Z=m3, GEOM=1, logfile=kohzuCtl.log" #seq &kohzuCtl, "P=xxx:, M_THETA=m1, M_Y=m2, M_Z=m3, GEOM=1, logfile=kohzuCtl.log"
#seq &hrCtl, "P=xxx:, N=1, M_PHI1=m1, M_PHI2=m2, logfile=hrCtl1.log" #seq &hrCtl, "P=xxx:, N=1, M_PHI1=m1, M_PHI2=m2, logfile=hrCtl1.log"
# 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. ### Start up the autosave task and tell it what to do.
# The task is actually named "save_restore". # The task is actually named "save_restore".
# Note that you can reload these sets after creating them: e.g., # Note that you can reload these sets after creating them: e.g.,
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment