Now saves all motor positions except for pc1 and pc2

r1359 | ffr | 2006-12-08 14:58:08 +1100 (Fri, 08 Dec 2006) | 2 lines
This commit is contained in:
Ferdi Franceschini
2006-12-08 14:58:08 +11:00
committed by Douglas Clowes
parent 9393a0b3e1
commit f815347e72
2 changed files with 57 additions and 7 deletions

View File

@@ -15,15 +15,14 @@ set pi 3.1415926
#set angsep [expr $tubedia/$dradius *(180/$pi)]
set angsep 1.25
# stthmin = (180 - (1.25*127))/2
set stthmin 10.625
proc addnxentry {nxobj entryname scanVariable scanVarPos } {
global dradius ndect angsep stthmin;
global dradius ndect angsep;
putcommon $nxobj $entryname $scanVariable
putcrystal $nxobj
putmonitor $nxobj
putsample $nxobj
set mtth_val [string trim [lindex [split [mtth] =] 1]]
$nxobj putfloat $scanVariable $mtth_val
set scanVar_value [string trim [lindex [split [$scanVariable] =] 1]]
$nxobj putfloat $scanVariable $scanVar_value
# Add thetamin and stth to tharr(i)
set sampletwotheta [string trim [lindex [split [stth] =] 1]]
for {set i 0} {$i < $ndect} {incr i} {
@@ -44,13 +43,13 @@ putsample $nxobj
}
proc bm_addnxentry {nxobj entryname scanVariable scanVarPos } {
global dradius ndect angsep stthmin;
global dradius ndect angsep;
putcommon $nxobj $entryname $scanVariable
putcrystal $nxobj
putmonitor $nxobj
putsample $nxobj
set mtth_val [string trim [lindex [split [mtth] =] 1]]
$nxobj putfloat $scanVariable $mtth_val
set scanVar_value [string trim [lindex [split [$scanVariable] =] 1]]
$nxobj putfloat $scanVariable $scanVar_value
# Add thetamin and stth to tharr(i)
# $nxobj puttext dtype He-3 position sensitive detector, tube active length=335+/-5mm, tube diameter=25.4 +/- 0.8mm
# $nxobj puttext ddesc 128 He-3 proportional counter detector tubes (GE Energy Reuter Stokes Inc. item=RS-P4-0814-217)
@@ -86,6 +85,27 @@ proc putcommon {nxobj entryName scanVariable} {
$nxobj puttext sname OPAL
$nxobj puttext stype Reactor Neutron Source
$nxobj puttext sprobe Neutron
putsamplemotors $nxobj
putslitmotors $nxobj
putmonomotors $nxobj
}
proc putsamplemotors {nxobj} {
foreach motor { som schi sphi sx sy stth sth } {
$nxobj putfloat $motor [getVal [$motor] ];
}
}
proc putmonomotors {nxobj} {
foreach motor { mom mchi mphi mx my mtth mth } {
$nxobj putfloat $motor [getVal [$motor] ];
}
}
proc putslitmotors {nxobj} {
foreach motor {ss1u ss1d ss1l ss1r ss1vg ss1vo ss1hg ss1ho ss2u ss2d ss2l ss2r ss2vg ss2vo ss2hg ss2ho } {
$nxobj putfloat $motor [getVal [$motor] ];
}
}
publish addnxentry user
publish bm_addnxentry user