Print statement fix

Author: Sparks29032

src/diffpy/pdfmorph/pdfmorph_io.py

@@ -174,6 +174,7 @@ def multiple_morph_output(
     target_directory=None,
     verbose=False,
     stdout_flag=False,
+    mm=False,
 ):
     """Helper function for printing details about a series of multiple morphs.
     Handles both printing to terminal and printing to a file.
@@ -201,6 +202,9 @@ def multiple_morph_output(
         Print additional summary details when True (default False).
     stdout_flag: bool
         Print to terminal when True (default False).
+    mm: bool
+        Multiple morphs done with a single target rather than multiple targets for a single morphed file.
+        Swaps morph and target in the code.
     """
 
     # Input parameters used for every morph
@@ -212,7 +216,10 @@ def multiple_morph_output(
     if verbose:
         # Output for every morph (information repeated in a succinct table below)
         for target in morph_results.keys():
-            output = f"\n# Target: {target}\n"
+            if not mm:
+                output = f"\n# Target: {target}\n"
+            else:
+                output = f"\n# Morph: {target}\n"
             output += "# Optimized morphing parameters:\n"
             output += "\n".join(
                 f"# {param} = {morph_results[target][param]:.6f}" for param in morph_results[target]
@@ -223,7 +230,10 @@ def multiple_morph_output(
     tabulated_results = tabulate_results(morph_results)
 
     # Table labels
-    labels = "\n# Labels: [Target]"
+    if not mm:
+        labels = "\n# Labels: [Target]"
+    else:
+        labels = "\n# Labels: [Morph]"
     if field is not None:
         labels += f" [{field}]"
     for param in tabulated_results.keys():
@@ -252,8 +262,12 @@ def multiple_morph_output(
         target_path_name = str(Path(target_directory).resolve())
 
         header = "# Data generated by pdfmorph\n"
-        header += f"# from morphing {morph_path_name}\n"
-        header += f"# with target directory {target_path_name}"
+        if not mm:
+            header += f"# from morphing {morph_path_name}\n"
+            header += f"# with target directory {target_path_name}"
+        else:
+            header += f"# from morphing directory {target_path_name}\n"
+            header += f"# with target {morph_path_name}"
         reference_table = Path(save_directory).joinpath("Morph_Reference_Table.txt")
         with open(reference_table, "w") as reference:
             print(f"{header}\n{inputs}\n{verbose_outputs}{table}", file=reference)

src/diffpy/pdfmorph/pdfmorphapp.py

@@ -732,12 +732,13 @@ def multiple_morphs(parser, opts, pargs, stdout_flag=True):
             morph_results,
             morph_file_names,
             save_directory=save_directory,
-            morph_directory=morph_directory,
-            target_file=target_file,
+            morph_file=target_file,
+            target_directory=morph_directory,
             field=field,
             field_list=field_list,
             verbose=opts.verbose,
             stdout_flag=stdout_flag,
+            mm=True,
         )
     except (FileNotFoundError, RuntimeError):
         save_fail_message = "Unable to save summary to directory."