Support mutli ID topics when checking for required topics (#206)

* Use id for required topics

* Hot fix, use a different index for calculating flight time

Author: Jaeyoung-Lim

Tools/parametric_model/src/tools/data_handler.py

@@ -122,7 +122,12 @@ def loadLogFile(self, rel_data_path):
     def check_ulog_for_req_topics(self, ulog):
         for topic_type in self.req_topics_dict.keys():
             try:
-                topic_type_data = ulog.get_dataset(topic_type)
+                topic_dict = self.req_topics_dict[topic_type]
+                if "id" in topic_dict.keys():
+                    id = topic_dict["id"]
+                    topic_type_data = ulog.get_dataset(topic_type, id)
+                else:
+                    topic_type_data = ulog.get_dataset(topic_type)
             except:
                 print("Missing topic type: ", topic_type)
                 exit(1)

Tools/parametric_model/src/tools/dataframe_tools.py

@@ -55,7 +55,7 @@ def compute_flight_time(act_df, pwm_threshold=None, control_threshold=None):
 
     if control_threshold is None:
         control_threshold = ACTUATOR_CONTROLS_THRESHOLD
-
+    act_df_crp = act_df[act_df.iloc[:, 2] > pwm_threshold]
     act_df_crp = act_df[act_df.iloc[:, 4] > pwm_threshold]
 
     t_start = act_df_crp.iloc[1, 0]