Changeset 1033

Timestamp:

Oct 27, 2010 9:08:37 PM (15 years ago)

Author:

toby

Message:

fix writing of abscor2 on all platforms; show abs cor on Histogram panel

Location:

trunk

Files:

• expgui (modified) (5 diffs)
• readexp.tcl (modified) (1 diff)

trunk/expgui ¶

@@ -1864 +1864 @@
         set expgui(backtermlbl) ""
         set expgui(backtypelbl) ""
+        set expgui(abstypelbl) ""
         foreach var {bref bdamp absref absdamp} {
             set entrycmd($var) "histinfo [list $histlist] $var"
@@ -1893 +1894 @@
             set entrycmd($var) "histinfo $hist $var"
             set entryvar($var) [eval $entrycmd($var)]
+        }
+        set abstype [histinfo $hist abstype]
+        if {$abstype > 1} {
+            set expgui(abstypelbl) "  Model #$abstype, values: [histinfo $hist abscor1], [histinfo $hist abscor2]"
+        } else {
+            set expgui(abstypelbl) "  Model #$abstype, value: [histinfo $hist abscor1]"
         }
     }
@@ -3299 +3306 @@
     RecordMacroEntry "incr expgui(changed)" 0
     destroy $top
+    DisplayHistogram
 }
 
@@ -3911 +3919 @@
             -row 2 -column 4 -sticky news -padx 4 -pady 3 -sticky e
     # Absorption information.
+    set expgui(abstypelbl) ""
+    grid [label $expgui(absBox).lbl1 \
+              -textvariable expgui(abstypelbl)] \
+            -row 1 -column 1 -columnspan 5 -sticky nws
     grid [label $expgui(absBox).rf1 -text "  Refine Abs./Refl." ] \
-            -row 2 -column 1 -sticky news -padx 4 -pady 3
+            -row 2 -column 1 -sticky news -padx 2 -pady 3
     grid [checkbutton $expgui(absBox).rf2 -text "" \
             -variable  entryvar(absref) ] \
@@ -3920 +3932 @@
     tk_optionMenu $expgui(absBox).d2  entryvar(absdamp) 0 1 2 3 4 5 6 7 8 9
     grid $expgui(absBox).d2 \
-            -row 2 -column 4 -sticky news -padx 4 -pady 3 -sticky e
+        -row 2 -column 4 -sticky news -padx 4 -pady 3 -sticky e
     grid [button $expgui(absBox).edit -textvariable expgui(abslbl) \
-            -command editabsorption] \
-            -row 2 -column 5 -sticky w -padx 2 -pady 3
+              -command editabsorption] \
+        -row 2 -column 5 -sticky nsw -padx 2 -pady 3
 
     #^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^END OF HISTOGRAM PANE CODE ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^

trunk/readexp.tcl ¶

@@ -1908 +1908 @@
             }
             abscor2-set {
-                # can't use validreal as the decimal must be in col 20
-                if {[catch {
-                    if {abs($value) < 99.99 && abs($value) > 1.e-4} {
-                        set tmp [format "%15.10f" $value]
-                        # make a final check of decimal
-                        if {[string range $tmp 4 4] != "."} {
-                            set tmp [format "%15.6E" $value]
-                        }
-                    } else {
-                        set tmp [format "%15.6E" $value]
+                # this must have a decimal as the 5th character, so that we end up with a 
+                # decimal point in column 20.
+                set tmp $value
+                if ![validreal tmp 12 7] {return 0}
+                set pos [string first "." $tmp]
+                while {$pos < 4} {
+                    set tmp " $tmp"
+                    set pos [string first "." $tmp]
+                }
+                if {$pos == 4} {
+                    setexp "${key}ABSCOR" $tmp 16 15
+                    return
+                }
+                catch {
+                    set tmp [format "%12.6E" $value]
+                    set pos [string first "." $tmp]
+                    while {$pos < 4} {
+                        set tmp " $tmp"
+                        set pos [string first "." $tmp]
                     }
-                }]} {return 0}
-                setexp "${key}ABSCOR" $tmp 16 15
+                    if {$pos == 4} {
+                        setexp "${key}ABSCOR" $tmp 16 15
+                        return
+                    }
+                }
+                return 0
             }
             abstype-get {