Skip to content

Commit de0998a

Browse files
committed
Made MigLogLikeList_3D the default migration score algorithmn for 3D data.
Previously, MigLogLikeList_uniformClutter was the default algorithm for both 2D and 3D data. That was a problem because that algorithm disregards the z-coordinates of detected objects in 3D data. This fixes issue #7. The deployed version will be fixed in release 1.7. Signed-off-by: Klas Magnusson <klasmagnus@gmail.com>
1 parent 22d2e6f commit de0998a

1 file changed

Lines changed: 12 additions & 9 deletions

File tree

Settings/AllSettings.m

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -103,8 +103,9 @@
103103
'type', 'numeric',...
104104
'category', 'image',...
105105
'level', 'advanced',...
106-
'alters', {'SegAlgorithm'; 'SegCellMorphMask'; 'PCSegPSF'; 'PCSegBeta';...
107-
'PCSegIterations'; 'PCSegPSFSizeXY'; 'PCSegPSFSizeZ'},...
106+
'alters', {'SegAlgorithm'; 'TrackMigLogLikeList';...
107+
'SegCellMorphMask'; 'PCSegPSF'; 'PCSegBeta'; 'PCSegIterations';...
108+
'PCSegPSFSizeXY'; 'PCSegPSFSizeZ'},...
108109
'checkfunction', @IsNonNegativeInteger,...
109110
'tooltip', 'The number of z-planes in 3D data. This should be 1 for 2D data.');
110111

@@ -1304,20 +1305,22 @@
13041305
'for Gaussian migration (or ''none'').']);
13051306

13061307
% Algorithms used to compute migration probabilities.
1307-
migLLL = {...
1308-
'MigLogLikeList_3D'
1308+
migLLL2D_development = {...
13091309
'MigLogLikeList_PHD_ISBI_tracks'
13101310
'MigLogLikeList_PHD_ISBI_IMM'
13111311
'MigLogLikeList_PHD_DRO'
1312-
'MigLogLikeList_agree'
1313-
'MigLogLikeList_cellClutter'
1314-
'MigLogLikeList_uniformClutter'
13151312
'MigLogLikeList_viterbiPaper'
13161313
'MigLogLikeList_Jaccard'};
1314+
migLLL3D_development = {...
1315+
'MigLogLikeList_PHD_ISBI_tracks'
1316+
'MigLogLikeList_PHD_ISBI_IMM'
1317+
'MigLogLikeList_PHD_DRO'
1318+
'MigLogLikeList_Jaccard'};
13171319
sett.TrackMigLogLikeList = Setting(...
13181320
'name', 'TrackMigLogLikeList',...
1319-
'default', 'MigLogLikeList_uniformClutter',...
1320-
'alternatives_development', migLLL,...
1321+
'default', @(x) Conditional(x.GetDim()==2, 'MigLogLikeList_uniformClutter', 'MigLogLikeList_3D'),...
1322+
'alternatives_basic', @(x) Conditional(x.GetDim()==2, 'MigLogLikeList_uniformClutter', 'MigLogLikeList_3D'),...,...
1323+
'alternatives_development', @(x) Conditional(x.GetDim()==2, migLLL2D_development, migLLL3D_development),...,...
13211324
'type', 'choice',...
13221325
'category', 'tracking',...
13231326
'level', 'development',...

0 commit comments

Comments
 (0)