X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=blobdiff_plain;f=resources%2Ftools%2Fpresentation%2Fgenerator_plots.py;h=a6b255eed2e18374032a6a0aa133fbc0a1d2a647;hp=52348fe5d15c39ba16c70fb7c0e3c3235ebca2f0;hb=e59007133ffb0a6f38badf11fcb5d9cd2dc8da25;hpb=eb5271b56cb94711420a1eb7372b0f4d5f275a40

diff --git a/resources/tools/presentation/generator_plots.py b/resources/tools/presentation/generator_plots.py
index 52348fe5d1..a6b255eed2 100644
--- a/resources/tools/presentation/generator_plots.py
+++ b/resources/tools/presentation/generator_plots.py
@@ -75,11 +75,7 @@ def plot_performance_box(plot, input_data):
                 if y_vals.get(test["parent"], None) is None:
                     y_vals[test["parent"]] = list()
                 try:
-                    # TODO: Remove when definitely no NDRPDRDISC tests are used:
-                    if test["type"] in ("NDR", "PDR"):
-                        y_vals[test["parent"]].\
-                            append(test["throughput"]["value"])
-                    elif test["type"] in ("NDRPDR", ):
+                    if test["type"] in ("NDRPDR", ):
                         if "-pdr" in plot_title.lower():
                             y_vals[test["parent"]].\
                                 append(test["throughput"]["PDR"]["LOWER"])
@@ -170,21 +166,7 @@ def plot_latency_box(plot, input_data):
                         list()   # direction2, max
                     ]
                 try:
-                    # TODO: Remove when definitely no NDRPDRDISC tests are used:
-                    if test["type"] in ("NDR", "PDR"):
-                        y_tmp_vals[test["parent"]][0].append(
-                            test["latency"]["direction1"]["50"]["min"])
-                        y_tmp_vals[test["parent"]][1].append(
-                            test["latency"]["direction1"]["50"]["avg"])
-                        y_tmp_vals[test["parent"]][2].append(
-                            test["latency"]["direction1"]["50"]["max"])
-                        y_tmp_vals[test["parent"]][3].append(
-                            test["latency"]["direction2"]["50"]["min"])
-                        y_tmp_vals[test["parent"]][4].append(
-                            test["latency"]["direction2"]["50"]["avg"])
-                        y_tmp_vals[test["parent"]][5].append(
-                            test["latency"]["direction2"]["50"]["max"])
-                    elif test["type"] in ("NDRPDR", ):
+                    if test["type"] in ("NDRPDR", ):
                         if "-pdr" in plot_title.lower():
                             ttype = "PDR"
                         elif "-ndr" in plot_title.lower():
@@ -298,31 +280,20 @@ def plot_throughput_speedup_analysis(plot, input_data):
                                                   "2": list(),
                                                   "4": list()}
                 try:
-                    # TODO: Remove when definitely no NDRPDRDISC tests are used:
-                    if test["type"] in ("NDR", "PDR"):
-                        if "1T1C" in test["tags"]:
-                            throughput[test["parent"]]["1"].\
-                                append(test["throughput"]["value"])
-                        elif "2T2C" in test["tags"]:
-                            throughput[test["parent"]]["2"]. \
-                                append(test["throughput"]["value"])
-                        elif "4T4C" in test["tags"]:
-                            throughput[test["parent"]]["4"]. \
-                                append(test["throughput"]["value"])
-                    elif test["type"] in ("NDRPDR", ):
+                    if test["type"] in ("NDRPDR", ):
                         if "-pdr" in plot_title.lower():
                             ttype = "PDR"
                         elif "-ndr" in plot_title.lower():
                             ttype = "NDR"
                         else:
                             continue
-                        if "1T1C" in test["tags"]:
+                        if "1C" in test["tags"]:
                             throughput[test["parent"]]["1"].\
                                 append(test["throughput"][ttype]["LOWER"])
-                        elif "2T2C" in test["tags"]:
+                        elif "2C" in test["tags"]:
                             throughput[test["parent"]]["2"]. \
                                 append(test["throughput"][ttype]["LOWER"])
-                        elif "4T4C" in test["tags"]:
+                        elif "4C" in test["tags"]:
                             throughput[test["parent"]]["4"]. \
                                 append(test["throughput"][ttype]["LOWER"])
                 except (KeyError, TypeError):