Changeset 453

Timestamp:

Dec 4, 2009 5:06:25 PM (14 years ago)

Author:

toby

Message:

# on 2001/09/25 23:35:54, toby did:
Add "D" to all dummy histogram type, save number of histograms
document histinfo x file
support changing dummy ranges, eventually
support histogram flag

File:

• trunk/readexp.tcl (modified) (6 diffs, 3 props)

trunk/readexp.tcl

@@ -81 +81 @@
 #                           =1 nuclear; 2 mag+nuc; 3 mag; 4 macro
 #     expmap(atomlist_$p)   gives a list of defined atoms in phase $p
-#     expmap(htype_$n)      gives the GSAS histogram type for histogram
-#     expmap(powderlist)    gives a list of powder histograms
+#     expmap(htype_$n)      gives the GSAS histogram type for histogram (all)
+#     expmap(powderlist)    gives a list of powder histograms in use
 #     expmap(phaselist_$n)  gives a list of phases used in histogram $n
+#     expmap(nhst)          the number of GSAS histograms
 #
 proc mapexp {} {
@@ -127 +128 @@
     }
     # now get the histogram types
-    set nhist [string trim [readexp { EXPR  NHST }]]
+    set expmap(nhst) [string trim [readexp { EXPR  NHST }]]
     set n 0
     set expmap(powderlist) {}
-    for {set i 0} {$i < $nhist} {incr i} {
+    for {set i 0} {$i < $expmap(nhst)} {incr i} {
         set ihist [expr {$i + 1}]
         if {[expr {$i % 12}] == 0} {
@@ -143 +144 @@
             incr j
         }
-        set expmap(htype_$ihist) [lindex $line $j]
+        set expmap(htype_$ihist) [string range $line [expr 2+5*$j] [expr 5*($j+1)]]
+        # is this a dummy histogram?
+        if {$ihist <=9} {
+            set key "HST  $ihist DUMMY"
+        } else {
+            set key "HST $ihist DUMMY"
+        }
         # at least for now, ignore non-powder histograms
         if {[string range $expmap(htype_$ihist) 0 0] == "P" && \
                 [string range $expmap(htype_$ihist) 3 3] != "*"} {
+            if {[existsexp $key]} {
+                set expmap(htype_$ihist) \
+                        [string replace $expmap(htype_$ihist) 3 3 D]
+            }
             lappend expmap(powderlist) $ihist
         }
@@ -967 +978 @@
 # parm:
 #     title
+#     file  -- file name of raw data for histogram (*)
 #     scale (*)
 #     sref/sdamp -- refinement flag/damping value for the scale factor (*)
@@ -993 +1005 @@
 #     excl -- excluded regions (*)
 #     dmin -- minimum d-space for reflection generation (*)
+#     use  -- use flag; 1 = use; 0 = do not use (*)
+#     dstart -- dummy histogram starting tmin/emin/2theta (*)
+#     dstep -- dummy histogram step size tmin/emin/2theta (*)
+#     dpoints -- dummy histogram number of points (*)
 proc histinfo {histlist parm "action get" "value {}"} {
     global expgui
@@ -1364 +1380 @@
                 if ![validreal value 10 4] {return 0}
                 setexp "${key} NREF" $value 6 10
+            }
+            use-get {
+                set k [expr {($hist+11)/12}]
+                set line [readexp " EXPR  HTYP$k"]
+                set j [expr {((($hist-1) % 12)+1)*5}]
+                if {[string range $line $j $j] == "*"} {return 0}
+                return 1
+            }
+            use-set {
+                set k [expr {($hist+11)/12}]
+                set line [readexp " EXPR  HTYP$k"]
+                set j [expr {((($hist-1) % 12)+1)*5+1}]
+                if {$value} {
+                    setexp " EXPR  HTYP$k" " " $j 1
+                } else {
+                    setexp " EXPR  HTYP$k" "*" $j 1
+                }
+            }
+            dstart-get {
+                return [string trim [string range [readexp "${key} DUMMY"] 20 29]]
+            }
+            dstart-set {
+                if ![validreal value 10 3] {return 0}
+                setexp "${key} DUMMY" $value 21 10
+            }
+            dstep-get {
+                return [string trim [string range [readexp "${key} DUMMY"] 30 39]]
+            }
+            dstep-set {
+                if ![validreal value 10 3] {return 0}
+                setexp "${key} DUMMY" $value 31 10
+            }
+            dpoints-get {
+                return [string trim [string range [readexp "${key} DUMMY"] 0 9]]
+            }
+            dpoints-set {
+                if ![validint value 10] {return 0}
+                setexp "${key} DUMMY" $value 1 10
             }
             default {