Changeset 1627

Timestamp:

Jan 9, 2015 6:33:57 PM (8 years ago)

Author:

toby

Message:

fixes to seq results display & update tutorials

Location:

trunk

Files:

• GSASIIexprGUI.py (modified) (1 diff)
• GSASIIgrid.py (modified) (4 diffs)
• help/ParametricFitting.htm (modified) (16 diffs)
• help/ParametricFitting_files/image001.png (modified) (previous)
• help/ParametricFitting_files/image016.png (modified) (previous)
• help/ParametricFitting_files/image017.png (deleted)
• help/ParametricFitting_files/image020.png (modified) (previous)
• help/ParametricFitting_files/image021.png (deleted)
• help/ParametricFitting_files/image024.png (modified) (previous)
• help/ParametricFitting_files/image025.png (deleted)
• help/ParametricFitting_files/image026.png (modified) (previous)
• help/ParametricFitting_files/image027.png (deleted)
• help/ParametricFitting_files/image048.png (modified) (previous)
• help/ParametricFitting_files/image049.png (deleted)
• help/ParametricFitting_files/image050.png (modified) (previous)
• help/ParametricFitting_files/image051.png (deleted)
• help/ParametricFitting_files/image052.png (modified) (previous)
• help/ParametricFitting_files/image053.png (deleted)
• help/ParametricFitting_files/image054.png (modified) (previous)
• help/ParametricFitting_files/image055.png (deleted)
• help/ParametricFitting_files/image056.png (modified) (previous)
• help/ParametricFitting_files/image057.png (deleted)
• help/ParametricFitting_files/image058.png (modified) (previous)
• help/ParametricFitting_files/image059.png (deleted)
• help/ParametricFitting_files/image060.png (modified) (previous)
• help/ParametricFitting_files/image061.png (deleted)
• help/ParametricFitting_files/image062.png (modified) (previous)
• help/ParametricFitting_files/image063.png (deleted)
• help/ParametricFitting_files/image064.png (modified) (previous)
• help/ParametricFitting_files/image065.png (deleted)
• help/ParametricFitting_files/image066.png (modified) (previous)
• help/ParametricFitting_files/image067.png (deleted)
• help/SequentialTutorial.htm (modified) (1 diff)

trunk/GSASIIexprGUI.py

@@ -173 +173 @@
             try: # deal with values that are in lists
                 val = parmDict[key][0]
+            except KeyError:
+                continue # there were dicts in parmDict (should be gone now)
             except (TypeError,IndexError):
                 val = parmDict[key]

trunk/GSASIIgrid.py

@@ -3427 +3427 @@
         sv = var.split(':')
         if len(sv) <= 1: return var
-        sv[1] = insChar
+        if sv[1]:
+            sv[1] = insChar
         return ':'.join(sv)
         
@@ -3958 +3959 @@
     # scan for locations where the variables change
     VaryListChanges = [] # histograms where there is a change
-    prevVaryList = []
     combinedVaryList = []
     firstValueList = []
@@ -3964 +3964 @@
     posdict = {}
     for i,name in enumerate(histNames):
-        if i == 0 or prevVaryList != sorted(data[name]['varyList']):
+        newval = False
+        for var,val in zip(data[name]['varyList'],data[name]['variables']):
+            svar = striphist(var,'*')
+            if svar in combinedVaryList: continue
             # add variables to list as they appear
-            for j,var in enumerate(data[name]['varyList']):
-                if var in combinedVaryList: continue
-                combinedVaryList.append(data[name]['varyList'][j])
-                firstValueList.append(data[name]['variables'][j])
+            combinedVaryList.append(svar)
+            firstValueList.append(val)
+            newval = True
+        if newval:
             vallookup[name] = dict(zip(data[name]['varyList'],data[name]['variables']))
             posdict[name] = {}
-            for lbl in data[name]['varyList']:
-                posdict[name][combinedVaryList.index(lbl)] = lbl            
-            prevVaryList = sorted(data[name]['varyList'])
+            for var in data[name]['varyList']:
+                svar = striphist(var,'*')
+                posdict[name][combinedVaryList.index(svar)] = svar
             VaryListChanges.append(name)
     if len(VaryListChanges) > 1:
@@ -4063 +4066 @@
         if name in posdict:
             varsellist = [posdict[name].get(i) for i in range(varcols)]
-            sellist = [data[name]['varyList'].index(v) if v is not None else None for v in varsellist]
+            #sellist = [data[name]['varyList'].index(v) if v is not None else None for v in varsellist]
+            sellist = [i if striphist(v,'*') in varsellist else None for i,v in enumerate(data[name]['varyList'])]
         if not varsellist: raise Exception()
         vals.append([data[name]['variables'][s] if s is not None else None for s in sellist])

trunk/help/ParametricFitting.htm

@@ -1198 +1198 @@
  type="#_x0000_t75" style='width:354pt;height:180.75pt;visibility:visible;
  mso-wrap-style:square'>
- <v:imagedata src="ParametricFitting_files/image016.png" o:title="" croptop="2743f"
-  cropbottom="7533f" cropleft="2917f" cropright="3097f"/>
+ <v:imagedata src="ParametricFitting_files/image016.png" o:title=""/>
 </v:shape><![endif]--><![if !vml]><img border=0 width=472 height=241
-src="ParametricFitting_files/image017.png" v:shapes="Picture_x0020_10"><![endif]></span></p>
+src="ParametricFitting_files/image016.png" v:shapes="Picture_x0020_10"><![endif]></span></p>
 
 <p class=MsoListParagraphCxSpMiddle><!--[if gte vml 1]><v:shape id="Picture_x0020_11"
@@ -1233 +1232 @@
  type="#_x0000_t75" style='width:351.75pt;height:303pt;visibility:visible;
  mso-wrap-style:square'>
- <v:imagedata src="ParametricFitting_files/image020.png" o:title="" croptop="2107f"
-  cropbottom="4939f" cropleft="3133f" cropright="3309f"/>
+ <v:imagedata src="ParametricFitting_files/image020.png" o:title=""/>
 </v:shape><![endif]--><![if !vml]><img border=0 width=469 height=404
-src="ParametricFitting_files/image021.png" v:shapes="Picture_x0020_12"><![endif]></span></p>
+src="ParametricFitting_files/image020.png" v:shapes="Picture_x0020_12"><![endif]></span></p>
 
 <p class=MsoListParagraphCxSpMiddle><o:p>&nbsp;</o:p></p>
@@ -1269 +1267 @@
  type="#_x0000_t75" style='width:353.25pt;height:303.75pt;visibility:visible;
  mso-wrap-style:square'>
- <v:imagedata src="ParametricFitting_files/image024.png" o:title="" croptop="1859f"
-  cropbottom="5066f" cropleft="3024f" cropright="3203f"/>
+ <v:imagedata src="ParametricFitting_files/image024.png" o:title=""/>
 </v:shape><![endif]--><![if !vml]><img border=0 width=471 height=405
-src="ParametricFitting_files/image025.png" v:shapes="Picture_x0020_14"><![endif]></span></p>
+src="ParametricFitting_files/image024.png" v:shapes="Picture_x0020_14"><![endif]></span></p>
 
 <h1>Step 3: Fitting a simple parametric equation to the unit cell volume</h1>
@@ -1292 +1289 @@
  type="#_x0000_t75" style='width:356.25pt;height:305.25pt;visibility:visible;
  mso-wrap-style:square'>
- <v:imagedata src="ParametricFitting_files/image026.png" o:title="" croptop="2107f"
-  cropbottom="4567f" cropleft="3024f" cropright="2769f"/>
+ <v:imagedata src="ParametricFitting_files/image026.png" o:title=""/>
 </v:shape><![endif]--><![if !vml]><img border=0 width=475 height=407
-src="ParametricFitting_files/image027.png" v:shapes="Picture_x0020_15"><![endif]></span></p>
+src="ParametricFitting_files/image026.png" v:shapes="Picture_x0020_15"><![endif]></span></p>
 
 <p class=MsoListParagraphCxSpMiddle style='text-indent:-.25in;mso-list:l0 level1 lfo6'><![if !supportLists]><span
@@ -1565 +1561 @@
 <p class=MsoListParagraphCxSpMiddle style='margin-left:1.5in;mso-add-space:
 auto'><b style='mso-bidi-font-weight:normal'><span style='font-family:Courier'><span
-style='mso-spacerun:yes'>   </span>::m<span style='mso-spacerun:yes'>  </span>=
--0.4476(5)<o:p></o:p></span></b></p>
+style='mso-spacerun:yes'>  </span>0::Vol = m*x +b<o:p></o:p></span></b></p>
 
 <p class=MsoListParagraphCxSpMiddle style='margin-left:1.5in;mso-add-space:
 auto'><b style='mso-bidi-font-weight:normal'><span style='font-family:Courier'><span
-style='mso-spacerun:yes'>   </span>::b<span style='mso-spacerun:yes'>  </span>=
-577.73(8)<o:p></o:p></span></b></p>
+style='mso-spacerun:yes'>   </span>x<span style='mso-spacerun:yes'>  </span>=
+Temperature<o:p></o:p></span></b></p>
+
+<p class=MsoListParagraphCxSpMiddle style='margin-left:1.5in;mso-add-space:
+auto'><b style='mso-bidi-font-weight:normal'><span style='font-family:Courier'><span
+style='mso-spacerun:yes'>   </span>b<span style='mso-spacerun:yes'>  </span>=
+561.7722(26)<o:p></o:p></span></b></p>
+
+<p class=MsoListParagraphCxSpMiddle style='margin-left:1.5in;mso-add-space:
+auto'><b style='mso-bidi-font-weight:normal'><span style='font-family:Courier'><span
+style='mso-spacerun:yes'>   </span>m<span style='mso-spacerun:yes'>  </span>=
+0.014833(14)<o:p></o:p></span></b></p>
+
 
 <p class=MsoListParagraphCxSpMiddle style='margin-left:1.5in;mso-add-space:
@@ -1580 +1586 @@
  type="#_x0000_t75" style='width:350.25pt;height:302.25pt;visibility:visible;
  mso-wrap-style:square'>
- <v:imagedata src="ParametricFitting_files/image048.png" o:title="" croptop="2231f"
-  cropbottom="5061f" cropleft="3133f" cropright="3524f"/>
+ <v:imagedata src="ParametricFitting_files/image048.png" o:title=""/>
 </v:shape><![endif]--><![if !vml]><img border=0 width=467 height=403
-src="ParametricFitting_files/image049.png" v:shapes="Picture_x0020_27"><![endif]></span><span
+src="ParametricFitting_files/image048.png" v:shapes="Picture_x0020_27"><![endif]></span><span
 style='font-family:"Cambria","serif";mso-ascii-theme-font:minor-latin;
 mso-hansi-theme-font:minor-latin'><o:p></o:p></span></p>
@@ -1625 +1630 @@
  type="#_x0000_t75" style='width:350.25pt;height:303pt;visibility:visible;
  mso-wrap-style:square'>
- <v:imagedata src="ParametricFitting_files/image050.png" o:title="" croptop="658f"
-  cropbottom="2861f" cropleft="1709f" cropright="1878f"/>
+ <v:imagedata src="ParametricFitting_files/image050.png" o:title=""/>
 </v:shape><![endif]--><![if !vml]><img border=0 width=467 height=404
-src="ParametricFitting_files/image051.png" v:shapes="Picture_x0020_28"><![endif]></span></p>
+src="ParametricFitting_files/image050.png" v:shapes="Picture_x0020_28"><![endif]></span></p>
 
 <p class=MsoListParagraphCxSpMiddle><o:p>&nbsp;</o:p></p>
@@ -1703 +1707 @@
 is certainly not what we want here.<span style='mso-spacerun:yes'>  </span>Finally,
 since this equation is too complex to fit without some reasonable starting
-values, specify an approximate value for the vicinity of where <i
-style='mso-bidi-font-style:normal'>c</i> starts to change, enter<b
-style='mso-bidi-font-weight:normal'> </b><b style='mso-bidi-font-weight:normal'><span
-style='font-family:"Calibri","sans-serif";mso-ascii-theme-font:major-latin;
-mso-hansi-theme-font:major-latin'>120</span> </b>for <b style='mso-bidi-font-weight:
+values, specify an approximate value, <b style='mso-bidi-font-weight:normal'><span
+style='font-family:"Calibri","sans-serif";mso-ascii-theme-font:major-latin;
+mso-hansi-theme-font:major-latin'>120</span></b>, for the vicinity of where the <i
+style='mso-bidi-font-style:normal'>c</i> lattice parameter starts to
+change (<b style='mso-bidi-font-weight:
 normal'><span style='font-family:"Calibri","sans-serif";mso-ascii-theme-font:
-major-latin;mso-hansi-theme-font:major-latin'>t0</span>.</b></p>
+major-latin;mso-hansi-theme-font:major-latin'>t0</span></b>) and
+non-zero values for variables <B>c</B> and <B>k</B>.</p>
 
 <p class=MsoListParagraphCxSpMiddle><o:p>&nbsp;</o:p></p>
@@ -1717 +1722 @@
  type="#_x0000_t75" style='width:317.25pt;height:171pt;visibility:visible;
  mso-wrap-style:square'>
- <v:imagedata src="ParametricFitting_files/image052.png" o:title="" croptop="3272f"
-  cropbottom="7856f" cropleft="3218f" cropright="3436f"/>
+ <v:imagedata src="ParametricFitting_files/image052.png" o:title=""/>
 </v:shape><![endif]--><![if !vml]><img border=0 width=423 height=228
-src="ParametricFitting_files/image053.png" v:shapes="Picture_x0020_40"><![endif]></span></p>
+src="ParametricFitting_files/image052.png" v:shapes="Picture_x0020_40"><![endif]></span></p>
 
 <p class=MsoListParagraphCxSpMiddle><o:p>&nbsp;</o:p></p>
@@ -1740 +1744 @@
  id="Picture_x0020_41" o:spid="_x0000_i1032" type="#_x0000_t75" style='width:317.25pt;
  height:168.75pt;visibility:visible;mso-wrap-style:square'>
- <v:imagedata src="ParametricFitting_files/image054.png" o:title="" croptop="3477f"
-  cropbottom="8265f" cropleft="3218f" cropright="3436f"/>
+ <v:imagedata src="ParametricFitting_files/image054.png" o:title=""/>
 </v:shape><![endif]--><![if !vml]><img border=0 width=423 height=225
-src="ParametricFitting_files/image055.png" v:shapes="Picture_x0020_41"><![endif]></span></p>
+src="ParametricFitting_files/image054.png" v:shapes="Picture_x0020_41"><![endif]></span></p>
 
 <p class=MsoListParagraphCxSpMiddle><o:p>&nbsp;</o:p></p>
@@ -1767 +1770 @@
  type="#_x0000_t75" style='width:353.25pt;height:300.75pt;visibility:visible;
  mso-wrap-style:square'>
- <v:imagedata src="ParametricFitting_files/image056.png" o:title="" croptop="2602f"
-  cropbottom="4943f" cropleft="3024f" cropright="3097f"/>
+ <v:imagedata src="ParametricFitting_files/image056.png" o:title=""/>
 </v:shape><![endif]--><![if !vml]><img border=0 width=471 height=401
-src="ParametricFitting_files/image057.png" v:shapes="Picture_x0020_32"><![endif]></span></p>
+src="ParametricFitting_files/image056.png" v:shapes="Picture_x0020_32"><![endif]></span></p>
 
 <p class=MsoListParagraphCxSpMiddle><o:p>&nbsp;</o:p></p>
@@ -1851 +1853 @@
  type="#_x0000_t75" style='width:315.75pt;height:168.75pt;visibility:visible;
  mso-wrap-style:square'>
- <v:imagedata src="ParametricFitting_files/image058.png" o:title="" croptop="3691f"
-  cropbottom="7919f" cropleft="2889f" cropright="3536f"/>
+ <v:imagedata src="ParametricFitting_files/image058.png" o:title=""/>
 </v:shape><![endif]--><![if !vml]><img border=0 width=421 height=225
-src="ParametricFitting_files/image059.png" v:shapes="Picture_x0020_42"><![endif]></span></p>
+src="ParametricFitting_files/image058.png" v:shapes="Picture_x0020_42"><![endif]></span></p>
 
 <p class=MsoListParagraphCxSpMiddle><o:p>&nbsp;</o:p></p>
@@ -1872 +1873 @@
  type="#_x0000_t75" style='width:351pt;height:302.25pt;visibility:visible;
  mso-wrap-style:square'>
- <v:imagedata src="ParametricFitting_files/image060.png" o:title="" croptop="2354f"
-  cropbottom="4937f" cropleft="3349f" cropright="3198f"/>
+ <v:imagedata src="ParametricFitting_files/image060.png" o:title=""/>
 </v:shape><![endif]--><![if !vml]><img border=0 width=468 height=403
-src="ParametricFitting_files/image061.png" v:shapes="Picture_x0020_35"><![endif]></span></p>
+src="ParametricFitting_files/image060.png" v:shapes="Picture_x0020_35"><![endif]></span></p>
 
 <p class=MsoListParagraphCxSpLast><o:p>&nbsp;</o:p></p>
@@ -1941 +1941 @@
  type="#_x0000_t75" style='width:332.25pt;height:186pt;visibility:visible;
  mso-wrap-style:square'>
- <v:imagedata src="ParametricFitting_files/image062.png" o:title="" croptop="3190f"
-  cropbottom="8105f" cropleft="3416f" cropright="3246f"/>
+ <v:imagedata src="ParametricFitting_files/image062.png" o:title=""/>
 </v:shape><![endif]--><![if !vml]><img border=0 width=443 height=248
-src="ParametricFitting_files/image063.png" v:shapes="Picture_x0020_44"><![endif]></span></p>
+src="ParametricFitting_files/image062.png" v:shapes="Picture_x0020_44"><![endif]></span></p>
 
 <p class=MsoNormal><o:p>&nbsp;</o:p></p>
@@ -1962 +1961 @@
  type="#_x0000_t75" style='width:333.75pt;height:189pt;visibility:visible;
  mso-wrap-style:square'>
- <v:imagedata src="ParametricFitting_files/image064.png" o:title="" croptop="2815f"
-  cropbottom="7542f" cropleft="3074f" cropright="3244f"/>
+ <v:imagedata src="ParametricFitting_files/image064.png" o:title=""/>
 </v:shape><![endif]--><![if !vml]><img border=0 width=445 height=252
-src="ParametricFitting_files/image065.png" v:shapes="Picture_x0020_45"><![endif]></span><span
+src="ParametricFitting_files/image064.png" v:shapes="Picture_x0020_45"><![endif]></span><span
 style='mso-spacerun:yes'> </span></p>
 
@@ -1979 +1977 @@
  type="#_x0000_t75" style='width:348.75pt;height:302.25pt;visibility:visible;
  mso-wrap-style:square'>
- <v:imagedata src="ParametricFitting_files/image066.png" o:title="" croptop="2231f"
-  cropbottom="5061f" cropleft="3350f" cropright="3415f"/>
+ <v:imagedata src="ParametricFitting_files/image066.png" o:title=""/>
 </v:shape><![endif]--><![if !vml]><img border=0 width=465 height=403
-src="ParametricFitting_files/image067.png" v:shapes="Picture_x0020_48"><![endif]></span></p>
+src="ParametricFitting_files/image066.png" v:shapes="Picture_x0020_48"><![endif]></span></p>
 
 <p class=MsoListParagraphCxSpLast><o:p>&nbsp;</o:p></p>

trunk/help/SequentialTutorial.htm

@@ -2595 +2595 @@
  type="#_x0000_t75" style='width:349.5pt;height:300pt;visibility:visible;
  mso-wrap-style:square'>
- <v:imagedata src="SequentialTutorial_files/image074.png" o:title="" croptop="1185f"
-  cropbottom="2863f" cropleft="1936f" cropright="1768f"/>
+ <v:imagedata src="SequentialTutorial_files/image074.png" o:title=""/>
 </v:shape><![endif]--><![if !vml]><img border=0 width=466 height=400
 src="SequentialTutorial_files/image074.png" v:shapes="Picture_x0020_42"><![endif]></span></p>