fixed few bugs from pyptv

Author: alexlib

openptv_python/constants.py

@@ -1,6 +1,6 @@
 """Constants used in the Python version of OpenPTV."""
-NMAX = 202400  # correspondences
-MAXCAND = 20  # assuming a maximum capacity of MAXCAND candidates
+NMAX = 10000  # correspondences
+MAXCAND = 40  # assuming a maximum capacity of MAXCAND candidates
 PT_UNUSED = -999
 
 COORD_UNUSED = -1e10
@@ -22,7 +22,7 @@
 TR_UNUSED = -1
 TR_BUFSPACE = 4  # 4 frames in the buffer to track
 TR_MAX_CAMS = 4  # 4 cameras in the imaging system
-MAX_TARGETS = 2048  # maximum number of targets
+MAX_TARGETS = 20480  # maximum number of targets
 MAX_CANDS = 4
 ADD_PART = 3
 

openptv_python/correspondences.py

@@ -47,16 +47,16 @@ def __init__(self, targs, cpar, cal, tol=0.00001, reset_numbers=True):
         self.buf = np.empty(self._num_pts, \
             dtype=np.dtype([('x', np.float64), ('y', np.float64), ('pnr', np.int32)]))
 
-        for tnum in range(self._num_pts):
-            targ = targs._tarr[tnum]
+        for tnum, targ in enumerate(targs):
+            targ = targs[tnum]
             if reset_numbers:
                 targ.pnr = tnum
 
             self.buf[tnum]['x'], self.buf[tnum]['y'] = pixel_to_metric(
-                targ.x, targ.y,  cpar._control_par
-                )
+                targ.x, targ.y,  cpar)
+
             self.buf[tnum]['x'], self.buf[tnum]['y'] = dist_to_flat(
-                self.buf[tnum]['x'], self.buf[tnum]['y'], cal._calibration, tol
+                self.buf[tnum]['x'], self.buf[tnum]['y'], cal, tol
                 )
             self.buf[tnum]['pnr'] = targ.pnr
 
@@ -244,7 +244,7 @@ def three_camera_matching(
         for i in range(target_counts[i1]):
             for i2 in range(i1 + 1, num_cams - 1):
                 p1 = corr_list[i1][i2][i].p1
-                if p1 > nmax or tusage[i1][p1] > 0:
+                if p1 >= nmax or tusage[i1][p1] > 0:
                     continue
 
                 # print(f"p1 {p1} candidates {corr_list[i1][i2][i].n } ")
@@ -323,14 +323,14 @@ def consistent_pair_matching(
         for i2 in range(i1 + 1, num_cams):
             for i in range(target_counts[i1]):
                 p1 = corr_list[i1][i2][i].p1
-                if p1 > nmax or tusage[i1][p1] > 0:
+                if p1 >= nmax or tusage[i1][p1] > 0:
                     continue
 
                 if corr_list[i1][i2][i].n != 1:
                     continue
 
                 p2 = corr_list[i1][i2][i].p2[0]
-                if p2 > nmax or tusage[i2][p2] > 0:
+                if p2 >= nmax or tusage[i2][p2] > 0:
                     continue
 
                 corr = corr_list[i1][i2][i].corr[0] / corr_list[i1][i2][i].dist[0]
@@ -423,6 +423,7 @@ def match_pairs(
 
                 # search for a conjugate point in corrected[i2]
                 # cand = [Correspond() for _ in range(MAXCAND)]
+
                 cand = find_candidate(
                     corrected[i2],
                     frm.targets[i2],
@@ -682,7 +683,7 @@ def correspondences(
 
 
     """
-    nmax = 1000  # NMAX
+    nmax = NMAX
 
     # Allocation of scratch buffers for internal tasks and return-value space
     con0 = [n_tupel() for _ in range(nmax * cpar.num_cams)]

openptv_python/parameters.py

@@ -836,7 +836,7 @@ class PftVersionPar(Parameters):
     def from_file(cls, file_path: str):
         """Read from pft_version.par file."""
         with open(file_path, 'r', encoding="utf-8") as file:
-            pft_version = bool(file.readline().strip())
+            pft_version = bool(int(file.readline().strip()))
         return cls(pft_version)
 
     @classmethod

openptv_python/tracking_frame_buf.py

@@ -214,6 +214,13 @@ def write_targets(
     targets: List[Target], num_targets: int, file_base: str, frame_num: int) -> bool:
     """Write targets to a file."""
     success = False
+
+    # fix old-type names, that are like cam1.# or just cam1.
+    if "%" not in file_base:
+        file_base = file_base + "%05d"
+    if '#' in file_base:
+        file_base = file_base.replace('#', '%05d')
+
     file_name = (
         file_base + "_targets"
         if frame_num == 0