Skip to content

avoid re-making casts every time script is run #9

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
PovlAbrahamsen wants to merge 2 commits into
base: master
Choose a base branch
from
Open

avoid re-making casts every time script is run #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9f0008a
avoid re-making casts every time script is run
Nov 4, 2022
8c29171
avoid re-making casts every time script is run
Nov 4, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 8 additions & 6 deletions CTD_Chipod/mfiles/MakeCasts_CTDchipod_function.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,9 +205,7 @@ function MakeCasts_CTDchipod_function(the_project,mixpath)
try

%~~ Load chipod data
if 1 %~exist(processed_file,'file')
%load(processed_file)
% else
if ~exist(fullfile(savedir_cal,[castStr '_' whSN '_downcast.mat']),'file')
disp('loading chipod data')

% Find and load chipod data for this time range
Expand Down Expand Up @@ -391,13 +389,17 @@ function MakeCasts_CTDchipod_function(the_project,mixpath)
fprintf(fileID,' No chi file found ');
%##
proc_info.(whSN).IsChiData(icast)=0;

delete(fullfile(chi_fig_path_specific,[whSN '_Cast_' castStr '_Fig0_RawCTD.png'])); % delete the CTD figure
end % if we have good chipod data for this profile

else
disp('this file already processed')
%##
% % load(processed_file)
% disp('this file already processed')
% %##
fprintf(fileID,' file already exists, skipping ');
%##
continue;
% %##
end % already processed

catch
Expand Down
9 changes: 9 additions & 0 deletions CTD_Chipod/mfiles/do_chi_calc_ctd_chipod.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,10 +145,19 @@ function do_chi_calc_ctd_chipod(the_project,mixpath,varargin)
castfile = Flist(icast).name;
id1 = strfind(castfile,['_' whSN]);
castStr = castfile(1:id1-1);

%fname=fullfile(savedir_cal,[castStr '_' whSN '_' castdir 'cast.mat']);
fname = fullfile(savedir_cal,castfile) ;
load(fname)
%---

chi_proc_path_avg = fullfile(chi_proc_path_specific,'avg',...
['zsm' num2str(Params.z_smooth) 'm_fmax' num2str(Params.fmax) 'Hz_respcorr' num2str(Params.resp_corr) '_fc_' num2str(Params.fc) 'hz_gamma' num2str(Params.gamma*100)] ) ;
processed_file=fullfile(chi_proc_path_avg,['avg_' castStr '_' C.castdir 'cast_' whSN '_' whsens '.mat']);
if exist(processed_file,'file')
disp(['avg_' castStr '_' C.castdir 'cast_' whSN '_' whsens ' already processed, skipping...'])
continue;
end

clear TP ctd
TP = C.([whsens 'P']);
Expand Down