hmm_configuration_common_1.tcl

The post_count callback should be called when the count ends.

quokka_configuration.tcl
Added lakeshore 336, qlink, and rheometer configurations.

quokka sct_flipper.tcl
Report "-1" for fields which return corrupt or invalid readings.

quokka environment.tcl
Implement histogram memory pre_count and post_count callbacks to record temperature before and after an acquisition.

quokka motor_configuration.tcl
Set correct max speed for detector motor, ie it is now 53mm/s instead of 40

wombat_configuration.tcl
Added lakeshore 336 driver and julabo and qlink.
r3034 | ffr | 2010-12-03 11:07:49 +1100 (Fri, 03 Dec 2010) | 17 lines

site_ansto/instrument/sans/config/beamline/sct_flipper.tcl

@@ -50,6 +50,7 @@ namespace eval ::scobj::rfgen {
 proc ::scobj::rfgen::mkStatArr {stateArrName stateReport} {
   upvar $stateArrName stateArr
   array set stateArr $stateReport
+
   if {$stateArr(curr) != 0} {
     set val [string trimleft $stateArr(curr) 0]
     if {[string is integer $val]} {
@@ -170,6 +171,18 @@ proc ::scobj::rfgen::rdStatFunc {} {
     return stateChange
   }
   set statList [split $statStr "|="]
+  foreach {k v} $statList {
+    if {$k == "type"} {
+      lappend temp "$k $v"
+      continue
+    }
+    if {[string is integer $v]} {
+      lappend temp "$k $v"
+    } else {
+      lappend temp "$k -1"
+    }
+  }
+  set statList [join $temp]
   mkStatArr stateArr $statList
 
   if {$statList != [sct oldStateRep]} { 

site_ansto/instrument/sans/config/environment/environment.tcl

@@ -4,15 +4,24 @@ puts "selecting $envtemp for environment control"
 switch $envtemp {
   "lh45" {
     add_lh45 tc1 ca5-quokka 4003 1
+    proc ::histogram_memory::pre_count {} {
+      hset /sample/tc1/sensor/start_temperature [hval /sample/tc1/sensor/value]
+      hset /sample/tc1/sensor/end_temperature   [hval   /sample/tc1/sensor/value]
+    }
+    proc ::histogram_memory::post_count {} {
+      hset /sample/tc1/sensor/end_temperature   [hval   /sample/tc1/sensor/value]
+    }
   }
   "rhqc" {
     puts "Configuring RHQC"
+    # 9600 8 1 None None Enable
     add_sct_ls340 tc1 ca5-[instname] 4001 "\r" 0.5 5.0
 # TODO Set controlsensor    
 #   if { [SplitReply [environment_simulation]] == "false"} {
 #     tc1 controlsensor sensorB
 #   }
 #   puts "Added tc1 with [tc1 controlsensor]"
+    # 9600 8 1 None None Enable
     add_sct_ls340 tc2 ca5-[instname] 4002 "\r" 0.5 5.0
 # TODO Set controlsensor    
 #   if { [SplitReply [environment_simulation]] == "false"} {
@@ -22,17 +31,17 @@ switch $envtemp {
   }
   "11TMagnet" {
     puts "Configuring 11TMagnet"
-    add_sct_ls340 tc1 ca5-[instname] 4001 "\r" 0.5 5.0
+    add_sct_ls340 tc2 ca5-[instname] 4001 "\r" 0.5 5.0
     if { [SplitReply [environment_simulation]] == "false"} {
       ::utility::macro::getset float temperature {} {
-        return [sicsmsgfmt [hval /sample/tc1/sensor/sensorValueA]]
+        return [sicsmsgfmt [hval /sample/tc2/sensor/sensorValueA]]
       }
       sicslist setatt temperature long_name temperature
       sicslist setatt temperature klass sample
       sicslist setatt temperature units K
 # TODO Set controlsensor    
 #     tc1 controlsensor sensorA
-    }
+#   }
     add_ips120 ips120 ca5-quokka 4004 0.001
 
   }

site_ansto/instrument/sans/config/motors/motor_configuration.tcl

@@ -331,7 +331,7 @@ Motor det $motor_driver_type [params \
   units mm\
   hardlowerlim 488\
   hardupperlim 19320\
-  maxSpeed 40\
+  maxSpeed 53\
   maxAccel 5\
   maxDecel 10\
   stepsPerX $det_StepsPerX\
@@ -344,7 +344,7 @@ det precision 1
 det softlowerlim 500
 det softupperlim 19310
 det home 350.5
-det speed 40
+det speed 53
 det Blockage_Fail 0
 
 # Detector translation across beam [-50,450] mm

site_ansto/instrument/sans/quokka_configuration.tcl

@@ -25,8 +25,8 @@ fileeval $cfPath(parameters)/parameters.tcl
 fileeval $cfPath(plc)/plc.tcl
 fileeval $cfPath(optics)/optics.tcl
 fileeval $cfPath(counter)/counter.tcl
-fileeval $cfPath(environment)/temperature/lakeshore340.tcl
-fileeval $cfPath(environment)/temperature/sct_lakeshore_3xx.tcl
+fileeval $cfPath(environment)/temperature/sct_lakeshore_340.tcl
+fileeval $cfPath(environment)/temperature/sct_lakeshore_336.tcl
 fileeval $cfPath(hmm)/hmm_configuration.tcl
 fileeval $cfPath(nexus)/nxscripts.tcl
 fileeval $cfPath(hmm)/detector.tcl
@@ -34,10 +34,12 @@ fileeval $cfPath(scan)/scan.tcl
 fileeval $cfPath(commands)/commands.tcl
 fileeval $cfPath(anticollider)/anticollider.tcl
 fileeval $cfPath(environment)/temperature/sct_julabo_lh45.tcl
+fileeval $cfPath(environment)/temperature/sct_qlink.tcl
 fileeval $cfPath(environment)/magneticField/sct_oxford_ips.tcl
 fileeval $cfPath(environment)/environment.tcl
+fileeval $cfPath(environment)/sct_mcr500_rheometer.tcl
+fileeval $cfPath(environment)/sct_protek_common.tcl
 fileeval $cfPath(beamline)/spin_flipper.tcl
-fileeval $cfPath(goniometer)/spin_goniometer.tcl
 source gumxml.tcl
 
 ::utility::mkVar ::anticollider::protect_detector text manager protect_detector false detector true false