From 65892284f5588e60bc1d50c1d891c6fca27311d8 Mon Sep 17 00:00:00 2001
From: Olivier Sauter <olivier.sauter@epfl.ch>
Date: Tue, 20 Jun 2017 08:00:04 +0000
Subject: [PATCH] adapt mhd for aug and gdat_plot for labels
git-svn-id: https://spcsvn.epfl.ch/repos/TCV/gdat/trunk@7564 d63d8f72-b253-0410-a779-e742ad2e26cf
---
crpptbx/AUG/aug_requests_mapping.m | 2 +-
crpptbx/gdat_plot.m | 8 ++++++--
2 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/crpptbx/AUG/aug_requests_mapping.m b/crpptbx/AUG/aug_requests_mapping.m
index f1a55341..5e935b79 100644
--- a/crpptbx/AUG/aug_requests_mapping.m
+++ b/crpptbx/AUG/aug_requests_mapping.m
@@ -171,7 +171,7 @@ switch lower(data_request)
mapping.expression = [{'FPG'},{'li'}];
case 'mhd'
mapping.timedim = 1;
- mapping.label = 'Odd and Even n';
+ mapping.label = {'n\_odd','n\_even'};% this superseeds the expression
mapping.method = 'expression';
mapping.expression = ['params_eff = gdat_data.gdat_params;params_eff.data_request={''MOD'',''OddN''}; ' ...
'gdat_tmp=gdat_aug(shot,params_eff);gdat_tmp.data=reshape(gdat_tmp.data,length(gdat_tmp.data),1 );' ...
diff --git a/crpptbx/gdat_plot.m b/crpptbx/gdat_plot.m
index 295fe32a..8f8bc137 100644
--- a/crpptbx/gdat_plot.m
+++ b/crpptbx/gdat_plot.m
@@ -94,7 +94,9 @@ if all(isfield(gdat_data,{'data','t'})) && ~isempty(gdat_data.data) && ~isempty(
imagesc(T+tmhdm(1),F/1e3,20*log10(abs(B)));axis xy;colormap jet;
ylabel('freq')
xlabel(gdat_data.dimunits{1})
- title([upper(gdat_data.gdat_params.machine) '#' num2str(gdat_data.shot) ' ' gdat_data.label{i}])
+ ylabel_eff = gdat_data.label;
+ if iscell(gdat_data.label) && length(gdat_data.label)>=i; ylabel_eff = gdat_data.label{i}; end
+ title([upper(gdat_data.gdat_params.machine) '#' num2str(gdat_data.shot) ' ' ylabel_eff])
mhd_sum_data = mhd_sum_data + gdat_data.data(:,i);
end
[B,F,T]=specgram(mhd_sum_data./size(gdat_data.data,2),nfft,1/mean(diff(gdat_data.t)),hanning(nfft),nfft/2);
@@ -102,7 +104,9 @@ if all(isfield(gdat_data,{'data','t'})) && ~isempty(gdat_data.data) && ~isempty(
imagesc(T+tmhdm(1),F/1e3,20*log10(abs(B)));axis xy;colormap jet;
ylabel('freq')
xlabel(gdat_data.dimunits{1})
- title([upper(gdat_data.gdat_params.machine) '#' num2str(gdat_data.shot) ' sum of ' gdat_data.label{:}])
+ ylabel_eff = gdat_data.label;
+ if iscell(gdat_data.label); ylabel_eff = sprintf('%s ',gdat_data.label{:}); end
+ title([upper(gdat_data.gdat_params.machine) '#' num2str(gdat_data.shot) ' sum of ' ylabel_eff])
end
else
disp('cannot plot gdat_data, has empty data or t field')
--
GitLab