Doppler averaged component outputed first, appropriate change in ploting

script

2 files changed, 56 insertions, 54 deletions

diff --git a/xmds2/Nlevels_with_doppler_with_z_4wm/Nlevels_with_doppler_with_z_4wm.xmds b/xmds2/Nlevels_with_doppler_with_z_4wm/Nlevels_with_doppler_with_z_4wm.xmds
index d15869d..5d71fe9 100644
--- a/xmds2/Nlevels_with_doppler_with_z_4wm/Nlevels_with_doppler_with_z_4wm.xmds
+++ b/xmds2/Nlevels_with_doppler_with_z_4wm/Nlevels_with_doppler_with_z_4wm.xmds
@@ -354,51 +354,6 @@
 	<!-- The output to generate -->
 	<output format="binary" filename="Nlevels_with_doppler_with_z_4wm.xsil">
 		<group>
-      <sampling basis="t(100) v(10)" initial_sample="yes">
-				<dependencies>E_field</dependencies>
-				<moments>I1_out I2_out I3_out I4_out</moments>
-				<![CDATA[
-				I1_out = mod2(E1);
-				I2_out = mod2(E2);
-				I3_out = mod2(E3);
-				I4_out = mod2(E4);
-				]]>
-			</sampling>
-		</group>
-
-		<group>
-      <sampling basis="t(100) v(10)" initial_sample="yes">
-				<dependencies>density_matrix</dependencies>
-				<moments>
-					r11_out r22_out r33_out r44_out 
-					r12_re_out r12_im_out r13_re_out r13_im_out r14_re_out r14_im_out
-					                      r23_re_out r23_im_out r24_re_out r24_im_out 
-					                                            r34_re_out r34_im_out
-				</moments>
-				<![CDATA[
-				// populations output 
-				r11_out = r11.Re();
-				r22_out = r22.Re();
-				r33_out = r33.Re();
-				r44_out = r44.Re();
-				// coherences output 
-				r12_re_out = r12.Re();
-				r12_im_out = r12.Im();
-				r13_re_out = r13.Re();
-				r13_im_out = r13.Im();
-				r14_re_out = r14.Re();
-				r14_im_out = r14.Im();
-				r23_re_out = r23.Re();
-				r23_im_out = r23.Im();
-				r24_re_out = r24.Re();
-				r24_im_out = r24.Im();
-				r34_re_out = r34.Re();
-				r34_im_out = r34.Im();
-				]]>
-			</sampling>
-		</group>
-
-		<group>
       <sampling basis="t(100) " initial_sample="yes">
 				<dependencies>E_field_avgd</dependencies>
 				<moments>I1_out I2_out I3_out I4_out</moments>
@@ -443,6 +398,53 @@
 			</sampling>
 		</group>
 
+		<group>
+      <sampling basis="t(100) v(10)" initial_sample="yes">
+				<!--E field distribution in velocity subgroups-->
+				<dependencies>E_field</dependencies>
+				<moments>I1_out_v I2_out_v I3_out_v I4_out_v</moments>
+				<![CDATA[
+				I1_out_v = mod2(E1);
+				I2_out_v = mod2(E2);
+				I3_out_v = mod2(E3);
+				I4_out_v = mod2(E4);
+				]]>
+			</sampling>
+		</group>
+
+		<group>
+      <sampling basis="t(100) v(10)" initial_sample="yes">
+				<!--density matrix distribution in velocity subgroups-->
+				<dependencies>density_matrix</dependencies>
+				<moments>
+					r11_out_v r22_out_v r33_out_v r44_out_v 
+					r12_re_out_v r12_im_out_v r13_re_out_v r13_im_out_v r14_re_out_v r14_im_out_v
+					                      r23_re_out_v r23_im_out_v r24_re_out_v r24_im_out_v 
+					                                            r34_re_out_v r34_im_out_v
+				</moments>
+				<![CDATA[
+				// populations output 
+				r11_out_v = r11.Re();
+				r22_out_v = r22.Re();
+				r33_out_v = r33.Re();
+				r44_out_v = r44.Re();
+				// coherences output 
+				r12_re_out_v = r12.Re();
+				r12_im_out_v = r12.Im();
+				r13_re_out_v = r13.Re();
+				r13_im_out_v = r13.Im();
+				r14_re_out_v = r14.Re();
+				r14_im_out_v = r14.Im();
+				r23_re_out_v = r23.Re();
+				r23_im_out_v = r23.Im();
+				r24_re_out_v = r24.Re();
+				r24_im_out_v = r24.Im();
+				r34_re_out_v = r34.Re();
+				r34_im_out_v = r34.Im();
+				]]>
+			</sampling>
+		</group>
+
 	</output>
 
 </simulation>
diff --git a/xmds2/Nlevels_with_doppler_with_z_4wm/pp_doppler.m b/xmds2/Nlevels_with_doppler_with_z_4wm/pp_doppler.m
index 6fb5cfb..8d1a219 100644
--- a/xmds2/Nlevels_with_doppler_with_z_4wm/pp_doppler.m
+++ b/xmds2/Nlevels_with_doppler_with_z_4wm/pp_doppler.m
@@ -1,26 +1,26 @@
 Nlevels_with_doppler_with_z_4wm
 
 %% field propagation
-z_1=z_1*100; % z in cm
-t_1=t_1*1e6; % time now measured in uS
+z_3=z_1*100; % z in cm
+t_3=t_1*1e6; % time now measured in uS
 
-[Nv, Nt, Nz]=size(I2_out_1);
+[Nv, Nt, Nz]=size(I2_out_v_3);
 
 Npl=Nv/2+1;
-Iv_out = reshape(I2_out_1(1:Npl,:,Nz),Npl,Nt);
+Iv_out_v = reshape(I2_out_v_3(1:Npl,:,Nz),Npl,Nt);
 
 for i=1:Npl
-	l_str{i}=num2str(v_1(i));
+	l_str{i}=num2str(v_3(i));
 end
 
 
 figure(1); hold off;
-plot(Iv_out'); hold on
-plot(I2_out_3(:,end), '-b', 'LineWidth',2);
+plot(Iv_out_v'); hold on
+plot(I2_out_1(:,end), '-b', 'LineWidth',2);
 l_str{Npl+1}=num2str('Doppler averaged out');
-plot(I2_out_3(:,1), '-r', 'LineWidth',2);
+plot(I2_out_1(:,1), '-r', 'LineWidth',2);
 l_str{Npl+2}=num2str('Doppler averaged in');
 legend(l_str);
 
 figure(2); hold off;
-imagesc(z_3, t_3, I2_out_avgd_3)
+imagesc(z_1, t_1, I2_out_1)