fixed some ugly bugs

Author: alexlib

pyptv/batch_convert_par_dirs_to_yaml.py

@@ -357,71 +357,28 @@ def py_correspondences_proc_c(exp):
     """
     frame = 123456789
 
+
+
     sorted_pos, sorted_corresp, num_targs = correspondences(
         exp.detections, exp.corrected, exp.cals, exp.vpar, exp.cpar
     )
 
-    # Get sequence parameters to write targets
-    if hasattr(exp, 'spar') and exp.spar is not None:
-        # Traditional experiment object with spar
-        for i_cam in range(exp.num_cams):
-            base_name = exp.spar.get_img_base_name(i_cam)
-            write_targets(exp.detections[i_cam], base_name, frame)
-    elif hasattr(exp, 'get_parameter'):
-        # MainGUI object - get sequence parameters from ParameterManager
-        seq_params = exp.get_parameter('sequence')
-        if seq_params and 'base_name' in seq_params:
-            for i_cam in range(exp.num_cams):
-                base_name = seq_params['base_name'][i_cam]
-                write_targets(exp.detections[i_cam], base_name, frame)
-        else:
-            print("Warning: No sequence parameters found, skipping target writing")
-    else:
-        print("Warning: No way to determine base names, skipping target writing")
-
-    # Generate short_file_bases once per experiment
     img_base_names = [exp.spar.get_img_base_name(i) for i in range(exp.num_cams)]
-    exp.short_file_bases = generate_short_file_bases(img_base_names)
-
-    for frame in range(exp.spar.get_first(), exp.spar.get_last() + 1):
-        detections = []
-        corrected = []
-        for i_cam in range(exp.num_cams):
-            targs = read_targets(exp.short_file_bases[i_cam], frame)
-            targs.sort_y()
-            detections.append(targs)
-            matched_coords = MatchedCoords(targs, exp.cpar, exp.cals[i_cam])
-            pos, _ = matched_coords.as_arrays()
-            corrected.append(matched_coords)
-        sorted_pos, sorted_corresp, _ = correspondences(
-            detections, corrected, exp.cals, exp.vpar, exp.cpar
-        )
-        print(
-            "Frame "
-            + str(frame)
-            + " had "
-            + repr([s.shape[1] for s in sorted_pos])
-            + " correspondences."
-        )
-        sorted_pos = np.concatenate(sorted_pos, axis=1)
-        sorted_corresp = np.concatenate(sorted_corresp, axis=1)
-        flat = np.array(
-            [corrected[i].get_by_pnrs(sorted_corresp[i]) for i in range(len(exp.cals))]
-        )
-        pos, _ = point_positions(flat.transpose(1, 0, 2), exp.cpar, exp.cals, exp.vpar)
-        if len(exp.cals) < 4:
-            print_corresp = -1 * np.ones((4, sorted_corresp.shape[1]))
-            print_corresp[: len(exp.cals), :] = sorted_corresp
-        else:
-            print_corresp = sorted_corresp
-        rt_is_filename = default_naming["corres"].decode()
-        rt_is_filename = f"{rt_is_filename}.{frame}"
-        with open(rt_is_filename, "w", encoding="utf8") as rt_is:
-            rt_is.write(str(pos.shape[0]) + "\n")
-            for pix, pt in enumerate(pos):
-                pt_args = (pix + 1,) + tuple(pt) + tuple(print_corresp[:, pix])
-                rt_is.write("%4d %9.3f %9.3f %9.3f %4d %4d %4d %4d\n" % pt_args)
+    short_file_bases = generate_short_file_bases(img_base_names)
 
+    for i_cam in range(exp.num_cams):
+        write_targets(exp.detections[i_cam], short_file_bases[i_cam], frame)
+    else:
+        print("Warning: No sequence parameters found, skipping target writing")
+
+    print(
+        "Frame "
+        + str(frame)
+        + " had "
+        + repr([s.shape[1] for s in sorted_pos])
+        + " correspondences."
+    )
+    
     return sorted_pos, sorted_corresp, num_targs
 
 

pyptv/ptv.py

@@ -1545,50 +1545,42 @@ def printException():
 
 def main():
     """main function"""
-    from pyptv.batch_convert_par_dirs_to_yaml import batch_convert_par_dirs_to_yaml
     software_path = Path.cwd().resolve()
     print(f"Running PyPTV from {software_path}")
 
     yaml_file = None
     exp_path = None
 
-    if len(sys.argv) > 1:
+    if len(sys.argv) == 2:
         arg_path = Path(sys.argv[1]).resolve()
         if arg_path.is_file() and arg_path.suffix in {".yaml", ".yml"}:
             yaml_file = arg_path
-            exp_path = yaml_file.parent
             print(f"YAML parameter file provided: {yaml_file}")
         elif arg_path.is_dir():
             exp_path = arg_path
-            # Convert legacy parameter directories to YAML if needed
-            yaml_files = list(exp_path.glob("*.yaml")) + list(exp_path.glob("*.yml"))
-            if not yaml_files:
-                print("Converting parameter directories to YAML...")
-                batch_convert_par_dirs_to_yaml(exp_path)
-                yaml_files = list(exp_path.glob("*.yaml")) + list(exp_path.glob("*.yml"))
-                if not yaml_files:
-                    raise OSError(f"No legacy parameter and no YAML files in {exp_path}")
-            yaml_file = yaml_files[0]
+            exp = Experiment()
+            exp.populate_runs(exp_path)
+            yaml_file = exp.active_params.yaml_path
             print(f"Using first YAML file found: {yaml_file}")
         else:
             raise OSError(f"Argument must be a directory or YAML file, got: {arg_path}")
     else:
         # Fallback to default test directory
         exp_path = software_path / "tests" / "test_cavity"
-        yaml_files = list(exp_path.glob("*.yaml")) + list(exp_path.glob("*.yml"))
-        if not yaml_files:
-            raise OSError(f"No YAML files found in default test directory {exp_path}")
-        yaml_file = yaml_files[0]
-        print(f"Without inputs, PyPTV falls back to default {yaml_file}")
-        print("Use File -> Open to select another YAML file")
+        exp = Experiment()
+        exp.populate_runs(exp_path)
+        yaml_file = exp.active_params.yaml_path
+        print(f"Without inputs, PyPTV uses default case {yaml_file}")
+        print("Tip: in PyPTV use File -> Open to select another YAML file")
 
     if not yaml_file or not yaml_file.exists():
         raise OSError(f"YAML parameter file does not exist: {yaml_file}")
 
     print(f"Changing directory to the working folder {yaml_file.parent}")
-    os.chdir(yaml_file.parent)
+    
 
     try:
+        os.chdir(yaml_file.parent)
         main_gui = MainGUI(yaml_file)
         main_gui.configure_traits()
     except OSError:
@@ -1597,3 +1589,13 @@ def main():
     finally:
         print(f"Changing back to the original {software_path}")
         os.chdir(software_path)
+
+
+if __name__ == "__main__":
+    try:
+        main()
+    except Exception as e:
+        print("An error occurred in the main function:")
+        print(e)
+        printException()
+        sys.exit(1)