diff --git a/matlab/TCV/gdat_tcv.m b/matlab/TCV/gdat_tcv.m index 8a7af130963d50f5249782c9079633e1df414f3c..83d5aa864d957e4fe7d9d724e37d810a0c22443a 100644 --- a/matlab/TCV/gdat_tcv.m +++ b/matlab/TCV/gdat_tcv.m @@ -1758,10 +1758,12 @@ elseif strcmp(mapping_for_tcv.method,'switchcase') getReport(ME) % without ; to get output % try to identify cause of the error if ~check_nodes_filled(shot,'toray') - 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?'; - else - msg = 'write_pyro(shot) found active launchers, but TORAY nodes are no filled, check hldsi(shot), and (ask to) relaunch TORAY.'; + if ~isempty(ec_inputs.launchers_active) + if ~any(ec_inputs.launchers_active.data,1) + msg = 'write_pyro(shot) found NO active launchers, maybe there was no EC in this shot?'; + else + msg = 'write_pyro(shot) found active launchers, but TORAY nodes are not filled, check hldsi(shot), and (ask to) relaunch TORAY.'; + end end elseif ~isempty(gdat_data.gdat_params.trialindx) msg = 'Is the trial index filled? Check TORAY nodes with hdlsi(shot).'; diff --git a/matlab/TCV/tcv_help_parameters.m b/matlab/TCV/tcv_help_parameters.m index 2248c26d6b12d32c66011c0691fc2cee8f6bbffb..f864a08468e84d120646871535122a4e2c54b2e4 100644 --- a/matlab/TCV/tcv_help_parameters.m +++ b/matlab/TCV/tcv_help_parameters.m @@ -39,7 +39,7 @@ help_struct_all.cocos = ['cocos value desired in output, uses eqdsk_cocos_transf 'is wanted. See O. Sauter et al Comput. Phys. Commun. 184 (2013) 293']; help_struct_all.nrz_out = 'Nb of radial and vertical points in output eqdsk, default is [129,129], set to [-1,-1] to get original meshes'; help_struct_all.edge = '0 (default), 1 to get edge Thomson values'; -help_struct_all.ec_inputs = '0 (default), 1 to get all characterics ofgyrotrons with specific launchers like freq'; +help_struct_all.ec_inputs = '0 (default), 1 to get characterics of gyrotrons connected to each launcher: active, freq, power'; help_struct_all.fit = '0, no fit profiles, 1 (default) if fit profiles desired as well, relevant for _rho profiles. See also fit_type'; help_struct_all.fit_type = 'provenance of fitted profiles ''conf'' (default) from conf nodes, ''avg'' or ''local'' for resp. proffit: nodes'; help_struct_all.trialindx = 'value of trialindx desired to get a specific one when relevant, otherwise gets ok_trialindx, that is 1 usually';