Commit f227980b authored by Jan Kiene's avatar Jan Kiene
Browse files

handle DMX measures via prefix in script

parent 61bf5f1b

scripts/create_histograms.py

+15 −3
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ def create_histograms( 
    output_folder: pathlib.Path,

    display_only: bool,

    bins_for_measures=BINS_FOR_MEASURES,

    prefix="",

):

    formats = df["format"].unique()

    categories = df["category"].unique()
@@ -38,7 +39,8 @@ def create_histograms( 
        output_folder.mkdir(exist_ok=True, parents=True)



    for measure in measures:

        bins = bins_for_measures.get(measure, get_bins_for_diff(df[measure]))

        measure_in_df = prefix + measure

        bins = bins_for_measures.get(measure, get_bins_for_diff(df[measure_in_df]))

        x = [f"{x}" for x in bins] + ["", "ERROR"]

        for fmt in formats:

            fig, ax = plt.subplots()
@@ -51,7 +53,7 @@ def create_histograms( 
                n_errors = np.sum(error_mask)

                df_hist = df_slice[np.logical_not(error_mask)]



                counts, _ = np.histogram(df_hist[measure], bins)

                counts, _ = np.histogram(df_hist[measure_in_df], bins)



                data = np.concat([counts, [0], [n_errors], [0]])

                ax.bar(
@@ -117,6 +119,11 @@ Use this for visualising diff scores.""", 
        default=DEFAULT_MEASURES,

        help=f"Measures to plot from the csv file. One of {allowed_measures}",

    )

    parser.add_argument(

        "--prefix",

        default="",

        help="Common suffix to use when collecting measures from the input csv file",

    )

    args = parser.parse_args()

    df = pd.read_csv(args.csv_report)
@@ -125,5 +132,10 @@ Use this for visualising diff scores.""", 
        bins_for_measures = {}



    create_histograms(

        df, args.measures, args.output_folder, args.display_only, bins_for_measures

        df,

        args.measures,

        args.output_folder,

        args.display_only,

        bins_for_measures,

        args.prefix,

    )

tests/conftest.py

+5 −3
Original line number Diff line number Diff line
@@ -1195,9 +1195,11 @@ def parse_properties( 
            min_ssnr = min(ssnrs)

            min_ssnr_channel = ssnrs.index(min_ssnr)



            prefix = "MIN" if prop == SSNR else "DMX"

            props[f"{prefix}_SSNR" + suffix] = min_ssnr

            props[f"{prefix}_SSNR_CHANNEL" + suffix] = min_ssnr_channel

            propname = "MIN_SSNR"

            if prop == DMX_SSNR:

                propname = "DMX_MIN_SSNR"

            props[propname + suffix] = min_ssnr

            props[f"{propname}_CHANNEL" + suffix] = min_ssnr_channel

        elif prop == ODG:

            odgs = re.findall(ODG_PATTERN, text_to_parse)

            min_odg = min(odgs)