Bug fix

Author: Sparks29032

src/diffpy/morph/morphapp.py

@@ -410,16 +410,18 @@ def single_morph(parser, opts, pargs, stdout_flag=True, python_wrap=False):
         parser.error(
             "Too many arguments. Make sure you only supply FILE1 and FILE2."
         )
-    elif (len(pargs) != 2 or len(pargs) != 6) and python_wrap:
-        parser.error("Python wrapper error.")
+    elif not (len(pargs) == 2 or len(pargs) == 6) and python_wrap:
+        parser.error(
+            "Python wrapper error."
+        )
 
     # Get the PDFs
     # If we get from python, we may wrap, which has input size 4
     if len(pargs) == 6 and python_wrap:
-        x_morph = pargs[1]
-        y_morph = pargs[2]
-        x_target = pargs[3]
-        y_target = pargs[4]
+        x_morph = pargs[2]
+        y_morph = pargs[3]
+        x_target = pargs[4]
+        y_target = pargs[5]
     else:
         x_morph, y_morph = getPDFFromFile(pargs[0])
         x_target, y_target = getPDFFromFile(pargs[1])

src/diffpy/morph/morphpy.py

@@ -42,7 +42,7 @@ def morph(morph_file, target_file, **kwargs):
     )
 
 
-def morphpy(morph_table, target_table, morph_header, target_header, **kwargs):
+def morphpy(morph_table, target_table, morph_header=None, target_header=None, **kwargs):
     """Run diffpy.morph at Python level.
 
     Parameters
@@ -82,6 +82,7 @@ def morphpy(morph_table, target_table, morph_header, target_header, **kwargs):
     y_target = target_table[:, 1]
 
     pargs = ["Morph", "Target", x_morph, y_morph, x_target, y_target]
+    print(pargs)
 
     return single_morph(
         parser, opts, pargs, stdout_flag=False, python_wrap=True