Changeset 1377


Ignore:
Timestamp:
Jun 11, 2014 12:39:31 PM (7 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:
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/GSASIIplot.py

    r1370 r1377  
    26412641        scalex = 1000./pixelSize[0]
    26422642        scaley = 1000./pixelSize[1]
    2643         pixLimit = Data['pixLimit']
     2643#        pixLimit = Data['pixLimit']    #can be too tight
     2644        pixLimit = 20       #this makes the search box 40x40 pixels
    26442645        if G2frame.itemPicked is None and PickName == 'Image Controls' and len(G2frame.ImageZ):
    26452646            Xpos = event.xdata
  • trunk/help/Calibration of an area detector in GSAS.htm

    r1195 r1377  
    2525  <o:Author>Von Dreele</o:Author>
    2626  <o:LastAuthor>Von Dreele</o:LastAuthor>
    27   <o:Revision>16</o:Revision>
    28   <o:TotalTime>160</o:TotalTime>
     27  <o:Revision>17</o:Revision>
     28  <o:TotalTime>163</o:TotalTime>
    2929  <o:Created>2012-05-04T19:00:00Z</o:Created>
    30   <o:LastSaved>2014-01-13T15:33:00Z</o:LastSaved>
     30  <o:LastSaved>2014-06-11T17:17:00Z</o:LastSaved>
    3131  <o:Pages>4</o:Pages>
    32   <o:Words>832</o:Words>
    33   <o:Characters>4745</o:Characters>
     32  <o:Words>853</o:Words>
     33  <o:Characters>4866</o:Characters>
    3434  <o:Company>Argonne National Laboratory</o:Company>
    35   <o:Lines>39</o:Lines>
     35  <o:Lines>40</o:Lines>
    3636  <o:Paragraphs>11</o:Paragraphs>
    37   <o:CharactersWithSpaces>5566</o:CharactersWithSpaces>
     37  <o:CharactersWithSpaces>5708</o:CharactersWithSpaces>
    3838  <o:Version>14.00</o:Version>
    3939 </o:DocumentProperties>
     
    967967style='font-family:"Calibri","sans-serif";mso-ascii-theme-font:minor-latin;
    968968mso-hansi-theme-font:minor-latin;mso-bidi-font-family:Calibri;mso-bidi-theme-font:
    969 minor-latin'>Image Controls</span></b> window or for the Mac, the <span
    970 class=GramE><b style='mso-bidi-font-weight:normal'><span style='font-family:
    971 "Calibri","sans-serif";mso-ascii-theme-font:minor-latin;mso-hansi-theme-font:
    972 minor-latin;mso-bidi-font-family:Calibri;mso-bidi-theme-font:minor-latin'>Image<span
    973 style='mso-spacerun:yes'>  </span>Controls</span></b></span> window must be
    974 active to place this into the system menu bar). At this point the status line
    975 on the bottom of the <b style='mso-bidi-font-weight:normal'><span
     969minor-latin'>Image Controls</span></b> window or for the Mac, the <b
     970style='mso-bidi-font-weight:normal'><span style='font-family:"Calibri","sans-serif";
     971mso-ascii-theme-font:minor-latin;mso-hansi-theme-font:minor-latin;mso-bidi-font-family:
     972Calibri;mso-bidi-theme-font:minor-latin'>Image Controls</span></b> window must
     973be active to place this into the system menu bar). At this point the status
     974line on the bottom of the <b style='mso-bidi-font-weight:normal'><span
    976975style='font-family:"Calibri","sans-serif";mso-ascii-theme-font:minor-latin;
    977976mso-hansi-theme-font:minor-latin;mso-bidi-font-family:Calibri;mso-bidi-theme-font:
     
    987986mso-hansi-theme-font:minor-latin;mso-bidi-font-family:Calibri;mso-bidi-theme-font:
    988987minor-latin;color:red'>+</span></b>&quot; is added to the plot. You need not
    989 hit the ring exactly as the code will search for the locally highest point. (On
    990 the Mac with a two or three button mouse, also use the left mouse button, or
    991 with a standard Mac single-button mouse, use the regular mouse button.)</p>
     988hit the ring exactly as the code will search for the locally highest point in a
     98940x40 pixel box. (On the Mac with a two or three button mouse, also use the
     990left mouse button, or with a standard Mac single-button mouse, use the regular
     991mouse button.)</p>
    992992
    993993<p class=MsoNormal><span style='mso-no-proof:yes'><!--[if gte vml 1]><v:shape
     
    10021002<p class=MsoNormal><span style='mso-spacerun:yes'>  </span>To remove a point
    10031003added in error click on that point with the right mouse button (on the Mac, if
    1004 you have a single-button mouse, hold the control key down and click). </p>
     1004you have a single-button mouse, hold the control key down and click). NB: it is
     1005slightly better to pick points just inside the inner ring as GSAS-II will then find
     1006the best point on that ring.</p>
    10051007
    10061008<h3><span style='mso-spacerun:yes'> </span>Fourth:</h3>
     
    10751077beam location on the image, <b style='mso-bidi-font-weight:normal'><span
    10761078style='font-family:"Calibri","sans-serif";mso-ascii-theme-font:minor-latin;
    1077 mso-hansi-theme-font:minor-latin'>tilt</span></b> is the angle of detector
    1078 rotation from being normal to the incident beam and <b style='mso-bidi-font-weight:
    1079 normal'><span style='font-family:"Calibri","sans-serif";mso-ascii-theme-font:
    1080 minor-latin;mso-hansi-theme-font:minor-latin'>phi</span></b> is the rotation of
    1081 the detector tilt axis from the x-axis. <span
    1082 style='mso-spacerun:yes'> </span>To see the actual points selected by the
    1083 program, click on the <b style='mso-bidi-font-weight:normal'><span
    1084 style='font-family:"Calibri","sans-serif";mso-ascii-theme-font:minor-latin;
    1085 mso-hansi-theme-font:minor-latin;mso-bidi-font-family:Calibri;mso-bidi-theme-font:
    1086 minor-latin'>show ring picks?</span></b> <span class=GramE>check</span> box </p>
     1079mso-hansi-theme-font:minor-latin'>tilt</span></b> is the angle of detector rotation
     1080from being normal to the incident beam and <b style='mso-bidi-font-weight:normal'><span
     1081style='font-family:"Calibri","sans-serif";mso-ascii-theme-font:minor-latin;
     1082mso-hansi-theme-font:minor-latin'>phi</span></b> is the rotation of the
     1083detector tilt axis from the x-axis.<span style='mso-spacerun:yes'>  </span>To
     1084see the actual points selected by the program, click on the <b
     1085style='mso-bidi-font-weight:normal'><span style='font-family:"Calibri","sans-serif";
     1086mso-ascii-theme-font:minor-latin;mso-hansi-theme-font:minor-latin;mso-bidi-font-family:
     1087Calibri;mso-bidi-theme-font:minor-latin'>show ring picks?</span></b> <span
     1088class=GramE>check</span> box </p>
    10871089
    10881090<p class=MsoNormal><span style='mso-no-proof:yes'><!--[if gte vml 1]><v:shape
     
    11261128mso-ascii-theme-font:minor-latin;mso-hansi-theme-font:minor-latin;mso-bidi-font-family:
    11271129Calibri;mso-bidi-theme-font:minor-latin'>Operations/Save Controls</span></b>
    1128 menu item. To save the project, including the now-derived calibration
    1129 information, use the <b style='mso-bidi-font-weight:normal'><span
     1130menu item. To save the project, including the now-derived calibration information,
     1131use the <b style='mso-bidi-font-weight:normal'><span style='font-family:"Calibri","sans-serif";
     1132mso-ascii-theme-font:minor-latin;mso-hansi-theme-font:minor-latin;mso-bidi-font-family:
     1133Calibri;mso-bidi-theme-font:minor-latin'>File/Save</span> </b><b
     1134style='mso-bidi-font-weight:normal'><span style='font-family:"Calibri","sans-serif";
     1135mso-ascii-theme-font:minor-latin;mso-hansi-theme-font:minor-latin;mso-bidi-font-family:
     1136Calibri;mso-bidi-theme-font:minor-latin'>Project</span></b><span
    11301137style='font-family:"Calibri","sans-serif";mso-ascii-theme-font:minor-latin;
    11311138mso-hansi-theme-font:minor-latin;mso-bidi-font-family:Calibri;mso-bidi-theme-font:
    1132 minor-latin'>File/Save</span> </b><b style='mso-bidi-font-weight:normal'><span
    1133 style='font-family:"Calibri","sans-serif";mso-ascii-theme-font:minor-latin;
    1134 mso-hansi-theme-font:minor-latin;mso-bidi-font-family:Calibri;mso-bidi-theme-font:
    1135 minor-latin'>Project</span></b><span style='font-family:"Calibri","sans-serif";
    1136 mso-ascii-theme-font:minor-latin;mso-hansi-theme-font:minor-latin;mso-bidi-font-family:
    1137 Calibri;mso-bidi-theme-font:minor-latin'> </span>menu item associated with the
    1138 data tree window; as this project has not been saved before the file save
    1139 dialog will need a file name. Don’t enter the extension; it will be set to “<b
    1140 style='mso-bidi-font-weight:normal'><span style='font-family:"Calibri","sans-serif";
    1141 mso-ascii-theme-font:minor-latin;mso-hansi-theme-font:minor-latin;mso-bidi-font-family:
    1142 Calibri;mso-bidi-theme-font:minor-latin'>.<span class=SpellE>gpx</span></span></b>”.</p>
     1139minor-latin'> </span>menu item associated with the data tree window; as this
     1140project has not been saved before the file save dialog will need a file name.
     1141Don’t enter the extension; it will be set to “<b style='mso-bidi-font-weight:
     1142normal'><span style='font-family:"Calibri","sans-serif";mso-ascii-theme-font:
     1143minor-latin;mso-hansi-theme-font:minor-latin;mso-bidi-font-family:Calibri;
     1144mso-bidi-theme-font:minor-latin'>.<span class=SpellE>gpx</span></span></b>”.</p>
    11431145
    11441146<h2>Next step: <span class=MsoHyperlink><span style='color:#0070C0'><a
  • trunk/help/Strain fitting of 2D data in GSAS-II.htm

    r1293 r1377  
    2525  <o:Author>Von Dreele</o:Author>
    2626  <o:LastAuthor>Von Dreele</o:LastAuthor>
    27   <o:Revision>7</o:Revision>
    28   <o:TotalTime>379</o:TotalTime>
     27  <o:Revision>8</o:Revision>
     28  <o:TotalTime>386</o:TotalTime>
    2929  <o:Created>2014-01-13T15:39:00Z</o:Created>
    30   <o:LastSaved>2014-01-13T19:49:00Z</o:LastSaved>
     30  <o:LastSaved>2014-06-11T17:08:00Z</o:LastSaved>
    3131  <o:Pages>6</o:Pages>
    3232  <o:Words>890</o:Words>
     
    974974<p class=MsoNormal>For this demo, data were collected with a MAR2300 area
    975975detector at APS 1-ID-C with a wavelength 0.12398 Å (100<span style='font-family:
    976 Symbol'>m</span>m diameter beam) from a 1.5mm square hot rolled steel test specimen;
    977 the front surface has been dusted with some CeO<sub>2</sub> to aid in
     976Symbol'>m</span>m diameter beam) from a 1.5mm square hot rolled steel test
     977specimen; the front surface has been dusted with some CeO<sub>2</sub> to aid in
    978978calibration. Two images are used here; one is with no load on the sample and
    979979the other is with the sample under tension along the y-axis (vertical). The
     
    11051105
    11061106<p class=MsoNormal><span style='mso-no-proof:yes'><!--[if gte vml 1]><v:shape
    1107  id="Picture_x0020_11" o:spid="_x0000_i1036" type="#_x0000_t75" style='width:472.5pt;
    1108  height:349.5pt;visibility:visible;mso-wrap-style:square'>
    1109  <v:imagedata src="Strain%20fitting%20of%202D%20data%20in%20GSAS-II_files/image004.png"
    1110   o:title=""/>
    1111 </v:shape><![endif]--><![if !vml]><img width=630 height=466
    1112 src="Strain%20fitting%20of%202D%20data%20in%20GSAS-II_files/image004.png"
    1113 v:shapes="Picture_x0020_11"><![endif]></span><span
     1107 id="_x0000_i1036" type="#_x0000_t75" style='width:472.5pt;height:388.5pt;
     1108 visibility:visible;mso-wrap-style:square'>
     1109 <v:imagedata src="Strain%20fitting%20of%202D%20data%20in%20GSAS-II_files/image016.png"
     1110  o:title=""/>
     1111</v:shape><![endif]--><![if !vml]><img width=630 height=518
     1112src="Strain%20fitting%20of%202D%20data%20in%20GSAS-II_files/image016.png"
     1113v:shapes="_x0000_i1036"><![endif]></span><span
    11141114style='mso-spacerun:yes'> </span></p>
    11151115
     
    11171117
    11181118<p class=MsoNormal><span style='mso-no-proof:yes'><!--[if gte vml 1]><v:shape
    1119  id="Picture_x0020_12" o:spid="_x0000_i1035" type="#_x0000_t75" style='width:459.75pt;
    1120  height:107.25pt;visibility:visible;mso-wrap-style:square'>
    1121  <v:imagedata src="Strain%20fitting%20of%202D%20data%20in%20GSAS-II_files/image005.png"
    1122   o:title=""/>
    1123 </v:shape><![endif]--><![if !vml]><img width=613 height=143
    1124 src="Strain%20fitting%20of%202D%20data%20in%20GSAS-II_files/image005.png"
    1125 v:shapes="Picture_x0020_12"><![endif]></span></p>
     1119 id="_x0000_i1035" type="#_x0000_t75" style='width:609.75pt;height:107.25pt;
     1120 visibility:visible;mso-wrap-style:square'>
     1121 <v:imagedata src="Strain%20fitting%20of%202D%20data%20in%20GSAS-II_files/image017.png"
     1122  o:title=""/>
     1123</v:shape><![endif]--><![if !vml]><img width=813 height=143
     1124src="Strain%20fitting%20of%202D%20data%20in%20GSAS-II_files/image017.png"
     1125v:shapes="_x0000_i1035"><![endif]></span></p>
    11261126
    11271127<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

    r1195 r1377  
    66 <o:File HRef="image002.png"/>
    77 <o:File HRef="image003.png"/>
    8  <o:File HRef="image004.png"/>
    9  <o:File HRef="image005.png"/>
     8 <o:File HRef="image016.png"/>
     9 <o:File HRef="image017.png"/>
    1010 <o:File HRef="image006.png"/>
    1111 <o:File HRef="image007.png"/>
Note: See TracChangeset for help on using the changeset viewer.