Changeset 1627


Ignore:
Timestamp:
Jan 9, 2015 6:33:57 PM (7 years ago)
Author:
toby
Message:

fixes to seq results display & update tutorials

Location:
trunk
Files:
14 deleted
19 edited

Legend:

Unmodified
Added
Removed
  • trunk/GSASIIexprGUI.py

    r1619 r1627  
    173173            try: # deal with values that are in lists
    174174                val = parmDict[key][0]
     175            except KeyError:
     176                continue # there were dicts in parmDict (should be gone now)
    175177            except (TypeError,IndexError):
    176178                val = parmDict[key]
  • trunk/GSASIIgrid.py

    r1626 r1627  
    34273427        sv = var.split(':')
    34283428        if len(sv) <= 1: return var
    3429         sv[1] = insChar
     3429        if sv[1]:
     3430            sv[1] = insChar
    34303431        return ':'.join(sv)
    34313432       
     
    39583959    # scan for locations where the variables change
    39593960    VaryListChanges = [] # histograms where there is a change
    3960     prevVaryList = []
    39613961    combinedVaryList = []
    39623962    firstValueList = []
     
    39643964    posdict = {}
    39653965    for i,name in enumerate(histNames):
    3966         if i == 0 or prevVaryList != sorted(data[name]['varyList']):
     3966        newval = False
     3967        for var,val in zip(data[name]['varyList'],data[name]['variables']):
     3968            svar = striphist(var,'*')
     3969            if svar in combinedVaryList: continue
    39673970            # add variables to list as they appear
    3968             for j,var in enumerate(data[name]['varyList']):
    3969                 if var in combinedVaryList: continue
    3970                 combinedVaryList.append(data[name]['varyList'][j])
    3971                 firstValueList.append(data[name]['variables'][j])
     3971            combinedVaryList.append(svar)
     3972            firstValueList.append(val)
     3973            newval = True
     3974        if newval:
    39723975            vallookup[name] = dict(zip(data[name]['varyList'],data[name]['variables']))
    39733976            posdict[name] = {}
    3974             for lbl in data[name]['varyList']:
    3975                 posdict[name][combinedVaryList.index(lbl)] = lbl           
    3976             prevVaryList = sorted(data[name]['varyList'])
     3977            for var in data[name]['varyList']:
     3978                svar = striphist(var,'*')
     3979                posdict[name][combinedVaryList.index(svar)] = svar
    39773980            VaryListChanges.append(name)
    39783981    if len(VaryListChanges) > 1:
     
    40634066        if name in posdict:
    40644067            varsellist = [posdict[name].get(i) for i in range(varcols)]
    4065             sellist = [data[name]['varyList'].index(v) if v is not None else None for v in varsellist]
     4068            #sellist = [data[name]['varyList'].index(v) if v is not None else None for v in varsellist]
     4069            sellist = [i if striphist(v,'*') in varsellist else None for i,v in enumerate(data[name]['varyList'])]
    40664070        if not varsellist: raise Exception()
    40674071        vals.append([data[name]['variables'][s] if s is not None else None for s in sellist])
  • trunk/help/ParametricFitting.htm

    r1434 r1627  
    11981198 type="#_x0000_t75" style='width:354pt;height:180.75pt;visibility:visible;
    11991199 mso-wrap-style:square'>
    1200  <v:imagedata src="ParametricFitting_files/image016.png" o:title="" croptop="2743f"
    1201   cropbottom="7533f" cropleft="2917f" cropright="3097f"/>
     1200 <v:imagedata src="ParametricFitting_files/image016.png" o:title=""/>
    12021201</v:shape><![endif]--><![if !vml]><img border=0 width=472 height=241
    1203 src="ParametricFitting_files/image017.png" v:shapes="Picture_x0020_10"><![endif]></span></p>
     1202src="ParametricFitting_files/image016.png" v:shapes="Picture_x0020_10"><![endif]></span></p>
    12041203
    12051204<p class=MsoListParagraphCxSpMiddle><!--[if gte vml 1]><v:shape id="Picture_x0020_11"
     
    12331232 type="#_x0000_t75" style='width:351.75pt;height:303pt;visibility:visible;
    12341233 mso-wrap-style:square'>
    1235  <v:imagedata src="ParametricFitting_files/image020.png" o:title="" croptop="2107f"
    1236   cropbottom="4939f" cropleft="3133f" cropright="3309f"/>
     1234 <v:imagedata src="ParametricFitting_files/image020.png" o:title=""/>
    12371235</v:shape><![endif]--><![if !vml]><img border=0 width=469 height=404
    1238 src="ParametricFitting_files/image021.png" v:shapes="Picture_x0020_12"><![endif]></span></p>
     1236src="ParametricFitting_files/image020.png" v:shapes="Picture_x0020_12"><![endif]></span></p>
    12391237
    12401238<p class=MsoListParagraphCxSpMiddle><o:p>&nbsp;</o:p></p>
     
    12691267 type="#_x0000_t75" style='width:353.25pt;height:303.75pt;visibility:visible;
    12701268 mso-wrap-style:square'>
    1271  <v:imagedata src="ParametricFitting_files/image024.png" o:title="" croptop="1859f"
    1272   cropbottom="5066f" cropleft="3024f" cropright="3203f"/>
     1269 <v:imagedata src="ParametricFitting_files/image024.png" o:title=""/>
    12731270</v:shape><![endif]--><![if !vml]><img border=0 width=471 height=405
    1274 src="ParametricFitting_files/image025.png" v:shapes="Picture_x0020_14"><![endif]></span></p>
     1271src="ParametricFitting_files/image024.png" v:shapes="Picture_x0020_14"><![endif]></span></p>
    12751272
    12761273<h1>Step 3: Fitting a simple parametric equation to the unit cell volume</h1>
     
    12921289 type="#_x0000_t75" style='width:356.25pt;height:305.25pt;visibility:visible;
    12931290 mso-wrap-style:square'>
    1294  <v:imagedata src="ParametricFitting_files/image026.png" o:title="" croptop="2107f"
    1295   cropbottom="4567f" cropleft="3024f" cropright="2769f"/>
     1291 <v:imagedata src="ParametricFitting_files/image026.png" o:title=""/>
    12961292</v:shape><![endif]--><![if !vml]><img border=0 width=475 height=407
    1297 src="ParametricFitting_files/image027.png" v:shapes="Picture_x0020_15"><![endif]></span></p>
     1293src="ParametricFitting_files/image026.png" v:shapes="Picture_x0020_15"><![endif]></span></p>
    12981294
    12991295<p class=MsoListParagraphCxSpMiddle style='text-indent:-.25in;mso-list:l0 level1 lfo6'><![if !supportLists]><span
     
    15651561<p class=MsoListParagraphCxSpMiddle style='margin-left:1.5in;mso-add-space:
    15661562auto'><b style='mso-bidi-font-weight:normal'><span style='font-family:Courier'><span
    1567 style='mso-spacerun:yes'>   </span>::m<span style='mso-spacerun:yes'>  </span>=
    1568 -0.4476(5)<o:p></o:p></span></b></p>
     1563style='mso-spacerun:yes'>  </span>0::Vol = m*x +b<o:p></o:p></span></b></p>
    15691564
    15701565<p class=MsoListParagraphCxSpMiddle style='margin-left:1.5in;mso-add-space:
    15711566auto'><b style='mso-bidi-font-weight:normal'><span style='font-family:Courier'><span
    1572 style='mso-spacerun:yes'>   </span>::b<span style='mso-spacerun:yes'>  </span>=
    1573 577.73(8)<o:p></o:p></span></b></p>
     1567style='mso-spacerun:yes'>   </span>x<span style='mso-spacerun:yes'>  </span>=
     1568Temperature<o:p></o:p></span></b></p>
     1569
     1570<p class=MsoListParagraphCxSpMiddle style='margin-left:1.5in;mso-add-space:
     1571auto'><b style='mso-bidi-font-weight:normal'><span style='font-family:Courier'><span
     1572style='mso-spacerun:yes'>   </span>b<span style='mso-spacerun:yes'>  </span>=
     1573561.7722(26)<o:p></o:p></span></b></p>
     1574
     1575<p class=MsoListParagraphCxSpMiddle style='margin-left:1.5in;mso-add-space:
     1576auto'><b style='mso-bidi-font-weight:normal'><span style='font-family:Courier'><span
     1577style='mso-spacerun:yes'>   </span>m<span style='mso-spacerun:yes'>  </span>=
     15780.014833(14)<o:p></o:p></span></b></p>
     1579
    15741580
    15751581<p class=MsoListParagraphCxSpMiddle style='margin-left:1.5in;mso-add-space:
     
    15801586 type="#_x0000_t75" style='width:350.25pt;height:302.25pt;visibility:visible;
    15811587 mso-wrap-style:square'>
    1582  <v:imagedata src="ParametricFitting_files/image048.png" o:title="" croptop="2231f"
    1583   cropbottom="5061f" cropleft="3133f" cropright="3524f"/>
     1588 <v:imagedata src="ParametricFitting_files/image048.png" o:title=""/>
    15841589</v:shape><![endif]--><![if !vml]><img border=0 width=467 height=403
    1585 src="ParametricFitting_files/image049.png" v:shapes="Picture_x0020_27"><![endif]></span><span
     1590src="ParametricFitting_files/image048.png" v:shapes="Picture_x0020_27"><![endif]></span><span
    15861591style='font-family:"Cambria","serif";mso-ascii-theme-font:minor-latin;
    15871592mso-hansi-theme-font:minor-latin'><o:p></o:p></span></p>
     
    16251630 type="#_x0000_t75" style='width:350.25pt;height:303pt;visibility:visible;
    16261631 mso-wrap-style:square'>
    1627  <v:imagedata src="ParametricFitting_files/image050.png" o:title="" croptop="658f"
    1628   cropbottom="2861f" cropleft="1709f" cropright="1878f"/>
     1632 <v:imagedata src="ParametricFitting_files/image050.png" o:title=""/>
    16291633</v:shape><![endif]--><![if !vml]><img border=0 width=467 height=404
    1630 src="ParametricFitting_files/image051.png" v:shapes="Picture_x0020_28"><![endif]></span></p>
     1634src="ParametricFitting_files/image050.png" v:shapes="Picture_x0020_28"><![endif]></span></p>
    16311635
    16321636<p class=MsoListParagraphCxSpMiddle><o:p>&nbsp;</o:p></p>
     
    17031707is certainly not what we want here.<span style='mso-spacerun:yes'>  </span>Finally,
    17041708since this equation is too complex to fit without some reasonable starting
    1705 values, specify an approximate value for the vicinity of where <i
    1706 style='mso-bidi-font-style:normal'>c</i> starts to change, enter<b
    1707 style='mso-bidi-font-weight:normal'> </b><b style='mso-bidi-font-weight:normal'><span
    1708 style='font-family:"Calibri","sans-serif";mso-ascii-theme-font:major-latin;
    1709 mso-hansi-theme-font:major-latin'>120</span> </b>for <b style='mso-bidi-font-weight:
     1709values, specify an approximate value, <b style='mso-bidi-font-weight:normal'><span
     1710style='font-family:"Calibri","sans-serif";mso-ascii-theme-font:major-latin;
     1711mso-hansi-theme-font:major-latin'>120</span></b>, for the vicinity of where the <i
     1712style='mso-bidi-font-style:normal'>c</i> lattice parameter starts to
     1713change (<b style='mso-bidi-font-weight:
    17101714normal'><span style='font-family:"Calibri","sans-serif";mso-ascii-theme-font:
    1711 major-latin;mso-hansi-theme-font:major-latin'>t0</span>.</b></p>
     1715major-latin;mso-hansi-theme-font:major-latin'>t0</span></b>) and
     1716non-zero values for variables <B>c</B> and <B>k</B>.</p>
    17121717
    17131718<p class=MsoListParagraphCxSpMiddle><o:p>&nbsp;</o:p></p>
     
    17171722 type="#_x0000_t75" style='width:317.25pt;height:171pt;visibility:visible;
    17181723 mso-wrap-style:square'>
    1719  <v:imagedata src="ParametricFitting_files/image052.png" o:title="" croptop="3272f"
    1720   cropbottom="7856f" cropleft="3218f" cropright="3436f"/>
     1724 <v:imagedata src="ParametricFitting_files/image052.png" o:title=""/>
    17211725</v:shape><![endif]--><![if !vml]><img border=0 width=423 height=228
    1722 src="ParametricFitting_files/image053.png" v:shapes="Picture_x0020_40"><![endif]></span></p>
     1726src="ParametricFitting_files/image052.png" v:shapes="Picture_x0020_40"><![endif]></span></p>
    17231727
    17241728<p class=MsoListParagraphCxSpMiddle><o:p>&nbsp;</o:p></p>
     
    17401744 id="Picture_x0020_41" o:spid="_x0000_i1032" type="#_x0000_t75" style='width:317.25pt;
    17411745 height:168.75pt;visibility:visible;mso-wrap-style:square'>
    1742  <v:imagedata src="ParametricFitting_files/image054.png" o:title="" croptop="3477f"
    1743   cropbottom="8265f" cropleft="3218f" cropright="3436f"/>
     1746 <v:imagedata src="ParametricFitting_files/image054.png" o:title=""/>
    17441747</v:shape><![endif]--><![if !vml]><img border=0 width=423 height=225
    1745 src="ParametricFitting_files/image055.png" v:shapes="Picture_x0020_41"><![endif]></span></p>
     1748src="ParametricFitting_files/image054.png" v:shapes="Picture_x0020_41"><![endif]></span></p>
    17461749
    17471750<p class=MsoListParagraphCxSpMiddle><o:p>&nbsp;</o:p></p>
     
    17671770 type="#_x0000_t75" style='width:353.25pt;height:300.75pt;visibility:visible;
    17681771 mso-wrap-style:square'>
    1769  <v:imagedata src="ParametricFitting_files/image056.png" o:title="" croptop="2602f"
    1770   cropbottom="4943f" cropleft="3024f" cropright="3097f"/>
     1772 <v:imagedata src="ParametricFitting_files/image056.png" o:title=""/>
    17711773</v:shape><![endif]--><![if !vml]><img border=0 width=471 height=401
    1772 src="ParametricFitting_files/image057.png" v:shapes="Picture_x0020_32"><![endif]></span></p>
     1774src="ParametricFitting_files/image056.png" v:shapes="Picture_x0020_32"><![endif]></span></p>
    17731775
    17741776<p class=MsoListParagraphCxSpMiddle><o:p>&nbsp;</o:p></p>
     
    18511853 type="#_x0000_t75" style='width:315.75pt;height:168.75pt;visibility:visible;
    18521854 mso-wrap-style:square'>
    1853  <v:imagedata src="ParametricFitting_files/image058.png" o:title="" croptop="3691f"
    1854   cropbottom="7919f" cropleft="2889f" cropright="3536f"/>
     1855 <v:imagedata src="ParametricFitting_files/image058.png" o:title=""/>
    18551856</v:shape><![endif]--><![if !vml]><img border=0 width=421 height=225
    1856 src="ParametricFitting_files/image059.png" v:shapes="Picture_x0020_42"><![endif]></span></p>
     1857src="ParametricFitting_files/image058.png" v:shapes="Picture_x0020_42"><![endif]></span></p>
    18571858
    18581859<p class=MsoListParagraphCxSpMiddle><o:p>&nbsp;</o:p></p>
     
    18721873 type="#_x0000_t75" style='width:351pt;height:302.25pt;visibility:visible;
    18731874 mso-wrap-style:square'>
    1874  <v:imagedata src="ParametricFitting_files/image060.png" o:title="" croptop="2354f"
    1875   cropbottom="4937f" cropleft="3349f" cropright="3198f"/>
     1875 <v:imagedata src="ParametricFitting_files/image060.png" o:title=""/>
    18761876</v:shape><![endif]--><![if !vml]><img border=0 width=468 height=403
    1877 src="ParametricFitting_files/image061.png" v:shapes="Picture_x0020_35"><![endif]></span></p>
     1877src="ParametricFitting_files/image060.png" v:shapes="Picture_x0020_35"><![endif]></span></p>
    18781878
    18791879<p class=MsoListParagraphCxSpLast><o:p>&nbsp;</o:p></p>
     
    19411941 type="#_x0000_t75" style='width:332.25pt;height:186pt;visibility:visible;
    19421942 mso-wrap-style:square'>
    1943  <v:imagedata src="ParametricFitting_files/image062.png" o:title="" croptop="3190f"
    1944   cropbottom="8105f" cropleft="3416f" cropright="3246f"/>
     1943 <v:imagedata src="ParametricFitting_files/image062.png" o:title=""/>
    19451944</v:shape><![endif]--><![if !vml]><img border=0 width=443 height=248
    1946 src="ParametricFitting_files/image063.png" v:shapes="Picture_x0020_44"><![endif]></span></p>
     1945src="ParametricFitting_files/image062.png" v:shapes="Picture_x0020_44"><![endif]></span></p>
    19471946
    19481947<p class=MsoNormal><o:p>&nbsp;</o:p></p>
     
    19621961 type="#_x0000_t75" style='width:333.75pt;height:189pt;visibility:visible;
    19631962 mso-wrap-style:square'>
    1964  <v:imagedata src="ParametricFitting_files/image064.png" o:title="" croptop="2815f"
    1965   cropbottom="7542f" cropleft="3074f" cropright="3244f"/>
     1963 <v:imagedata src="ParametricFitting_files/image064.png" o:title=""/>
    19661964</v:shape><![endif]--><![if !vml]><img border=0 width=445 height=252
    1967 src="ParametricFitting_files/image065.png" v:shapes="Picture_x0020_45"><![endif]></span><span
     1965src="ParametricFitting_files/image064.png" v:shapes="Picture_x0020_45"><![endif]></span><span
    19681966style='mso-spacerun:yes'> </span></p>
    19691967
     
    19791977 type="#_x0000_t75" style='width:348.75pt;height:302.25pt;visibility:visible;
    19801978 mso-wrap-style:square'>
    1981  <v:imagedata src="ParametricFitting_files/image066.png" o:title="" croptop="2231f"
    1982   cropbottom="5061f" cropleft="3350f" cropright="3415f"/>
     1979 <v:imagedata src="ParametricFitting_files/image066.png" o:title=""/>
    19831980</v:shape><![endif]--><![if !vml]><img border=0 width=465 height=403
    1984 src="ParametricFitting_files/image067.png" v:shapes="Picture_x0020_48"><![endif]></span></p>
     1981src="ParametricFitting_files/image066.png" v:shapes="Picture_x0020_48"><![endif]></span></p>
    19851982
    19861983<p class=MsoListParagraphCxSpLast><o:p>&nbsp;</o:p></p>
  • trunk/help/SequentialTutorial.htm

    r1624 r1627  
    25952595 type="#_x0000_t75" style='width:349.5pt;height:300pt;visibility:visible;
    25962596 mso-wrap-style:square'>
    2597  <v:imagedata src="SequentialTutorial_files/image074.png" o:title="" croptop="1185f"
    2598   cropbottom="2863f" cropleft="1936f" cropright="1768f"/>
     2597 <v:imagedata src="SequentialTutorial_files/image074.png" o:title=""/>
    25992598</v:shape><![endif]--><![if !vml]><img border=0 width=466 height=400
    26002599src="SequentialTutorial_files/image074.png" v:shapes="Picture_x0020_42"><![endif]></span></p>
Note: See TracChangeset for help on using the changeset viewer.