Merge pull request #120 from mfmceneaney/fix_rescaling

format: Formatted python code.

Author: mfmceneaney

py/saga/orchestrate.py

@@ -12,7 +12,12 @@
 
 
 def create_jobs(
-    configs, base_dir="./", submit_path="submit.sh", yaml_path="args.yaml", aliases=None, replacements=None,
+    configs,
+    base_dir="./",
+    submit_path="submit.sh",
+    yaml_path="args.yaml",
+    aliases=None,
+    replacements=None,
 ):
     """
     Parameters

py/saga/plot.py

@@ -1401,13 +1401,21 @@ def plot_results_array(
                     continue
 
                 # Format graph titles and axes depending on location in grid array
-                if j != 0 and use_grid_ylabels and graph_array[i][j-1] is not None:
+                if j != 0 and use_grid_ylabels and graph_array[i][j - 1] is not None:
                     plot_results_kwargs_array[i][j]["ylabel"] = ""
-                if i != 0 and use_grid_titles and graph_array[i-1][j] is not None:
+                if i != 0 and use_grid_titles and graph_array[i - 1][j] is not None:
                     plot_results_kwargs_array[i][j]["title"] = ""
-                if i != shape[0] - 1 and use_grid_xlabels and graph_array[i+1][j] is not None:
+                if (
+                    i != shape[0] - 1
+                    and use_grid_xlabels
+                    and graph_array[i + 1][j] is not None
+                ):
                     plot_results_kwargs_array[i][j]["xlabel"] = ""
-                if j != shape[1] - 1 and use_grid_hist_ylabels and graph_array[i][j+1] is not None:
+                if (
+                    j != shape[1] - 1
+                    and use_grid_hist_ylabels
+                    and graph_array[i][j + 1] is not None
+                ):
                     plot_results_kwargs_array[i][j]["hist_ylabel"] = ""
 
                 # Plot results

py/saga/rescale.py

@@ -134,7 +134,9 @@ def rescale_graph_data(
     # Set y values to constant and update scaled y errors if requested
     scaled_y_mean = y_mean if yvalue < -1 else [yvalue for i in range(len(y_mean))]
     if yvalue >= -1:
-        scaled_yerr_mean *= np.sqrt(1 - np.square(yvalue * tpol_factor))
+        scaled_yerr_mean = (
+            np.divide(1.0, np.sqrt(scaled_ct_mean)) * 1.0 / (tpol_factor * tdil_factor)
+        ) * np.sqrt(1 - np.square(yvalue * tpol_factor * tdil_factor))
 
     # Create a length 1 list of graph data with scaled graph results
     graph_list = np.array(