From 25976f2934ba3c58e87b9d72c1a0c14bbdcc2d7f Mon Sep 17 00:00:00 2001 From: cjwgriesel Date: Thu, 4 Apr 2024 13:13:55 +0100 Subject: [PATCH 1/7] issue 1110 mod completed --- process/io/mfile_comparison.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/process/io/mfile_comparison.py b/process/io/mfile_comparison.py index 7a470cfda8..8656a7bae9 100755 --- a/process/io/mfile_comparison.py +++ b/process/io/mfile_comparison.py @@ -16,7 +16,7 @@ """ import sys -import scipy +import numpy import argparse import process.io.mfile as mf from numpy import isfinite @@ -323,7 +323,7 @@ def main(arg): if "normres" in v: continue - values = scipy.zeros(n) + values = numpy.zeros(n) if v not in get_dicts()["DICT_VAR_TYPE"].keys(): try: From 6655c45e6ab7deee9550b77509f7eacfcfa4c0d3 Mon Sep 17 00:00:00 2001 From: cjwgriesel Date: Fri, 5 Apr 2024 11:50:46 +0100 Subject: [PATCH 2/7] added a mod --- process/io/mfile_comparison.py | 1 + 1 file changed, 1 insertion(+) diff --git a/process/io/mfile_comparison.py b/process/io/mfile_comparison.py index 8656a7bae9..2a2c3acc7a 100755 --- a/process/io/mfile_comparison.py +++ b/process/io/mfile_comparison.py @@ -325,6 +325,7 @@ def main(arg): values = numpy.zeros(n) + if v not in get_dicts()["DICT_VAR_TYPE"].keys(): try: eval(mfile_list[0].data[v].get_scan(-1)) From 842686913fed9de7e8e40c5f4ce66d2d2cb52bcc Mon Sep 17 00:00:00 2001 From: cjwgriesel Date: Fri, 5 Apr 2024 15:44:41 +0100 Subject: [PATCH 3/7] added correction --- process/io/mfile_comparison.py | 1 - 1 file changed, 1 deletion(-) diff --git a/process/io/mfile_comparison.py b/process/io/mfile_comparison.py index 2a2c3acc7a..8656a7bae9 100755 --- a/process/io/mfile_comparison.py +++ b/process/io/mfile_comparison.py @@ -325,7 +325,6 @@ def main(arg): values = numpy.zeros(n) - if v not in get_dicts()["DICT_VAR_TYPE"].keys(): try: eval(mfile_list[0].data[v].get_scan(-1)) From 1b19a022c04d9eafd6170db1ce3a0b3da236cf77 Mon Sep 17 00:00:00 2001 From: cjwgriesel Date: Fri, 5 Apr 2024 16:50:44 +0100 Subject: [PATCH 4/7] added corecctions for flake and black --- process/io/mfile_to_csv_vars.json | 42 +++++++++++++++---------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/process/io/mfile_to_csv_vars.json b/process/io/mfile_to_csv_vars.json index 9e2a740e3f..77db494495 100644 --- a/process/io/mfile_to_csv_vars.json +++ b/process/io/mfile_to_csv_vars.json @@ -1,23 +1,23 @@ { - "vars": [ - "minmax", - "pinjalw", - "pnetelin", - "ripmax", - "tbrnmn", - "alstroh", - "sig_tf_wp_max", - "thwcndut", - "fcohbop", - "alstroh", - "rmajor", - "tfcth", - "ohcth", - "cpttf", - "dr_tf_wp", - "ddwex", - "shldoth", - "divfix", - "rmajor" - ] + "vars": [ + "minmax", + "pinjalw", + "pnetelin", + "ripmax", + "tbrnmn", + "alstroh", + "sig_tf_wp_max", + "thwcndut", + "fcohbop", + "alstroh", + "rmajor", + "tfcth", + "ohcth", + "cpttf", + "dr_tf_wp", + "ddwex", + "shldoth", + "divfix", + "rmajor", + ] } From 3250e50bc15702e18021dbd2bd9b19d18e43a902 Mon Sep 17 00:00:00 2001 From: cjwgriesel Date: Thu, 18 Apr 2024 16:59:59 +0100 Subject: [PATCH 5/7] made a mod --- process/io/mfile_comparison.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/process/io/mfile_comparison.py b/process/io/mfile_comparison.py index 8656a7bae9..cd070ff77c 100755 --- a/process/io/mfile_comparison.py +++ b/process/io/mfile_comparison.py @@ -323,7 +323,7 @@ def main(arg): if "normres" in v: continue - values = numpy.zeros(n) + values = numpy.zeros(n) # replaced scipy with numpy if v not in get_dicts()["DICT_VAR_TYPE"].keys(): try: From 031c055c63c10df7901f604e1e334e7450b29790 Mon Sep 17 00:00:00 2001 From: cjwgriesel Date: Thu, 18 Apr 2024 17:18:32 +0100 Subject: [PATCH 6/7] black and flake mods --- process/io/mfile_comparison.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/process/io/mfile_comparison.py b/process/io/mfile_comparison.py index cd070ff77c..9386dba912 100755 --- a/process/io/mfile_comparison.py +++ b/process/io/mfile_comparison.py @@ -323,7 +323,7 @@ def main(arg): if "normres" in v: continue - values = numpy.zeros(n) # replaced scipy with numpy + values = numpy.zeros(n) # replaced scipy with numpy if v not in get_dicts()["DICT_VAR_TYPE"].keys(): try: From 6acdf85855dc41c4b638006514c070fe05f0191d Mon Sep 17 00:00:00 2001 From: Timothy Nunn Date: Fri, 19 Apr 2024 09:44:34 +0100 Subject: [PATCH 7/7] Remove trailing comma in mfile to csv json --- process/io/mfile_to_csv_vars.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/process/io/mfile_to_csv_vars.json b/process/io/mfile_to_csv_vars.json index 77db494495..d102b4c82b 100644 --- a/process/io/mfile_to_csv_vars.json +++ b/process/io/mfile_to_csv_vars.json @@ -18,6 +18,6 @@ "ddwex", "shldoth", "divfix", - "rmajor", + "rmajor" ] -} +}