diff --git a/crpptbx/TCV/gdat_tcv.m b/crpptbx/TCV/gdat_tcv.m index be0d65bcd7adba668b294036a4d1020bb58264ae..d3185903ef8b892df159d0a9475a2562f40d2839 100644 --- a/crpptbx/TCV/gdat_tcv.m +++ b/crpptbx/TCV/gdat_tcv.m @@ -1001,6 +1001,7 @@ elseif strcmp(mapping_for_tcv.method,'switchcase') gdat_data.gdat_params.nfft = 1024; end % load n=1, 2 and 3 Bdot from magnetic measurements + n3.data = []; if shot< 50926 n1=tdi('abs(mhdmode("LFS",1,1))'); n2=tdi('abs(mhdmode("LFS",2,1))'); @@ -1019,7 +1020,7 @@ elseif strcmp(mapping_for_tcv.method,'switchcase') n1.data = aaLFSz23_sect3.data - aaLFSz23_sect11.data; n2 = aaLFSz23_sect3; n2.data = aaLFSz23_sect3.data + aaLFSz23_sect11.data; - n3=n1; + % n3=n1; gdat_data.data_fullpath='\atlas::DT196_MHD_001:channel_067 -+ \atlas::DT196_MHD_001:channel_075 for n=1,2, LFS_sect_3/11, z=23cm'; if strcmp(gdat_data.gdat_params.source,'23full') % HFS from sec 3 and 11 @@ -1039,7 +1040,7 @@ elseif strcmp(mapping_for_tcv.method,'switchcase') n1.data = aaLFSz0_sect3.data - aaLFSz0_sect11.data; n2 = aaLFSz0_sect3; n2.data = aaLFSz0_sect3.data + aaLFSz0_sect11.data; - n3=n1; + % n3=n1; gdat_data.data_fullpath='\atlas::DT196_MHD_001:channel_083 -+ \atlas::DT196_MHD_001:channel_091 for n=1,2, LFS_sect_3/11, z=0cm'; if strcmp(gdat_data.gdat_params.source,'0full') % sect 11 180deg from sec 3 @@ -1068,10 +1069,14 @@ elseif strcmp(mapping_for_tcv.method,'switchcase') gdat_data.dimunits{2} = 'n number'; if shot>= 50926 gdat_data.dimunits{2} = 'n number, at this stage n3=n1'; + gdat_data.dimunits{2} = 'n number, at this stage n3 not computed'; end gdat_data.units = 'T/s'; - gdat_data.request_description = 'delta_Bdot from magnetic probes to get n=1, 2 and 3'; + gdat_data.request_description = 'delta_Bdot from magnetic probes to get n=1/odd, 2/even and 3'; gdat_data.label = {'n=1','n=2','n=3'}; % can be used in legend(gdat_data.label) + if shot>= 50926 + gdat_data.label = {'n odd','n even'}; % can be used in legend(gdat_data.label) + end end %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -1497,6 +1502,7 @@ elseif strcmp(mapping_for_tcv.method,'switchcase') end end % + index_rad = []; if any(strmatch('rad',gdat_data.gdat_params.source)) % RAD nodenameeff='\results::bolo:prad:total'; @@ -1514,16 +1520,18 @@ elseif strcmp(mapping_for_tcv.method,'switchcase') gdat_data.rad.help = tracetdi.help; % add to main with linear interpolation and 0 for extrapolated values gdat_data.data(:,end+1) = interpos(-21,gdat_data.rad.t,gdat_data.rad.data(:,end),gdat_data.t); + index_rad = size(gdat_data.data,2); gdat_data.x(end+1) = size(gdat_data.data,2); gdat_data.label{end+1}=gdat_data.rad.label; end end % add all to last index of .data(:,i) - gdat_data.data(:,end+1) = sum(gdat_data.data,2); + ij = setdiff([1:size(gdat_data.data,2)],index_rad); + gdat_data.data(:,end+1) = sum(gdat_data.data(:,ij),2); gdat_data.x(end+1) = size(gdat_data.data,2); - gdat_data.label{end+1}='total'; + gdat_data.label{end+1}='total heating'; gdat_data.dim{2} = gdat_data.x; - gdat_data.dimunits = {'s', 'index for each source + total'}; + gdat_data.dimunits = {'s', 'index for each source + total heating'}; %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% case {'q_rho'}