Skip to content

Commit

Permalink
Added: Added new experimental CS4 surface pipeline.
Browse files Browse the repository at this point in the history
Changed paths:
 M CHANGES.txt
 M cat_conf_extopts.m
 M cat_main1639.m
  • Loading branch information
ChristianGaser committed Mar 3, 2025
1 parent e17a897 commit 112c77e
Show file tree
Hide file tree
Showing 3 changed files with 28 additions and 3 deletions.
9 changes: 9 additions & 0 deletions CHANGES.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,13 @@
------------------------------------------------------------------------
r2655 | gaser | 2025-03-03 10:38:47

Changed paths:
M CHANGES.txt
M cat_conf_extopts.m
M cat_main1639.m

Added: Added new experimental CS4 surface pipeline.
------------------------------------------------------------------------
r2647 | gaser | 2025-02-09 01:53:58

Changed paths:
Expand Down
6 changes: 4 additions & 2 deletions cat_conf_extopts.m
Original file line number Diff line number Diff line change
Expand Up @@ -460,8 +460,9 @@
'CS2 with SIC (22)',...
'CS3 with SIC (30; IN DEVELOPMENT)',...
'CS3 with fast SIC (33; IN DEVELOPMENT)',...
'CS4 (40; IN DEVELOPMENT)',...
};
SRP.values = {10 20 12 22 30 33};
SRP.values = {10 20 12 22 30 33 40};
elseif expert > 1
SRP.labels = {...
'CS1 without SIC (10)',...
Expand All @@ -472,8 +473,9 @@
'CS2 with SIC with optimization (22)',...
'CS3 with SIC (30; IN DEVELOPMENT)',...
'CS3 with fast SIC with optimization (33; IN DEVELOPMENT)',...
'CS4 (40; IN DEVELOPMENT)',...
};
SRP.values = {10 11 12 20 21 22 30 33};
SRP.values = {10 11 12 20 21 22 30 33 40};
end
SRP.help = {
['CAT uses the projection-based thickness approach (PBT; Dahnke et al., 2012) to reconstruct the central surface. ' ...
Expand Down
16 changes: 15 additions & 1 deletion cat_main1639.m
Original file line number Diff line number Diff line change
Expand Up @@ -818,7 +818,21 @@
if ~isfield(job.extopts,'reduce_mesh'), job.extopts.reduce_mesh = 1; end % cat_get_defaults('extopts.reduce_mesh'); end
if ~isfield(job.output,'surf_measures'), job.output.surf_measures = 1; end % developer
%%
if job.extopts.SRP >= 30
if job.extopts.SRP >= 40
%% Yb0 was modified in cat_main_amap* for some conditions and we can use it as better mask in
% cat_surf_createCS3 except for inv_weighting or if gcut was not used
if ~(job.extopts.gcutstr>0 && ~job.inv_weighting)
Yb0(:) = 1;
end

[Yth1, S, Psurf, qa.createCS] = ...
cat_surf_createCS4(VT,VT0,Ymix,Yl1,YMF,YT,Yb0,struct('trans',trans,'reduce_mesh',job.extopts.reduce_mesh,... required for Ypp output
'interpV',job.extopts.pbtres,'pbtmethod',job.extopts.pbtmethod,'SRP', mod(job.extopts.SRP,10), ...
'Affine',res.Affine,'surf',{surf},...
'verb',job.extopts.verb,'useprior',job.useprior),job);
qa.subjectmeasures.EC_abs = NaN;
qa.subjectmeasures.defect_size = NaN;
elseif job.extopts.SRP >= 30
%% Yb0 was modified in cat_main_amap* for some conditions and we can use it as better mask in
% cat_surf_createCS3 except for inv_weighting or if gcut was not used
if ~(job.extopts.gcutstr>0 && ~job.inv_weighting)
Expand Down

0 comments on commit 112c77e

Please sign in to comment.