From 6f194981c7c2742f7860410ec693f6719acc1ae9 Mon Sep 17 00:00:00 2001
From: Olivier Sauter <olivier.sauter@epfl.ch>
Date: Sun, 9 Apr 2023 20:36:18 +0200
Subject: [PATCH] correct icrh/ptot call to keep older version
---
matlab/JET/gdat_jet.m | 13 ++++++++++++-
1 file changed, 12 insertions(+), 1 deletion(-)
diff --git a/matlab/JET/gdat_jet.m b/matlab/JET/gdat_jet.m
index 3566bf44..7a36ec5c 100644
--- a/matlab/JET/gdat_jet.m
+++ b/matlab/JET/gdat_jet.m
@@ -1372,11 +1372,22 @@ elseif strcmp(mapping_for_jet.method,'switchcase')
%
if any(strmatch('ic',gdat_data.gdat_params.source))
% ic
- params_eff.data_request={'ppf','icrh','ptot'};
params_eff.data_request={'ppf','rff','ptot'};
try
ic=gdat_jet(shot,params_eff);
+ if isempty(ic.data) || isempty(ic.dim)
+ params_eff.data_request={'ppf','icrh','ptot'};
+ try
+ ic=gdat_jet(shot,params_eff);
+ catch
+ end
+ end
catch
+ params_eff.data_request={'ppf','icrh','ptot'};
+ try
+ ic=gdat_jet(shot,params_eff);
+ catch
+ end
end
if ~isempty(ic.data) && ~isempty(ic.dim)
for i=1:length(fields_to_copy)
--
GitLab