Changeset 1195

Timestamp:

Jan 13, 2014 1:38:24 PM (9 years ago)

Author:

vondreele

Message:

Add an update d-zero command
add new tutorial for strain fitting

Location:

trunk

Files:

• GSASIIgrid.py (modified) (2 diffs)
• GSASIIimgGUI.py (modified) (7 diffs)
• help/Calibration of an area detector in GSAS.htm (modified) (13 diffs)
• help/Calibration of an area detector in GSAS_files/image002.png (modified) (previous)
• help/Calibration of an area detector in GSAS_files/image006.png (modified) (previous)
• help/Calibration of an area detector in GSAS_files/image007.png (modified) (previous)
• help/Calibration of an area detector in GSAS_files/image008.png (modified) (previous)
• help/Integration of area detector data in GSAS.htm (modified) (11 diffs)
• help/Integration of area detector data in GSAS_files/filelist.xml (modified) (1 diff)
• help/Integration of area detector data in GSAS_files/image001.png (modified) (previous)
• help/Integration of area detector data in GSAS_files/image004.png (modified) (previous)
• help/Strain fitting of 2D data in GSAS-II_files (added)
• help/Strain fitting of 2D data in GSAS-II_files/colorschememapping.xml (added)
• help/Strain fitting of 2D data in GSAS-II_files/filelist.xml (added)
• help/Strain fitting of 2D data in GSAS-II_files/image001.png (added)
• help/Strain fitting of 2D data in GSAS-II_files/image002.png (added)
• help/Strain fitting of 2D data in GSAS-II_files/image003.png (added)
• help/Strain fitting of 2D data in GSAS-II_files/image004.png (added)
• help/Strain fitting of 2D data in GSAS-II_files/image005.png (added)
• help/Strain fitting of 2D data in GSAS-II_files/image006.png (added)
• help/Strain fitting of 2D data in GSAS-II_files/image007.png (added)
• help/Strain fitting of 2D data in GSAS-II_files/image008.png (added)
• help/Strain fitting of 2D data in GSAS-II_files/image009.png (added)
• help/Strain fitting of 2D data in GSAS-II_files/image010.png (added)
• help/Strain fitting of 2D data in GSAS-II_files/image011.png (added)
• help/Strain fitting of 2D data in GSAS-II_files/image012.png (added)
• help/Strain fitting of 2D data in GSAS-II_files/image013.png (added)
• help/Strain fitting of 2D data in GSAS-II_files/image014.png (added)
• help/Strain fitting of 2D data in GSAS-II_files/image015.png (added)
• help/Strain fitting of 2D data in GSAS-II_files/themedata.thmx (added)

trunk/GSASIIgrid.py

@@ -101 +101 @@
 
 [ wxID_STRSTACOPY, wxID_STRSTAFIT, wxID_STRSTASAVE, wxID_STRSTALOAD,wxID_APPENDDZERO,
-    wxID_STRSTAALLFIT,
-] = [wx.NewId() for item in range(6)]
+    wxID_STRSTAALLFIT,wxID_UPDATEDZERO,
+] = [wx.NewId() for item in range(7)]
 
 [ wxID_BACKCOPY,wxID_LIMITCOPY,wxID_SAMPLECOPY, wxID_BACKFLAGCOPY, wxID_SAMPLEFLAGCOPY,
@@ -2424 +2424 @@
         self.StrStaEdit.Append(help='Fit stress/strain data', 
             id=wxID_STRSTAFIT, kind=wx.ITEM_NORMAL,text='Fit stress/strain')
+        self.StrStaEdit.Append(help='Update d-zero from ave d-zero',
+            id=wxID_UPDATEDZERO, kind=wx.ITEM_NORMAL,text='Update d-zero')        
         self.StrStaEdit.Append(help='Fit stress/strain data for all images', 
             id=wxID_STRSTAALLFIT, kind=wx.ITEM_NORMAL,text='All image fit')

trunk/GSASIIimgGUI.py

@@ -1326 +1326 @@
             'ImxyObs':[[],[]],'ImtaObs':[[],[]],'ImtaCalc':[[],[]],'Emat':[1.0,1.0,1.0]})
         UpdateStressStrain(G2frame,data)
+        
+    def OnUpdateDzero(event):
+        for item in data['d-zero']:
+            if item['Dcalc']:   #skip unrefined ones
+                item['Dset'] = item['Dcalc']
+        UpdateStressStrain(G2frame,data)
             
     def OnCopyStrSta(event):
@@ -1356 +1362 @@
                         ifcopy,name,id = item
                         if ifcopy:
-                            oldData = copy.deepcopy(G2frame.PatternTree.GetItemPyData(G2gd.GetPatternTreeItemId(G2frame,id, 'Stress/Strain')))
                             G2frame.PatternTree.SetItemPyData(G2gd.GetPatternTreeItemId(G2frame,id, 'Stress/Strain'),copy.deepcopy(Data))
             finally:
@@ -1399 +1404 @@
         UpdateStressStrain(G2frame,data)
         G2plt.PlotExposedImage(G2frame,event=event)
-        G2plt.PlotStrain(G2frame,data,newPlot=False)
+        G2plt.PlotStrain(G2frame,data,newPlot=True)
         
     def OnAllFitStrSta(event):
@@ -1496 +1501 @@
                 G2frame.ErrorDialog('Strain peak selection','WARNING - No points found for this ring selection')
                 
-        #sort them on d-spacing?
             UpdateStressStrain(G2frame,data)
-            G2plt.PlotExposedImage(G2frame,event=event)
-            G2plt.PlotStrain(G2frame,data,newPlot=False)
+            G2plt.PlotExposedImage(G2frame,event=event,newPlot=False)
+            G2plt.PlotStrain(G2frame,data,newPlot=True)
             
         def OnDeleteDzero(event):
@@ -1505 +1509 @@
             del(data['d-zero'][delIndx.index(Obj)])
             UpdateStressStrain(G2frame,data)
-            G2plt.PlotExposedImage(G2frame,event=event)
-            G2plt.PlotStrain(G2frame,data,newPlot=False)
+            G2plt.PlotExposedImage(G2frame,event=event,newPlot=True)
+            G2plt.PlotStrain(G2frame,data,newPlot=True)
         
         def OnCutOff(event):
@@ -1516 +1520 @@
             Obj.SetValue("%.1f"%(value))
             data['d-zero'][Indx[Obj.GetId()]]['cutoff'] = value 
+            Ring,R = G2img.MakeStrStaRing(data['d-zero'][Indx[Obj.GetId()]],G2frame.ImageZ,Controls)
             G2plt.PlotExposedImage(G2frame,event=event)
-            G2plt.PlotStrain(G2frame,data,newPlot=False)
+            G2plt.PlotStrain(G2frame,data,newPlot=True)
         
         def OnPixLimit(event):
             Obj = event.GetEventObject()
             data['d-zero'][Indx[Obj.GetId()]]['pixLimit'] = int(Obj.GetValue())
+            Ring,R = G2img.MakeStrStaRing(data['d-zero'][Indx[Obj.GetId()]],G2frame.ImageZ,Controls)
             G2plt.PlotExposedImage(G2frame,event=event)
-            G2plt.PlotStrain(G2frame,data,newPlot=False)
+            G2plt.PlotStrain(G2frame,data,newPlot=True)
             
         Indx = {}
@@ -1579 +1585 @@
     G2gd.SetDataMenuBar(G2frame,G2frame.dataFrame.StrStaMenu)
     G2frame.dataFrame.Bind(wx.EVT_MENU, OnAppendDzero, id=G2gd.wxID_APPENDDZERO)
+    G2frame.dataFrame.Bind(wx.EVT_MENU, OnUpdateDzero, id=G2gd.wxID_UPDATEDZERO)
     G2frame.dataFrame.Bind(wx.EVT_MENU, OnFitStrSta, id=G2gd.wxID_STRSTAFIT)
     G2frame.dataFrame.Bind(wx.EVT_MENU, OnAllFitStrSta, id=G2gd.wxID_STRSTAALLFIT)

trunk/help/Calibration of an area detector in GSAS.htm

@@ -25 +25 @@
   <o:Author>Von Dreele</o:Author>
   <o:LastAuthor>Von Dreele</o:LastAuthor>
-  <o:Revision>14</o:Revision>
-  <o:TotalTime>137</o:TotalTime>
+  <o:Revision>16</o:Revision>
+  <o:TotalTime>160</o:TotalTime>
   <o:Created>2012-05-04T19:00:00Z</o:Created>
-  <o:LastSaved>2013-04-30T17:13:00Z</o:LastSaved>
+  <o:LastSaved>2014-01-13T15:33:00Z</o:LastSaved>
   <o:Pages>4</o:Pages>
-  <o:Words>695</o:Words>
-  <o:Characters>3966</o:Characters>
+  <o:Words>832</o:Words>
+  <o:Characters>4745</o:Characters>
   <o:Company>Argonne National Laboratory</o:Company>
-  <o:Lines>33</o:Lines>
-  <o:Paragraphs>9</o:Paragraphs>
-  <o:CharactersWithSpaces>4652</o:CharactersWithSpaces>
+  <o:Lines>39</o:Lines>
+  <o:Paragraphs>11</o:Paragraphs>
+  <o:CharactersWithSpaces>5566</o:CharactersWithSpaces>
   <o:Version>14.00</o:Version>
  </o:DocumentProperties>
@@ -348 +348 @@
  /* Font Definitions */
  @font-face
-        {font-family:"Cambria Math";
-        panose-1:2 4 5 3 5 4 6 3 2 4;
-        mso-font-charset:0;
-        mso-generic-font-family:roman;
-        mso-font-pitch:variable;
-        mso-font-signature:-536870145 1107305727 0 0 415 0;}
-@font-face
         {font-family:Calibri;
         panose-1:2 15 5 2 2 2 4 3 2 4;
@@ -880 +873 @@
  <v:path o:extrusionok="f" gradientshapeok="t" o:connecttype="rect"/>
  <o:lock v:ext="edit" aspectratio="t"/>
-</v:shapetype><v:shape id="_x0000_i1032" type="#_x0000_t75" style='width:300pt;
- height:187.5pt;visibility:visible;mso-wrap-style:square'>
+</v:shapetype><v:shape id="Picture_x0020_1" o:spid="_x0000_i1032" type="#_x0000_t75"
+ style='width:300pt;height:187.5pt;visibility:visible;mso-wrap-style:square'>
  <v:imagedata src="Calibration%20of%20an%20area%20detector%20in%20GSAS_files/image001.png"
   o:title=""/>
 </v:shape><![endif]--><![if !vml]><img border=0 width=400 height=250
 src="Calibration%20of%20an%20area%20detector%20in%20GSAS_files/image001.png"
-v:shapes="_x0000_i1032"><![endif]></span></p>
+v:shapes="Picture_x0020_1"><![endif]></span></p>
 
 <p class=MsoNormal>At this point the data tree window will have several
@@ -895 +888 @@
 
 <p class=MsoNormal><span style='mso-no-proof:yes'><!--[if gte vml 1]><v:shape
- id="Picture_x0020_10" o:spid="_x0000_i1031" type="#_x0000_t75" style='width:472.5pt;
- height:342pt;visibility:visible;mso-wrap-style:square'>
+ id="Picture_x0020_10" o:spid="_x0000_i1031" type="#_x0000_t75" style='width:471.75pt;
+ height:349.5pt;visibility:visible;mso-wrap-style:square'>
  <v:imagedata src="Calibration%20of%20an%20area%20detector%20in%20GSAS_files/image002.png"
   o:title=""/>
-</v:shape><![endif]--><![if !vml]><img border=0 width=630 height=456
+</v:shape><![endif]--><![if !vml]><img border=0 width=629 height=466
 src="Calibration%20of%20an%20area%20detector%20in%20GSAS_files/image002.png"
 v:shapes="Picture_x0020_10"><![endif]></span></p>
 
 <p class=MsoNormal><span style='mso-spacerun:yes'> </span>The plot window shows
-the image; notice the elliptical shape of the powder diffraction rings
-due to the 45 degree detector tilt. The
-blue <b style='mso-bidi-font-weight:normal'><span style='font-family:"Calibri","sans-serif";
-mso-ascii-theme-font:minor-latin;mso-hansi-theme-font:minor-latin;mso-bidi-font-family:
-Calibri;mso-bidi-theme-font:minor-latin;color:#4F81BD;mso-themecolor:accent1'>X</span></b>
-marks the beam location (which defaults to the image center); the
-calibration you will perform here will find the correct
-placement for it. Also note that as the mouse is moved across the plot
-the plot window status bar (at bottom of plot window) shows the
-cursor position, as computed from the default (incorrect) 
-calibration values. These constants will be correctly determined after you finish the calibration.</p>
+the image; notice the elliptical shape of the powder diffraction rings due to
+the 45 degree detector tilt. The blue <b style='mso-bidi-font-weight:normal'><span
+style='font-family:"Calibri","sans-serif";mso-ascii-theme-font:minor-latin;
+mso-hansi-theme-font:minor-latin;mso-bidi-font-family:Calibri;mso-bidi-theme-font:
+minor-latin;color:#4F81BD;mso-themecolor:accent1'>X</span></b> marks the beam
+location (which defaults to the image center); the calibration you will perform
+here will find the correct placement for it. Also note that as the mouse is
+moved across the plot the plot window status bar (at bottom of plot window)
+shows the cursor position, as computed from the default (incorrect) calibration
+values. These constants will be correctly determined after you finish the
+calibration.</p>
 
 <p class=MsoNormal><span style='mso-spacerun:yes'> </span><span
-style='mso-no-proof:yes'><!--[if gte vml 1]><v:shape id="Picture_x0020_11"
+style='mso-no-proof:yes'><!--[if gte vml 1]><v:shape id="Picture_x0020_3"
  o:spid="_x0000_i1030" type="#_x0000_t75" style='width:525pt;height:450pt;
  visibility:visible;mso-wrap-style:square'>
@@ -924 +917 @@
 </v:shape><![endif]--><![if !vml]><img border=0 width=700 height=600
 src="Calibration%20of%20an%20area%20detector%20in%20GSAS_files/image003.png"
-v:shapes="Picture_x0020_11"><![endif]></span></p>
+v:shapes="Picture_x0020_3"><![endif]></span></p>
 
 <h1><span style='mso-spacerun:yes'> </span>Step 2: Edit image parameters</h1>
@@ -965 +958 @@
 Calibri;mso-bidi-theme-font:minor-latin'>LaB6 SRM660a</span></b></p>
 
-<h3><span style='mso-spacerun:yes'> </span>Second: </h3>
+<h3>Second: </h3>
 
 <p class=MsoNormal><span style='mso-spacerun:yes'>   </span>Use the <b
@@ -994 +987 @@
 mso-hansi-theme-font:minor-latin;mso-bidi-font-family:Calibri;mso-bidi-theme-font:
 minor-latin;color:red'>+</span></b>&quot; is added to the plot. You need not
-hit the ring exactly as the code will search for the locally highest
-point. (On the Mac with a two or three button mouse, also use the left
-mouse button, or with a standard Mac single-button mouse, use the
-regular mouse button.)</p>
+hit the ring exactly as the code will search for the locally highest point. (On
+the Mac with a two or three button mouse, also use the left mouse button, or
+with a standard Mac single-button mouse, use the regular mouse button.)</p>
 
 <p class=MsoNormal><span style='mso-no-proof:yes'><!--[if gte vml 1]><v:shape
@@ -1009 +1001 @@
 
 <p class=MsoNormal><span style='mso-spacerun:yes'>  </span>To remove a point
-added in error click on that point with the right mouse button
-(on the Mac, if you have a single-button mouse, hold the control key
-down and click).
-</p>
+added in error click on that point with the right mouse button (on the Mac, if
+you have a single-button mouse, hold the control key down and click). </p>
 
 <h3><span style='mso-spacerun:yes'> </span>Fourth:</h3>
 
 <p class=MsoNormal><span style='mso-spacerun:yes'>  </span>When done, press the
-right mouse button well away from any points that have been added
-(on the Mac, if you have a single-button mouse, hold the control key
-down and click).
-</p>
+right mouse button well away from any points that have been added (on the Mac,
+if you have a single-button mouse, hold the control key down and click). </p>
 
 <p class=MsoNormal>The calibration is then performed. First the rings are
@@ -1051 +1039 @@
 
 <p class=MsoNormal><span style='mso-no-proof:yes'><!--[if gte vml 1]><v:shape
- id="Picture_x0020_13" o:spid="_x0000_i1027" type="#_x0000_t75" style='width:472.5pt;
- height:342pt;visibility:visible;mso-wrap-style:square'>
+ id="Picture_x0020_11" o:spid="_x0000_i1027" type="#_x0000_t75" style='width:471.75pt;
+ height:349.5pt;visibility:visible;mso-wrap-style:square'>
  <v:imagedata src="Calibration%20of%20an%20area%20detector%20in%20GSAS_files/image006.png"
   o:title=""/>
-</v:shape><![endif]--><![if !vml]><img border=0 width=630 height=456
+</v:shape><![endif]--><![if !vml]><img border=0 width=629 height=466
 src="Calibration%20of%20an%20area%20detector%20in%20GSAS_files/image006.png"
-v:shapes="Picture_x0020_13"><![endif]></span><span
+v:shapes="Picture_x0020_11"><![endif]></span><span
 style='mso-spacerun:yes'> </span></p>
 
@@ -1064 +1052 @@
 
 <p class=MsoNormal><span style='mso-no-proof:yes'><!--[if gte vml 1]><v:shape
- id="Picture_x0020_14" o:spid="_x0000_i1026" type="#_x0000_t75" style='width:396.75pt;
- height:134.25pt;visibility:visible;mso-wrap-style:square'>
+ id="Picture_x0020_13" o:spid="_x0000_i1026" type="#_x0000_t75" style='width:453.75pt;
+ height:107.25pt;visibility:visible;mso-wrap-style:square'>
  <v:imagedata src="Calibration%20of%20an%20area%20detector%20in%20GSAS_files/image007.png"
   o:title=""/>
-</v:shape><![endif]--><![if !vml]><img border=0 width=529 height=179
+</v:shape><![endif]--><![if !vml]><img border=0 width=605 height=143
 src="Calibration%20of%20an%20area%20detector%20in%20GSAS_files/image007.png"
-v:shapes="Picture_x0020_14"><![endif]></span></p>
-
-<p class=MsoNormal><span style='mso-spacerun:yes'> </span>To see the actual
-points selected by the program, click on the <b style='mso-bidi-font-weight:
+v:shapes="Picture_x0020_13"><![endif]></span></p>
+
+<p class=MsoNormal>The <b style='mso-bidi-font-weight:normal'><span
+style='font-family:"Calibri","sans-serif";mso-ascii-theme-font:minor-latin;
+mso-hansi-theme-font:minor-latin'>distance</span></b> is from the sample to the
+plane containing the detector, <span class=SpellE><b style='mso-bidi-font-weight:
 normal'><span style='font-family:"Calibri","sans-serif";mso-ascii-theme-font:
-minor-latin;mso-hansi-theme-font:minor-latin;mso-bidi-font-family:Calibri;
-mso-bidi-theme-font:minor-latin'>show ring picks?</span></b> <span class=GramE>check</span>
-box </p>
+minor-latin;mso-hansi-theme-font:minor-latin'>det</span></b></span><b
+style='mso-bidi-font-weight:normal'><span style='font-family:"Calibri","sans-serif";
+mso-ascii-theme-font:minor-latin;mso-hansi-theme-font:minor-latin'>-x</span></b>
+&amp; <span class=SpellE><b style='mso-bidi-font-weight:normal'><span
+style='font-family:"Calibri","sans-serif";mso-ascii-theme-font:minor-latin;
+mso-hansi-theme-font:minor-latin'>det</span></b></span><b style='mso-bidi-font-weight:
+normal'><span style='font-family:"Calibri","sans-serif";mso-ascii-theme-font:
+minor-latin;mso-hansi-theme-font:minor-latin'>-y</span></b> is the incident
+beam location on the image, <b style='mso-bidi-font-weight:normal'><span
+style='font-family:"Calibri","sans-serif";mso-ascii-theme-font:minor-latin;
+mso-hansi-theme-font:minor-latin'>tilt</span></b> is the angle of detector
+rotation from being normal to the incident beam and <b style='mso-bidi-font-weight:
+normal'><span style='font-family:"Calibri","sans-serif";mso-ascii-theme-font:
+minor-latin;mso-hansi-theme-font:minor-latin'>phi</span></b> is the rotation of
+the detector tilt axis from the x-axis. <span
+style='mso-spacerun:yes'> </span>To see the actual points selected by the
+program, click on the <b style='mso-bidi-font-weight:normal'><span
+style='font-family:"Calibri","sans-serif";mso-ascii-theme-font:minor-latin;
+mso-hansi-theme-font:minor-latin;mso-bidi-font-family:Calibri;mso-bidi-theme-font:
+minor-latin'>show ring picks?</span></b> <span class=GramE>check</span> box </p>
 
 <p class=MsoNormal><span style='mso-no-proof:yes'><!--[if gte vml 1]><v:shape
- id="Picture_x0020_15" o:spid="_x0000_i1025" type="#_x0000_t75" style='width:525pt;
+ id="Picture_x0020_14" o:spid="_x0000_i1025" type="#_x0000_t75" style='width:525pt;
  height:450pt;visibility:visible;mso-wrap-style:square'>
  <v:imagedata src="Calibration%20of%20an%20area%20detector%20in%20GSAS_files/image008.png"
@@ -1086 +1093 @@
 </v:shape><![endif]--><![if !vml]><img border=0 width=700 height=600
 src="Calibration%20of%20an%20area%20detector%20in%20GSAS_files/image008.png"
-v:shapes="Picture_x0020_15"><![endif]></span><span
+v:shapes="Picture_x0020_14"><![endif]></span><span
 style='mso-spacerun:yes'> </span><span style='color:#1F497D;mso-themecolor:
 text2'><o:p></o:p></span></p>
@@ -1096 +1103 @@
 mso-ascii-theme-font:minor-latin;mso-hansi-theme-font:minor-latin;mso-bidi-font-family:
 Calibri;mso-bidi-theme-font:minor-latin'>Operations/Recalibrate</span></b> menu
-item.</p>
-
-<p class=MsoNormal>Assuming that these calibration results will be applied to
-other images in the same GSAS-II project, click on <b style='mso-bidi-font-weight:
+item. In cases where particular types of detectors are used close to the sample
+and the diffraction pattern extends to near the edges of the detector, the <b
+style='mso-bidi-font-weight:normal'><span style='font-family:"Calibri","sans-serif";
+mso-ascii-theme-font:minor-latin;mso-hansi-theme-font:minor-latin'>Penetration</span></b>
+correction may need to be refined. Just select the check box and do <b
+style='mso-bidi-font-weight:normal'><span style='font-family:"Calibri","sans-serif";
+mso-ascii-theme-font:minor-latin;mso-hansi-theme-font:minor-latin;mso-bidi-font-family:
+Calibri;mso-bidi-theme-font:minor-latin'>Operations/Recalibrate</span></b>, the
+result should be &gt;0 for a reasonable correction. Close examination of the
+outer rings will show a small shift in the calculated rings to better match the
+observed ones. Assuming that these calibration results will be applied to other
+images in the same GSAS-II project, click on <b style='mso-bidi-font-weight:
 normal'><span style='font-family:"Calibri","sans-serif";mso-ascii-theme-font:
 minor-latin;mso-hansi-theme-font:minor-latin;mso-bidi-font-family:Calibri;
@@ -1111 +1126 @@
 mso-ascii-theme-font:minor-latin;mso-hansi-theme-font:minor-latin;mso-bidi-font-family:
 Calibri;mso-bidi-theme-font:minor-latin'>Operations/Save Controls</span></b>
-menu item. To save the project, including the now-derived calibration information,
-use the <b style='mso-bidi-font-weight:normal'><span style='font-family:"Calibri","sans-serif";
+menu item. To save the project, including the now-derived calibration
+information, use the <b style='mso-bidi-font-weight:normal'><span
+style='font-family:"Calibri","sans-serif";mso-ascii-theme-font:minor-latin;
+mso-hansi-theme-font:minor-latin;mso-bidi-font-family:Calibri;mso-bidi-theme-font:
+minor-latin'>File/Save</span> </b><b style='mso-bidi-font-weight:normal'><span
+style='font-family:"Calibri","sans-serif";mso-ascii-theme-font:minor-latin;
+mso-hansi-theme-font:minor-latin;mso-bidi-font-family:Calibri;mso-bidi-theme-font:
+minor-latin'>Project</span></b><span style='font-family:"Calibri","sans-serif";
 mso-ascii-theme-font:minor-latin;mso-hansi-theme-font:minor-latin;mso-bidi-font-family:
-Calibri;mso-bidi-theme-font:minor-latin'>File/Save</span> </b><b
+Calibri;mso-bidi-theme-font:minor-latin'> </span>menu item associated with the
+data tree window; as this project has not been saved before the file save
+dialog will need a file name. Don’t enter the extension; it will be set to “<b
 style='mso-bidi-font-weight:normal'><span style='font-family:"Calibri","sans-serif";
 mso-ascii-theme-font:minor-latin;mso-hansi-theme-font:minor-latin;mso-bidi-font-family:
-Calibri;mso-bidi-theme-font:minor-latin'>Project</span></b><span
-style='font-family:"Calibri","sans-serif";mso-ascii-theme-font:minor-latin;
-mso-hansi-theme-font:minor-latin;mso-bidi-font-family:Calibri;mso-bidi-theme-font:
-minor-latin'> </span>menu item associated with the data tree window; as this
-project has not been saved before the file save dialog will need a file name.
-Don’t enter the extension; it will be set to “<b style='mso-bidi-font-weight:
-normal'><span style='font-family:"Calibri","sans-serif";mso-ascii-theme-font:
-minor-latin;mso-hansi-theme-font:minor-latin;mso-bidi-font-family:Calibri;
-mso-bidi-theme-font:minor-latin'>.<span class=SpellE>gpx</span></span></b>”.</p>
+Calibri;mso-bidi-theme-font:minor-latin'>.<span class=SpellE>gpx</span></span></b>”.</p>
 
 <h2>Next step: <span class=MsoHyperlink><span style='color:#0070C0'><a

trunk/help/Integration of area detector data in GSAS.htm

@@ -25 +25 @@
   <o:Author>Von Dreele</o:Author>
   <o:LastAuthor>Von Dreele</o:LastAuthor>
-  <o:Revision>12</o:Revision>
-  <o:TotalTime>118</o:TotalTime>
+  <o:Revision>13</o:Revision>
+  <o:TotalTime>137</o:TotalTime>
   <o:Created>2012-05-04T20:46:00Z</o:Created>
-  <o:LastSaved>2013-04-30T17:23:00Z</o:LastSaved>
-  <o:Pages>3</o:Pages>
-  <o:Words>808</o:Words>
-  <o:Characters>4610</o:Characters>
+  <o:LastSaved>2014-01-13T15:37:00Z</o:LastSaved>
+  <o:Pages>2</o:Pages>
+  <o:Words>821</o:Words>
+  <o:Characters>4685</o:Characters>
   <o:Company>Argonne National Laboratory</o:Company>
-  <o:Lines>38</o:Lines>
+  <o:Lines>39</o:Lines>
   <o:Paragraphs>10</o:Paragraphs>
-  <o:CharactersWithSpaces>5408</o:CharactersWithSpaces>
+  <o:CharactersWithSpaces>5496</o:CharactersWithSpaces>
   <o:Version>14.00</o:Version>
  </o:DocumentProperties>
@@ -1028 +1028 @@
 box. Note that inner limit is shown as a green ellipse at 2deg and the outer is
 shown as a red ellipse at 5deg by default. These limits may also be dragged to
-the desired values; a small popup window shows the value. <o:p></o:p></p>
+the desired values; a small popup window shows the value. </p>
 
 <p class=MsoNormal>Change the limits to <b style='mso-bidi-font-weight:normal'><span
@@ -1060 +1060 @@
  <v:path o:extrusionok="f" gradientshapeok="t" o:connecttype="rect"/>
  <o:lock v:ext="edit" aspectratio="t"/>
-</v:shapetype><v:shape id="Picture_x0020_6" o:spid="_x0000_i1029" type="#_x0000_t75"
- style='width:472.5pt;height:342pt;visibility:visible;mso-wrap-style:square'>
+</v:shapetype><v:shape id="Picture_x0020_6" o:spid="_x0000_i1028" type="#_x0000_t75"
+ style='width:472.5pt;height:349.5pt;visibility:visible;mso-wrap-style:square'>
  <v:imagedata src="Integration%20of%20area%20detector%20data%20in%20GSAS_files/image001.png"
   o:title=""/>
-</v:shape><![endif]--><![if !vml]><img border=0 width=630 height=456
+</v:shape><![endif]--><![if !vml]><img border=0 width=630 height=466
 src="Integration%20of%20area%20detector%20data%20in%20GSAS_files/image001.png"
 v:shapes="Picture_x0020_6"><![endif]></span></p>
@@ -1073 +1073 @@
 style='font-family:"Calibri","sans-serif";mso-ascii-theme-font:minor-latin;
 mso-hansi-theme-font:minor-latin;mso-bidi-font-family:Calibri;mso-bidi-theme-font:
-minor-latin'>Azimuth offset</span></b>: The image vertical axis (from the beam
-center, going down) is labeled with the azimuth value placed in the <b
+minor-latin'>Azimuth offset</span></b>: The image horizontal axis (from the
+beam center, going right) is labeled with the azimuth value placed in the <b
 style='mso-bidi-font-weight:normal'><span style='font-family:"Calibri","sans-serif";
 mso-ascii-theme-font:minor-latin;mso-hansi-theme-font:minor-latin;mso-bidi-font-family:
@@ -1088 +1088 @@
 minor-latin;mso-hansi-theme-font:minor-latin;mso-bidi-font-family:Calibri;
 mso-bidi-theme-font:minor-latin'>Do full integration?</span></b> <span
-class=GramE>checkbox</span> is not checked, the integration will be run only to
-the maximum value specified. When the range is less than 360 degrees, the
+class=GramE>check</span> box is not checked, the integration will be run only
+to the maximum value specified. When the range is less than 360 degrees, the
 integration range will be shown (if selected) with the high and low limits
 plotted and only segments of the max and min ellipses drawn. These limits may
-also be dragged on the plot to desired locations.</p>
+also be dragged on the plot to desired locations. In this case <b
+style='mso-bidi-font-weight:normal'><span style='font-family:"Calibri","sans-serif";
+mso-ascii-theme-font:minor-latin;mso-hansi-theme-font:minor-latin'>45</span></b>
+is a better choice than the default.</p>
 
 <p class=MsoNormal><b style='mso-bidi-font-weight:normal'><span
@@ -1104 +1107 @@
 needed, but there should more than 6 points across each peak
 full-width-at-half-maximum (FWHM) in the final pattern to be useful for further
-analysis. In this case <b style='mso-bidi-font-weight:normal'><span
+analysis. For this reason <b style='mso-bidi-font-weight:normal'><span
 style='font-family:"Calibri","sans-serif";mso-ascii-theme-font:minor-latin;
 mso-hansi-theme-font:minor-latin'>5000</span></b> is a better choice than the
@@ -1119 +1122 @@
 with distance from the beam-center, with a shape like a slice of cake or pie.
 When more than one azimuthal bin is used, the regions are shown in the plot
-with dashed lines, when the Show integration limits?&quot; check box is
-checked. </p>
+with dashed lines, when the <b style='mso-bidi-font-weight:normal'><span
+style='font-family:"Calibri","sans-serif";mso-ascii-theme-font:minor-latin;
+mso-hansi-theme-font:minor-latin'>Show integration limits?</span></b> <span
+class=GramE>check</span> box is checked. </p>
+
+<p class=MsoNormal><b style='mso-bidi-font-weight:normal'><span
+style='font-family:"Calibri","sans-serif";mso-ascii-theme-font:minor-latin;
+mso-hansi-theme-font:minor-latin'>Appl. Sample absorption</span></b> and <b
+style='mso-bidi-font-weight:normal'><span style='font-family:"Calibri","sans-serif";
+mso-ascii-theme-font:minor-latin;mso-hansi-theme-font:minor-latin'>value</span></b>:
+An absorption correction for a horizontal cylinder is applied to the results of
+the integration. The range in <span class=SpellE><span style='font-family:Symbol'>m</span>R</span>
+is limited because the correction is unreliable for <span class=SpellE><span
+style='font-family:Symbol'>m</span>R</span> &gt; 2.</p>
 
 <p class=MsoNormal><b style='mso-bidi-font-weight:normal'><span
@@ -1151 +1166 @@
 
 <p class=MsoNormal><span style='mso-no-proof:yes'><!--[if gte vml 1]><v:shape
- id="Picture_x0020_7" o:spid="_x0000_i1028" type="#_x0000_t75" style='width:525pt;
- height:450pt;visibility:visible;mso-wrap-style:square'>
+ id="_x0000_i1027" type="#_x0000_t75" style='width:525pt;height:450pt;
+ visibility:visible;mso-wrap-style:square'>
  <v:imagedata src="Integration%20of%20area%20detector%20data%20in%20GSAS_files/image002.png"
   o:title=""/>
 </v:shape><![endif]--><![if !vml]><img border=0 width=700 height=600
 src="Integration%20of%20area%20detector%20data%20in%20GSAS_files/image002.png"
-v:shapes="Picture_x0020_7"><![endif]></span></p>
+v:shapes="_x0000_i1027"><![endif]></span></p>
 
 <h2>Step 3: Perform integration </h2>
@@ -1180 +1195 @@
 
 <p class=MsoNormal><span style='mso-no-proof:yes'><!--[if gte vml 1]><v:shape
- id="Picture_x0020_8" o:spid="_x0000_i1027" type="#_x0000_t75" style='width:300pt;
+ id="Picture_x0020_8" o:spid="_x0000_i1026" type="#_x0000_t75" style='width:300pt;
  height:187.5pt;visibility:visible;mso-wrap-style:square'>
  <v:imagedata src="Integration%20of%20area%20detector%20data%20in%20GSAS_files/image003.png"
@@ -1189 +1204 @@
 style='mso-spacerun:yes'> </span></p>
 
-<p class=MsoNormal>Two plots are added to the plot window: One (with tab <b
-style='mso-bidi-font-weight:normal'><span style='font-family:"Calibri","sans-serif";
-mso-ascii-theme-font:minor-latin;mso-hansi-theme-font:minor-latin;mso-bidi-font-family:
-Calibri;mso-bidi-theme-font:minor-latin'>2D Integration</span></b>) shows the
-diffraction intensity as a function of both 2-theta and (when there is more
-than one azimuthal integration region) azimuthal angle.</p>
+<p class=MsoNormal>A plot is added to the plot window with a conventional 1-D
+powder pattern(s) for each &quot;slice&quot;</p>
 
 <p class=MsoNormal><span style='mso-no-proof:yes'><!--[if gte vml 1]><v:shape
- id="Picture_x0020_9" o:spid="_x0000_i1026" type="#_x0000_t75" style='width:525pt;
+ id="Picture_x0020_7" o:spid="_x0000_i1025" type="#_x0000_t75" style='width:525pt;
  height:450pt;visibility:visible;mso-wrap-style:square'>
  <v:imagedata src="Integration%20of%20area%20detector%20data%20in%20GSAS_files/image004.png"
@@ -1203 +1214 @@
 </v:shape><![endif]--><![if !vml]><img border=0 width=700 height=600
 src="Integration%20of%20area%20detector%20data%20in%20GSAS_files/image004.png"
-v:shapes="Picture_x0020_9"><![endif]></span><span
-style='mso-spacerun:yes'> </span></p>
-
-<p class=MsoNormal><span class=GramE>and</span> a conventional 1-D powder
-pattern(s) for each &quot;slice&quot;</p>
-
-<p class=MsoNormal><span style='mso-no-proof:yes'><!--[if gte vml 1]><v:shape
- id="Picture_x0020_10" o:spid="_x0000_i1025" type="#_x0000_t75" style='width:525pt;
- height:450pt;visibility:visible;mso-wrap-style:square'>
- <v:imagedata src="Integration%20of%20area%20detector%20data%20in%20GSAS_files/image005.png"
-  o:title=""/>
-</v:shape><![endif]--><![if !vml]><img border=0 width=700 height=600
-src="Integration%20of%20area%20detector%20data%20in%20GSAS_files/image005.png"
-v:shapes="Picture_x0020_10"><![endif]></span></p>
+v:shapes="Picture_x0020_7"><![endif]></span></p>
 
 <p class=MsoNormal>Again you could save the project with <b style='mso-bidi-font-weight:

trunk/help/Integration of area detector data in GSAS_files/filelist.xml

@@ -7 +7 @@
  <o:File HRef="image003.png"/>
  <o:File HRef="image004.png"/>
- <o:File HRef="image005.png"/>
  <o:File HRef="filelist.xml"/>
 </xml>