Commit a0ce82d5 authored by Lore, Jeremy's avatar Lore, Jeremy
Browse files

Minor updates in plotting routines

parent 302761d5

matlab/bfield_library_jdl/D3D/find_spikes.m

+7 −3
Original line number Diff line number Diff line 
function spikes = find_spikes(t,d,thresh,dt_thresh,MEDFILT)

function spikes = find_spikes(t,d,thresh,dt_thresh,MEDFILT,plotit)

if nargin < 6

    plotit = 1;

end



if MEDFILT

d=d-medflt1d_jl(d,floor(length(t)*0.1),'zero');
@@ -41,6 +44,7 @@ while any(dt_ind < dt_thresh) 
    end    

end



if plotit

figure; hold on; box on;

subplot(2,1,1); hold on; box on;

plot(t,d)
@@ -53,8 +57,8 @@ plot(t(p_ind),sig_norm(p_ind),'ro') 
yline(thresh,'k')

ylabel('Normalized signal')

xlabel('Time [ms]')

title('ELM timing (IR)')



% title('ELM timing (IR)')

end

spikes.time_inds = p_ind;

spikes.times = t(p_ind);

spikes.val = d(p_ind);

matlab/bfield_library_jdl/D3D/make_downstream_data_file.m

+3 −4
Original line number Diff line number Diff line 
clearvars;



run_path = 'C:\Users\jjl\Dropbox (ORNL)\DIII-D\Qprl experiment\1743XX';

outFileName = 'downstream_data_174306.mat';



IRFileName = 'IR_profile_174306_twin_3200_4000_elm_80_95.mat';

LPFileName = 'LP_174306_processed.mat';

TSFileName = 'dts_osp_174306.mat';



% outFileName = 'downstream_data_174306.mat'; IRFileName = 'IR_profile_174306_twin_3200_4000_elm_80_95.mat'; LPFileName = 'LP_174306_processed.mat'; TSFileName = 'dts_osp_174306.mat';

outFileName = 'downstream_data_174310.mat'; IRFileName = 'IR_profile_174310_twin_3200_4000_elm_80_95.mat'; LPFileName = 'LP_174310_processed.mat'; TSFileName = 'dts_osp_174310.mat';





% From plot_ir_profile

matlab/bfield_library_jdl/D3D/plot_ir_profile.m

+3 −1
Original line number Diff line number Diff line
@@ -5,7 +5,9 @@ elm_file = []; 
% fname = 'C:\Work\DIII-D\APS 2016\irtv_data\irtv_156861_2000_4900.mat'; shot = 156861; SHIFT_CM = 3.5;

% fname = 'C:\Work\DIII-D\APS 2016\irtv_data\irtv_156867_2000_4900.mat'; shot = 156867; SHIFT_CM = 0;

% fname = 'C:\Work\DIII-D\APS 2016\irtv_data\irtv_156871_2000_4900.mat'; shot = 156871; SHIFT_CM = 0;

% 

fname = 'C:\Users\jjl\Dropbox (ORNL)\DIII-D\Qprl experiment\1743XX\irtv_174306_3000_4000.mat'; shot = 174306; SHIFT_CM = 1.5;

% fname = 'C:\Users\jjl\Dropbox (ORNL)\DIII-D\Qprl experiment\1743XX\irtv_174310_3000_4000.mat'; shot = 174310; SHIFT_CM = 1.5;
@@ -27,7 +29,7 @@ dtThreshMS = 1; % Discard "ELM" spikes repeated in this threshold (ms) 
dROutFindELMCM = -10;



WRITE_FILE = 1;

MAKE2DPLOTS = 0;

MAKE2DPLOTS = 1;



dROuterWantRangeCM = [-10,22];

dRInnerWantRangeCM = [-5,15];

matlab/bfield_library_jdl/EFIT_routines/plot_gfile.m

+1 −0
Original line number Diff line number Diff line
@@ -39,6 +39,7 @@ end 




% figure; hold on; box on;

set(gcf,'color','w');

if isfield(g,'lim')

    plot(g.lim(1,g.lim(1,:)>0),g.lim(2,g.lim(1,:)>0),con_linesty,'linewidth',2)

end