From 4a84343671c33f8a53f4b221e3baea76641780cb Mon Sep 17 00:00:00 2001
From: Olivier Sauter <olivier.sauter@epfl.ch>
Date: Thu, 3 Dec 2015 10:33:05 +0000
Subject: [PATCH] added sector 11 and source option in mhd request
git-svn-id: https://spcsvn.epfl.ch/repos/TCV/gdat/trunk@5312 d63d8f72-b253-0410-a779-e742ad2e26cf
---
crpptbx/TCV/gdat_tcv.m | 60 ++++++++++++++++++++++++++-----
crpptbx/TCV/tcv_help_parameters.m | 3 +-
2 files changed, 54 insertions(+), 9 deletions(-)
diff --git a/crpptbx/TCV/gdat_tcv.m b/crpptbx/TCV/gdat_tcv.m
index f8dd46b7..d76e045f 100644
--- a/crpptbx/TCV/gdat_tcv.m
+++ b/crpptbx/TCV/gdat_tcv.m
@@ -797,14 +797,58 @@ elseif strcmp(mapping_for_tcv.method,'switchcase')
n3=tdi('abs(mhdmode("LFS",3,1))');
gdat_data.data_fullpath='abs(mhdmode("LFS",n,1));% for 1, 2, 3';
else
- aaLFSz23_sect3=tdi('\atlas::DT196_MHD_001:channel_067');
- aaHFSz23_sect3=tdi('\atlas::DT196_MHD_002:channel_018');
- n1 = aaLFSz23_sect3;
- n1.data = aaLFSz23_sect3.data - aaHFSz23_sect3.data;
- n2 = aaLFSz23_sect3;
- n2.data = aaLFSz23_sect3.data + aaHFSz23_sect3.data;
- n3=n1;
- gdat_data.data_fullpath='\atlas::DT196_MHD_001:channel_067 -+ \atlas::DT196_MHD_002:channel_018 for n=1,2, sector3, z=23cm';
+ if isfield(gdat_data.gdat_params,'source') && ~isempty(gdat_data.gdat_params.source)
+ % gdat_data.gdat_params.source;
+ else
+ gdat_data.gdat_params.source = '23';
+ end
+ if strcmp(gdat_data.gdat_params.source(1:2),'23')
+ aaLFSz23_sect3=tdi('\atlas::DT196_MHD_001:channel_067');
+ aaHFSz23_sect3=tdi('\atlas::DT196_MHD_002:channel_018');
+ n1 = aaLFSz23_sect3;
+ n1.data = aaLFSz23_sect3.data - aaHFSz23_sect3.data;
+ n2 = aaLFSz23_sect3;
+ n2.data = aaLFSz23_sect3.data + aaHFSz23_sect3.data;
+ n3=n1;
+ gdat_data.data_fullpath='\atlas::DT196_MHD_001:channel_067 -+ \atlas::DT196_MHD_002:channel_018 for n=1,2, sector3, z=23cm';
+ if strcmp(gdat_data.gdat_params.source,'23full')
+ % sect 11 180deg from sec 3
+ aaLFSz23_sect11=tdi('\atlas::DT196_MHD_001:channel_075');
+ aaHFSz23_sect11=tdi('\atlas::DT196_MHD_002:channel_022');
+ gdat_data.n1_11=aaLFSz23_sect11;
+ gdat_data.n1_11.data = gdat_data.n1_11.data - aaHFSz23_sect11.data;
+ gdat_data.n2_11=aaLFSz23_sect11;
+ gdat_data.n2_11.data = gdat_data.n2_11.data + aaHFSz23_sect11.data;
+ gdat_data.data_fullpath=['\atlas::DT196_MHD_001:channel_067 -+ \atlas::DT196_MHD_002:channel_018 for n=1,2, sector3, z=23cm; _11' ...
+ ' same for sector 11: MHD_001:channel_075-+MHD_002:channel_022'];
+ end
+ elseif strcmp(gdat_data.gdat_params.source(1),'0')
+ aaLFSz0_sect3=tdi('\atlas::DT196_MHD_001:channel_083');
+ aaHFSz0_sect3=tdi('\atlas::DT196_MHD_002:channel_034');
+ n1 = aaLFSz0_sect3;
+ n1.data = aaLFSz0_sect3.data - aaHFSz0_sect3.data;
+ n2 = aaLFSz0_sect3;
+ n2.data = aaLFSz0_sect3.data + aaHFSz0_sect3.data;
+ n3=n1;
+ gdat_data.data_fullpath='\atlas::DT196_MHD_001:channel_083 -+ \atlas::DT196_MHD_002:channel_034 for n=1,2, sector3, z=0cm';
+ if strcmp(gdat_data.gdat_params.source,'0full')
+ % sect 11 180deg from sec 3
+ aaLFSz0_sect11=tdi('\atlas::DT196_MHD_001:channel_091');
+ aaHFSz0_sect11=tdi('\atlas::DT196_MHD_002:channel_038');
+ gdat_data.n1_11=aaLFSz0_sect11;
+ gdat_data.n1_11.data = gdat_data.n1_11.data - aaHFSz0_sect11.data;
+ gdat_data.n2_11=aaLFSz0_sect11;
+ gdat_data.n2_11.data = gdat_data.n2_11.data + aaHFSz0_sect11.data;
+ gdat_data.data_fullpath=['\atlas::DT196_MHD_001:channel_083 -+ \atlas::DT196_MHD_002:channel_034 for n=1,2, sector3, z=0cm; _11' ...
+ ' same for sector 11: MHD_001:channel_091-+MHD_002:channel_038'];
+
+ end
+
+
+ else
+ disp('should not be here in ''mhd'', ask O. Sauter')
+ return
+ end
end
if ~isempty(n1.data)
gdat_data.data(:,1) = reshape(n1.data,length(n1.data),1);
diff --git a/crpptbx/TCV/tcv_help_parameters.m b/crpptbx/TCV/tcv_help_parameters.m
index 349cd8dc..ef6e287a 100644
--- a/crpptbx/TCV/tcv_help_parameters.m
+++ b/crpptbx/TCV/tcv_help_parameters.m
@@ -38,7 +38,8 @@ help_struct_all.edge = '0 (default), 1 to get edge Thomson values';
help_struct_all.fit = '0, no fit profiles, 1 (default) if fit profiles desired as well, relevant for _rho profiles. See also fit_type';
help_struct_all.fit_type = 'provenance of fitted profiles ''conf'' (default) from conf nodes, ''avg'' or ''local'' for resp. proffit: nodes';
help_struct_all.trialindx = 'value of trialindx desired to get a specific one when relevant, otherwise gets ok_trialindx, that is 1 usually';
-help_struct_all.source = 'cxrs: [1 2 3] (default systems); sxr: main source: ''MPX'' (default) or ''XTOMO'', case insensitive';
+help_struct_all.source = ['cxrs: [1 2 3] (default systems); sxr: main source: ''MPX'' (default) or ''XTOMO'', case insensitive' ...
+ '; mhd request: ''23'':23 LFS/HFS (default), ''23full'': 23cm sector 3 and 11, ''0'':z=0 LFS/HFS, ''0full'': 0cm sector 3 and 11'];
help_struct_all.camera = ['sxr: for MPX: ''central'', ''top'' (default), ''bottom'' or ''both'' ; ' ...
' 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';
--
GitLab