From 7f2503f9ee51379ee3bbec46d85e5598901707fc Mon Sep 17 00:00:00 2001
From: Olivier Sauter <Olivier.Sauter@epfl.ch>
Date: Wed, 11 Mar 2020 18:49:50 +0100
Subject: [PATCH] seems ECN/G1PO4 changed to G5PO4 for shot >= 36794, modified
add catch to avoid crashing
---
matlab/AUG/gdat_aug.m | 20 ++++++++++++++++----
1 file changed, 16 insertions(+), 4 deletions(-)
diff --git a/matlab/AUG/gdat_aug.m b/matlab/AUG/gdat_aug.m
index 32ca4c95..ed613d65 100644
--- a/matlab/AUG/gdat_aug.m
+++ b/matlab/AUG/gdat_aug.m
@@ -1871,14 +1871,26 @@ elseif strcmp(mapping_for_aug.method,'switchcase')
else
gdat_data.ec{i+4}.gtor_ec = gdat_data_i;
end
- params_eff.data_request={'ECN',['G' num2str(i) 'PO4']};
- gdat_data_i=gdat_aug(shot,params_eff);
+ ishift=0;
+ if shot >= 36794; ishift=4; end
+ params_eff.data_request={'ECN',['G' num2str(i+ishift) 'PO4']};
+ try
+ gdat_data_i=gdat_aug(shot,params_eff);
+ catch ME1
+ disp(getReport(ME1))
+ gdat_data_i.data = [];
+ end
if isempty(gdat_data_i.data) || isempty(gdat_data_i.dim)
else
gdat_data.ec{i+4}.gpo4_ec = gdat_data_i;
end
- params_eff.data_request={'ECN',['G' num2str(i) 'PO8']};
- gdat_data_i=gdat_aug(shot,params_eff);
+ params_eff.data_request={'ECN',['G' num2str(i+ishift) 'PO8']};
+ try
+ gdat_data_i=gdat_aug(shot,params_eff);
+ catch ME2
+ disp(getReport(ME2))
+ gdat_data_i.data = [];
+ end
if isempty(gdat_data_i.data) || isempty(gdat_data_i.dim)
else
gdat_data.ec{i+4}.gpo8_ec = gdat_data_i;
--
GitLab