0 values in measured column indicates how many rounds were done.

xlap/parse.py

@@ -29,8 +29,8 @@ def _evaluate_file(file_name, stamps, kind, measured_column, sender=False):
     else:
         df.drop(_extract_stamps_by_src_and_kind(stamps, "sender"), axis=1, inplace=True)
 
-    # Drop empty rows (as they have probably not been written out).
-    return df[pd.notnull(df).all(axis=1)]
+    # Drop rows with value 0 (as they have probably not been written out).
+    return df[df[measured_column + "_T"] != 0]
 
 
 def _diff_t_c(df, start, stop):
@@ -41,8 +41,8 @@ def _diff_t_c(df, start, stop):
 
 def evaluate(sender_file, receiver_file, config, kind=0):
     stamps = config["stamps"]
-    df1 = _evaluate_file(sender_file, stamps, kind, True)
-    df2 = _evaluate_file(receiver_file, stamps, kind)
+    df1 = _evaluate_file(sender_file, stamps, kind, _stamp_name_by_src_and_type(stamps, "sender", kind=["time"])[0], True)
+    df2 = _evaluate_file(receiver_file, stamps, kind, _stamp_name_by_src_and_type(stamps, "receiver", kind=["time"])[0])
     df = df1.join(df2)
 
     tr = config["time_reference"]