From 49f9ed41a146b1aa18e228655f48622160b41937 Mon Sep 17 00:00:00 2001
From: Olivier Sauter <olivier.sauter@epfl.ch>
Date: Thu, 2 Nov 2017 09:12:52 +0000
Subject: [PATCH] add nfft in mhd which is then used in gdat_plot for
spectrograms time resolution, changed default to 512 from 1024
git-svn-id: https://spcsvn.epfl.ch/repos/TCV/gdat/trunk@8824 d63d8f72-b253-0410-a779-e742ad2e26cf
---
crpptbx/TCV/gdat_tcv.m | 8 ++++++++
crpptbx/TCV/tcv_help_parameters.m | 1 +
crpptbx/gdat_plot.m | 2 +-
3 files changed, 10 insertions(+), 1 deletion(-)
diff --git a/crpptbx/TCV/gdat_tcv.m b/crpptbx/TCV/gdat_tcv.m
index b2574ee9..aa1f576b 100644
--- a/crpptbx/TCV/gdat_tcv.m
+++ b/crpptbx/TCV/gdat_tcv.m
@@ -994,6 +994,11 @@ elseif strcmp(mapping_for_tcv.method,'switchcase')
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
case {'mhd'}
+ if isfield(gdat_data.gdat_params,'nfft') && ~isempty(gdat_data.gdat_params.nfft)
+ % used in gdat_plot for spectrogram plot
+ else
+ gdat_data.gdat_params.nfft = 1024;
+ end
% load n=1, 2 and 3 Bdot from magnetic measurements
if shot< 50926
n1=tdi('abs(mhdmode("LFS",1,1))');
@@ -1060,6 +1065,9 @@ elseif strcmp(mapping_for_tcv.method,'switchcase')
gdat_data.dim{2} = [1; 2; 3];
gdat_data.dimunits{1} = n1.dimunits{1};
gdat_data.dimunits{2} = 'n number';
+ if shot>= 50926
+ gdat_data.dimunits{2} = 'n number, at this stage n3=n1';
+ end
gdat_data.units = 'T/s';
gdat_data.request_description = 'delta_Bdot from magnetic probes to get n=1, 2 and 3';
gdat_data.label = {'n=1','n=2','n=3'}; % can be used in legend(gdat_data.label)
diff --git a/crpptbx/TCV/tcv_help_parameters.m b/crpptbx/TCV/tcv_help_parameters.m
index a61d86bf..2278708d 100644
--- a/crpptbx/TCV/tcv_help_parameters.m
+++ b/crpptbx/TCV/tcv_help_parameters.m
@@ -48,6 +48,7 @@ help_struct_all.camera = ['sxr: for MPX: ''central'', ''top'' (default), ''botto
' for XTOMO: ''central'' (a central chord only), defaults if empty, [1 3 5] if only camera 1, 3 and 5 are desired'];
help_struct_all.freq = '''slow'', default, lower sampling; ''fast'' full samples for both mpx and xtomo';
help_struct_all.max_adcs = 'rtc: source=''adcs'' maximum nb of adc channels loaded for each board in each active node';
+help_struct_all.nfft = '512 (default) changes time resolution in spectrogram in gdat_plot for ''mhd'' request';
%help_struct_all. = '';
diff --git a/crpptbx/gdat_plot.m b/crpptbx/gdat_plot.m
index 0e138882..7493a8a5 100644
--- a/crpptbx/gdat_plot.m
+++ b/crpptbx/gdat_plot.m
@@ -104,7 +104,7 @@ if all(isfield(gdat_data,{'data','t'})) && ~isempty(gdat_data.data) && ~isempty(
if isfield(gdat_data.gdat_params,'nfft') && ~isempty(gdat_data.gdat_params.nfft)
nfft = gdat_data.gdat_params.nfft;
else
- nfft=1024;
+ nfft=512;
end
tmhdm=mean(reshape(gdat_data.t(1:nfft*fix(length(gdat_data.t)/nfft)),nfft,fix(length(gdat_data.t)/nfft)));
for i=1:size(gdat_data.data,2)
--
GitLab