Headline table and revert hack in combine_rate_output

python/MooreTests/combine_rate_output.py

@@ -134,21 +134,11 @@ def make_rate_table_row_per_stream(stream_config, fname_helper, process):
     """
 
     frames = []
-    if stream_config == "streamless":
-        file = fname_helper.tmp_rate_table_per_line_path(
-            stream_config, stream_config)
+    for file in glob.glob(
+            fname_helper.tmp_rate_table_per_stream_path(
+                stream_config, "*")):
         df = pd.read_csv(file, header=None)
-        df.columns = _columns_per_line(process).keys()
-        df = df.drop(
-            'Exclusive Retention(%)', axis=1).drop(
-                'Exclusive Rate (kHz)', axis=1)
         frames.append(df)
-    else:
-        for file in glob.glob(
-                fname_helper.tmp_rate_table_per_stream_path(
-                    stream_config, "*")):
-            df = pd.read_csv(file, header=None)
-            frames.append(df)
 
     df = pd.concat(frames)
     df.columns = COLUMNS_PER_STREAM

python/MooreTests/line-and-stream-rates.py

@@ -384,13 +384,13 @@ if __name__ == '__main__':
     else:
         evts_all, rawbanks_all, dst_all, event_stats, exclusive, raw, dst = processing_events_per_line_and_stream(
             LHCbApp().EvtMax, lines, args.process)
-        # Calculate key quantities per stream
-        rates_per_stream(
-            evts_all, rawbanks_all, dst_all, args.stream,
-            input_config['input_rate'],
-            fname_helper.tmp_rate_table_per_stream_path(
-                args.stream_config, args.stream))
 
+    # Calculate key quantities per stream
+    rates_per_stream(
+        evts_all, rawbanks_all, dst_all, args.stream,
+        input_config['input_rate'],
+        fname_helper.tmp_rate_table_per_stream_path(
+            args.stream_config, args.stream))
     # Calculate key quantities per line
     rates_per_line(
         event_stats, exclusive, raw, dst, input_config['input_rate'],