hipadaba_configuration_common.tcl

Oops calling the deleted hlistplainprop function instead of the new hlistprop.

sans/config/commands/commands.tcl
Set beamstop diameter (BSdiam) when selecting a beamstop

sans optics/aperture_configuration.tcl
The entrance app is 50mm when guide config is g1 to g9 or p1 to p9

sans parameters.tcl
Added GuideConfig parameter to record the last configuration set by SICS.

r2870 | ffr | 2010-01-15 18:19:22 +1100 (Fri, 15 Jan 2010) | 12 lines

site_ansto/instrument/sans/config/commands/commands.tcl

@@ -56,31 +56,37 @@ proc selbs {bs {bx "UNDEF"} {bz "UNDEF"}} {
       "1" {
         set bsmot "bs1"
         set bs_target 93.20
+        set bs_diameter 110
         set bsdownCmd "drive bs2 $bsl(2) bs3 $bsl(3) bs4 $bsl(4) bs5 $bsl(5) bs6 $bsl(6)"
       }
       "2" {
         set bsmot "bs2"
         set bs_target 86.84
+        set bs_diameter 88
         set bsdownCmd "drive bs1 $bsl(1) bs3 $bsl(3) bs4 $bsl(4) bs5 $bsl(5) bs6 $bsl(6)"
       }
       "3" {
         set bsmot "bs3"
         set bs_target 93.35
+        set bs_diameter 66
         set bsdownCmd "drive bs2 $bsl(2) bs1 $bsl(1) bs4 $bsl(4) bs5 $bsl(5) bs6 $bsl(6)"
       }
       "4" {
         set bsmot "bs4"
         set bs_target 86.85
+        set bs_diameter 44
         set bsdownCmd "drive bs2 $bsl(2) bs3 $bsl(3) bs1 $bsl(1) bs5 $bsl(5) bs6 $bsl(6)"
       }
       "5" {
         set bsmot "bs5"
         set bs_target 93.27
+        set bs_diameter 22
         set bsdownCmd "drive bs2 $bsl(2) bs3 $bsl(3) bs4 $bsl(4) bs1 $bsl(1) bs6 $bsl(6)"
       }
       "6" {
         set bsmot "bs6"
         set bs_target 86.98
+        set bs_diameter 11
         set bsdownCmd "drive bs2 $bsl(2) bs3 $bsl(3) bs4 $bsl(4) bs5 $bsl(5) bs1 $bsl(1)"
       }
       default {
@@ -95,9 +101,11 @@ proc selbs {bs {bx "UNDEF"} {bz "UNDEF"}} {
       if {[info level] > 1} {statemon start [lindex [info level -1] 0]}
       set bsdriving true
       BeamStop -1
+      BSdiam -1
       drive $bsmot $bs_target
       eval $bsdownCmd
       BeamStop $bs
+      BSdiam $bs_diameter
       set bsdriving false
       statemon stop selbs
       if {[info level] > 1} {statemon stop [lindex [info level -1] 0]}
@@ -114,9 +122,11 @@ proc selbs {bs {bx "UNDEF"} {bz "UNDEF"}} {
       if {[info level] > 1} {statemon start [lindex [info level -1] 0]}
       set bsdriving true
       BeamStop -1
+      BSdiam -1
       drive $bsmot $bs_target bsx $bsx_target bsz $bsz_target
       eval $bsdownCmd
       BeamStop $bs
+      BSdiam $bs_diameter
       set bsdriving false
       statemon stop selbs
       if {[info level] > 1} {statemon stop [lindex [info level -1] 0]}
@@ -177,6 +187,7 @@ namespace eval optics {
 
     variable guide_configuration
     variable guide_configuration_columns
+
     if [ catch {
 
       foreach {compselection position} $guide_configuration($configuration) {
@@ -188,6 +199,7 @@ namespace eval optics {
         set msg [eval "drive $to_config"]
         EApPosYmm $position
       }
+      GuideConfig $configuration
     } message ] {
       ::optics::guide -set feedback status IDLE
       if {$::errorCode=="NONE"} {return $message}

site_ansto/instrument/sans/config/optics/aperture_configuration.tcl

@@ -48,15 +48,22 @@ proc ::optics::AttRotLookup {angle} {
 
 proc ::optics::EApLookUp {angle param} {
 	variable EApLookupTable
+
 	set foundit false
 	if [ catch {
+  if {$param == "size"} {
+    set cgf [SplitReply [GuideConfig]]
+    if {[string first $cgf "g1 g2 g3 g4 g5 g6 g7 g8 g9 p1 p2 p3 p4 p5 p6 p7 p8 p9"] != -1} {
+      return 50
+    }
+  }
 	switch $param {
 		"size" {set index 0}
 		"shape" {set index 1}
 		 default {
 			error "ERROR: Invalid lookup parameter $param"
 		 }
-	} 
+	}
 	foreach vangle [array names EApLookupTable] {
 		if {$vangle == [expr int($angle)]} {
 			set foundit true

site_ansto/instrument/sans/config/parameters/parameters.tcl

@@ -14,6 +14,7 @@ foreach {var lname type priv units klass} {
   DetPosYOffset    DetPosYOffsetfloat float user     mm   parameter
   EApPosY          EApPosY            float user     mm   parameter
   EndFacePosY      EndFacePosY        float readonly mm   parameter
+  GuideConfig      GuideConfig        text  user     none parameter
   magnetic_field   magnetic_field     float user     T    sample
   RotApPosY        RotApPosY          float readonly mm   @none
   SampleThickness  SampleThickness    float user     mm   sample