Changeset 53 for trunk

Timestamp:

Dec 4, 2009 4:59:37 PM (14 years ago)

Author:

toby

Message:

# on 1999/02/16 18:05:57, toby did:

1. better error messages
2. allow pointflag in cols 6/7
3. ignore file delete errors

File:

• trunk/liveplot (modified) (5 diffs, 3 props)

trunk/liveplot

@@ -169 +169 @@
                 if {$num > 0} {
                     set Ispec 0
+                    set X -999
                     scan [string range $line 8 end] %e%e%e%e%e%e \
                             X Iobs Icalc Ispec fixB fitB
                     #puts $line
-                    #    puts "[string range $line 6 6]"
-                    # is this 6 or 7; 6 on win & 7 on SGI
-                    set pointflag [string range $line 6 7]
                     # eliminate excluded points
-                    if {$Ispec > 0.0} {
+                    if {$Ispec > 0.0 && $X >= 0} {
                         lappend xlist $X
                         lappend obslist $Iobs
@@ -183 +181 @@
                     }
                     # add peaks to peak lists
-                    if [regexp {[1-9]} $pointflag ph] {
+                    #    puts "[string range $line 6 6]"
+                    # is this 6 or 7; 6 on win & 7 on SGI
+                    if [regexp {[1-9]} [string range $line 6 7] ph] {
                         lappend reflns($ph) $X
                     }
@@ -193 +193 @@
         if {$units == "Theta"} {set units "2-Theta"}
         close $input
-        file delete histdump$hst.inp
+        catch {file delete histdump$hst.inp}
         xvec set $xlist
         obsvec set $obslist
@@ -210 +210 @@
         plotdata $box
     } errmsg] {
-        $box config -title "(Error reading Histogram -- not ready or invalid)"
+        $box config -title "Read error: $errmsg"
+        catch {console show}
         puts "error message: $errmsg"
         update
@@ -345 +346 @@
             append msg [read $out]
             close $out
-            file delete liveplot.msg
+            catch {file delete liveplot.msg}
         }
         if {$msg != ""} {