Changeset 1221 for branches

Timestamp:

Sep 21, 2012 5:56:33 PM (11 years ago)

Author:

toby

Message:

more Fourier work; remove warning on R *3* H sg in CIF

Location:

branches/sandbox

Files:

• expgui (modified) (2 diffs)
• export_drawxtl.tcl (modified) (4 diffs)
• gsascmds.tcl (modified) (1 diff)
• gsasmenu.tcl (modified) (2 diffs)
• import_cif.tcl (modified) (1 diff)

branches/sandbox/expgui

@@ -70 +70 @@
 set expgui(HistSelectList) {}
 # location for web pages, if not found locally
-set expgui(website) 11bm.xor.aps.anl.gov/expguidoc/
+set expgui(website) subversion.xray.aps.anl.gov/EXPGUI/trunk/doc/
 # default for archive mode = on
 set expgui(archive) 1
@@ -4452 +4452 @@
         CIFselect $expgui(expfile)
     }
+    $expgui(fm).graphs.menu add cascade \
+        -menu  $expgui(fm).graphs.menu.fourier \
+        -label "Fourier"
+    menu $expgui(fm).graphs.menu.fourier
+    foreach num {1 2 3 4 5 6 7 8 9} {
+        $expgui(fm).graphs.menu.fourier add command -label "Setup phase $num" \
+            -command "EditFourier $num"
+    }
+    $expgui(fm).graphs.menu.fourier add command -label "run fourier prog" \
+        -command {runGSASwEXP fourier}
+
     # add the commands in expgui_menulist 
     foreach menu [array names expgui_menulist ] {

branches/sandbox/export_drawxtl.tcl

@@ -162 +162 @@
               -command "$bx.f.canvas yview"] -sticky ns -row 3 -column 2
     grid [button $bx.f.1.1 -text "Setup\nFourier" \
-              -command EditFourier] -column 0 -row 0
+              -command {EditFourier $::expgui(export_phase); SetupFourierButtons} \
+             ] -column 0 -row 0
     grid [button [set ::DXTL(FourCompute) $bx.f.1.2] -text "Compute\nFourier" \
               -command {DXTLwritegrd $expgui(export_phase)}] -column 1 -row 0
@@ -186 +187 @@
     trace variable ::expgui(export_phase) w OnNewFourierPhase
     OnNewFourierPhase
-#SetupFourierButtons
-#return
     # this appears to be needed by OSX
     ResizeWin .export
@@ -584 +583 @@
 # and the files that are present
 proc SetupFourierButtons {} {
-    set phase $::expgui(export_phase)
-    $::DXTL(FourCompute) config -state disabled
-    $::DXTL(AddContour) config -state disabled
-    $::DXTL(fmenu) delete 0 end
+    if {[catch {
+        set phase $::expgui(export_phase)
+        $::DXTL(FourCompute) config -state disabled
+        $::DXTL(AddContour) config -state disabled
+        $::DXTL(fmenu) delete 0 end
+    }]} return
     set ::DXTL(mtype) ""
     set ::DXTL(mfil) ""
@@ -619 +620 @@
         incr i
     }
-}
-
-proc EditFourier {} {
-    set phase $::expgui(export_phase)
-    # check that all Fourier records are set to the current phase
-    foreach i [listFourier] {
-        set ph [Fourierinfo $i phase]
-        if {$ph != $phase} {Fourierinfo $i phase set $phase}
-    }
-    # for now we will not offer access to section, (dmin, dmax not supported)
-    set typelist {}
-    foreach i [listFourier] {
-        lappend typelist [Fourierinfo $i type]
-    }
-    set histlist [FourierHists $phase]
-    set limits  [getFourierLimits $phase]
-    set box .export.fourier
-    catch {destroy $box}
-    toplevel $box
-    grid [frame $box.1] -row 1 -column 1 -rowspan 10
-    grid [frame $box.2] -row 1 -column 2 -rowspan 10
-    grid [frame $box.b] -sticky news -row 11 -column 1 -columnspan 2
-    grid columnconfigure $box.b 0 -weight 1
-    grid columnconfigure $box.b 3 -weight 1
-    grid [button $box.b.1 -text Continue \
-              -command "set ::DXTL(quit) 0; destroy $box" \
-             ] -row 1 -column 1
-    grid [button $box.b.2 -text Quit \
-              -command "set ::DXTL(quit) 1; destroy $box" \
-             ] -row 1 -column 2
-    
-    # map type selection
-    set row 0
-    grid [label $box.1.$row -text "Select map type(s)"] -column 1 -row $row
-    foreach typ {DELF FCLC FOBS 2FDF 3FDF 4FDF PTSN DPTS} lbl {
-        "Difference Fourier" "Fcalc Fourier" "Fobs Fourier" 
-        "2*Fo-Fc Fourier" "3*Fo-2*Fc Fourier" "4*Fo-3*Fc Fourier" "Patterson map" "Delta-F Patterson"\
-        } {
-            incr row
-            grid [ \
-                       checkbutton $box.1.$row -variable ::DXTL($typ) \
-                       -text "$lbl ($typ)" \
-                      ] -column 1 -row $row -sticky w
-            if {[lsearch $typelist $typ] == -1} {
-                set ::DXTL($typ) 0
-            } else {
-                set ::DXTL($typ) 1
-            }
-        }
-    grid [label $box.2.a1 -text "Histogram(s) to be used\n(last superceeds)"] -column 1 -row 1
-    grid [entry $box.2.a2 -textvariable ::DXTL(histlist) -width 20] -column 2 -row 1 -columnspan 3
-    set ::DXTL(histlist) $histlist
-    grid [label $box.2.m1 -text min] -column 2 -row 2
-    grid [label $box.2.m2 -text max] -column 3 -row 2
-    grid [label $box.2.m3 -text "map step\n(A)"] -column 4 -row 2
-    set row 3
-    foreach axis {X Y Z} lim [lrange $limits 1 end] step [lindex $limits 0] {
-        incr row
-        grid [label $box.2.0$axis -text "$axis limits"] -column 1 -row $row -sticky e
-        grid [entry $box.2.min$axis -width 10 -textvariable ::DXTL(min$axis)] -column 2 -row $row
-        grid [entry $box.2.max$axis -width 10 -textvariable ::DXTL(max$axis)] -column 3 -row $row
-        grid [entry $box.2.step$axis -width 10 -textvariable ::DXTL(step$axis)] -column 4 -row $row
-        set ::DXTL(min$axis) [lindex $lim 0]
-        set ::DXTL(max$axis) [lindex $lim 1]
-        set ::DXTL(step$axis) [format "%.4f" [expr {$step + 0.0001}]]
-    }
-    putontop $box
-    tkwait window $box
-    afterputontop
-    if $::DXTL(quit) return
-    delFourier
-    foreach typ {DELF FCLC FOBS 2FDF 3FDF 4FDF PTSN DPTS} {
-        if {$::DXTL($typ)} {
-            addFourier $phase $typ
-        }
-    }
-    FourierHists $phase set $::DXTL(histlist)
-    setFourierLimits $phase \
-        [list $::DXTL(stepX) $::DXTL(stepY) $::DXTL(stepZ)] \
-        [list $::DXTL(minX) $::DXTL(maxX)] \
-        [list $::DXTL(minY) $::DXTL(maxY)] \
-        [list $::DXTL(minZ) $::DXTL(maxZ)]
-    SetupFourierButtons
-    incr ::expgui(changed)
 }
 

branches/sandbox/gsascmds.tcl

@@ -3932 +3932 @@
     exit
 }
+
+# Fourier routines
+proc EditFourier {phase} {
+    #is this a valid phase #?
+    if {[lsearch $::expmap(phaselist) $phase] == -1} return
+    # check that all Fourier records are set to the current phase
+    foreach i [listFourier] {
+        set ph [Fourierinfo $i phase]
+        if {$ph != $phase} {Fourierinfo $i phase set $phase}
+    }
+    # for now we will not offer access to section, (dmin, dmax not supported)
+    set typelist {}
+    foreach i [listFourier] {
+        lappend typelist [Fourierinfo $i type]
+    }
+    set histlist [FourierHists $phase]
+    set limits  [getFourierLimits $phase]
+    if {[winfo exists .export]} {
+        set box .export.fourier
+    } else {
+        set box .fourier
+    }
+    catch {destroy $box}
+    toplevel $box
+    wm title $box "Set Fourier Options, phase $phase"
+    grid [frame $box.1] -row 1 -column 1 -rowspan 10
+    grid [frame $box.2] -row 1 -column 2 -rowspan 10
+    grid [frame $box.b] -sticky news -row 11 -column 1 -columnspan 2
+    grid columnconfigure $box.b 0 -weight 1
+    grid columnconfigure $box.b 3 -weight 1
+    grid [button $box.b.1 -text Continue \
+              -command "set ::DXTL(quit) 0; destroy $box" \
+             ] -row 1 -column 1
+    grid [button $box.b.2 -text Quit \
+              -command "set ::DXTL(quit) 1; destroy $box" \
+             ] -row 1 -column 2
+    
+    # map type selection
+    set row 0
+    grid [label $box.1.$row -text "Select map type(s)"] -column 1 -row $row
+    foreach typ {DELF FCLC FOBS 2FDF 3FDF 4FDF PTSN DPTS} lbl {
+        "Difference Fourier" "Fcalc Fourier" "Fobs Fourier" 
+        "2*Fo-Fc Fourier" "3*Fo-2*Fc Fourier" "4*Fo-3*Fc Fourier" "Patterson map" "Delta-F Patterson"\
+        } {
+            incr row
+            grid [ \
+                       checkbutton $box.1.$row -variable ::DXTL($typ) \
+                       -text "$lbl ($typ)" \
+                      ] -column 1 -row $row -sticky w
+            if {[lsearch $typelist $typ] == -1} {
+                set ::DXTL($typ) 0
+            } else {
+                set ::DXTL($typ) 1
+            }
+        }
+    grid [label $box.2.a1 -text "Histogram(s) to be used:\n(last superceeds)"] -column 1 -row 1
+    grid [label $box.2.a2 -textvariable ::DXTL(histlist) -width 20] -column 2 -row 1 -columnspan 2
+    grid [button $box.2.a3 -text Set \
+              -command "SetFourierHists $box"] -column 5 -row 1
+    set ::DXTL(histlist) {}
+    foreach i $histlist {
+        if {$::DXTL(histlist) != ""} {append ::DXTL(histlist) ", "}
+        append ::DXTL(histlist) $i
+    }
+    grid [label $box.2.m1 -text min] -column 2 -row 2
+    grid [label $box.2.m2 -text max] -column 3 -row 2
+    grid [label $box.2.m3 -text "map step\n(A)"] -column 4 -row 2
+    set row 3
+    foreach axis {X Y Z} lim [lrange $limits 1 end] step [lindex $limits 0] {
+        incr row
+        grid [label $box.2.0$axis -text "$axis limits"] -column 1 -row $row -sticky e
+        grid [entry $box.2.min$axis -width 10 -textvariable ::DXTL(min$axis)] -column 2 -row $row
+        grid [entry $box.2.max$axis -width 10 -textvariable ::DXTL(max$axis)] -column 3 -row $row
+        grid [entry $box.2.step$axis -width 10 -textvariable ::DXTL(step$axis)] -column 4 -row $row
+        set ::DXTL(min$axis) [lindex $lim 0]
+        set ::DXTL(max$axis) [lindex $lim 1]
+        set ::DXTL(step$axis) [format "%.4f" [expr {$step + 0.0001}]]
+    }
+    putontop $box
+    tkwait window $box
+    afterputontop
+    if $::DXTL(quit) return
+    delFourier
+    foreach typ {DELF FCLC FOBS 2FDF 3FDF 4FDF PTSN DPTS} {
+        if {$::DXTL($typ)} {
+            addFourier $phase $typ
+        }
+    }
+    if {$::DXTL(histlist) != "<none>"} {
+        FourierHists $phase set [regsub -all "," $::DXTL(histlist) " "]
+    }
+    setFourierLimits $phase \
+        [list $::DXTL(stepX) $::DXTL(stepY) $::DXTL(stepZ)] \
+        [list $::DXTL(minX) $::DXTL(maxX)] \
+        [list $::DXTL(minY) $::DXTL(maxY)] \
+        [list $::DXTL(minZ) $::DXTL(maxZ)]
+    incr ::expgui(changed)
+}
+
+proc SetFourierHists {top} {
+    set box $top.hstsel
+    set ::DXTL(histbox) $box
+    catch {destroy $box}
+    toplevel $box
+    wm title $box "Select Histograms"
+    grid [frame $box.1 -class HistList] -column 1 -row 1 -sticky news
+    grid columnconfigure $box 1 -weight 1
+    grid [frame $box.2] -column 2 -row 1
+    grid [label $box.2.a -text {Select a histogram from the box
+to the left to add it to the 
+histogram list below
+
+(note that reflection intensities 
+from the last histograms in list 
+override earlier ones)
+
+Histogram List:}] \
+    -column 1 -row 1
+    grid [label $box.2.b -textvariable ::DXTL(histlist)] -column 1 -row 2
+    grid [button $box.2.c -text Clear -command ClearFourierHist] \
+        -column 1 -row 3
+    grid [button $box.3 -text Close -command "destroy $box"] \
+        -column 1 -row 3 -columnspan 2
+    MakeHistBox $box.1
+    bind $box.1.lbox <ButtonRelease-1>  {
+        set selhist [$::DXTL(histbox).1.lbox curselection]
+        if {[llength $selhist] != 1} return
+        AddFourierHist [lindex $::expmap(powderlist) $selhist]
+        lappend ::DXTL(histlist)
+        set hist [lindex $::expmap(powderlist) $selhist]
+        $::DXTL(histbox).2.b config -text $hist
+    }
+    sethistlist
+    putontop $box
+    tkwait window $box
+    afterputontop
+}
+
+proc AddFourierHist {num} {
+    if {$::DXTL(histlist) == "<none>"} {
+        set ::DXTL(histlist) {}
+    }
+    if {$::DXTL(histlist) != ""} {append ::DXTL(histlist) ", "}
+    append ::DXTL(histlist) $num
+}
+
+proc ClearFourierHist {} {
+    set ::DXTL(histlist) "<none>"
+}

branches/sandbox/gsasmenu.tcl

@@ -40 +40 @@
     }
     graphs {
+        forsrh
         forplot
         polfplot
@@ -45 +46 @@
         ortep
         rawplot
-        fourier
-        forsrh
         gsas2map
         liveplot

branches/sandbox/import_cif.tcl

@@ -98 +98 @@
         # remove spaces from space group
         regsub -all " " $sgtmp "" sgtmp
+        # check for final H
+        if {[string range $sgtmp end end] == "H"} {
+            set sgtmp [string range $sgtmp 0 end-1]
+        }
         # make a copy where we treat bar 3 as the same as 3 
         regsub -- "-3" $sgtmp "3" sgtmp3