commands_common.tcl
Added histmem and runscan command hmm_configuration_common_1.tcl Set histmem_cmd status feedback to IDLE on COUNTEND event nxscripts_common_1.tcl When saving a set of files the time-stamp is offset from the time the first file is created. scan_common_1.tcl The hmscan hook functions now set feedback on the runscan_cmd sct_positmotor_common.tcl Added mk_sct_positmotor command to create a script context controller which runs a motor to an indexed position. Added positmotor_configuration.tcl to echidna, wombat, kowari, quokka, platypus. sans/config/motors/positmotor_configuration.tcl Has an example of a positmotor configuration for the sample changer sanx/quokka_configuration.tcl Setup feedback nodes for AttRotDeg and RotApDeg. motor_utility.tcl Added reldrive and relrun commands along with getmotpar convenience command. r2725 | ffr | 2008-10-27 15:55:48 +1100 (Mon, 27 Oct 2008) | 26 lines
This commit is contained in:
committed by
Douglas Clowes
parent
7ded983eba
commit
81f98bd337
@@ -402,6 +402,7 @@ proc ::nexus::save {{point 0}} {
|
||||
proc ::nexus::save_collection {args} {
|
||||
variable state
|
||||
variable data_gp_path
|
||||
variable start_seconds
|
||||
variable start_seconds_array
|
||||
variable currFilename
|
||||
|
||||
@@ -456,7 +457,7 @@ proc ::nexus::save {{point 0}} {
|
||||
eend [lindex [sicstime] 1]
|
||||
array unset start_seconds_array
|
||||
set start_seconds [clock seconds]
|
||||
set start_seconds_array($data_label) $start_seconds
|
||||
# set start_seconds_array($data_label) $start_seconds
|
||||
timestamp 0
|
||||
::nexus::nxreopenfile $currFilename($data_label)
|
||||
::nexus::save_data $point
|
||||
@@ -465,7 +466,8 @@ proc ::nexus::save {{point 0}} {
|
||||
::nexus::nxclosefile $currFilename($data_label)
|
||||
} else {
|
||||
eend [lindex [sicstime] 1]
|
||||
timestamp [expr {[clock seconds] - $start_seconds_array($data_label)}]
|
||||
# timestamp [expr {[clock seconds] - $start_seconds_array($data_label)}]
|
||||
timestamp [expr {[clock seconds] - $start_seconds}]
|
||||
dataFileName $currFilename($data_label)
|
||||
::nexus::nxreopenfile $currFilename($data_label)
|
||||
::nexus::save_data $point
|
||||
@@ -1214,7 +1216,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.44 $}]
|
||||
set tmpstr [string map {"$" ""} {$Revision: 1.45 $}]
|
||||
set nx_content_revision_num [lindex $tmpstr [expr [llength $tmpstr] - 1]]
|
||||
|
||||
#namespace eval data {
|
||||
|
||||
Reference in New Issue
Block a user