Changeset 718


Ignore:
Timestamp:
Aug 16, 2012 1:03:42 PM (10 years ago)
Author:
vondreele
Message:

another CallAfter? fix
small fixes to tutorials

Location:
trunk
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • trunk/GSASIIpwdGUI.py

    r705 r718  
    419419                    del(data[1]['debyeTerms'][-1])
    420420            wx.CallAfter(UpdateBackground,G2frame,data)
     421           
    421422        def KeyEditPeakGrid(event):
    422423            colList = debyeGrid.GetSelectedCols()
     
    477478                    del(data[1]['peaksList'][-1])
    478479            wx.CallAfter(UpdateBackground,G2frame,data)
     480           
    479481        def KeyEditPeakGrid(event):
    480482            colList = peaksGrid.GetSelectedCols()
     
    11851187            data['Shift'] = [0.0,False]
    11861188            data['Transparency'] = [0.0,False]
    1187         G2frame.dataDisplay.Destroy()
    11881189        wx.CallAfter(UpdateSampleGrid,G2frame,data)
    11891190       
     
    15111512        controls[12] = G2lat.calc_V(G2lat.cell2A(controls[6:12]))
    15121513        G2frame.PatternTree.SetItemPyData(UnitCellsId,[controls,bravais,cells,dmin])
    1513         wx.CallAfter(UpdateUnitCellsGrid,G2frame,data)
    1514        
    15151514        G2frame.dataFrame.RefineCell.Enable(True)
     1515        wx.CallAfter(UpdateUnitCellsGrid,G2frame,data)       
    15161516               
    15171517    def RefineCell(event):
  • trunk/help/Laboratory X.htm

    r651 r718  
    2323  <o:Author>Von Dreele</o:Author>
    2424  <o:LastAuthor>Von Dreele</o:LastAuthor>
    25   <o:Revision>15</o:Revision>
    26   <o:TotalTime>1444</o:TotalTime>
     25  <o:Revision>16</o:Revision>
     26  <o:TotalTime>1446</o:TotalTime>
    2727  <o:Created>2012-05-08T16:04:00Z</o:Created>
    28   <o:LastSaved>2012-05-18T17:59:00Z</o:LastSaved>
     28  <o:LastSaved>2012-08-16T17:41:00Z</o:LastSaved>
    2929  <o:Pages>9</o:Pages>
    3030  <o:Words>3132</o:Words>
    31   <o:Characters>17857</o:Characters>
     31  <o:Characters>17855</o:Characters>
    3232  <o:Company>Argonne National Laboratory</o:Company>
    3333  <o:Lines>148</o:Lines>
    3434  <o:Paragraphs>41</o:Paragraphs>
    35   <o:CharactersWithSpaces>20948</o:CharactersWithSpaces>
     35  <o:CharactersWithSpaces>20946</o:CharactersWithSpaces>
    3636  <o:Version>14.00</o:Version>
    3737 </o:DocumentProperties>
     
    980980<p class=MsoNormal>In this tutorial you will refine the structure of <span
    981981class=SpellE>fluoroapatite</span>, <span class=GramE>Ca<sub>5</sub>F(</span>PO<sub>4</sub>)<sub>3</sub>,
    982 using constant wavelength laboratory X-ray powder diffraction data. At the
    983 completion of the refinement you will then prepare a drawing of the <span
    984 class=SpellE>fluoroapatite</span> structure. The structure is hexagonal with
    985 four different kinds of atoms spread over seven different sites. The data was
    986 taken on a conventional Bragg-Brentano powder diffractometer using <span
    987 class=SpellE>CuK</span><sub><span style='font-family:Symbol'>a</span></sub>
    988 radiation.</p>
     982using constant wavelength laboratory X-ray powder diffraction data. At the completion
     983of the refinement you will then prepare a drawing of the <span class=SpellE>fluoroapatite</span>
     984structure. The structure is hexagonal with four different kinds of atoms spread
     985over seven different sites. The data was taken on a conventional Bragg-Brentano
     986powder diffractometer using <span class=SpellE>CuK</span><sub><span
     987style='font-family:Symbol'>a</span></sub> radiation.</p>
    989988
    990989<p class=MsoNormal>If you have not done so already, <a
     
    11531152  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt'>
    11541153  <p class=MsoListParagraphCxSpLast align=center style='margin-left:0in;
    1155   mso-add-space:auto;text-align:center'>0. .001</p>
     1154  mso-add-space:auto;text-align:center'>0.001</p>
    11561155  </td>
    11571156 </tr>
     
    13391338class=SpellE>pulldown</span> menu. Select <b style='mso-bidi-font-weight:normal'><span
    13401339style='font-family:"Calibri","sans-serif";mso-ascii-theme-font:minor-latin;
    1341 mso-hansi-theme-font:minor-latin;mso-bidi-theme-font:minor-latin'>from GSAS .EXP
    1342 file. </span></b><span class=GramE>The</span> file selection dialog will still
    1343 be set to the directory the data was found; click on <b style='mso-bidi-font-weight:
    1344 normal'><span style='font-family:"Calibri","sans-serif";mso-ascii-theme-font:
    1345 minor-latin;mso-hansi-theme-font:minor-latin;mso-bidi-theme-font:minor-latin'>FAP.EXP</span></b>
     1340mso-hansi-theme-font:minor-latin;mso-bidi-theme-font:minor-latin'>from GSAS
     1341.EXP file. </span></b>The file selection dialog will still be set to the
     1342directory the data was found; click on <b style='mso-bidi-font-weight:normal'><span
     1343style='font-family:"Calibri","sans-serif";mso-ascii-theme-font:minor-latin;
     1344mso-hansi-theme-font:minor-latin;mso-bidi-theme-font:minor-latin'>FAP.EXP</span></b>
    13461345and <b style='mso-bidi-font-weight:normal'><span style='font-family:"Calibri","sans-serif";
    13471346mso-ascii-theme-font:minor-latin;mso-hansi-theme-font:minor-latin;mso-bidi-theme-font:
     
    14031402src="Laboratory%20X_files/image003.png" v:shapes="Picture_x0020_13"><![endif]></span></p>
    14041403
    1405 <p class=MsoNormal>We will return to this window later when we consider the
    1406 effect of crystallite size and mustrain broadening.</p>
     1404<p class=MsoNormal>We will return to this window later when we consider the effect
     1405of crystallite size and mustrain broadening.</p>
    14071406
    14081407<h2>Step 4: Adjust background parameterization</h2>
     
    14101409<p class=MsoNormal>You may have noticed that the background in this powder
    14111410pattern rises significantly at low angles; there is also a less apparent rise
    1412 at the high angle end as well. The default background function doesn’t handle this
    1413 very well so find the <b style='mso-bidi-font-weight:normal'><span
     1411at the high angle end as well. The default background function doesn’t handle
     1412this very well so find the <b style='mso-bidi-font-weight:normal'><span
    14141413style='font-family:"Calibri","sans-serif";mso-ascii-theme-font:minor-latin;
    14151414mso-hansi-theme-font:minor-latin;mso-bidi-theme-font:minor-latin'>Background</span></b>
     
    19431942 <v:imagedata src="Laboratory%20X_files/image017.png" o:title=""/>
    19441943</v:shape><![endif]--><![if !vml]><img border=0 width=551 height=452
    1945 src="Laboratory%20X_files/image018.jpg" v:shapes="Picture_x0020_1"><![endif]></span></p>
     1944src="Laboratory%20X_files/image018.png" v:shapes="Picture_x0020_1"><![endif]></span></p>
    19461945
    19471946<p class=MsoNormal>Notice the slider controls in <b style='mso-bidi-font-weight:
     
    21952194 <v:imagedata src="Laboratory%20X_files/image021.png" o:title=""/>
    21962195</v:shape><![endif]--><![if !vml]><img border=0 width=582 height=496
    2197 src="Laboratory%20X_files/image022.jpg" v:shapes="Picture_x0020_288"><![endif]></span></p>
     2196src="Laboratory%20X_files/image022.png" v:shapes="Picture_x0020_288"><![endif]></span></p>
    21982197
    21992198<h2><span class=GramE>Step 10.</span> Calculate bond distances and angles</h2>
  • trunk/help/Laboratory X_files/filelist.xml

    r611 r718  
    2020 <o:File HRef="image016.png"/>
    2121 <o:File HRef="image017.png"/>
    22  <o:File HRef="image018.jpg"/>
     22 <o:File HRef="image018.png"/>
    2323 <o:File HRef="image019.png"/>
    2424 <o:File HRef="image020.png"/>
    2525 <o:File HRef="image021.png"/>
    26  <o:File HRef="image022.jpg"/>
     26 <o:File HRef="image022.png"/>
    2727 <o:File HRef="image023.png"/>
    2828 <o:File HRef="filelist.xml"/>
Note: See TracChangeset for help on using the changeset viewer.