Merging release 2.0 branch with CVS trunk

r2601 | ffr | 2008-05-30 10:26:57 +1000 (Fri, 30 May 2008) | 2 lines

site_ansto/instrument/hrpd/config/INSTCFCOMMON.TXT

@@ -1,5 +1,7 @@
+config/anticollider/anticollider_common.tcl
 config/plc/plc_common_1.tcl
 config/counter/counter_common_1.tcl
+config/environment/temperature/lakeshore340_common.tcl
 config/hipadaba/hipadaba_configuration_common.tcl
 config/hipadaba/common_instrument_dictionary.tcl
 config/hipadaba/instdict_specification.tcl
@@ -9,3 +11,4 @@ config/hmm/anstohm_linked.xml
 config/scan/scan_common_1.hdd
 config/scan/scan_common_1.tcl
 config/nexus/nxscripts_common_1.tcl
+config/commands/commands_common.tcl

site_ansto/instrument/hrpd/config/anticollider/acscript.txt

@@ -0,0 +1,18 @@
+# This script is loaded automatically by anticollider.tcl when SICS is launched
+# TODO Allow sequencing
+# TODO Allow functional dependencies
+#
+# Examples
+# for pcx forbid { {80 130} {10 20} }
+# when stth in { {0 10} {20 30} } forbid { {10 20} {90 100} } for mtth
+#
+## The next example forbids movement when both schi and sx are in the given ranges
+# forbid {0 10} for sphi whenall {schi in {10 15} sx {10 11} }
+
+
+for pcx forbid {80 130}
+for pcr forbid {-inf inf} when mom in {45 50}
+for stth forbid {160 167} when mtth in {87 88}
+for stth forbid {0 15} when mtth in {139.5 140.5}
+for mtth forbid {87 100} when stth in {166 167}
+for mtth forbid {130 140.5} when stth in {0 1}

site_ansto/instrument/hrpd/config/anticollider/anticollider.tcl

@@ -0,0 +1,8 @@
+
+# $Revision: 1.2 $
+# $Date: 2008-05-30 00:26:56 $
+# Author: Ferdi Franceschini (ffr@ansto.gov.au)
+# Last revision by: $Author: ffr $
+
+source $cfPath(anticollider)/anticollider_common.tcl 
+::anticollider::loadscript acscript.txt

site_ansto/instrument/hrpd/config/commands/commands.tcl

@@ -0,0 +1 @@
+source $cfPath(commands)/commands_common.tcl

site_ansto/instrument/hrpd/config/environment/temperature/lakeshore340.tcl

@@ -0,0 +1,24 @@
+source $cfPath(environment)/temperature/lakeshore340_common.tcl
+
+# @brief Adds a lakeshore 340 temperature controller object.
+#
+# This must be called when the instrument configuration is loaded and before\n
+# the buildHDB function is called.  Currently there is no way to add and remove\n
+# environment controllers and their hdb paths at runtime.
+proc ::environment::temperature::add_ls340 {} {
+  set sim_mode [SplitReply [environment_simulation]]
+  if {$sim_mode == "true"} {
+    ::environment::temperature::mkls340sim tc1
+  } else {
+    ::environment::temperature::mkls340 tc1
+    tc1 tolerance 1
+    tc1 Settle 30
+    tc1 range 2
+    tc1 UpperLimit 500
+    tc1 LowerLimit 4
+  }
+
+  sicslist setatt tc1 environment_name tempone 
+  sicslist setatt tc1 long_name control_sensor_reading
+  ::environment::mkenvinfo tc1 {heateron {priv user} range {priv manager} }
+}

site_ansto/instrument/hrpd/config/hmm/hmm_configuration.tcl

@@ -2,51 +2,63 @@ source $cfPath(hmm)/hmm_configuration_common_1.tcl
 source $cfPath(hmm)/hmm_cylindrical_detector_configuration.tcl
 set sim_mode [SplitReply [hmm_simulation]]
 
-##\brief Return the detector position
+proc ::histogram_memory::init_OAT_TABLE {} {
+  if [ catch {
+  # We don't need a MAX_CHAN parameter for time because the time channel 
+  # is scaled by calling the ::histogram_memory::clock_scale function
+    OAT_TABLE X -setdata MAX_CHAN 128
+    OAT_TABLE Y -setdata MAX_CHAN 512
+    OAT_TABLE X -setdata BMIN -0.5
+    OAT_TABLE X -setdata BMAX  127.5
+    OAT_TABLE Y -setdata BMIN -0.5
+    OAT_TABLE Y -setdata BMAX  511.5
+
+    OAT_TABLE -set X { 127.5 126.5 } NXC 128 Y { -0.5 0.5 } NYC 512 T { 0 2000 } NTC 1 
+  } message ] {
+    if {$::errorCode=="NONE"} {return $message}
+    return -code error $message
+  }
+}
+
+##
+# @brief Return the detector position
 proc ::histogram_memory::detector_posn_degrees {} {
   return [SplitReply [stth]]
 }
 proc ::histogram_memory::pre_count {} {}
 proc ::histogram_memory::post_count {} {}
 proc ::histogram_memory::initialize {} {
-  if {$::sim_mode == "true"} {
-      hmm configure oat_ntc_eff 1
-      hmm configure oat_nyc_eff 1024
-      hmm configure oat_nxc_eff 64
-  }
-  ::histogram_memory::_initialize
-  ::histogram_memory::two_theta -boundaries
+  if [ catch {
+    if {$::sim_mode == "true"} {
+        hmm configure oat_ntc_eff 1
+        hmm configure oat_nyc_eff 1024
+        hmm configure oat_nxc_eff 64
+    }
+    BAT_TABLE -init
+    CAT_TABLE -init
+    SAT_TABLE -init
+    OAT_TABLE -init
+    FAT_TABLE -init
+    ::histogram_memory::_initialize
+    ::histogram_memory::two_theta -boundaries
 
-  detector_active_height_mm 335
-  detector_active_width_mm 500
-  detector_radius_mm 1250.0
-  set x_bb0 -0.5; set xbbmax 63.5
-  set y_bb0 -0.5; set ybbmax 1023.5
-  hmm configure FAT_SIMULATED_EVENT_Y0 $y_bb0
-  hmm configure FAT_SIMULATED_EVENT_Y1 $ybbmax
-  hmm configure FAT_SIMULATED_EVENT_X0 $x_bb0
-  hmm configure FAT_SIMULATED_EVENT_X1 $xbbmax
-  set x_binwidth 1
-  if {[expr {$xbbmax - $x_bb0}] > 0} {
-    set x_bb1 [expr {$x_bb0+$x_binwidth}]
-  } else {
-    set x_bb1 [expr {$x_bb0-$x_binwidth}]
-  }
-  set y_binwidth 1
-  if {[expr {$ybbmax - $y_bb0}] > 0} {
-    set y_bb1 [expr {$y_bb0+$y_binwidth}]
-  } else {
-    set y_bb1 [expr {$y_bb0-$y_binwidth}]
-  }
-  OAT_TABLE -init X_MIN $x_bb0 X_MAX $xbbmax Y_MIN $y_bb0 Y_MAX $ybbmax
-  # We default to one big bin for time
-  set t_bb0 [OAT_TABLE -get T_MIN]
-  set t_bb1 [OAT_TABLE -get T_MAX]
-  OAT_TABLE X "$x_bb0 $x_bb1" Y "$y_bb0 $y_bb1" T "$t_bb0 $t_bb1"
-  ::histogram_memory::upload_config Filler_defaults
+    detector_active_height_mm 335
+    detector_active_width_mm 500
+    detector_radius_mm 1250.0
 
-  ::nexus::data alias ::histogram_memory::vertical_axis ::histogram_memory::y_pixel_offset
-  ::nexus::data alias ::histogram_memory::horizontal_axis ::histogram_memory::two_theta
+  # hmm configure FAT_SIMULATED_EVENT_Y0 $y_bb0
+  # hmm configure FAT_SIMULATED_EVENT_Y1 $ybbmax
+  # hmm configure FAT_SIMULATED_EVENT_X0 $x_bb0
+  # hmm configure FAT_SIMULATED_EVENT_X1 $xbbmax
+    ::histogram_memory::init_OAT_TABLE
+    ::histogram_memory::upload_config Filler_defaults
+
+    ::nexus::data alias ::histogram_memory::vertical_axis ::histogram_memory::y_pixel_offset
+    ::nexus::data alias ::histogram_memory::horizontal_axis ::histogram_memory::two_theta
+  } message ] {
+    if {$::errorCode=="NONE"} {return $message}
+    return -code error $message
+  }
 }
 
 proc histmem {cmd args} {

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

@@ -1,7 +1,8 @@
-# $Revision: 1.23 $
-# $Date: 2008-05-29 04:54:06 $
+# $Revision: 1.24 $
+# $Date: 2008-05-30 00:26:56 $
 # Author: Ferdi Franceschini (ffr@ansto.gov.au)
-# Last revision by: $Author: dcl $
+# Last revision by: $Author: ffr $
+source $cfPath(anticollider)/anticollider.tcl
 
 # START MOTOR CONFIGURATION
 
@@ -256,7 +257,6 @@ mtth blockage_ratio 5
 mtth backlash_offset -1
 mtth creep_offset 90
 mtth creep_precision 0.02
-#mtth debug 1
 
 mtth part crystal
 mtth long_name takeoff_angle
@@ -445,7 +445,6 @@ stth blockage_ratio 1.5
 stth backlash_offset -0.1
 stth creep_offset 0.1
 stth creep_precision 0.00002
-stth debug 1
 
 stth part sample
 stth long_name azimuthal_angle
@@ -695,3 +694,4 @@ make_gap_motors ss2hg gap ss2ho offset ss2r ss2l mm $slit2HGroup
 proc motor_set_sobj_attributes {} {
 }
 # END MOTOR CONFIGURATION
+::anticollider::init