Add new tutorial files

diffpy · Sparks29032 · Jun 22, 2023 · Jun 26, 2023 · Jun 27, 2023 · Jul 3, 2023
commit a16d57cab7fed2759662807949d09f2c88379dd2
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -5,8 +5,8 @@ Release Notes
 .. current developments
 
 v0.0.1
-====================
+------
 
-**Changed:**
+**Added:**
 
-* Fixed rever GH address
+* INSERT SYNOPSIS
diff --git a/diffpy/pdfmorph/pdfplot.py b/diffpy/pdfmorph/pdfplot.py
@@ -80,7 +80,11 @@ def comparePDFs(
     :param show: Show the plot (default True).
     :param maglim: Point after which to magnify the signal by mag. If None (default), no magnification will take
         place.
+<<<<<<< Updated upstream
     :param mag: Magnification factor (default 5).
+=======
+    :param mag: Magnification factor (default 5)
+>>>>>>> Stashed changes
     :param rw: Rw value to display on the plot, if any.
     :param legend: Display the legend (default True).
 

diff --git a/doc/source/index.rst b/doc/source/index.rst
@@ -47,7 +47,11 @@ Christopher L. Farrow, Christopher J. Wright, Pavol Juhás, Chia-Hao
 For a detailed list of contributors, check `here 
 <https://github.com/diffpy/diffpy.pdfmorph/graphs/contributors>`_.
 
-To get started, please go to :ref:`quick_start`
+..
+    Add user manual.
+
+To get started, please go to :ref:`quick_start`. The same information can be found on the user
+available in both PDF and HTML formats.
 
 .. toctree::
    :maxdepth: 3

diff --git a/doc/source/quickstart.rst b/doc/source/quickstart.rst
@@ -14,7 +14,7 @@ Before you've started this tutorial, please ensure that you've installed
 all necessary software and dependencies.
 
 Basic PDFmorph Workflow
------------------------
+=======================
 
     1. Open your Terminal or Command Prompt.
 
@@ -179,11 +179,20 @@ Enjoy the software!
 .. Additional PDFmorph Functionality/Exploration
 .. ---------------------------------------------
 
-.. TODO include undoped PDF example, phase changed PDFs, and nano/non-nano PDFs
+.. TODO include undoped PDF example, phase changed PDFs
 
+Extras
+======
 
-Bug Reports
+Morph Shape
 -----------
 
+
+Morphing Across a Directory
+---------------------------
+
+Bug Reports
+===========
+
 Please enjoy using our software! If you come accross any bugs in the
 application, please report them to diffpy-dev@googlegroups.com.
diff --git a/tutorial/advancedData/__MACOSX/._advancedData b/tutorial/advancedData/__MACOSX/._advancedData
diff --git a/tutorial/advancedData/__MACOSX/advancedData/._ni_qmax25.cgr b/tutorial/advancedData/__MACOSX/advancedData/._ni_qmax25.cgr
diff --git a/tutorial/advancedData/__MACOSX/advancedData/._ni_qmax25_e17.5_p5.0.cgr b/tutorial/advancedData/__MACOSX/advancedData/._ni_qmax25_e17.5_p5.0.cgr
diff --git a/tutorial/advancedData/__MACOSX/advancedData/._ni_qmax25_psize35.cgr b/tutorial/advancedData/__MACOSX/advancedData/._ni_qmax25_psize35.cgr
diff --git a/tutorial/advancedData/advancedData/ni_qmax25.cgr b/tutorial/advancedData/advancedData/ni_qmax25.cgr
diff --git a/tutorial/advancedData/advancedData/ni_qmax25_e17.5_p5.0.cgr b/tutorial/advancedData/advancedData/ni_qmax25_e17.5_p5.0.cgr
diff --git a/tutorial/advancedData/advancedData/ni_qmax25_psize35.cgr b/tutorial/advancedData/advancedData/ni_qmax25_psize35.cgr