Merged release 2.1

r2664 | ffr | 2008-07-18 14:33:39 +1000 (Fri, 18 Jul 2008) | 2 lines
2008-07-18 14:33:39 +10:00
parent 8fb864ee37
commit e31aa973a6
10 changed files with 61 additions and 55 deletions
--- a/site_ansto/instrument/config/nexus/nxscripts_common_1.tcl
+++ b/site_ansto/instrument/config/nexus/nxscripts_common_1.tcl
@@ -344,8 +344,8 @@ proc ::nexus::newfile {type {namestyle data}} {
      if {$isNewFile || $dataTypeChanged} {
        set state(file,new) true
        ::nexus::createfile
-        estart [lindex [sicstime] 1] 
-        eend [lindex [sicstime] 1] 
+        estart [sicstime] 
+        eend [sicstime] 
        start_seconds [clock seconds]
        timestamp 0
        ::nexus::nxreopenfile
@@ -354,7 +354,7 @@ proc ::nexus::newfile {type {namestyle data}} {
        ::nexus::set_plotdata_info
        ::nexus::nxclosefile
      } else {
-        eend [lindex [sicstime] 1] 
+        eend [sicstime]
        timestamp [expr {[clock seconds] - [SplitReply [start_seconds]]}] 
        ::nexus::nxreopenfile
        ::nexus::save_data $point
@@ -1060,7 +1060,7 @@ foreach expt $::nexus::exports {

 set tmpstr [string map {"$" ""} {$Name: not supported by cvs2svn $}]
 set nx_content_release_tag [lindex $tmpstr [expr [llength $tmpstr] - 1]]
-set tmpstr [string map {"$" ""} {$Revision: 1.40 $}]
+set tmpstr [string map {"$" ""} {$Revision: 1.41 $}]
 set nx_content_revision_num [lindex $tmpstr [expr [llength $tmpstr] - 1]]

 #namespace eval data {
--- a/site_ansto/instrument/hipd/config/hmm/hmm_configuration.tcl
+++ b/site_ansto/instrument/hipd/config/hmm/hmm_configuration.tcl
@@ -2,8 +2,14 @@ source $cfPath(hmm)/hmm_configuration_common_1.tcl
 source $cfPath(hmm)/hmm_cylindrical_detector_configuration.tcl
 set sim_mode [SplitReply [hmm_simulation]]

-proc ::histogram_memory::init_OAT_TABLE {} {
+proc ::histogram_memory::init_OAT_TABLE {args} {
  if [ catch {
+    array set pararr $args
+    if [info exists pararr(res)] {
+      set resolution $pararr(res)
+    } else {
+      set resolution "hires"
+    }
    # 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 3872
@@ -15,10 +21,21 @@ proc ::histogram_memory::init_OAT_TABLE {} {
      OAT_TABLE Y -setdata BMIN -0.5
      OAT_TABLE Y -setdata BMAX 511.5

-    # x bin range 0, 3871
-    # y bin range 0, 511
-      FAT_TABLE -set MULTI_HOST_HISTO_STITCH_OVERLAP 32
-      OAT_TABLE -set X { 991.5 990.5 } NXC 992 Y { 511.5 510.5 } NYC 512 T { 0 20000 } NTC 1
+      switch $resolution {
+      "hires" {
+          FAT_TABLE -set MULTI_HOST_HISTO_STITCH_OVERLAP 32
+          OAT_TABLE -set X { 991.5 990.5 } NXC 992 Y { -0.5 0.5 } NYC 512 T { 0 20000 } NTC 1
+        }
+      "std_968x128" {
+          FAT_TABLE -set MULTI_HOST_HISTO_STITCH_OVERLAP 8
+          OAT_TABLE -set X { 991.5 987.5 } NXC 248 Y { -0.5 3.5 } NYC 128 T { 0 20000 } NTC 1
+        }
+        default {
+        # Default to std_968x128
+          FAT_TABLE -set MULTI_HOST_HISTO_STITCH_OVERLAP 8
+          OAT_TABLE -set X { 991.5 987.5 } NXC 248 Y { -0.5 3.5 } NYC 128 T { 0 20000 } NTC 1
+        }
+      }
  } message ] {
    if {$::errorCode=="NONE"} {return $message}
    return -code error $message
@@ -34,14 +51,9 @@ proc ::histogram_memory::oat_bins {axis} {
      foreach {bb0 bb1} [OAT_TABLE -get $axis] {}
      set bstep [expr $bb1 - $bb0]
      if {$bstep < 0} {
-      set nch_perseg [OAT_TABLE -get $channID($axis)]
-      set overlap [FAT_TABLE -get MULTI_HOST_HISTO_STITCH_OVERLAP]
-      set bb0 [expr 4*$nch_perseg - 3*$overlap + $bstep/2.0]
-      set bb1 [expr $bb0+$bstep]
-        ###########
-#       set overlap [FAT_TABLE -get MULTI_HOST_HISTO_STITCH_OVERLAP]
-#       set bb0 [expr 4*$bb0 - 3*($overlap-1)]
-#       set bb1 [expr $bb0+$bstep]
+        set bb0 3871.5
+        set bb1 [expr $bb0+$bstep]
+        FAT_TABLE -set MULTI_HOST_HISTO_STITCH_OVERLAP [expr abs(32.0/$bstep)]
      } 
      return [list $bb0 $bb1]
    } else {
@@ -104,11 +116,7 @@ proc ::histogram_memory::isc_initialize {} {
    detector_active_width_mm 1524
    detector_radius_mm 728.0

-  # 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::init_OAT_TABLE res "std_968x128"
    ::histogram_memory::upload_config Filler_defaults

    ::nexus::data alias ::histogram_memory::vertical_axis ::histogram_memory::y_pixel_offset
--- a/site_ansto/instrument/hipd/config/motors/motor_configuration.tcl
+++ b/site_ansto/instrument/hipd/config/motors/motor_configuration.tcl
@@ -643,4 +643,3 @@ make_gap_motors ss2hg gap ss2ho offset ss2r ss2l mm $slit2HGroup
 proc motor_set_sobj_attributes {} {
 }
 # END MOTOR CONFIGURATION
-::anticollider::init
--- a/site_ansto/instrument/hipd/wombat_configuration.tcl
+++ b/site_ansto/instrument/hipd/wombat_configuration.tcl
@@ -1,5 +1,5 @@
-# $Revision: 1.23 $
-# $Date: 2008-07-11 01:09:56 $
+# $Revision: 1.24 $
+# $Date: 2008-07-18 04:33:39 $
 # Author: Ferdi Franceschini (ffr@ansto.gov.au)
 # Last revision by: $Author: ffr $

@@ -47,8 +47,8 @@ catch {
  #::environment::temperature::add_ls340


-  if [file exists extraconfig.tcl] {
-    fileeval extraconfig.tcl
+  if [file exists ../extraconfig.tcl] {
+    fileeval ../extraconfig.tcl
  }

  buildHDB instrument_dictionary
--- a/site_ansto/instrument/hrpd/echidna_configuration.tcl
+++ b/site_ansto/instrument/hrpd/echidna_configuration.tcl
@@ -1,5 +1,5 @@
-# $Revision: 1.30 $
-# $Date: 2008-07-11 01:09:57 $
+# $Revision: 1.31 $
+# $Date: 2008-07-18 04:33:39 $
 # Author: Ferdi Franceschini (ffr@ansto.gov.au)
 # Last revision by: $Author: ffr $

@@ -43,8 +43,8 @@ catch {
  server_init
  #::environment::temperature::add_ls340 

-  if [file exists extraconfig.tcl] {
-    fileeval extraconfig.tcl
+  if [file exists ../extraconfig.tcl] {
+    fileeval ../extraconfig.tcl
  }

  buildHDB instrument_dictionary
--- a/site_ansto/instrument/reflectometer/config/motors/motor_configuration.tcl
+++ b/site_ansto/instrument/reflectometer/config/motors/motor_configuration.tcl
@@ -45,9 +45,7 @@ set sphi_home 7450470
 set sx_home 8574000
 set sy_home 7500000
 set sz_home 8927484
-#set dy_home 8161489
-#set dy_home 9226449
-set dy_home 9051645
+set dy_home 8838649
 set dz_home 7805000

 #Measured or computed step rate for sz (Sample Raise)
@@ -467,7 +465,7 @@ Motor sz $motor_driver_type [params \
  units mm\
  hardlowerlim 0\
  hardupperlim 280.0\
-  maxSpeed 2\
+  maxSpeed 1.5\
  maxAccel 1\
  maxDecel 2\
  stepsPerX $szStepRate\
@@ -481,7 +479,7 @@ sz long_name translate_z
 sz softlowerlim 0
 sz softupperlim 280.0
 sz home 0
-sz speed 2
+sz speed 1.5
 sz backlash_offset -0.1
 sz creep_offset 0.05
 sz creep_precision 0.0005
@@ -506,6 +504,7 @@ dz long_name vertical_translation
 dz softlowerlim 0
 dz softupperlim 1351
 dz home 0
+dz speed 2
 dz backlash_offset -0.5
 dz creep_offset 0.05
 dz creep_precision 0.001
--- a/site_ansto/instrument/reflectometer/platypus_configuration.tcl
+++ b/site_ansto/instrument/reflectometer/platypus_configuration.tcl
@@ -1,5 +1,5 @@
-# $Revision: 1.19 $
-# $Date: 2008-07-11 01:09:57 $
+# $Revision: 1.20 $
+# $Date: 2008-07-18 04:33:39 $
 # Author: Ferdi Franceschini (ffr@ansto.gov.au)
 # Last revision by: $Author: ffr $

@@ -47,8 +47,8 @@ catch {
  ::anticollider::init
  server_init

-  if [file exists extraconfig.tcl] {
-    fileeval extraconfig.tcl
+  if [file exists ../extraconfig.tcl] {
+    fileeval ../extraconfig.tcl
  }

  buildHDB instrument_dictionary
--- a/site_ansto/instrument/rsd/kowari_configuration.tcl
+++ b/site_ansto/instrument/rsd/kowari_configuration.tcl
@@ -1,5 +1,5 @@
-# $Revision: 1.13 $
-# $Date: 2008-07-11 01:09:57 $
+# $Revision: 1.14 $
+# $Date: 2008-07-18 04:33:39 $
 # Author: Ferdi Franceschini (ffr@ansto.gov.au)
 # Last revision by: $Author: ffr $

@@ -42,8 +42,8 @@ catch {
  ::anticollider::init
  server_init

-  if [file exists extraconfig.tcl] {
-    fileeval extraconfig.tcl
+  if [file exists ../extraconfig.tcl] {
+    fileeval ../extraconfig.tcl
  }

  buildHDB instrument_dictionary
--- a/site_ansto/instrument/sans/quokka_configuration.tcl
+++ b/site_ansto/instrument/sans/quokka_configuration.tcl
@@ -1,5 +1,5 @@
-# $Revision: 1.11 $
-# $Date: 2008-07-11 01:09:57 $
+# $Revision: 1.12 $
+# $Date: 2008-07-18 04:33:39 $
 # Author: Ferdi Franceschini (ffr@ansto.gov.au)
 # Last revision by: $Author: ffr $

@@ -56,8 +56,8 @@ catch {
  ::anticollider::init
  server_init

-  if [file exists extraconfig.tcl] {
-    fileeval extraconfig.tcl
+  if [file exists ../extraconfig.tcl] {
+    fileeval ../extraconfig.tcl
  }

  buildHDB instrument_dictionary
--- a/site_ansto/instrument/server_config.tcl
+++ b/site_ansto/instrument/server_config.tcl
@@ -1,7 +1,7 @@
 # SICS common configuration

-# $Revision: 1.37 $
-# $Date: 2008-07-11 01:09:56 $
+# $Revision: 1.38 $
+# $Date: 2008-07-18 04:33:38 $
 # Author: Ferdi Franceschini (ffr@ansto.gov.au)
 # Last revision by $Author: ffr $

@@ -125,11 +125,11 @@ SicsDataPrefix [SplitReply [Instrument]]
 ::utility::mkVar SicsDataPostFix Text manager
 SicsDataPostFix nx.hdf

-foreach {var val klass} {
-  program_name "SICS" entry
-  run_mode "normal" entry
+foreach {var val klass priv} {
+  program_name "SICS" entry manager
+  run_mode "normal" entry user
 } {
-  ::utility::mkVar $var Text manager $var true $klass true true
+  ::utility::mkVar $var Text $priv $var true $klass true true
  $var $val
 }
 ::utility::mkVar sics_release Text manager sics_release true entry true true
@@ -138,7 +138,7 @@ sics_release [lindex $tmpstr [expr [llength $tmpstr] - 1]]
 sics_release lock

 ::utility::mkVar sics_revision_num Text internal
-set tmpstr [string map {"$" ""} {$Revision: 1.37 $}]
+set tmpstr [string map {"$" ""} {$Revision: 1.38 $}]
 sics_revision_num [lindex $tmpstr [expr [llength $tmpstr] - 1]]
 sics_revision_num lock