diff --git a/src/napatrackmater/Trackmate.py b/src/napatrackmater/Trackmate.py index 02213e2..fbc0b84 100644 --- a/src/napatrackmater/Trackmate.py +++ b/src/napatrackmater/Trackmate.py @@ -2035,7 +2035,9 @@ def _update_spot_fate(self, TrackIds, fate_label): for track_id in TrackIds: self.unique_track_fate_label[track_id] = fate_label - cell_ids = self.all_current_cell_ids[int(track_id)] + if track_id is not None: + if track_id is not self.TrackidBox: + cell_ids = self.all_current_cell_ids[int(track_id)] for cell_id in cell_ids: self.unique_spot_properties[cell_id].update({self.fate_key: fate_label}) diff --git a/src/napatrackmater/Trackvector.py b/src/napatrackmater/Trackvector.py index 03d4092..8fde4fa 100644 --- a/src/napatrackmater/Trackvector.py +++ b/src/napatrackmater/Trackvector.py @@ -230,16 +230,25 @@ def _get_track_vector_xml_data(self): self.AllTrackIds = [] self.DividingTrackIds = [] self.NormalTrackIds = [] + self.GobletTrackIds = [] + self.BasalTrackIds = [] + self.RadialTrackIds = [] self.all_track_properties = [] self.split_points_times = [] self.AllTrackIds.append(None) self.DividingTrackIds.append(None) self.NormalTrackIds.append(None) + self.GobletTrackIds.append(None) + self.BasalTrackIds.append(None) + self.RadialTrackIds.append(None) self.AllTrackIds.append(self.TrackidBox) self.DividingTrackIds.append(self.TrackidBox) self.NormalTrackIds.append(self.TrackidBox) + self.GobletTrackIds.append(self.TrackidBox) + self.BasalTrackIds.append(self.TrackidBox) + self.RadialTrackIds.append(self.TrackidBox) self.Spotobjects = self.xml_content.find("Model").find("AllSpots") # Extract the tracks from xml @@ -750,8 +759,6 @@ def build_closeness_dict(self, radius): self.closeness_dict[time_point] = closeness_dict_time_point - - def _iterate_over_tracklets( track_data, training_tracklets, track_id, prediction=False, ignore_columns=[] ): diff --git a/src/napatrackmater/_version.py b/src/napatrackmater/_version.py index e52f957..cf998bf 100644 --- a/src/napatrackmater/_version.py +++ b/src/napatrackmater/_version.py @@ -1,2 +1,2 @@ -__version__ = version = "5.3.9" -__version_tuple__ = version_tuple = (5, 3, 9) +__version__ = version = "5.4.0" +__version_tuple__ = version_tuple = (5, 4, 0)