Changeset 3544


Ignore:
Timestamp:
Aug 2, 2018 1:08:36 PM (5 years ago)
Author:
toby
Message:

add 2nd calibration tutorial, add to index & add video links

Files:
45 added
4 edited

Legend:

Unmodified
Added
Removed

  • Tutorials/DeterminingWavelength/DeterminingWavelength.html

    r3540 r3544  
    11<html><head><meta content="text/html; charset=UTF-8" http-equiv="content-type"><style type="text/css">@import url('https://themes.googleusercontent.com/fonts/css?kit=f07rT8OfEooBJQZ-uS2Ruw');ol{margin:0;padding:0}table td,table th{padding:0}.c1{padding-top:0pt;padding-bottom:0pt;line-height:1.15;orphans:2;widows:2;text-align:left;height:11pt}.c3{padding-top:0pt;padding-bottom:0pt;line-height:1.15;orphans:2;widows:2;text-align:left}.c8{padding-top:18pt;padding-bottom:4pt;line-height:1.15;text-align:left}.c4{color:#000000;text-decoration:none;vertical-align:baseline;font-style:normal}.c9{font-weight:700;font-size:24pt;font-family:"Times New Roman"}.c5{background-color:#ffffff}.c6{font-weight:700;font-size:18pt;font-family:"Times New Roman"}.c7{font-weight:400;font-size:11pt;font-family:"Arial"}.c0{font-size:12pt;font-family:"Calibri";font-weight:700}.c2{font-size:12pt;font-family:"Times New Roman";font-weight:400}.title{padding-top:0pt;color:#000000;font-size:26pt;padding-bottom:3pt;font-family:"Arial";line-height:1.15;page-break-after:avoid;orphans:2;widows:2;text-align:left}.subtitle{padding-top:0pt;color:#666666;font-size:15pt;padding-bottom:16pt;font-family:"Arial";line-height:1.15;page-break-after:avoid;orphans:2;widows:2;text-align:left}li{color:#000000;font-size:11pt;font-family:"Arial"}p{margin:0;color:#000000;font-size:11pt;font-family:"Arial"}h1{padding-top:20pt;color:#000000;font-size:20pt;padding-bottom:6pt;font-family:"Arial";line-height:1.15;page-break-after:avoid;orphans:2;widows:2;text-align:left}h2{padding-top:18pt;color:#000000;font-size:16pt;padding-bottom:6pt;font-family:"Arial";line-height:1.15;page-break-after:avoid;orphans:2;widows:2;text-align:left}h3{padding-top:16pt;color:#434343;font-size:14pt;padding-bottom:4pt;font-family:"Arial";line-height:1.15;page-break-after:avoid;orphans:2;widows:2;text-align:left}h4{padding-top:14pt;color:#666666;font-size:12pt;padding-bottom:4pt;font-family:"Arial";line-height:1.15;page-break-after:avoid;orphans:2;widows:2;text-align:left}h5{padding-top:12pt;color:#666666;font-size:11pt;padding-bottom:4pt;font-family:"Arial";line-height:1.15;page-break-after:avoid;orphans:2;widows:2;text-align:left}h6{padding-top:12pt;color:#666666;font-size:11pt;padding-bottom:4pt;font-family:"Arial";line-height:1.15;page-break-after:avoid;font-style:italic;orphans:2;widows:2;text-align:left}</style></head>
     2
    23<body class="c5"><div><p class="c1"><span class="c4 c7"></span></p></div><p class="c3">
    3 <span class="c4 c9">Part 1: Determining Wavelength Using Multiple Detector Placements</span></p><p class="c3"><span class="c2">
     4<span class="c4 c9">
     5Area Detector Calibration with Multiple Distances, part 1: Determine Wavelength
     6</span></p><p class="c3"><span class="c2">
    47</span></p><p class="c1"></p><p class="c3"><span class="c4 c2">
    58<B>A video version of this tutorial is available at
    6 <A href="https://anl.box.com/v/DeterminingWavelength">https://anl.box.com/v/DeterminingWavelength</A></B>
     9<A href="https://anl.box.com/v/DeterminingWavelength" target="_blank">https://anl.box.com/v/DeterminingWavelength</A></B>
    710</span></p><p class="c1"></p><p class="c3"><span class="c4 c2">
    811

  • trunk/GSASIIctrlGUI.py

    r3506 r3544  
    40304030#        wx.aui.AuiNotebook.Bind(self,eventtype,handler,*args,**kwargs)
    40314031                                                     
    4032     def Clear(self):       
     4032    def Clear(self):
    40334033        GSNoteBook.DeleteAllPages(self)
    40344034       
    … …  
    50715071    ['2DTexture', 'Texture analysis of 2D data in GSAS-II.htm', 'Texture analysis of 2D data',
    50725072     '''This shows 3 different methods for determining texture via spherical harmonics from 2D x-ray diffraction images. '''],
    5073              
     5073    ['DeterminingWavelength', 'DeterminingWavelength.html', 'Area Detector Calibration with Multiple Distances: Determine Wavelength',
     5074     '''To get an accurate wavelength, without knowing the sample-to-detector distance accurately, images recorded with
     5075     several different distances can be used. This exercise shows how to determine the wavelength from such a series.
     5076     This exercise is the prerequisite for the next one.'''],
     5077    ['CalibrationTutorial', 'CalibrationTutorial.html', '    Area Detector Calibration with Multiple Distances: Calibrate Detector Distances',
     5078     '''To get an accurate wavelength, without knowing the sample-to-detector distance accurately, images recorded with
     5079     several different distances can be used. After using the previous exercise to determine the wavelength,
     5080     this exercise calibrates the detector distances and shows examples of how to mask, integrate, and save those parameters
     5081     for future reuse.'''],
     5082                   
    50745083    ['Small-Angle Scattering'],       
    50755084    ['SAsize', 'Small Angle Size Distribution.htm', 'Small angle x-ray data size distribution (alumina powder)',

  • trunk/help/Tutorials.html

    r3506 r3544  
    117117 [link: <A href="https://subversion.xray.aps.anl.gov/pyGSAS/Tutorials/2DTexture/data">Exercise files</A>].
    118118<blockquote><I>This shows 3 different methods for determining texture via spherical harmonics from 2D x-ray diffraction images. </I></blockquote>
     119<LI><A href="https://subversion.xray.aps.anl.gov/pyGSAS/Tutorials/DeterminingWavelength/DeterminingWavelength.html">Area Detector Calibration with Multiple Distances: Determine Wavelength</A>
     120 [link: <A href="https://anl.box.com/v/DeterminingWavelength">video</A>].
     121 [link: <A href="https://subversion.xray.aps.anl.gov/pyGSAS/Tutorials/DeterminingWavelength/data">Exercise files</A>].
     122<blockquote><I>To get an accurate wavelength, without knowing the sample-to-detector distance accurately, images recorded with
     123     several different distances can be used. This exercise shows how to determine the wavelength from such a series.
     124     This exercise is the prerequisite for the next one.</I></blockquote>
     125<UL><LI><A href="https://subversion.xray.aps.anl.gov/pyGSAS/Tutorials/CalibrationTutorial/CalibrationTutorial.html">Area Detector Calibration with Multiple Distances: Calibrate Detector Distances</A> <A href="#prereq">*</A>
     126 [link: <A href="https://anl.box.com/v/CalibrationTutorial">video</A>].
     127 [No exercise files].
     128<blockquote><I>To get an accurate wavelength, without knowing the sample-to-detector distance accurately, images recorded with
     129     several different distances can be used. After using the previous exercise to determine the wavelength,
     130     this exercise calibrates the detector distances and shows examples of how to mask, integrate, and save those parameters
     131     for future reuse.</I></blockquote>
     132</UL>
    119133</UL><h4>Small-Angle Scattering</H4><UL>
    120134<LI><A href="https://subversion.xray.aps.anl.gov/pyGSAS/Tutorials/SAsize/Small Angle Size Distribution.htm">Small angle x-ray data size distribution (alumina powder)</A>

  • trunk/makeTutorial.py

    r3386 r3544  
    1919from __future__ import print_function
    2020import os
     21import requests
    2122import GSASIIpath
    2223#import GSASIIctrl as G2G
    … …  
    6667            else:
    6768                print('<LI><A href="{}">{}</A>'.format(pageURL,l[2].strip()),file=out)
    68 
     69           
     70            # check for video tutorial
     71            vname = 'https://anl.box.com/v/' + os.path.splitext(l[1])[0].replace(' ','')[:30]
     72            if requests.get(vname).status_code == 200:
     73                print(' [link: <A href="{}">video</A>].'.format(vname),file=out)
     74                #print('Found video',vname)
     75            else:
     76                print('No video',vname)
    6977            if GSASIIpath.svnList(dataURL,False):
    7078                print(' [link: <A href="{}">Exercise files</A>].'.format(dataURL),file=out)
Note: See TracChangeset for help on using the changeset viewer.