Update track_detection.py

scripts/track_detection.py

@@ -101,12 +101,11 @@ def track(in_loc_dir, out_loc_dir, metadata_path, seq, config, verbose):
                 image_meter_height = sequence['y_meter_start'] - sequence['y_meter_stop']
 
 
-    results, real_width, real_height = do_associative_tracking(inference, image_shapes, width, height, image_meter_width, image_meter_height, min_length=config['min_length'], max_age=config['max_age'], iou_thres=config['iou_threshold'], min_hits=config['min_hits'], verbose=verbose)
-
     if False:
+        results, real_width, real_height = do_associative_tracking(inference, image_shapes, width, height, image_meter_width, image_meter_height, min_length=config['min_length'], max_age=config['max_age'], iou_thres=config['iou_threshold'], min_hits=config['min_hits'], verbose=verbose)
+    else:
         outputs = do_suppression(inference, conf_thres=config['conf_threshold'], iou_thres=config['nms_iou'], verbose=verbose)
 
-
         if config['use_associative']:
 
             do_confidence_boost(inference, outputs, conf_power=config['boost_power'], conf_decay=config['boost_decay'], verbose=verbose)
@@ -115,6 +114,8 @@ def track(in_loc_dir, out_loc_dir, metadata_path, seq, config, verbose):
 
         all_preds, real_width, real_height = format_predictions(image_shapes, outputs, width, height, verbose=verbose)
 
+        results = do_tracking(all_preds, image_meter_width, image_meter_height, min_length=config['min_length'], max_age=config['max_age'], iou_thres=config['iou_threshold'], min_hits=config['min_hits'], verbose=verbose)
+
 
     mot_rows = []
     for frame in results['frames']: