Changeset 1706


Ignore:
Timestamp:
Mar 14, 2015 4:44:16 PM (8 years ago)
Author:
toby
Message:

finish with new Tutorial/Exercise? locs/links

Location:
trunk
Files:
34 added
3 edited

Legend:

Unmodified
Added
Removed

  • trunk/GSASII.py

    r1698 r1706  
    20152015            self._init_Macro()
    20162016        HelpMenu=G2G.MyHelp(self,helpType='Data tree',
    2017             morehelpitems=[('&Tutorials','Tutorials'),
    2018                            ('&New Tutorials','NewTutorials'), # this will eventually go away
     2017            morehelpitems=[('&Old Tutorials','OldTutorials'), # this will eventually go away
     2018                           ('&Download Tutorial','Tutorials'),
    20192019                           ])
    20202020        menubar.Append(menu=HelpMenu,title='&Help')

  • trunk/GSASIIctrls.py

    r1701 r1706  
    14811481            print 'Error: help lookup failed!',event.GetEventObject()
    14821482            print 'id=',event.GetId()
    1483         elif helpType == 'Tutorials':
     1483        elif helpType == 'OldTutorials': # this will go away
    14841484            self.frame.Tutorials = True
    14851485            ShowHelp(helpType,self.frame)
    1486         elif helpType == 'NewTutorials': # this is just for testing
     1486        elif helpType == 'Tutorials':
    14871487            dlg = OpenTutorial(self.frame)
    14881488            if dlg.ShowModal() == wx.ID_OK:
    … …  
    19571957################################################################################
    19581958G2BaseURL = "https://subversion.xray.aps.anl.gov/pyGSAS"
     1959# N.B. tutorialCatalog is generated by routine catalog.py, which also generates the appropriate
     1960# empty directories (.../MT/* .../trunk/GSASII/* *=[help,Exercises])
    19591961tutorialCatalog = (
    19601962    # tutorial dir,      exercise dir,      web page file name                                title for page
    1961     ['TOF Calibration', 'TOF Calibration', 'Calibration of a TOF powder diffractometer.htm', 'Calibration of a TOF powder diffractometer'],
     1963
     1964    ['StartingGSASII', 'StartingGSASII', 'Starting GSAS.htm',
     1965       'Starting GSAS-II'],
     1966       
     1967    ['FitPeaks', 'FitPeaks', 'Fit Peaks.htm',
     1968       'Fitting individual peaks & autoindexing'],
     1969       
     1970    ['CWNeutron', 'CWNeutron', 'Neutron CW Powder Data.htm',
     1971       'CW Neutron Powder fit for Yttrium-Iron Garnet'],
     1972    ['LabData', 'LabData', 'Laboratory X.htm',
     1973       'Fitting laboratory X-ray powder data for fluoroapatite'],
     1974    ['CWCombined', 'CWCombined', 'Combined refinement.htm',
     1975       'Combined X-ray/CW-neutron refinement of PbSO4'],
     1976    ['TOF-CW Joint Refinement', 'TOF-CW Joint Refinement', 'TOF combined XN Rietveld refinement in GSAS.htm',
     1977       'Combined X-ray/TOF-neutron Rietveld refinement'],
     1978    ['SeqRefine', 'SeqRefine', 'SequentialTutorial.htm',
     1979       'Sequential refinement of multiple datasets'],
     1980    ['SeqParametric', 'SeqParametric', 'ParametricFitting.htm',
     1981       'Parametric Fitting and Pseudo Variables for Sequential Fits'],
     1982       
     1983    ['CFjadarite', 'CFjadarite', 'Charge Flipping in GSAS.htm',
     1984       'Charge Flipping structure solution for jadarite'],
     1985    ['CFsucrose', 'CFsucrose', 'Charge Flipping - sucrose.htm',
     1986       'Charge Flipping structure solution for sucrose'],
    19621987    ['TOF Charge Flipping', 'TOF Charge Flipping', 'Charge Flipping with TOF single crystal data in GSASII.htm',
    1963      'Charge flipping with neutron TOF single crystal data'],
    1964     ['TOF-CW Joint Refinement', 'TOF-CW Joint Refinement', 'TOF combined XN Rietveld refinement in GSAS.htm', 'Combined XN Rietveld refinement with TOF data'],
    1965     ['TOF Sequential Single Peak Fit', 'TOF Sequential Single Peak Fit', '', ''],
    1966     ['TOF Single Crystal Refinement', 'TOF Single Crystal Refinement', '', ''],
     1988       'Charge flipping with neutron TOF single crystal data'],
     1989    ['MCsimanneal', 'MCsimanneal', 'MCSA in GSAS.htm',
     1990       'Monte-Carlo simulated annealing structure'],
     1991
     1992    ['2DCalibration', '2DCalibration', 'Calibration of an area detector in GSAS.htm',
     1993       'Calibration of an area detector'],
     1994    ['2DIntegration', '2DIntegration', 'Integration of area detector data in GSAS.htm',
     1995       'Integration of area detector data'],
     1996    ['TOF Calibration', 'TOF Calibration', 'Calibration of a TOF powder diffractometer.htm',
     1997       'Calibration of a Neutron TOF diffractometer'],
     1998       
     1999    ['2DStrain', '2DStrain', 'Strain fitting of 2D data in GSAS-II.htm',
     2000       'Strain fitting of 2D data'],
     2001       
     2002    ['SAimages', 'SAimages', 'Small Angle Image Processing.htm',
     2003       'Image Processing of small angle x-ray data'],
     2004    ['SAfit', 'SAfit', 'Fitting Small Angle Scattering Data.htm',
     2005       'Fitting small angle x-ray data (alumina powder)'],
     2006    ['SAsize', 'SAsize', 'Small Angle Size Distribution.htm',
     2007       'Small angle x-ray data size distribution (alumina powder)'],
     2008    ['SAseqref', 'SAseqref', 'Sequential Refinement of Small Angle Scattering Data.htm',
     2009       'Sequential refinement with small angle scattering data'],
     2010   
     2011    #['TOF Sequential Single Peak Fit', 'TOF Sequential Single Peak Fit', '', ''],
     2012    #['TOF Single Crystal Refinement', 'TOF Single Crystal Refinement', '', ''],
    19672013    )
    19682014if GSASIIpath.GetConfigValue('Tutorial_location'):
    … …  
    20122058        sizer.Add(hlp,0,wx.ALIGN_RIGHT|wx.ALL)
    20132059        #======================================================================
    2014         # This is needed only until we get all the tutorials items moved
    2015         btn = wx.Button(pnl, wx.ID_ANY, "Open older tutorials")
    2016         btn.Bind(wx.EVT_BUTTON, self.OpenOld)
    2017         sizer.Add(btn,0,wx.ALIGN_CENTRE|wx.ALL)
     2060        # # This is needed only until we get all the tutorials items moved
     2061        # btn = wx.Button(pnl, wx.ID_ANY, "Open older tutorials")
     2062        # btn.Bind(wx.EVT_BUTTON, self.OpenOld)
     2063        # sizer.Add(btn,0,wx.ALIGN_CENTRE|wx.ALL)
    20182064        #======================================================================
    20192065        self.BrowseMode = 1
    … …  
    20522098        self.topsizer=sizer
    20532099        self.CenterOnParent()
    2054     def OpenOld(self,event):
    2055         '''Open old tutorials. This is needed only until we get all the tutorials items moved
    2056         '''
    2057         self.EndModal(wx.ID_OK)
    2058         self.frame.Tutorials = True
    2059         ShowHelp('Tutorials',self.frame)
     2100    # def OpenOld(self,event):
     2101    #     '''Open old tutorials. This is needed only until we get all the tutorials items moved
     2102    #     '''
     2103    #     self.EndModal(wx.ID_OK)
     2104    #     self.frame.Tutorials = True
     2105    #     ShowHelp('Tutorials',self.frame)
    20602106    def OnModeSelect(self,event):
    20612107        '''Respond when the mode is changed

  • trunk/help/gsasII.html

    r1475 r1706  
    23112311<p class=MsoNormal><span style='mso-fareast-font-family:"Times New Roman"'><o:p>&nbsp;</o:p></span></p>
    23122312
    2313 <h2><a name=Tutorials><strong>GSAS-II tutorials</strong></a><strong>:<o:p></o:p></strong></h2>
     2313<h2><a name=Tutorials><strong>Older GSAS-II tutorials</strong></a><strong>:<o:p></o:p></strong></h2>
    23142314
    23152315<p class=MsoNormal><strong><a href="Starting%20GSAS.htm"><span
    … …  
    23812381Scattering Data</span></a></span><o:p></o:p></strong></p>
    23822382
    2383 <p class=MsoNormal><strong><span style='font-weight:normal;mso-bidi-font-weight:
    2384 bold'><o:p>&nbsp;</o:p></span></strong></p>
    2385 
    2386 <p class=MsoNormal><strong><o:p>&nbsp;</o:p></strong></p>
     2383<h2><a name=Tutorials><strong>GSAS-II tutorials</strong></a><strong>:<o:p></o:p></strong></h2>
     2384The best way to learn about GSAS-II is to work through tutorials,
     2385which shows how to use different sections of the program. A list
     2386appears below. These tutorials can be viewed as web pages using the
     2387links below, but to actually perform the tutorial exercises, the
     2388sample data needs to be downloaded, which can be done most easily
     2389using the Help/Tutorials menu command. When that is used, data files
     2390(and optionally the web pages for off-line use) can be downloaded.
     2391
     2392<p><i>Getting started</i><UL>
     2393<LI><strong><a href="https://subversion.xray.aps.anl.gov/pyGSAS/Tutorials/StartingGSASII/Starting GSAS.htm"><span style='font-weight:normal'>Starting GSAS-II
     2394</span></a></strong>
     2395(no files)
     2396</LI>
     2397
     2398<li><strong><a href="https://subversion.xray.aps.anl.gov/pyGSAS/Tutorials/FitPeaks/Fit Peaks.htm">
     2399<span style='font-weight:normal'>Fitting individual peaks & autoindexing
     2400</span></a></strong>
     2401(<a href="https://subversion.xray.aps.anl.gov/pyGSAS/Exercises/FitPeaks/">files</a>)</li>
     2402 
     2403</ul><p><i>Rietveld fitting</i><ul>
     2404
     2405<li><strong><a href="https://subversion.xray.aps.anl.gov/pyGSAS/Tutorials/CWNeutron/Neutron
     2406CW Powder Data.htm">
     2407<span style='font-weight:normal'>CW Neutron Powder fit for Yttrium-Iron Garnet
     2408</span></a></strong>
     2409(<a href="https://subversion.xray.aps.anl.gov/pyGSAS/Exercises/CWNeutron">files</a>)</li>
     2410
     2411<li><strong><a href="https://subversion.xray.aps.anl.gov/pyGSAS/Tutorials/LabData/Laboratory X.htm">
     2412<span style='font-weight:normal'>Fitting laboratory X-ray powder data for fluoroapatite
     2413</span></a></strong>
     2414(<a href="https://subversion.xray.aps.anl.gov/pyGSAS/Exercises/LabData">files</a>)</li>
     2415
     2416<li><strong><a href="https://subversion.xray.aps.anl.gov/pyGSAS/Tutorials/CWCombined/Combined refinement.htm">
     2417<span style='font-weight:normal'>Combined X-ray/CW-neutron refinement of PbSO4
     2418</span></a></strong>
     2419(<a href="https://subversion.xray.aps.anl.gov/pyGSAS/Exercises/CWCombined">files</a>)</li>
     2420
     2421<li><strong><a href="https://subversion.xray.aps.anl.gov/pyGSAS/Tutorials/TOF-CW Joint Refinement/TOF combined XN Rietveld refinement in GSAS.htm">
     2422<span style='font-weight:normal'>Combined X-ray/TOF-neutron Rietveld refinement
     2423</span></a></strong>
     2424(<a href="https://subversion.xray.aps.anl.gov/pyGSAS/Exercises/TOF-CW Joint Refinement">files</a>)</li>
     2425
     2426<li><strong><a href="https://subversion.xray.aps.anl.gov/pyGSAS/Tutorials/SeqRefine/SequentialTutorial.htm">
     2427<span style='font-weight:normal'>Sequential refinement of multiple datasets
     2428</span></a></strong>
     2429(<a href="https://subversion.xray.aps.anl.gov/pyGSAS/Exercises/SeqRefine">files</a>)</li>
     2430
     2431<li><strong><a href="https://subversion.xray.aps.anl.gov/pyGSAS/Tutorials/SeqParametric/ParametricFitting.htm">
     2432<span style='font-weight:normal'>Parametric Fitting and Pseudo Variables for Sequential Fits
     2433</span></a></strong>
     2434(<a href="https://subversion.xray.aps.anl.gov/pyGSAS/Exercises/SeqParametric">files</a>)</li>
     2435
     2436</ul><p><i>Structure solution</i><ul>
     2437
     2438<li><strong><a href="https://subversion.xray.aps.anl.gov/pyGSAS/Tutorials/CFjadarite/Charge Flipping in GSAS.htm">
     2439<span style='font-weight:normal'>Charge Flipping structure solution for jadarite
     2440</span></a></strong>
     2441(<a href="https://subversion.xray.aps.anl.gov/pyGSAS/Exercises/CFjadarite">files</a>)</li>
     2442
     2443<li><strong><a href="https://subversion.xray.aps.anl.gov/pyGSAS/Tutorials/CFsucrose/Charge Flipping - sucrose.htm">
     2444<span style='font-weight:normal'>Charge Flipping structure solution for sucrose
     2445</span></a></strong>
     2446(<a href="https://subversion.xray.aps.anl.gov/pyGSAS/Exercises/CFsucrose">files</a>)</li>
     2447
     2448<li><strong><a href="https://subversion.xray.aps.anl.gov/pyGSAS/Tutorials/TOF Charge Flipping/Charge Flipping with TOF single crystal data in GSASII.htm">
     2449<span style='font-weight:normal'>Charge flipping with neutron TOF single crystal data
     2450</span></a></strong>
     2451(<a href="https://subversion.xray.aps.anl.gov/pyGSAS/Exercises/TOF Charge Flipping">files</a>)</li>
     2452
     2453<li><strong><a href="https://subversion.xray.aps.anl.gov/pyGSAS/Tutorials/MCsimanneal/MCSA in GSAS.htm">
     2454<span style='font-weight:normal'>Monte-Carlo simulated annealing structure
     2455</span></a></strong>
     2456(<a href="https://subversion.xray.aps.anl.gov/pyGSAS/Exercises/MCsimanneal">files</a>)</li>
     2457
     2458</ul><p><i>Calibration/Image Processing</i><ul>
     2459
     2460<li><strong><a href="https://subversion.xray.aps.anl.gov/pyGSAS/Tutorials/2DCalibration/Calibration of an area detector in GSAS.htm">
     2461<span style='font-weight:normal'>Calibration of an area detector
     2462</span></a></strong>
     2463(<a href="https://subversion.xray.aps.anl.gov/pyGSAS/Exercises/2DCalibration">files</a>)</li>
     2464
     2465<li><strong><a href="https://subversion.xray.aps.anl.gov/pyGSAS/Tutorials/2DIntegration/Integration of area detector data in GSAS.htm">
     2466<span style='font-weight:normal'>Integration of area detector data
     2467</span></a></strong>
     2468(<a href="https://subversion.xray.aps.anl.gov/pyGSAS/Exercises/2DIntegration">files</a>)</li>
     2469
     2470<li><strong><a href="https://subversion.xray.aps.anl.gov/pyGSAS/Tutorials/TOF Calibration/Calibration of a TOF powder diffractometer.htm">
     2471<span style='font-weight:normal'>Calibration of a Neutron TOF diffractometer
     2472</span></a></strong>
     2473(<a href="https://subversion.xray.aps.anl.gov/pyGSAS/Exercises/TOF Calibration">files</a>)</li>
     2474       
     2475</ul><p><i>Other</i><ul>
     2476
     2477<li><strong><a href="https://subversion.xray.aps.anl.gov/pyGSAS/Tutorials/2DStrain/Strain fitting of 2D data in GSAS-II.htm">
     2478<span style='font-weight:normal'>Strain fitting of 2D data
     2479</span></a></strong>
     2480(<a href="https://subversion.xray.aps.anl.gov/pyGSAS/Exercises/2DStrain">files</a>)</li>
     2481
     2482</ul><p><i>Small-Angle scattering</i><ul>
     2483
     2484<li><strong><a href="https://subversion.xray.aps.anl.gov/pyGSAS/Tutorials/SAimages/Small Angle Image Processing.htm">
     2485<span style='font-weight:normal'>Image Processing of small angle x-ray data
     2486</span></a></strong>
     2487(<a href="https://subversion.xray.aps.anl.gov/pyGSAS/Exercises/SAimages">files</a>)</li>
     2488
     2489<li><strong><a href="https://subversion.xray.aps.anl.gov/pyGSAS/Tutorials/SAfit/Fitting Small Angle Scattering Data.htm">
     2490<span style='font-weight:normal'>Fitting small angle x-ray data (alumina powder)
     2491</span></a></strong>
     2492(<a href="https://subversion.xray.aps.anl.gov/pyGSAS/Exercises/SAfit">files</a>)</li>
     2493
     2494<li><strong><a href="https://subversion.xray.aps.anl.gov/pyGSAS/Tutorials/SAsize/Small Angle Size Distribution.htm">
     2495<span style='font-weight:normal'>Small angle x-ray data size distribution (alumina powder)
     2496</span></a></strong>
     2497(<a href="https://subversion.xray.aps.anl.gov/pyGSAS/Exercises/SAsize">files</a>)</li>
     2498
     2499<li><strong><a href="https://subversion.xray.aps.anl.gov/pyGSAS/Tutorials/SAseqref/Sequential Refinement of Small Angle Scattering Data.htm">
     2500<span style='font-weight:normal'>Sequential refinement with small angle scattering data
     2501</span></a></strong>
     2502(<a href="https://subversion.xray.aps.anl.gov/pyGSAS/Exercises/SAseqref">files</a>)</li>
     2503</UL>
    23872504
    23882505<p class=MsoNormal><strong><o:p>&nbsp;</o:p></strong></p>
    … …  
    63146431style='mso-bookmark:Pawley'><o:p>&nbsp;</o:p></span></p>
    63156432
    6316 <p class=MsoNormal><span style='mso-bookmark:Pawley'><!-- hhmts start --></span><a
    6317 href="gsasII.html"><span style='mso-bookmark:Pawley'><span style='mso-fareast-font-family:
    6318 "Times New Roman";color:windowtext;text-decoration:none;text-underline:none'>Last
    6319 modified: Tue Nov 22 13:19:47 CST 2011 </span></span><span style='mso-bookmark:
    6320 Pawley'></span></a><span style='mso-bookmark:Pawley'></span><span
    6321 class=MsoHyperlink><span style='mso-fareast-font-family:"Times New Roman";
    6322 color:windowtext;text-decoration:none;text-underline:none'><o:p></o:p></span></span></p>
    6323 
    6324 </div>
    6325 
    6326 <!-- hhmts end -->
     6433<p class=MsoNormal><span style='mso-bookmark:Pawley'><!-- hhmts start -->Last modified: Sat Mar 14 16:34:31 CDT 2015 <!-- hhmts end -->
    63276434</body>
    63286435
Note: See TracChangeset for help on using the changeset viewer.