Quokka environment.tcl

Don't make the temperature getset-macro or select the control sensor for the script validator instance of SICS. (fixed in-situ)
Use new ls340 and ls336 controllers.

script_context_util.tcl
Modified hinitprops so that it can take sub-paths

nxscripts_common_1.tcl
Added ::nexus::OnFirstsave ::nexus:OnLastSave to register commands which will be executed on the first and last save of a data file.

sct_julabo_lh45.tcl
Added start_temperature and end_temperature parameters to record the initial and final temperature readings in the data files.
Also only set the setpoint if the Julabo is in remote mode.

sct_positmotor_common.tcl
Report 99999 if a posit motor table is out of range.

quokka guide_configuration.tcl
Updated aperture size for p1, p1lp, p1lens in the guide configuration table.

r2969 | ffr | 2010-07-01 22:09:09 +1000 (Thu, 01 Jul 2010) | 20 lines

site_ansto/instrument/config/nexus/nxscripts_common_1.tcl

@@ -23,6 +23,10 @@ sicslist setatt nexus_datatype mutable false
 namespace eval nexus {
   nexus_datatype "UNKNOWN"
   set exports [list newfile closefile save data newfile_collection save_collection]
+  proc estartSetVal {} { estart [sicstime] }
+  proc eendSetVal {} { eend [sicstime] }
+  set FirstSaveList [list estartSetVal eendSetVal]
+  set LastSaveList {list eendSetVal}
   eval namespace export $exports
   if 0 {datafilename}
 
@@ -74,6 +78,33 @@ proc getVal {cmd_output} {
   return [string trim [lindex [split $cmd_output =] 1 ] ]
 }
 
+##
+# @brief Registers a list of procs/commands to call on the first save to a data file
+proc ::nexus::OnFirstSave {args} {
+  lappend ::nexus::FirstSaveList $args
+}
+
+##
+# @brief Registers a list of procs/commands to call on the last save to a data file
+proc ::nexus::OnLastSave {args} {
+  lappend ::nexus::LastSaveList $args
+}
+
+##
+# @brief Executes the list of procs registered with OnFirstSave
+proc ::nexus::CallSSProcs {} {
+  foreach cmd $::nexus::FirstSaveList {
+    eval $cmd
+  }
+}
+
+##
+# @brief Executes the list of procs registered with OnLastSave
+proc ::nexus::CallESProcs {} {
+  foreach cmd $::nexus::LastSaveList {
+    eval $cmd
+  }
+}
 proc ::nexus::datapath {} {
   return [SplitReply [sicsdatapath]]
 }
@@ -443,8 +474,8 @@ proc ::nexus::save {{point 0}} {
         set isNewFile($data_label) "false"
         ::nexus::createfile $currFilename($data_label)
         dataFileName $currFilename($data_label)
-        estart [sicstime]
-        eend [sicstime]
+
+        ::nexus::CallSSProcs
         array unset start_seconds_array
         set start_seconds [clock seconds]
 #       set start_seconds_array($data_label) $start_seconds
@@ -457,7 +488,8 @@ proc ::nexus::save {{point 0}} {
         nxscript updatedictvar pa_entryName $entryName
         ::nexus::save_data $point newfile
       } else {
-        eend [sicstime]
+
+        ::nexus::CallESProcs
 #       timestamp [expr {[clock seconds] - $start_seconds_array($data_label)}] 
         timestamp [expr {[clock seconds] - $start_seconds}] 
         dataFileName $currFilename($data_label)
@@ -1250,7 +1282,7 @@ set nx_content_release_tag [lindex $tmpstr [expr [llength $tmpstr] - 1]]
 sics_release $nx_content_release_tag
 sics_release lock
 
-set tmpstr [string map {"$" ""} {$Revision: 1.51.2.13 $}]
+set tmpstr [string map {"$" ""} {$Revision: 1.51.2.14 $}]
 set nx_content_revision_num [lindex $tmpstr [expr [llength $tmpstr] - 1]]
 
 #namespace eval data {