Merged 2.4 branch

r2828 | ffr | 2009-11-25 09:56:49 +1100 (Wed, 25 Nov 2009) | 2 lines

site_ansto/instrument/hrpd/config/INSTCFCOMMON.TXT

@@ -3,10 +3,12 @@ config/anticollider/anticollider_common.tcl
 config/plc/plc_common_1.tcl
 config/counter/counter_common_1.tcl
 config/environment/temperature/lakeshore340_common.tcl
+config/environment/temperature/sct_lakeshore_3xx.tcl
 config/hipadaba/hipadaba_configuration_common.tcl
 config/hipadaba/common_instrument_dictionary.tcl
 config/hipadaba/instdict_specification.tcl
 config/hmm/hmm_configuration_common_1.tcl
+config/hmm/hmm_object.tcl
 config/hmm/hmm_cylindrical_detector_configuration.tcl
 config/hmm/anstohm_linked.xml
 config/scan/scan_common_1.hdd

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

@@ -10,8 +10,14 @@
 # forbid {0 10} for sphi whenall {schi in {10 15} sx {10 11} }
 
 
+#-----------monochromator rotation---------------
+for mom forbid {0 48}
+#----------primary collimator translation--------
 for pcx forbid {80 130}
-for pcr forbid {3 176} when mom in {45 50}
+#----------primary collimator rotation-----------
+for pcr forbid {{3 177} {-177 -3}} when mom in {0 89}
+for pcr forbid {{3 177} {-177 -3}} when pcx in {{-inf 68} {72 inf}}
+
 #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}

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

@@ -130,13 +130,16 @@ proc ::histogram_memory::detector_posn_degrees {} {
 proc ::histogram_memory::pre_count {} {}
 proc ::histogram_memory::post_count {} {}
 proc ::histogram_memory::isc_initialize {} {
+  # Instrument specific X and Y dimension names
+  variable INST_NXC "oat_nxc_eff"
+  variable INST_NYC "oat_nyc_eff"
 
   if [ catch {
     ::histogram_memory::init_hmm_objs
     if {$::sim_mode == "true"} {
         hmm configure oat_ntc_eff 1
-        hmm configure oat_nyc_eff 1024
-        hmm configure oat_nxc_eff 64
+        hmm configure $INST_NYC 1024
+        hmm configure $INST_NXC 64
     }
     BAT_TABLE -init
     CAT_TABLE -init
@@ -144,11 +147,14 @@ proc ::histogram_memory::isc_initialize {} {
     OAT_TABLE -init
     FAT_TABLE -init
     ::histogram_memory::ic_initialize
-    ::histogram_memory::two_theta -boundaries
+    ::histogram_memory::set_graphtype "two_theta" "boundaries"
 
     detector_active_height_mm 335
+    detector_active_height_mm lock
     detector_active_width_mm 3490.64
+    detector_active_width_mm lock
     detector_radius_mm 1250.0
+    detector_radius_mm lock
 
   # hmm configure FAT_SIMULATED_EVENT_Y0 $y_bb0
   # hmm configure FAT_SIMULATED_EVENT_Y1 $ybbmax
@@ -160,7 +166,7 @@ proc ::histogram_memory::isc_initialize {} {
     ::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
+    ::nexus::data alias ::histogram_memory::horizontal_axis ::histogram_memory::x_pixel_angular_offset
   } message ] {
     if {$::errorCode=="NONE"} {return $message}
     return -code error $message

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

@@ -1,5 +1,5 @@
-# $Revision: 1.35 $
-# $Date: 2009-03-31 06:25:19 $
+# $Revision: 1.36 $
+# $Date: 2009-11-24 22:56:47 $
 # Author: Ferdi Franceschini (ffr@ansto.gov.au)
 # Last revision by: $Author: ffr $
 
@@ -36,10 +36,12 @@ set mphi_Home 11839906
 set mchi_Home 8417936
 set my_Home 7781389
 set mx_Home 7580366
-set mom_Home 13442930
+#set mom_Home 13442930
+set mom_Home 13447313
 set mtth_Home 11534660
 set pcx_Home 8345600
 set pcr_Home 5440000
+set scr_Home 31734679
 set sphi_Home 7924507
 set schi_Home 7542917
 set sy_Home 7626584
@@ -160,7 +162,7 @@ Motor mchi $motor_driver_type [params \
   asyncqueue mc1\
   axis B\
   units degrees\
-  hardlowerlim 88\
+  hardlowerlim -2\
   hardupperlim 92\
   maxSpeed 1\
   maxAccel 1\
@@ -169,8 +171,7 @@ Motor mchi $motor_driver_type [params \
   absEnc 1\
   absEncHome $mchi_Home\
   cntsPerX 8192]
-mchi 90.1
-mchi softlowerlim 88
+mchi softlowerlim -2 
 mchi softupperlim 92
 mchi speed 1
 mchi movecount $move_count
@@ -326,6 +327,27 @@ pcr precision 0.01
 pcr part collimator
 pcr long_name primary_collimator_rotation
 
+# Secondary Collimator Rotation
+Motor scr $motor_driver_type [params \
+  asyncqueue mc2\
+  axis G\
+  units degrees\
+  hardlowerlim -10\
+  hardupperlim 10\
+  maxSpeed 1.0\
+  maxAccel 0.1\
+  maxDecel 0.1\
+  stepsPerX 12500\
+  absEnc 1\
+  absEncHome $scr_Home\
+  cntsPerX 4096]
+setHomeandRange -motor scr -home 0 -lowrange 5 -uprange 185
+scr speed 1
+scr movecount $move_count
+scr precision 0.01
+scr part collimator
+scr long_name secondary_collimator_rotation
+
 ############################
 # Motor Controller 2
 # Motor Controller 2
@@ -498,6 +520,8 @@ mf1 speed 0.1
 mf1 movecount $move_count
 mf1 precision 0.01
 mf1 creep_offset 0.1
+mf1 part crystal
+mf1 long_name mf1
 
 # Slit 1, right
 Motor ss1r $motor_driver_type [params \

site_ansto/instrument/hrpd/config/nexus/nxscripts.tcl

@@ -1 +1,4 @@
 source $cfPath(nexus)/nxscripts_common_1.tcl
+proc ::nexus::isc_initialize {} {
+  ::nexus::ic_initialize
+}