From 76e8fc001feb9fe4f47bffdb2347aa599fab145f Mon Sep 17 00:00:00 2001
From: Olivier Sauter <olivier.sauter@epfl.ch>
Date: Wed, 1 Mar 2017 09:28:11 +0000
Subject: [PATCH] debug ohm part with several source, when checking for ide
git-svn-id: https://spcsvn.epfl.ch/repos/TCV/gdat/trunk@7049 d63d8f72-b253-0410-a779-e742ad2e26cf
---
crpptbx/AUG/gdat_aug.m | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/crpptbx/AUG/gdat_aug.m b/crpptbx/AUG/gdat_aug.m
index 2756caf1..8ed5fdc0 100644
--- a/crpptbx/AUG/gdat_aug.m
+++ b/crpptbx/AUG/gdat_aug.m
@@ -199,8 +199,8 @@ end
data_request_eff = gdat_params.data_request; % in case was defined in pairs
% default equil:
if ~isfield(gdat_params,'equil'); gdat_params.equil = 'EQI'; end
-if isfield(gdat_params,'source') && (strcmp(lower(gdat_params.source),'ide') || strcmp(lower(gdat_params.source),'idg') ...
- || strcmp(lower(gdat_params.source),'ida')); gdat_params.equil = 'IDE'; end
+if isfield(gdat_params,'source') && (any(strcmp(lower(gdat_params.source),'ide')) || any(strcmp(lower(gdat_params.source),'idg')) ...
+ || any(strcmp(lower(gdat_params.source),'ida'))); gdat_params.equil = 'IDE'; end
% if it is a request_keyword can obtain description:
if ischar(data_request_eff) || length(data_request_eff)==1
@@ -1514,6 +1514,8 @@ elseif strcmp(mapping_for_aug.method,'switchcase')
try
ohm=gdat_aug(shot,params_eff);
catch
+ ohm.data = [];
+ ohm.dim = [];
end
if ~isempty(ohm.data) && ~isempty(ohm.dim)
for i=1:length(fields_to_copy)
--
GitLab