Changeset 1377

Timestamp:

Jun 11, 2014 12:39:31 PM (9 years ago)

Author:

vondreele

Message:

set pixLimit to search a 40x40 pixel box for image Calibrate
modify image & stress-strain tutorials to reflect this

Location:

trunk

Files:

• GSASIIplot.py (modified) (1 diff)
• help/Calibration of an area detector in GSAS.htm (modified) (6 diffs)
• help/Strain fitting of 2D data in GSAS-II.htm (modified) (4 diffs)
• help/Strain fitting of 2D data in GSAS-II_files/filelist.xml (modified) (1 diff)

trunk/GSASIIplot.py

@@ -2641 +2641 @@
         scalex = 1000./pixelSize[0]
         scaley = 1000./pixelSize[1]
-        pixLimit = Data['pixLimit']
+#        pixLimit = Data['pixLimit']    #can be too tight
+        pixLimit = 20       #this makes the search box 40x40 pixels
         if G2frame.itemPicked is None and PickName == 'Image Controls' and len(G2frame.ImageZ):
             Xpos = event.xdata

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>16</o:Revision>
-  <o:TotalTime>160</o:TotalTime>
+  <o:Revision>17</o:Revision>
+  <o:TotalTime>163</o:TotalTime>
   <o:Created>2012-05-04T19:00:00Z</o:Created>
-  <o:LastSaved>2014-01-13T15:33:00Z</o:LastSaved>
+  <o:LastSaved>2014-06-11T17:17:00Z</o:LastSaved>
   <o:Pages>4</o:Pages>
-  <o:Words>832</o:Words>
-  <o:Characters>4745</o:Characters>
+  <o:Words>853</o:Words>
+  <o:Characters>4866</o:Characters>
   <o:Company>Argonne National Laboratory</o:Company>
-  <o:Lines>39</o:Lines>
+  <o:Lines>40</o:Lines>
   <o:Paragraphs>11</o:Paragraphs>
-  <o:CharactersWithSpaces>5566</o:CharactersWithSpaces>
+  <o:CharactersWithSpaces>5708</o:CharactersWithSpaces>
   <o:Version>14.00</o:Version>
  </o:DocumentProperties>
@@ -967 +967 @@
 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'>Image Controls</span></b> window or for the Mac, the <span
-class=GramE><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'>Image<span
-style='mso-spacerun:yes'>  </span>Controls</span></b></span> window must be
-active to place this into the system menu bar). At this point the status line
-on the bottom of the <b style='mso-bidi-font-weight:normal'><span
+minor-latin'>Image Controls</span></b> window or for the Mac, 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'>Image Controls</span></b> window must
+be active to place this into the system menu bar). At this point the status
+line on the bottom of 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:
@@ -987 +986 @@
 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 in a
+40x40 pixel box. (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
@@ -1002 +1002 @@
 <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>
+you have a single-button mouse, hold the control key down and click). NB: it is
+slightly better to pick points just inside the inner ring as GSAS-II will then find
+the best point on that ring.</p>
 
 <h3><span style='mso-spacerun:yes'> </span>Fourth:</h3>
@@ -1075 +1077 @@
 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>
+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
@@ -1126 +1128 @@
 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
+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 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>
+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>
 
 <h2>Next step: <span class=MsoHyperlink><span style='color:#0070C0'><a

trunk/help/Strain fitting of 2D data in GSAS-II.htm

@@ -25 +25 @@
   <o:Author>Von Dreele</o:Author>
   <o:LastAuthor>Von Dreele</o:LastAuthor>
-  <o:Revision>7</o:Revision>
-  <o:TotalTime>379</o:TotalTime>
+  <o:Revision>8</o:Revision>
+  <o:TotalTime>386</o:TotalTime>
   <o:Created>2014-01-13T15:39:00Z</o:Created>
-  <o:LastSaved>2014-01-13T19:49:00Z</o:LastSaved>
+  <o:LastSaved>2014-06-11T17:08:00Z</o:LastSaved>
   <o:Pages>6</o:Pages>
   <o:Words>890</o:Words>
@@ -974 +974 @@
 <p class=MsoNormal>For this demo, data were collected with a MAR2300 area
 detector at APS 1-ID-C with a wavelength 0.12398 Å (100<span style='font-family:
-Symbol'>m</span>m diameter beam) from a 1.5mm square hot rolled steel test specimen;
-the front surface has been dusted with some CeO<sub>2</sub> to aid in
+Symbol'>m</span>m diameter beam) from a 1.5mm square hot rolled steel test
+specimen; the front surface has been dusted with some CeO<sub>2</sub> to aid in
 calibration. Two images are used here; one is with no load on the sample and
 the other is with the sample under tension along the y-axis (vertical). The
@@ -1105 +1105 @@
 
 <p class=MsoNormal><span style='mso-no-proof:yes'><!--[if gte vml 1]><v:shape
- id="Picture_x0020_11" o:spid="_x0000_i1036" type="#_x0000_t75" style='width:472.5pt;
- height:349.5pt;visibility:visible;mso-wrap-style:square'>
- <v:imagedata src="Strain%20fitting%20of%202D%20data%20in%20GSAS-II_files/image004.png"
-  o:title=""/>
-</v:shape><![endif]--><![if !vml]><img width=630 height=466
-src="Strain%20fitting%20of%202D%20data%20in%20GSAS-II_files/image004.png"
-v:shapes="Picture_x0020_11"><![endif]></span><span
+ id="_x0000_i1036" type="#_x0000_t75" style='width:472.5pt;height:388.5pt;
+ visibility:visible;mso-wrap-style:square'>
+ <v:imagedata src="Strain%20fitting%20of%202D%20data%20in%20GSAS-II_files/image016.png"
+  o:title=""/>
+</v:shape><![endif]--><![if !vml]><img width=630 height=518
+src="Strain%20fitting%20of%202D%20data%20in%20GSAS-II_files/image016.png"
+v:shapes="_x0000_i1036"><![endif]></span><span
 style='mso-spacerun:yes'> </span></p>
 
@@ -1117 +1117 @@
 
 <p class=MsoNormal><span style='mso-no-proof:yes'><!--[if gte vml 1]><v:shape
- id="Picture_x0020_12" o:spid="_x0000_i1035" type="#_x0000_t75" style='width:459.75pt;
- height:107.25pt;visibility:visible;mso-wrap-style:square'>
- <v:imagedata src="Strain%20fitting%20of%202D%20data%20in%20GSAS-II_files/image005.png"
-  o:title=""/>
-</v:shape><![endif]--><![if !vml]><img width=613 height=143
-src="Strain%20fitting%20of%202D%20data%20in%20GSAS-II_files/image005.png"
-v:shapes="Picture_x0020_12"><![endif]></span></p>
+ id="_x0000_i1035" type="#_x0000_t75" style='width:609.75pt;height:107.25pt;
+ visibility:visible;mso-wrap-style:square'>
+ <v:imagedata src="Strain%20fitting%20of%202D%20data%20in%20GSAS-II_files/image017.png"
+  o:title=""/>
+</v:shape><![endif]--><![if !vml]><img width=813 height=143
+src="Strain%20fitting%20of%202D%20data%20in%20GSAS-II_files/image017.png"
+v:shapes="_x0000_i1035"><![endif]></span></p>
 
 <p class=MsoNormal>You should now copy these results to the other image. Use <b

trunk/help/Strain fitting of 2D data in GSAS-II_files/filelist.xml

@@ -6 +6 @@
  <o:File HRef="image002.png"/>
  <o:File HRef="image003.png"/>
- <o:File HRef="image004.png"/>
- <o:File HRef="image005.png"/>
+ <o:File HRef="image016.png"/>
+ <o:File HRef="image017.png"/>
  <o:File HRef="image006.png"/>
  <o:File HRef="image007.png"/>