Changeset 128

Timestamp:

Dec 4, 2009 5:00:52 PM (14 years ago)

Author:

toby

Message:

# on 2000/05/16 21:48:45, toby did:
set expload return value to indicate when .EXP files are "fixed"
add expmap(phasetype) to indicate phase types
ignore * histgrams (I forget why)
fix error that caused 1st character in phase & overall titles to be lost

File:

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

trunk/readexp.tcl

@@ -6 +6 @@
 #   ... reading an EXP file into an array
 proc expload {expfile} {
-    global exparray tcl_platform
+    global exparray
     # $expfile is the path to the data file.
     if [catch {set fil [open "$expfile" r]}] {
         tk_dialog .expFileErrorMsg "File Open Error" \
-                "Unable to open file $expfile" error 0 "Exit" ; return 1
+                "Unable to open file $expfile" error 0 "Exit" ; return -1
     }
     set len [gets $fil line]
@@ -17 +17 @@
                 "You are using an old version of Tcl/Tk and your .EXP file has binary characters; run convstod or upgrade" \
                 error 0 "Exit"
-        exit
+        return -1
+    }
+    catch {
+        unset exparray
     }
     if {$len > 160} {
+        set fmt 0
         # a UNIX-type file
         set i1 0
@@ -31 +35 @@
         }
     } else {
+        set fmt 1
         while {$len > 0} {
             set key [string range $line 0 11]
@@ -38 +43 @@
     }
     close $fil
-    return 0
+    return $fmt
 }
 
@@ -58 +63 @@
 #   creates the following entries in global array expmap
 #     expmap(phaselist)     gives a list of defined phases
+#     expmap(phasetype)     gives the phase type for each defined phase
+#                           =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
@@ -73 +80 @@
 #    }
     set expmap(phaselist) {}
+    set expmap(phasetype) {}
     # loop over phases
     foreach iph {1 2 3 4 5 6 7 8 9} {
@@ -79 +87 @@
         set flag [string trim [string range $line $i5s $i5e]]
         if {$flag == ""} {set flag 0}
-        if $flag {lappend expmap(phaselist) $iph}
+        if $flag {
+            lappend expmap(phaselist) $iph
+            lappend expmap(phasetype) $flag
+        }
     }
     # get the list of defined atoms for each phase
@@ -116 +127 @@
         set expmap(htype_$ihist) [lindex $line $j]
         # at least for now, ignore non-powder histograms
-        if {[string range $expmap(htype_$ihist) 0 0] == "P"} {
+        if {[string range $expmap(htype_$ihist) 0 0] == "P" && \
+                [string range $expmap(htype_$ihist) 3 3] != "*"} {
             lappend expmap(powderlist) $ihist
         }
@@ -206 +218 @@
 }
 
-# delete an exp recorde
+# delete an exp record
 # returns 1 if OK; 0 if not found
 proc delexp {key} {
@@ -284 +296 @@
         }
         title-set {
-            setexp "      DESCR" " $value" 1 68
+            setexp "      DESCR" " $value" 2 68
         }
 
@@ -386 +398 @@
 
         name-set {
-            setexp "CRS$phase    PNAM" " $value" 1 68
+            setexp "CRS$phase    PNAM" " $value" 2 68
         }
 
@@ -1176 +1188 @@
     return [llength [array names exparray {    HSTRY*}]]
 }
-
-