Merged release 2.1

r2664 | ffr | 2008-07-18 14:33:39 +1000 (Fri, 18 Jul 2008) | 2 lines

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 {