From 7b2e4e2be9d138bfc828a56fa137a79db1e4cbde Mon Sep 17 00:00:00 2001
From: Olivier Sauter <olivier.sauter@epfl.ch>
Date: Mon, 11 Sep 2023 22:00:33 +0200
Subject: [PATCH] ensure all numeric double
---
matlab/AUG/gdat_aug.m | 2 +-
matlab/AUG/rdaAUG_eff.m | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/matlab/AUG/gdat_aug.m b/matlab/AUG/gdat_aug.m
index df8a711b..5170f474 100644
--- a/matlab/AUG/gdat_aug.m
+++ b/matlab/AUG/gdat_aug.m
@@ -2947,7 +2947,7 @@ Lpf_SOL = fix(Lpf_tot/i_ref);
Lpf1_t = mod(Lpf_tot,i_ref)+1; % nb of Lpf points
if max(Lpf1_t) > 3000
% most probably i_ref wrong
- i_ref = 10^fix(log10(double(max(Lpf1_t))));
+ i_ref = 10^fix(log10(max(Lpf1_t)));
Lpf_tot = Lpf_par.value(1:NTIME); % nb of points: i_ref*nb_SOL points + nb_core
Lpf_SOL = fix(Lpf_tot/i_ref);
Lpf1_t = mod(Lpf_tot,i_ref)+1; % nb of Lpf points
diff --git a/matlab/AUG/rdaAUG_eff.m b/matlab/AUG/rdaAUG_eff.m
index 142ca6a1..d1ac063d 100644
--- a/matlab/AUG/rdaAUG_eff.m
+++ b/matlab/AUG/rdaAUG_eff.m
@@ -167,8 +167,8 @@ if usemdsplus
% use augsignal to get effective layout as in ISIS and sf2sig, for example for EQI/PFM
eval(['[data,error]=mdsvalue(''_rdaeff' user diagname '=augsignal(' num2str(shot) ',"' diagname '","' sigtype '","' shotfile_exp ...
'",' ed_number ',' tstart ',' tend ',_oshot' user diagname ',_oed' user diagname ',' ask_raw ')'');']);
- if isa(data,'single')
- data=double(data);
+ if isnumeric(data)
+ data=double(data);
end
elseif isempty(param_set_name) && ~area_base && ~time_base
% use augparam
--
GitLab