Changeset 46

Timestamp:

Dec 4, 2009 4:59:29 PM (13 years ago)

Author:

toby

Message:

# on 1999/01/21 22:55:47, toby did:
move & consolidate sourcing

File:

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

trunk/liveplot

@@ -122 +122 @@
 set expgui(gsasexe) [file join $expgui(gsasdir) exe]
 
-# fetch EXP file processing routines 
-source [file join $expgui(scriptdir) readexp.tcl]
-
-# override options with locally defined values
-if [file exists [file join $expgui(scriptdir) localconfig]] {
-    source [file join $expgui(scriptdir) localconfig]
-}
-if [file exists [file join ~ .gsas_config]] {
-    source [file join ~ .gsas_config]
-}
 
 proc readdata {box} {
@@ -467 +457 @@
 }
 
+# fetch EXP file processing routines 
+source [file join $expgui(scriptdir) readexp.tcl]
+
+set fl [file join $expgui(scriptdir) icddcmd.tcl]
+if [file exists $fl] {source $fl}
+set fl [file join $expgui(scriptdir) cellgen.tcl]
+if [file exists $fl] {source $fl}
+
+# override options with locally defined values
+if [file exists [file join $expgui(scriptdir) localconfig]] {
+    source [file join $expgui(scriptdir) localconfig]
+}
+if [file exists [file join ~ .gsas_config]] {
+    source [file join ~ .gsas_config]
+}
+
 # vectors
 vector xvec
@@ -537 +543 @@
         -command "SaveOptions"
 
-# fetch EXP file processing routines 
-source [file join $expgui(scriptdir) readexp.tcl]
-
-set fl [file join $expgui(scriptdir) icddcmd.tcl]
-if [file exists $fl] {source $fl}
-set fl [file join $expgui(scriptdir) cellgen.tcl]
-if [file exists $fl] {source $fl}
-
 pack [menubutton .a.help -text Help -underline 0 -menu .a.help.menu] -side right
 menu .a.help.menu -tearoff 0