Improves the way the plotting function handles 'prefixes'

Author: StuntsPT

structure_threader/argparser.py

@@ -166,10 +166,11 @@ def argument_parser(args):
     sort_opts_ex = sort_opts.add_mutually_exclusive_group(required=True)
 
     main_opts.add_argument("-i", dest="prefix", type=str, required=True,
-                           help="The prefix of the output meanQ files."
-                                "You can provide a full path or just the "
-                                "prefix. Passing just the prefix will assume "
-                                "the current working diretory.")
+                           help="The directory where output meanQ files you "
+                                "want to plot are located."
+                                "If plotting MavericK results, provide"
+                                "the directory where the directories named"
+                                "`mav_KX` are located.")
     main_opts.add_argument("-f", dest="program", type=str, required=True,
                            choices=["structure", "faststructure",
                                     "maverick"],

structure_threader/structure_threader.py

@@ -230,19 +230,17 @@ def plots_only(arg):
 
     if prefix_dir == "":
         prefix_dir = "."
+    k_vals = arg.bestk
 
     if arg.program == "faststructure":
-        infiles = [os.path.join(prefix_dir, x)
-                   for x in os.listdir(prefix_dir) if
-                   x.startswith(prefix_name) and
-                   x.endswith(".meanQ")]
+        infiles = [os.path.join(prefix_abs_path, "fS_run_K." + x + ".meanQ")
+                   for x in k_vals]
+
     elif arg.program == "structure":
-        infiles = [os.path.join(prefix_dir, x)
-                   for x in os.listdir(prefix_dir) if
-                   x.startswith(prefix_name) and
-                   "rep1_" in x]
+        infiles = [os.path.join(prefix_abs_path, "str_K" + x + "_rep1_f")
+                   for x in k_vals]
+
     else:
-        k_vals = arg.bestk
         infiles = [os.path.join(os.path.join(prefix_abs_path, "mav_K" + x),
                                 "outputQmatrix_ind_K" + x + ".csv")
                    for x in k_vals]