Skip to content
Snippets Groups Projects

Remove ec_inputs from defaults of ec_data call

Merged Antonia Frank requested to merge change-ec-data-defaults into master
All threads resolved!
2 files
+ 7
3
Compare changes
  • Side-by-side
  • Inline
Files
2
+ 6
3
@@ -83,6 +83,7 @@ varargout{1}=cell(1,1);
@@ -83,6 +83,7 @@ varargout{1}=cell(1,1);
error_status=1;
error_status=1;
% construct main default parameters structure
% construct main default parameters structure
 
% parameters and defaults related to a specific request should be defined in the relevant switch case section
gdat_params.data_request = '';
gdat_params.data_request = '';
default_machine = 'tcv';
default_machine = 'tcv';
@@ -91,7 +92,6 @@ gdat_params.doplot = 0;
@@ -91,7 +92,6 @@ gdat_params.doplot = 0;
gdat_params.liuqe = 1;
gdat_params.liuqe = 1;
gdat_params.nverbose = 1;
gdat_params.nverbose = 1;
gdat_params.trialindx = [];
gdat_params.trialindx = [];
gdat_params.ec_inputs = 0;
% construct list of keywords from global set of keywords and specific TCV set
% construct list of keywords from global set of keywords and specific TCV set
% get data_request names from centralized table
% get data_request names from centralized table
@@ -1512,7 +1512,7 @@ elseif strcmp(mapping_for_tcv.method,'switchcase')
@@ -1512,7 +1512,7 @@ elseif strcmp(mapping_for_tcv.method,'switchcase')
if ~isempty(gdat_data.gdat_params.trialindx) && gdat_data.gdat_params.trialindx < 0
if ~isempty(gdat_data.gdat_params.trialindx) && gdat_data.gdat_params.trialindx < 0
gdat_data.gdat_params.trialindx = [];
gdat_data.gdat_params.trialindx = [];
end
end
% specific parameters check and default settings
if ~isfield(gdat_data.gdat_params,'source') || isempty(gdat_data.gdat_params.source)
if ~isfield(gdat_data.gdat_params,'source') || isempty(gdat_data.gdat_params.source)
switch data_request_eff
switch data_request_eff
case 'ec_data'
case 'ec_data'
@@ -1549,6 +1549,9 @@ elseif strcmp(mapping_for_tcv.method,'switchcase')
@@ -1549,6 +1549,9 @@ elseif strcmp(mapping_for_tcv.method,'switchcase')
end
end
end
end
end
end
 
if ~isfield(gdat_data.gdat_params,'ec_inputs') || isempty(gdat_data.gdat_params.ec_inputs) || ~isnumeric(gdat_data.gdat_params.ec_inputs)
 
gdat_data.gdat_params.ec_inputs = 0;
 
end
% create structure for icd sources from params and complete with defaults
% create structure for icd sources from params and complete with defaults
source_icd.ec = 'toray';
source_icd.ec = 'toray';
@@ -1754,7 +1757,7 @@ elseif strcmp(mapping_for_tcv.method,'switchcase')
@@ -1754,7 +1757,7 @@ elseif strcmp(mapping_for_tcv.method,'switchcase')
getReport(ME) % without ; to get output
getReport(ME) % without ; to get output
% try to identify cause of the error
% try to identify cause of the error
if ~check_nodes_filled(shot,'toray')
if ~check_nodes_filled(shot,'toray')
if ~any(ec_inputs.launchers_active.data,1)
if ~isempty(ec_inputs.launchers_active) && ~any(ec_inputs.launchers_active.data,1)
msg = 'write_pyro(shot) found NO active launchers, maybe there was no EC in this shot?';
msg = 'write_pyro(shot) found NO active launchers, maybe there was no EC in this shot?';
else
else
msg = 'write_pyro(shot) found active launchers, but TORAY nodes are no filled, check hldsi(shot), and (ask to) relaunch TORAY.';
msg = 'write_pyro(shot) found active launchers, but TORAY nodes are no filled, check hldsi(shot), and (ask to) relaunch TORAY.';
Loading