Changeset 3343

Timestamp:

Apr 12, 2018 4:52:34 PM (5 years ago)

Author:

toby

Message:

add to web page listing

Location:

trunk

Files:

• help/Tutorials.html (modified) (2 diffs)
• makeTutorial.py (modified) (1 diff)

trunk/help/Tutorials.html

@@ -2 +2 @@
 <h2>List of GSAS-II tutorials</H2><UL>
 
-<p> A list of available tutorials appears below. Each tutorial is a
-web page that can be opened using the link below, but most tutorials also need
-to have example data files downloaded. This can also be done with links included below, 
-but it can be easier to access tutorials using 
-<b>Help/Tutorials</b> menu item.
-When this menu entry is used from inside GSAS-II (unless "browse tutorial on web" is selected),
-the data files are downloaded to a local directory and GSAS-II will start from that directory
-for most file open commands. 
-</p>
+    <p> A list of available tutorials appears below. Each tutorial is a
+    web page that can be opened using the link below, but most tutorials also need
+    to have example data files downloaded. This can also be done with links included below, 
+    but it can be easier to access tutorials using 
+    <b>Help/Tutorials</b> menu item.
+    When this menu entry is used from inside GSAS-II (unless "browse tutorial on web" is selected),
+    the data files are downloaded to a local directory and GSAS-II will start from that directory
+    for most file open commands. 
+    </p>
 </UL><h4>Getting started</H4><UL>
 <LI><A href="https://subversion.xray.aps.anl.gov/pyGSAS/Tutorials/StartingGSASII/Starting GSAS.htm">Starting GSAS-II</A>
@@ -27 +27 @@
 <LI><A href="https://subversion.xray.aps.anl.gov/pyGSAS/Tutorials/Simulation/SimTutorial.htm">Simulating Powder Diffraction with GSAS-II</A>
  [link: <A href="https://subversion.xray.aps.anl.gov/pyGSAS/Tutorials/Simulation/data">Exercise files</A>].
+<LI><A href="https://subversion.xray.aps.anl.gov/pyGSAS/Tutorials/CWInstDemo/FindProfParamCW.htm">Determining Starting Profile Parameters from a Standard</A>
+ [link: <A href="https://subversion.xray.aps.anl.gov/pyGSAS/Tutorials/CWInstDemo/data">Exercise files</A>].
 </UL><h4>Parametric Rietveld fitting</H4><UL>
 <LI><A href="https://subversion.xray.aps.anl.gov/pyGSAS/Tutorials/SeqRefine/SequentialTutorial.htm">Sequential refinement of multiple datasets</A>

trunk/makeTutorial.py

@@ -29 +29 @@
     outname = os.path.join(GSASIIpath.path2GSAS2,'help','Tutorials.html')
 
-    dirList = [l[0] for l in tutorialIndex if len(l) == 3]
+    dirList = [l[0] for l in tutorialIndex if len(l) >= 3]
 
     # loop through directories in Tutorials repository
     dirs = [d[:-1] for d in GSASIIpath.svnList(tutURL,False).split('\n') if d and d[-1] == '/']    
     for d in dirs:
-        if d not in dirList: print(u"makeTutorial: Listed tutorial is missing: "+d)
+        if d not in dirList: print(u"makeTutorial: tutorial directory not in GSASIIctrlGUI.tutorialIndex: "+d)
 
     #import sys