From fde2ea55e70fcdfb421b689ff4600f1ba274e9e1 Mon Sep 17 00:00:00 2001
From: Olivier Sauter <olivier.sauter@epfl.ch>
Date: Tue, 29 Mar 2016 14:14:30 +0000
Subject: [PATCH] add to get each nbi source for AUG
git-svn-id: https://spcsvn.epfl.ch/repos/TCV/gdat/trunk@5595 d63d8f72-b253-0410-a779-e742ad2e26cf
---
crpptbx/AUG/gdat_aug.m | 6 ++++--
crpptbx/AUG/rdaAUG_eff.m | 16 +++++++++++++++-
2 files changed, 19 insertions(+), 3 deletions(-)
diff --git a/crpptbx/AUG/gdat_aug.m b/crpptbx/AUG/gdat_aug.m
index c175a44e..a9f3c7dd 100644
--- a/crpptbx/AUG/gdat_aug.m
+++ b/crpptbx/AUG/gdat_aug.m
@@ -267,6 +267,8 @@ if strcmp(mapping_for_aug.method,'signal')
end
gdat_data.data = aatmp.data;
gdat_data.t = aatmp.t;
+ gdat_data.x = aatmp.x;
+ if isfield(aatmp,'dimunits'); gdat_data.dimunits = aatmp.dimunits; end
if isempty(aatmp.data)
return
end
@@ -1536,7 +1538,7 @@ elseif strcmp(mapping_for_aug.method,'switchcase')
%
if any(strmatch('nb',gdat_data.gdat_params.source))
% nbi
- params_eff.data_request={'NIS','PNI'};
+ params_eff.data_request={'NIS','PNIQ'};
try
nbi=gdat_aug(shot,params_eff);
catch
@@ -1548,7 +1550,7 @@ elseif strcmp(mapping_for_aug.method,'switchcase')
end
end
% add to main with linear interpolation and 0 for extrapolated values
- gdat_data.data(:,end+1) = interpos(-21,gdat_data.nbi.t,gdat_data.nbi.data,gdat_data.t);
+ gdat_data.data(:,end+1) = interpos(-21,gdat_data.nbi.t,gdat_data.nbi.data(:,end),gdat_data.t);
gdat_data.x(end+1) =gdat_data.x(end)+1;
gdat_data.label{end+1}='P_{nbi}';
end
diff --git a/crpptbx/AUG/rdaAUG_eff.m b/crpptbx/AUG/rdaAUG_eff.m
index 6bf1e8ef..80e488a5 100644
--- a/crpptbx/AUG/rdaAUG_eff.m
+++ b/crpptbx/AUG/rdaAUG_eff.m
@@ -122,7 +122,21 @@ else
adata_time.index(2) = length(adata.value);
end
end
-
+ %
+ if strcmp(upper(sigtype),'PNIQ')
+ % transform 4x2 PINIs in 1:8 PINIs and total in index=9
+ if (prod(size(adata.value))/length(adata_time.value) == 8)
+ tmp(:,1:4) = adata.value(:,:,1);
+ tmp(:,5:8) = adata.value(:,:,2);
+ tmp(:,9) = sum(tmp,2);
+ adata.value = tmp'; % transpose since will be transposed afterwards
+ adata.dimunits = {'s','8 sources;total'};
+ else
+ disp('expects 8 sources in PNIQ');
+ return
+ end
+ end
+
adata.time_aug = adata_time;
adata.area = adata_area;
--
GitLab