Merge branch 'master' into doppler

8 files changed, 91 insertions, 129 deletions

diff --git a/xmds2/Nlevels_no_dopler_with_z_4wm_for_irina_pqe/fast_to_slow_switch/Makefile b/xmds2/Nlevels_no_dopler_with_z_4wm_for_irina_pqe/fast_to_slow_switch/Makefile
index 7581c04..d67ae2c 100644
--- a/xmds2/Nlevels_no_dopler_with_z_4wm_for_irina_pqe/fast_to_slow_switch/Makefile
+++ b/xmds2/Nlevels_no_dopler_with_z_4wm_for_irina_pqe/fast_to_slow_switch/Makefile
@@ -9,7 +9,14 @@ GNUPLOT_FILES = $(wildcard *.gp)
 XSIL2GRAPHICS = xsil2graphics
 
 # fast light
-PARAMS =  --delta1=0 --delta2=0 --delta3=0 --E1o=1.9e7 --E2o=3.1e5 --E3o=3.8e7 --E4o=0
+PARAMS =  \
+	  --Ndens=1e15 \
+	  --Lcell=1.5e-2 \
+	  --Temperature=1e-9 \
+	  --delta1=0 --delta2=0 --delta3=0 \
+	  --E1o=1.9e7 --E2o=3.1e5 --E3o=3.8e7 --E4o=0 
+
+
 # slow light EIT
 #PARAMS =  --delta1=0 --delta2=0 --delta3=0 --E1o=1.9e7 --E2o=3.1e5 --E3o=0 --E4o=0
 
diff --git a/xmds2/Nlevels_no_dopler_with_z_4wm_for_irina_pqe/fast_to_slow_switch/plot_fields_propagation_I2.gp b/xmds2/Nlevels_no_dopler_with_z_4wm_for_irina_pqe/fast_to_slow_switch/plot_fields_propagation_I2.gp
index 77b4870..e11c569 100644..120000
--- a/xmds2/Nlevels_no_dopler_with_z_4wm_for_irina_pqe/fast_to_slow_switch/plot_fields_propagation_I2.gp
+++ b/xmds2/Nlevels_no_dopler_with_z_4wm_for_irina_pqe/fast_to_slow_switch/plot_fields_propagation_I2.gp
@@ -1,15 +1 @@
-set terminal postscript portrait enhanced color solid size 5,3.5
-set output 'fields_propagation_I2.eps'
-set dgrid3d 100,100 qnorm 4
-set pm3d map
-#set contour
-set hidden3d
-set palette rgb 10,13,31 negative
-
-
-set xlabel "z (cm)"
-set ylabel "t ({/Symbol m}S)"
-set zlabel "I_2 (1/S)"
-set nokey
-#set view map
-splot [0:][-0.2:0.2] 'I2.dat' 
+../plot_fields_propagation_I2.gp
\ No newline at end of file
diff --git a/xmds2/Nlevels_no_dopler_with_z_4wm_for_irina_pqe/fast_to_slow_switch/plot_fields_propagation_I4.gp b/xmds2/Nlevels_no_dopler_with_z_4wm_for_irina_pqe/fast_to_slow_switch/plot_fields_propagation_I4.gp
new file mode 120000
index 0000000..134a380
--- /dev/null
+++ b/xmds2/Nlevels_no_dopler_with_z_4wm_for_irina_pqe/fast_to_slow_switch/plot_fields_propagation_I4.gp
@@ -0,0 +1 @@
+../plot_fields_propagation_I4.gp
\ No newline at end of file
diff --git a/xmds2/Nlevels_no_dopler_with_z_4wm_for_irina_pqe/fast_to_slow_switch/pp_I2.m b/xmds2/Nlevels_no_dopler_with_z_4wm_for_irina_pqe/fast_to_slow_switch/pp_I2.m
index c4b6333..4a1ed9b 100644..120000
--- a/xmds2/Nlevels_no_dopler_with_z_4wm_for_irina_pqe/fast_to_slow_switch/pp_I2.m
+++ b/xmds2/Nlevels_no_dopler_with_z_4wm_for_irina_pqe/fast_to_slow_switch/pp_I2.m
@@ -1,91 +1 @@
-Nlevels_no_dopler_with_z_4wm;
-
-%% field I2  propagation
-z_1=z_1*100; % z in cm
-t_1=t_1*1e6; % time now measured in uS
-figure(1)
-%set(gca,'fontsize',20); 
-imagesc(z_1, t_1, I2_out_1); colorbar
-tmin=-0.4;
-tmax= 0.4;
-ylim([tmin,tmax],'manual');	
-xlabel('z (cm)')
-ylabel('t (uS)')
-zlabel('I_2')
-title('I_2')
-print('-color','-depsc2', '-tight', '-S200,120', 'fields_propagation_I2.eps')
-
-desired_x_size=200;
-desired_y_size=200;
-xskip=ceil(length(z_1)/desired_x_size);
-yskip=ceil(length(t_1)/desired_y_size);
-map2dat('I2.dat',z_1,t_1, I2_out_1, xskip, yskip);
-
-
-%% field I4  propagation
-figure(2)
-
-imagesc(z_1, t_1, I4_out_1); colorbar
-tmin=-0.4;
-tmax= 0.4;
-ylim([tmin,tmax],'manual');	
-xlabel('z (cm)')
-ylabel('t (uS)')
-zlabel('I_2')
-title('I_2')
-print('-color','-depsc2', '-tight', '-S200,120', 'fields_propagation_I4.eps')
-
-
-
-
-
-%% fields before and after the cell
-figure(3)
-%set(gca,'fontsize',30); 
-plot( ...
-	t_1,I2_out_1(:,1),'.-;I_2 before;', "linewidth", 4  ...
-	,t_1,I2_out_1(:,end), '-;I_2 after;', "linewidth", 4 ...
-	,t_1,I4_out_1(:,end), '-;I_4 after;', "linewidth", 4 ...
-	)
-xlabel('t (uS)')
-ylabel('I (1/s)^2')
-title('Fields before and after cell')
-legend('location', 'northeast');
-
-[b, a]=butter(3, 0.05);
-I2_out_after=I2_out_1(:,end);
-I2_out_after_filtered=filtfilt(b,a,I2_out_after);
-settling_time=0.01; %uS
-t_good_indx=t_1> min(t_1 + settling_time);
-[m,max_pos_before]=max(I2_out_1(t_good_indx,1) ); [m,max_pos_after]=max(I2_out_after_filtered(t_good_indx));
-delay_time=t_1(max_pos_after)-t_1(max_pos_before);
-printf('Second field delay time  = %f uS\n',delay_time);
-
-%set(gca,'fontsize',40); 
-%set (gcf,'paperposition',[0.5 0 2.5,1.5]); % IMPORTANT to shrink eps size for readable fonts
-print('-color','-depsc2', '-tight','-S200,120', 'fields_before_after_cell.eps')
-
-figure(4)
-I2_max_in=max(I2_out_1(t_good_indx,1));
-I2_max_out=max(I2_out_1(t_good_indx,end));
-I4_max_out=max(I4_out_1(t_good_indx,end));
-I2_in_norm=(I2_out_1(:,1))/I2_max_in;
-I2_out_norm=(I2_out_1(:,end))/I2_max_out;
-I4_out_norm=(I4_out_1(:,end))/I4_max_out;
-tmin=-.05;
-tmax=.05;
-indx=(t_1>=tmin & t_1<=tmax);  % soom in in time to this region
-plot( ...
-	t_1(indx),I2_in_norm(indx),'.-;I_2 before;', "linewidth", 4,  ...
-	t_1(indx),I2_out_norm(indx), '-;I_2 after;', "linewidth", 4 ...
-	,t_1(indx),I4_out_norm(indx), '-;I_4 after;', "linewidth", 4 ...
-	)
-legend('location', 'southeast');
-xlim([tmin,tmax],'manual');	
-ylim([0.5,1],'manual');	
-xlabel('t (uS)')
-ylabel('I normalized')
-title('Fields before and after cell normalized')
-%set (gcf,'paperposition',[0.5 0 2.5,1.5]); % IMPORTANT to shrink eps size for readable fonts
-print('-color','-depsc2', '-tight','-S200,120', 'fields_before_after_cell_normalized.eps')
-
+../pp_I2.m
\ No newline at end of file
diff --git a/xmds2/Nlevels_no_dopler_with_z_4wm_for_irina_pqe/plot_fields_propagation_I2.gp b/xmds2/Nlevels_no_dopler_with_z_4wm_for_irina_pqe/plot_fields_propagation_I2.gp
new file mode 100644
index 0000000..77b4870
--- /dev/null
+++ b/xmds2/Nlevels_no_dopler_with_z_4wm_for_irina_pqe/plot_fields_propagation_I2.gp
@@ -0,0 +1,15 @@
+set terminal postscript portrait enhanced color solid size 5,3.5
+set output 'fields_propagation_I2.eps'
+set dgrid3d 100,100 qnorm 4
+set pm3d map
+#set contour
+set hidden3d
+set palette rgb 10,13,31 negative
+
+
+set xlabel "z (cm)"
+set ylabel "t ({/Symbol m}S)"
+set zlabel "I_2 (1/S)"
+set nokey
+#set view map
+splot [0:][-0.2:0.2] 'I2.dat' 
diff --git a/xmds2/Nlevels_no_dopler_with_z_4wm_for_irina_pqe/plot_fields_propagation_I4.gp b/xmds2/Nlevels_no_dopler_with_z_4wm_for_irina_pqe/plot_fields_propagation_I4.gp
new file mode 100644
index 0000000..3849e2f
--- /dev/null
+++ b/xmds2/Nlevels_no_dopler_with_z_4wm_for_irina_pqe/plot_fields_propagation_I4.gp
@@ -0,0 +1,15 @@
+set terminal postscript portrait enhanced color solid size 5,3.5
+set output 'fields_propagation_I4.eps'
+set dgrid3d 100,100 qnorm 4
+set pm3d map
+#set contour
+set hidden3d
+set palette rgb 10,13,31 negative
+
+
+set xlabel "z (cm)"
+set ylabel "t ({/Symbol m}S)"
+set zlabel "I_2 (1/S)"
+set nokey
+#set view map
+splot [0:][-0.2:0.2] 'I4.dat' 
diff --git a/xmds2/Nlevels_no_dopler_with_z_4wm_for_irina_pqe/pp_I2.m b/xmds2/Nlevels_no_dopler_with_z_4wm_for_irina_pqe/pp_I2.m
index 45d4913..f632d0a 100644
--- a/xmds2/Nlevels_no_dopler_with_z_4wm_for_irina_pqe/pp_I2.m
+++ b/xmds2/Nlevels_no_dopler_with_z_4wm_for_irina_pqe/pp_I2.m
@@ -1,6 +1,6 @@
-Nlevels_no_dopler_with_z_4wm
+Nlevels_with_doppler_with_z_4wm
 
-%% field propagation
+%% field I2  propagation
 z_1=z_1*100; % z in cm
 t_1=t_1*1e6; % time now measured in uS
 figure(1)
@@ -13,33 +13,50 @@ xlabel('z (cm)')
 ylabel('t (uS)')
 zlabel('I_2')
 title('I_2')
+print('-color','-depsc2', '-tight', '-S200,120', 'fields_propagation_I2.eps')
 
-xskip=1;
-yskip=10;
-%map2dat('I2.dat',z_1,t_1, I2_out_1, xskip, yskip);
+desired_x_size=200;
+desired_y_size=200;
+xskip=ceil(length(z_1)/desired_x_size);
+yskip=ceil(length(t_1)/desired_y_size);
+map2dat('I2.dat',z_1,t_1, I2_out_1, xskip, yskip);
 
 
+%% field I4  propagation
+figure(2)
+
+imagesc(z_1, t_1, I4_out_1); colorbar
+tmin=-0.4;
+tmax= 0.4;
+ylim([tmin,tmax],'manual');	
+xlabel('z (cm)')
+ylabel('t (uS)')
+zlabel('I_2')
+title('I_2')
+print('-color','-depsc2', '-tight', '-S200,120', 'fields_propagation_I4.eps')
+map2dat('I4.dat',z_1,t_1, I4_out_1, xskip, yskip);
+
 
-print('-color','-depsc2', '-tight', '-S200,120', 'fields_propagation_I2.eps')
 
 
 
 %% fields before and after the cell
-figure(2)
+figure(3)
 %set(gca,'fontsize',30); 
 plot( ...
-	t_1,I2_out_1(:,1),'.-;before;', "linewidth", 4,  ...
-	t_1,I2_out_1(:,end), '-;after;', "linewidth", 4 ...
+	t_1,I2_out_1(:,1),'.-;I_2 before;', "linewidth", 4  ...
+	,t_1,I2_out_1(:,end), '-;I_2 after;', "linewidth", 4 ...
+	,t_1,I4_out_1(:,end), '-;I_4 after;', "linewidth", 4 ...
 	)
 xlabel('t (uS)')
-ylabel('I_2 (1/s)^2')
-title('I_2 before and after cell')
-legend('location', 'southwest');
+ylabel('I (1/s)^2')
+title('Fields before and after cell')
+legend('location', 'northeast');
 
 [b, a]=butter(3, 0.05);
 I2_out_after=I2_out_1(:,end);
 I2_out_after_filtered=filtfilt(b,a,I2_out_after);
-settling_time=0.8; %uS
+settling_time=0.01; %uS
 t_good_indx=t_1> min(t_1 + settling_time);
 [m,max_pos_before]=max(I2_out_1(t_good_indx,1) ); [m,max_pos_after]=max(I2_out_after_filtered(t_good_indx));
 delay_time=t_1(max_pos_after)-t_1(max_pos_before);
@@ -47,25 +64,29 @@ printf('Second field delay time  = %f uS\n',delay_time);
 
 %set(gca,'fontsize',40); 
 %set (gcf,'paperposition',[0.5 0 2.5,1.5]); % IMPORTANT to shrink eps size for readable fonts
-print('-color','-depsc2', '-tight','-S200,120', 'fields_before_after_cell_I2.eps')
+print('-color','-depsc2', '-tight','-S200,120', 'fields_before_after_cell.eps')
 
 figure(4)
 I2_max_in=max(I2_out_1(t_good_indx,1));
 I2_max_out=max(I2_out_1(t_good_indx,end));
+I4_max_out=max(I4_out_1(t_good_indx,end));
 I2_in_norm=(I2_out_1(:,1))/I2_max_in;
 I2_out_norm=(I2_out_1(:,end))/I2_max_out;
-tmin=-0.05;
-tmax=0.05;
+I4_out_norm=(I4_out_1(:,end))/I4_max_out;
+tmin=-.05;
+tmax=.05;
 indx=(t_1>=tmin & t_1<=tmax);  % soom in in time to this region
 plot( ...
-	t_1(indx),I2_in_norm(indx),'.-;before;', "linewidth", 4,  ...
-	t_1(indx),I2_out_norm(indx), '-;after;', "linewidth", 4 ...
+	t_1(indx),I2_in_norm(indx),'.-;I_2 before;', "linewidth", 4,  ...
+	t_1(indx),I2_out_norm(indx), '-;I_2 after;', "linewidth", 4 ...
+	,t_1(indx),I4_out_norm(indx), '-;I_4 after;', "linewidth", 4 ...
 	)
 legend('location', 'southeast');
 xlim([tmin,tmax],'manual');	
+ylim([0.5,1],'manual');	
 xlabel('t (uS)')
-ylabel('I_2')
-title('I_2 before and after cell normalized')
+ylabel('I normalized')
+title('Fields before and after cell normalized')
 %set (gcf,'paperposition',[0.5 0 2.5,1.5]); % IMPORTANT to shrink eps size for readable fonts
-print('-color','-depsc2', '-tight','-S200,120', 'probe_before_after_cell_I2_normalized.eps')
+print('-color','-depsc2', '-tight','-S200,120', 'fields_before_after_cell_normalized.eps')
 
diff --git a/xmds2/Nlevels_with_doppler_with_z_4wm/fast_to_slow_switch/Makefile b/xmds2/Nlevels_with_doppler_with_z_4wm/fast_to_slow_switch/Makefile
index 11c0320..12efac9 100644
--- a/xmds2/Nlevels_with_doppler_with_z_4wm/fast_to_slow_switch/Makefile
+++ b/xmds2/Nlevels_with_doppler_with_z_4wm/fast_to_slow_switch/Makefile
@@ -10,7 +10,14 @@ XSIL2GRAPHICS = xsil2graphics
 
 # fast light
 #PARAMS =  --delta1=0 --delta2=0 --delta3=0 --E1o=1.9e7 --E2o=3.1e5 --E3o=3.8e7 --E4o=1e1
-PARAMS =  --delta1=0 --delta2=0 --delta3=0 --E1o=0.1e7 --E2o=1e4 --E3o=.3e7 --E4o=0
+#PARAMS =  --delta1=0 --delta2=0 --delta3=0 --E1o=0.1e7 --E2o=1e4 --E3o=.3e7 --E4o=0 --Lcell=1.5e-2 --Temperature=.0001
+PARAMS =  \
+	  --Ndens=1e15 \
+	  --Lcell=1.5e-2 \
+	  --Temperature=1e-9 \
+	  --delta1=0 --delta2=0 --delta3=0 \
+	  --E1o=1.9e7 --E2o=3.1e5 --E3o=3.8e7 --E4o=0
+
 
 # slow light EIT
 #PARAMS =  --delta1=0 --delta2=0 --delta3=0 --E1o=1.9e7 --E2o=3.1e5 --E3o=0 --E4o=0