Python Interfacing for PDFmorph (Clean Branch)

doc/source/morphpy.rst

@@ -0,0 +1,174 @@
+.. _morphpy:
+
+Using diffpy.morph in Python
+############################
+
+On top of the command-line usage described in the `quickstart tutorial <quickstart.html>`__,
+``diffpy.morph`` also supports Python integration.
+This functionality is intended for those acquainted with the basic morphs
+described in the aforementioned quickstart tutorial who want to use ``diffpy.morph`` in their
+Python scripts.
+
+Python Morphing Functions
+=========================
+
+    1. In the quickstart tutorial, you were asked to try a combined scale, stretch, and smear
+       morph on the files `darkSub_rh20_C_01.gr` and `darkSub_rh20_C_44.gr` using the command-line
+       command ::
+
+          diffpy.morph --scale=0.8 --smear=-0.08 --stretch=0.5 --rmin=1.5 --rmax=30 darkSub_rh20_C_01.gr darkSub_rh20_C_44.gr
+
+    2. To do the same on Python, we must first create a new Python script in the same directory as the
+       data files `darkSub_rh20_C_01.gr` and `darkSub_rh20_C_44.gr`.
+    3. Then, in that script, import ::
+
+           from diffpy.morph.morphpy import morph
+
+    3. Finally, we run the ``morph`` function ::
+
+           morph_info, morph_table = morph("darkSub_rh20_C_01.gr", "darkSub_rh20_C_44.gr", scale=0.8, smear=-0.08, stretch=0.5, rmin=1.5, rmax=30)
+
+           * The ``morph`` function takes in two file names (or paths). You can also provide various parameters
+             for morphing (see the Full Parameter List below).
+           * If, let's say, the file `darkSub_rh20_C_01.gr` is in a subdirectory `subdir/darkSub_rh20_C_01.gr`,
+             you should replace ``"darkSub_rh20_C_01.gr"`` in the above example with ``"subdir/darkSub_rh20_C_01.gr"``.
+
+    4. The ``morph`` function returns a dictionary ``morph_info`` and a numpy array ``morph_table``.
+
+       * ``morph_info`` contains all morphs as keys (e.g. ``"scale"``, ``"stretch"``, ``"smear"``) with
+         the optimized morphing parameters found by ``diffpy.morph`` as values. ``morph_info`` also contains
+         the Rw and Pearson correlation coefficients found post-morphing.
+       * ``morph_table`` is a two-column array of the morphed function interpolated onto the grid of the
+         target function (e.g. in our example, it returns the contents of `darkSub_rh20_C_01.gr` after
+         the morphs are applied interpolated onto the grid of `darkSub_rh20_C_44.gr`).
+    5. Notice that most parameters you are able to use are the same as the options provided in the command-line
+       interface version of ``diffpy.morph``. For example, the ``--apply`` option becomes the ``apply=True`` parameter.
+    6. With that, you have already mastered the basics of using ``diffpy.morph`` on Python!
+    7. Note that instead of passing two files to ``diffpy.morph``, you might instead want to directly
+       pass arrays. For example, rather than passing `darkSub_rh20_C_01.gr`, I may want to pass
+       a two-column array named ``ds_rh20_c_01_array`` containing the data table contents of the file
+       `darkSub_rh20_C_01.gr`. In this case, we have a separate function ::
+
+           from diffpy.morph.morphpy import morph_arrays
+
+    8. Assuming we have loaded the data in `darkSub_rh20_C_01.gr` into ``ds_rh20_c_01_array`` and
+       `darkSub_rh20_C_44.gr` into ``ds_rh20_c_44_array``, we can apply the same morph as step 3
+       by running ::
+
+           morph_info, morph_table = morph_arrays(ds_rh20_c_01_array, ds_rh20_c_44_array, scale=0.8, smear=-0.08, stretch=0.5, rmin=1.5, rmax=30)
+
+    9. Notice that the two-column format of the input to ``morph_arrays`` is the same as the
+       output of ``morph`` and ``morph_arrays``. It is VERY IMPORTANT that the data is in two-column format
+       rather than the traditional two-row format. This is to reflect the file formats conventionally
+       used to store PDFs.
+    10. For a full list of parameters used by (both) ``morph`` and ``morph_arrays``, see the Full Parameter List
+        section below.
+
+Full Parameter List
+===================
+
+General Parameters
+------------------
+
+save: str or path
+    Save the morphed function to a the file passed to save. Use '-' for stdout.
+verbose: bool
+    Print additional header details to saved files. These include details about the morph
+    inputs and outputs.
+rmin: float
+    Minimum r-value (abscissa) to use for function comparisons.
+rmax: float
+    Maximum r-value (abscissa) to use for function comparisons.
+tolerance: float
+    Specify least squares refiner tolerance when optimizing for morph parameters. Default: 10e-8.
+pearson: bool
+    The refiner instead maximizes agreement in the Pearson function
+    (default behavior is to minimize the residual).
+    Note that this is insensitive to scale.
+addpearson: bool
+    Maximize agreement in the Pearson function as well as minimizing the residual.
+
+Manipulations
+-------------
+These parameters select the manipulations that are to be applied to the
+function. The passed values will be refined unless specifically
+excluded with the apply or exclude parameters.
+
+apply: bool
+    Apply morphs but do not refine.
+exclude: str
+    Exclude a manipulation from refinement by name.
+scale: float
+    Apply scale factor. This multiplies the function ordinate by scale.
+stretch: float
+    Stretch function grid by a fraction stretch. Specifically, this multiplies the function grid by 1+stretch.
+squeeze: list of float
+    Squeeze function grid given a polynomial
+    p(x) = squeeze[0]+squeeze[1]*x+...+squeeze[n]*x^n. n is dependent on the number
+    of values in the user-inputted comma-separated list.
+    The morph transforms the function grid from x to x+p(x).
+    When this parameter is given, hshift is disabled.
+    When n>1, stretch is disabled.
+smear: float
+    Smear the peaks with a Gaussian of width smear. This
+    is done by convolving the function with a Gaussian
+    with standard deviation smear. If both smear and
+    smear_pdf are used, only smear_pdf will be
+    applied.
+smear_pdf: float
+    Convert PDF to RDF. Then, smear peaks with a Gaussian
+    of width smear_pdf. Convert back to PDF. If both smear and
+    smear_pdf are used, only smear_pdf will be
+    applied.
+slope: float
+    Slope of the baseline used in converting from PDF to RDF.
+    This is used with the option smear_pdf. The slope will
+    be estimated if not provided.
+hshift: float
+    Shift the function horizontally by hshift to the right.
+vshift: float
+    Shift the function vertically by vshift upward.
+qdamp: float
+    Dampen PDF by a factor qdamp.
+radius: float
+    Apply characteristic function of sphere with radius
+    given by parameter radius. If pradius is also specified, instead apply
+    characteristic function of spheroid with equatorial
+    radius radius and polar radius pradius.
+pradius: float
+    Apply characteristic function of spheroid with
+    equatorial radius given by above parameter radius and polar radius pradius.
+    If only pradius is specified, instead apply
+    characteristic function of sphere with radius pradius.
+iradius: float
+    Apply inverse characteristic function of sphere with
+    radius iradius. If ipradius is also specified, instead
+    apply inverse characteristic function of spheroid with
+    equatorial radius iradius and polar radius ipradius.
+ipradius: float
+    Apply inverse characteristic function of spheroid with
+    equatorial radius iradius and polar radius ipradius.
+    If only ipradius is specified, instead apply inverse
+    characteristic function of sphere with radius ipradius.
+funcy: tuple (function, dict)
+    See Python-Specific Morphs below.
+
+Python-Specific Morphs
+======================
+
+Some morphs in ``diffpy.morph`` are supported only in Python. Here, we detail
+how they are used and how to call them.
+
+funcy: tuple (function, dict)
+    This morph applies the function funcy[0] with parameters given in funcy[1].
+    The function funcy[0] must be a function of both the abscissa and ordinate
+    (e.g. take in at least two inputs with as many additional parameters as needed).
+    For example, let's start with a two-column table with abscissa x and ordinate y.
+    let us say we want to apply the function ::
+
+        def linear(x, y, a, b, c):
+            return a * x + b * y + c
+
+    This function takes in both the abscissa and ordinate on top of three additional
+    parameters a, b, and c. To use the funcy parameter with initial guesses
+    a=1.0, b=2.0, c=3.0, we would pass ``funcy=(linear, {a: 1.0, b: 2.0, c: 3.0})``.

doc/source/quickstart.rst

@@ -4,7 +4,11 @@ diffpy.morph Tutorial
 #####################
 
 Welcome! This will be a quick tutorial to accquaint users with ``diffpy.morph``
-and some of what it can do. To see more details and definitions about
+and some of what it can do on the command-line.
+For those wishing to integrate ``diffpy.morph`` into their Python scripts,
+see the `morphpy tutorial <morphpy.html>`__.
+
+To see more details and definitions about
 the morphs please see the publication describing ``diffpy.morph``.
 
 To be published:

news/morphpy.rst

@@ -0,0 +1,24 @@
+**Added:**
+
+* Python interfacing to call PDFmorph
+* Returns dictionary of morph metrics (dict) and the r, gr pair for plotting or further manipulation
+
+**Changed:**
+
+* <news item>
+
+**Deprecated:**
+
+* <news item>
+
+**Removed:**
+
+* <news item>
+
+**Fixed:**
+
+* <news item>
+
+**Security:**
+
+* <news item>

src/diffpy/morph/morph_io.py

@@ -16,6 +16,7 @@
 
 from __future__ import print_function
 
+import inspect
 import sys
 from pathlib import Path
 
@@ -66,29 +67,55 @@ def single_morph_output(
         + "\n"
     )
 
+    mr_copy = morph_results.copy()
     morphs_out = "# Optimized morphing parameters:\n"
-    # Handle special inputs
-    if "squeeze" in morph_results:
-        sq_dict = morph_results.pop("squeeze")
-        rw_pos = list(morph_results.keys()).index("Rw")
-        morph_results_list = list(morph_results.items())
+    # Handle special inputs (numerical)
+    if "squeeze" in mr_copy:
+        sq_dict = mr_copy.pop("squeeze")
+        rw_pos = list(mr_copy.keys()).index("Rw")
+        morph_results_list = list(mr_copy.items())
         for idx, _ in enumerate(sq_dict):
             morph_results_list.insert(
                 rw_pos + idx, (f"squeeze a{idx}", sq_dict[f"a{idx}"])
             )
-        morph_results = dict(morph_results_list)
+        mr_copy = dict(morph_results_list)
+    funcy_function = None
+    if "function" in mr_copy:
+        funcy_function = mr_copy.pop("function")
+        print(funcy_function)
+    if "funcy" in mr_copy:
+        fy_dict = mr_copy.pop("funcy")
+        rw_pos = list(mr_copy.keys()).index("Rw")
+        morph_results_list = list(mr_copy.items())
+        for idx, key in enumerate(fy_dict):
+            morph_results_list.insert(
+                rw_pos + idx, (f"funcy {key}", fy_dict[key])
+            )
+        mr_copy = dict(morph_results_list)
     # Normal inputs
     morphs_out += "\n".join(
-        f"# {key} = {morph_results[key]:.6f}" for key in morph_results.keys()
+        f"# {key} = {mr_copy[key]:.6f}" for key in mr_copy.keys()
     )
+    # Special inputs (functional)
+    if funcy_function is not None:
+        morphs_in += '# funcy function =\n"""\n'
+        f_code, _ = inspect.getsourcelines(funcy_function)
+        n_leading = len(f_code[0]) - len(f_code[0].lstrip())
+        for idx, f_line in enumerate(f_code):
+            f_code[idx] = f_line[n_leading:]
+        morphs_in += "".join(f_code)
+        morphs_in += '"""\n'
 
     # Printing to terminal
     if stdout_flag:
         print(f"{morphs_in}\n{morphs_out}\n")
 
     # Saving to file
     if save_file is not None:
-        path_name = str(Path(morph_file).resolve())
+        if not Path(morph_file).exists():
+            path_name = "NO FILE PATH PROVIDED"
+        else:
+            path_name = str(Path(morph_file).resolve())
         header = "# PDF created by diffpy.morph\n"
         header += f"# from {path_name}"