diff --git a/ci/basop-pages/create_report_pages.py b/ci/basop-pages/create_report_pages.py
index 25fde10409bba73e20a58dbc7c0e5f7f101a9a2e..33681ecbeb10f50b1020a33c91c180a71da120f0 100644
--- a/ci/basop-pages/create_report_pages.py
+++ b/ci/basop-pages/create_report_pages.py
@@ -35,14 +35,11 @@ Comparing:
Merged csv data
-{images_mld}
-
-{images_diff}
-
-{images_ssnr}
-
-
+
+
+
+
How is the table sorted?
- Cases with result ERROR or invalid/missing values for the numerical measures are given first
@@ -122,7 +119,6 @@ def create_subpage(
id_current: int,
id_previous: int,
job_name: str,
- histogram,
):
merged_reports = merge_and_cleanup_mld_reports(
csv_current, csv_previous, id_current, id_previous
@@ -145,32 +141,6 @@ def create_subpage(
table_body = "\n".join(
tr_from_row(row, id_current, id_previous) for row in merged_reports
)
- if histogram:
- images_mld = (
- f"MLD summary {job_name}
\n"
- + " ".join(
- [f"
" for x in FORMATS]
- )
- + f'\n
summary_{id_current}_MLD.csv'
- )
- images_ssnr = (
- f"MIN_SSNR summary {job_name}
\n"
- + " ".join(
- [f"
" for x in FORMATS]
- )
- + f'\n
summary_{id_current}_SSNR.csv'
- )
- images_diff = (
- f"MAX ABS DIFFERENCE summary {job_name}
\n"
- + " ".join(
- [f"
" for x in FORMATS]
- )
- + f'\n
summary_{id_current}_DIFF.csv'
- )
- else:
- images_mld = ""
- images_ssnr = ""
- images_diff = ""
new_subpage = SUBPAGE_TMPL_CSS + SUBPAGE_TMPL_HTML.format(
id_current=id_current,
@@ -179,9 +149,6 @@ def create_subpage(
job_name=job_name,
table_header_a=table_header_a,
table_header_b=table_header_b,
- images_mld=images_mld,
- images_ssnr=images_ssnr,
- images_diff=images_diff,
)
with open(html_out, "w") as f:
f.write(new_subpage)
@@ -324,7 +291,10 @@ def merge_tables(tbl1, tbl2, suffix1, suffix2, merge_key, other_keys):
if row1[merge_key] == row2[merge_key]:
new_row[merge_key] = row1[merge_key]
for key in other_keys:
- new_row[f"{key}-{suffix2}"] = row2[key]
+ if key in row2: # In case key is missing, just insert a blank
+ new_row[f"{key}-{suffix2}"] = row2[key]
+ else:
+ new_row[f"{key}-{suffix2}"] = ""
break
merged.append(new_row)
@@ -332,6 +302,7 @@ def merge_tables(tbl1, tbl2, suffix1, suffix2, merge_key, other_keys):
return merged
+
if __name__ == "__main__":
parser = argparse.ArgumentParser()
parser.add_argument("html_out")
@@ -341,7 +312,6 @@ if __name__ == "__main__":
parser.add_argument("id_current", type=int)
parser.add_argument("id_previous", type=int)
parser.add_argument("job_name")
- parser.add_argument("--histogram", action="store_true")
args = parser.parse_args()
create_subpage(
@@ -352,5 +322,4 @@ if __name__ == "__main__":
args.id_current,
args.id_previous,
args.job_name,
- args.histogram,
)
diff --git a/ci/basop-pages/create_summary_page.py b/ci/basop-pages/create_summary_page.py
new file mode 100644
index 0000000000000000000000000000000000000000..0f19f281005bfe1df58d09e45b9777181a9e10fd
--- /dev/null
+++ b/ci/basop-pages/create_summary_page.py
@@ -0,0 +1,55 @@
+import argparse
+
+from create_report_pages import SUBPAGE_TMPL_CSS, FORMATS
+
+MEASURES = ["MLD","DIFF","SSNR"]
+
+SUMMARY_PAGE_TMPL_HTML = """
+
+Summary for job {job_name}, ID: {id_current}
+
+{images}
+
+"""
+
+def create_summary_page(
+ html_out,
+ id_current: int,
+ job_name: str,
+):
+ images = histogram_summary(job_name)
+
+ new_summary_page = SUBPAGE_TMPL_CSS + SUMMARY_PAGE_TMPL_HTML.format(
+ id_current=id_current,
+ job_name=job_name,
+ images=images,
+ )
+ with open(html_out, "w") as f:
+ f.write(new_summary_page)
+
+def histogram_summary(
+ job_name:str,
+ ):
+ images = "
"
+ for m in MEASURES:
+ images += (
+ f"{m} summary {job_name}
\n"
+ + " ".join(
+ [f"
" for x in FORMATS]
+ )
+ + f'\n
summary_{m}.csv
\n\n'
+ )
+ return images
+
+if __name__ == "__main__":
+ parser = argparse.ArgumentParser()
+ parser.add_argument("html_out")
+ parser.add_argument("id_current", type=int)
+ parser.add_argument("job_name")
+ args = parser.parse_args()
+
+ create_summary_page(
+ args.html_out,
+ args.id_current,
+ args.job_name,
+ )