Changeset 592

Timestamp:

May 7, 2012 11:25:08 AM (12 years ago)

Author:

vondreele

Message:

 

Location:

trunk/help

Files:

• gsasII.html (modified) (14 diffs)
• gsasII_files/props011.xml (modified) (1 diff)

trunk/help/gsasII.html

@@ -25 +25 @@
   <o:Author>Von Dreele</o:Author>
   <o:LastAuthor>Von Dreele</o:LastAuthor>
-  <o:Revision>82</o:Revision>
-  <o:TotalTime>2819</o:TotalTime>
+  <o:Revision>84</o:Revision>
+  <o:TotalTime>2820</o:TotalTime>
   <o:Created>2011-11-28T16:49:00Z</o:Created>
-  <o:LastSaved>2012-05-05T15:39:00Z</o:LastSaved>
-  <o:Pages>8</o:Pages>
-  <o:Words>7195</o:Words>
-  <o:Characters>41018</o:Characters>
+  <o:LastSaved>2012-05-07T03:17:00Z</o:LastSaved>
+  <o:Pages>9</o:Pages>
+  <o:Words>7204</o:Words>
+  <o:Characters>41066</o:Characters>
   <o:Company>Argonne National Laboratory</o:Company>
-  <o:Lines>341</o:Lines>
+  <o:Lines>342</o:Lines>
   <o:Paragraphs>96</o:Paragraphs>
-  <o:CharactersWithSpaces>48117</o:CharactersWithSpaces>
+  <o:CharactersWithSpaces>48174</o:CharactersWithSpaces>
   <o:Version>14.00</o:Version>
  </o:DocumentProperties>
@@ -1963 +1963 @@
  <o:lock v:ext="edit" aspectratio="t"/>
 </v:shapetype><v:shape id="Picture_x0020_2" o:spid="_x0000_s1026" type="#_x0000_t75"
- alt="Description: Description: Description: GSAS-II logo" style='position:absolute;
- margin-left:44.8pt;margin-top:0;width:96pt;height:96pt;z-index:251657728;
- visibility:visible;mso-wrap-style:square;mso-width-percent:0;
- mso-height-percent:0;mso-wrap-distance-left:0;mso-wrap-distance-top:0;
- mso-wrap-distance-right:0;mso-wrap-distance-bottom:0;
+ alt="Description: Description: Description: Description: Description: GSAS-II logo"
+ style='position:absolute;margin-left:44.8pt;margin-top:0;width:96pt;height:96pt;
+ z-index:251657728;visibility:visible;mso-wrap-style:square;
+ mso-width-percent:0;mso-height-percent:0;mso-wrap-distance-left:0;
+ mso-wrap-distance-top:0;mso-wrap-distance-right:0;mso-wrap-distance-bottom:0;
  mso-position-horizontal:right;mso-position-horizontal-relative:text;
  mso-position-vertical:absolute;mso-position-vertical-relative:line;
@@ -1975 +1975 @@
  <w:wrap type="square" anchory="line"/>
 </v:shape><![endif]--><![if !vml]><img width=128 height=128 src=gsas2logo.png
-align=right alt="Description: Description: Description: GSAS-II logo" v:shapes="Picture_x0020_2"><![endif]><span
-style='mso-fareast-font-family:"Times New Roman"'>Help for GSAS-II<o:p></o:p></span></h1>
+align=right
+alt="Description: Description: Description: Description: Description: GSAS-II logo"
+v:shapes="Picture_x0020_2"><![endif]><span style='mso-fareast-font-family:"Times New Roman"'>Help
+for GSAS-II<o:p></o:p></span></h1>
 
 <p class=MsoNormal><span style='mso-fareast-font-family:"Times New Roman"'>This
@@ -2009 +2011 @@
 (future)<o:p></o:p></strong></p>
 
-<p class=MsoNormal><strong>CW Neutron powder pattern Rietveld refinement
-(future)<o:p></o:p></strong></p>
+<p class=MsoNormal><strong><a href="Neutron%20CW%20Powder%20Data.htm"><span
+style='font-weight:normal'>CW Neutron powder pattern Rietveld refi</span><span
+style='font-weight:normal'>nement with constraints</span></a><o:p></o:p></strong></p>
 
 <p class=MsoNormal><strong>Synchrotron X-ray powder pattern Rietveld refinement
@@ -2070 +2073 @@
 style='font:7.0pt "Times New Roman"'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; </span></span></span><![endif]><b
 style='mso-bidi-font-weight:normal'>Open project&#8230;</b> - Open a previously
-saved GSAS-II project file (name.gpx). If you currently have a project file
-open, you are asked if it is OK to over write it; Cancel will cancel the process.
-<b style='mso-bidi-font-weight:normal'>NB</b>: you may open a backup <span
+saved GSAS-II project file (name.gpx). If you currently have a project file open,
+you are asked if it is OK to over write it; Cancel will cancel the process. <b
+style='mso-bidi-font-weight:normal'>NB</b>: you may open a backup <span
 class=SpellE>gpx</span> file (e.g. name.bak3.gpx) to recover a previous version
 of your project. Remember to <b style='mso-bidi-font-weight:normal'>Save As</b>&#8230;
@@ -2225 +2228 @@
 pair distribution function (PDF) controls for each powder pattern selected in
 the dialog box. See <b style='mso-bidi-font-weight:normal'><span
-style='color:#4F81BD;mso-themecolor:accent1'><a href="#PDF_Controls">PDF
-Controls</a></span></b> for further directions.</p>
+style='color:#4F81BD;mso-themecolor:accent1'><a href="#PDF_Controls">PDF Controls</a></span></b>
+for further directions.</p>
 
 <p class=MsoListParagraphCxSpMiddle style='margin-left:1.0in;mso-add-space:
@@ -2424 +2427 @@
 <p class=MsoNormal><span style='mso-fareast-font-family:"Times New Roman"'>Two
 of the main refinement tools are the <span class=SpellE><span class=GramE>fortran</span></span>
-MINPACK <span class=SpellE>lmdif</span> and <span class=SpellE>lmder</span>
-algorithms wrapped in python as provided in the <span class=SpellE>Scipy</span>
-package and a third one is a python version utilizing only the <span
-class=SpellE>numpy</span> package. The purpose is to </span>minimize the sum of
-the squares of M<span style='mso-fareast-font-family:"Times New Roman"'>
-nonlinear functions in N variables by a modification of the <span class=SpellE>Levenberg</span>-Marquardt
+MINPACK <span class=SpellE>lmdif</span> and <span class=SpellE>lmder</span> algorithms
+wrapped in python as provided in the <span class=SpellE>Scipy</span> package
+and a third one is a python version utilizing only the <span class=SpellE>numpy</span>
+package. The purpose is to </span>minimize the sum of the squares of M<span
+style='mso-fareast-font-family:"Times New Roman"'> nonlinear functions in N
+variables by a modification of the <span class=SpellE>Levenberg</span>-Marquardt
 algorithm. The <span class=SpellE>lmdif</span> and <span class=SpellE>lmder</span>
 routines were written by </span>Burton S. <span class=SpellE>Garbow</span>,
@@ -2672 +2675 @@
 whatever comment lines (preceded by &#8220;#&#8221;) found when the powder data
 file was read by GSAS-II. If you are lucky, there will be useful information
-here (e.g. sample name, date collected, wavelength used, etc.). If not, this
-window will be blank. The text is read-only in that anything you try to enter
-here is not saved.</span></p>
+here (e.g. sample name, date collected, wavelength used, etc.). If not, this window
+will be blank. The text is read-only in that anything you try to enter here is
+not saved.</span></p>
 
 <span style='mso-bookmark:Comments'></span>
@@ -2695 +2698 @@
 class=SpellE>Tmin</span> and <span class=SpellE>Tmax</span> in the
 &#8216;changed&#8217; row as needed. Use the mouse to select the value to be
-changed (the background on the box will be blue or have a black border or a
-vertical bar will appear in the value), then enter the new value and press
-Enter or click the mouse elsewhere in the Background window. This will set the
-new value.<o:p></o:p></span></p>
+changed (the background on the box will be blue or have a black border or a vertical
+bar will appear in the value), then enter the new value and press Enter or
+click the mouse elsewhere in the Background window. This will set the new
+value.<o:p></o:p></span></p>
 
 <p class=MsoListParagraphCxSpMiddle style='text-indent:-.25in;mso-list:l3 level1 lfo6'><![if !supportLists]><span
@@ -3550 +3553 @@
 rendered as lines, van der Waals radii balls, sticks, balls &amp; sticks,
 ellipsoids &amp; sticks or <span class=SpellE>polyhedra</span>. There are two
-menus for this tab; Edit allows modification of the list of atoms to be
-rendered and Compute gives some options for geometric characterization of
-selected atoms.</p>
+menus for this tab; Edit allows modification of the list of atoms to be rendered
+and Compute gives some options for geometric characterization of selected
+atoms.</p>
 
 <h5><span style='mso-fareast-font-family:"Times New Roman"'>What can I do here?<o:p></o:p></span></h5>
@@ -3571 +3574 @@
 style='font:7.0pt "Times New Roman"'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; </span></span></span><![endif]>Atom
 Selection from plot: select an atom by a left click of the mouse while holding
-down the Shift key and pointed at the center of the displayed atom, it will turn
-green if successful and the corresponding entry in the table will be
+down the Shift key and pointed at the center of the displayed atom, it will
+turn green if successful and the corresponding entry in the table will be
 highlighted (in grey); any previous selections will be cleared. To add to .your
 selection use the right mouse button (Shift down); if a previously selection is
@@ -3868 +3871 @@
 mso-no-proof:yes'><img border=0 width=225 height=31 id="_x0000_i1032"
 src=graphbar.jpg
-alt="Description: Description: Description: D:\pyGSAS\help\graphbar.jpg"></span><span
+alt="Description: Description: Description: Description: Description: D:\pyGSAS\help\graphbar.jpg"></span><span
 style='mso-fareast-font-family:"Times New Roman"'><o:p></o:p></span></p>
 
@@ -4004 +4007 @@
 style='font:7.0pt "Times New Roman"'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; </span></span></span><![endif]><span
 class=GramE><b style='mso-bidi-font-weight:normal'>c</b></span><b
-style='mso-bidi-font-weight:normal'>: contour on/off</b> &#8211; if multiple powder
-profiles, then a contour plot is shown of the observed intensities. All data
-sets must be the same length as the first one to be included in the contour
-plot.</p>
+style='mso-bidi-font-weight:normal'>: contour on/off</b> &#8211; if multiple
+powder profiles, then a contour plot is shown of the observed intensities. All
+data sets must be the same length as the first one to be included in the
+contour plot.</p>
 
 <p class=MsoListParagraphCxSpMiddle style='margin-left:1.0in;mso-add-space:
@@ -4198 +4201 @@
 <span class=GramE>q(</span>=2</span><span style='font-family:Symbol;mso-fareast-font-family:
 "Times New Roman"'>p</span><span style='mso-fareast-font-family:"Times New Roman"'>/d)
-from the Gaussian and Lorentzian parts of the profile function. The computed
-curves are based on the values of U, V, W, X and Y shown in the Instrument
-Parameters window in parentheses. These are the values for the instrument
-contribution that were set when the powder pattern was first read in to
-GSAS-II. If individual peak fitting has been performed, the values of
-&#8216;sig&#8217; &amp; &#8216;gam&#8217; for the peaks are plotted as
-&#8216;+&#8217;; these are computed from the fitted values of U, V, W, X and Y
-as well as any sig or gam individually refined.<o:p></o:p></span></p>
+from the Gaussian and Lorentzian parts of the profile function. The computed curves
+are based on the values of U, V, W, X and Y shown in the Instrument Parameters
+window in parentheses. These are the values for the instrument contribution
+that were set when the powder pattern was first read in to GSAS-II. If
+individual peak fitting has been performed, the values of &#8216;sig&#8217;
+&amp; &#8216;gam&#8217; for the peaks are plotted as &#8216;+&#8217;; these are
+computed from the fitted values of U, V, W, X and Y as well as any sig or gam
+individually refined.<o:p></o:p></span></p>
 
 <h4><span style='mso-fareast-font-family:"Times New Roman"'>Texture </span></h4>

trunk/help/gsasII_files/props011.xml

@@ -1 +1 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<ds:datastoreItem ds:itemID="{C08B664B-EBAE-424A-8DB5-BCA8A35A496B}" xmlns:ds="http://schemas.openxmlformats.org/officeDocument/2006/customXml"><ds:schemaRefs><ds:schemaRef ds:uri="http://schemas.openxmlformats.org/officeDocument/2006/bibliography"/></ds:schemaRefs></ds:datastoreItem>
+<ds:datastoreItem ds:itemID="{2F27EE4F-99E9-45F4-AE92-593783FDEC2E}" xmlns:ds="http://schemas.openxmlformats.org/officeDocument/2006/customXml"><ds:schemaRefs><ds:schemaRef ds:uri="http://schemas.openxmlformats.org/officeDocument/2006/bibliography"/></ds:schemaRefs></ds:datastoreItem>