redid output groups to reflect current situation

1 files changed, 36 insertions, 70 deletions

diff --git a/MOR_5_levels_with_doppler_and_propagation/Nlevels_with_MOR.xmds b/MOR_5_levels_with_doppler_and_propagation/Nlevels_with_MOR.xmds
index 99cb3b4..2ff871c 100644
--- a/MOR_5_levels_with_doppler_and_propagation/Nlevels_with_MOR.xmds
+++ b/MOR_5_levels_with_doppler_and_propagation/Nlevels_with_MOR.xmds
@@ -153,7 +153,7 @@
 							works for Doppler averaging in up to 400K for Rb when lasers are zero detuned
 			 -->
 			<dimension name="t"   lattice="10000"   domain="(-1e-6, 1e-6)" />
-			<dimension name="v"   lattice="2"   domain="(V_maxwell_min, V_maxwell_max)" />
+			<dimension name="v"   lattice="3"   domain="(V_maxwell_min, V_maxwell_max)" />
 		</transverse_dimensions>
 	</geometry>
 
@@ -274,7 +274,7 @@
 
 		<!--<integrate algorithm="SIC" interval="4e-2" steps="200">-->
 
-			<samples>100 100</samples>
+			<samples>100 100 100</samples>
 			<!--Use the next line for debuging to see velocity dependence. Uncomment/switch on output groups 3,4-->
 			<!--<samples>100 100 100 100</samples>--> 
 			<operators>
@@ -376,99 +376,65 @@
 		</group>
 
 		<group>
-      <sampling basis="t(100) v(2)" initial_sample="yes">
+      <sampling basis="t(100)" initial_sample="yes">
 				<dependencies>density_matrix_averaged</dependencies>
 				<moments>
-					rbb_out rBB_out
-					rcc_out rCC_out
-					raa_out 
-					rcb_re_out rcb_im_out
- 					rCB_re_out rCB_im_out
-					rab_re_out rab_im_out 
-					rAB_re_out rAB_im_out
-					rca_re_out rca_im_out 
-					rCA_re_out rCA_im_out
+					rbb_av_out rBB_av_out
+					rcc_av_out rCC_av_out
+					raa_av_out 
+					rcb_av_re_out rcb_av_im_out
+ 					rCB_av_re_out rCB_av_im_out
+					rab_av_re_out rab_av_im_out 
+					rAB_av_re_out rAB_av_im_out
+					rca_av_re_out rca_av_im_out 
+					rCA_av_re_out rCA_av_im_out
 				</moments>
 				<![CDATA[
 				// populations output 
-				rbb_out = rbb_av.Re();
-				rBB_out = rBB_av.Re();
+				rbb_av_out = rbb_av.Re();
+				rBB_av_out = rBB_av.Re();
 
-				rcc_out = rcc_av.Re();	
-				rCC_out = rCC_av.Re();
+				rcc_av_out = rcc_av.Re();	
+				rCC_av_out = rCC_av.Re();
 			
-				raa_out = raa_av.Re();
+				raa_av_out = raa_av.Re();
 
 				// coherences output 
-				rcb_re_out = rcb_av.Re();
-				rcb_im_out = rcb_av.Im();
+				rcb_av_re_out = rcb_av.Re();
+				rcb_av_im_out = rcb_av.Im();
 
-				rCB_re_out = rCB_av.Re();
-				rCB_im_out = rCB_av.Im();
+				rCB_av_re_out = rCB_av.Re();
+				rCB_av_im_out = rCB_av.Im();
 				
-				rab_re_out = rab_av.Re();
-				rab_im_out = rab_av.Im();
+				rab_av_re_out = rab_av.Re();
+				rab_av_im_out = rab_av.Im();
 
-				rAB_re_out = rAB_av.Re();
-				rAB_im_out = rAB_av.Im();
+				rAB_av_re_out = rAB_av.Re();
+				rAB_av_im_out = rAB_av.Im();
 
-				rca_re_out = rca_av.Re();
-				rca_im_out = rca_av.Im();
+				rca_av_re_out = rca_av.Re();
+				rca_av_im_out = rca_av.Im();
 
-				rCA_re_out = rCA_av.Re();
-				rCA_im_out = rCA_av.Im();
+				rCA_av_re_out = rCA_av.Re();
+				rCA_av_im_out = rCA_av.Im();
 
 				]]>
 			</sampling>
 		</group>
 
-		<!-- use the following two groups only for debuging 
+		<!-- use the following groups only for debuging 
 				 otherwise they are quite useless and have to much information 
 				 in 3D space (z,t,v) -->
 		<!--
 		<group>
-      <sampling basis="t(100) v(10)" initial_sample="yes">
+      <sampling basis="t(100) v(3)" initial_sample="yes">
 				<dependencies>E_field</dependencies>
-				<moments>I1_out_v I2_out_v I3_out_v I4_out_v</moments>
+				<moments>IdL_out_v IpL_out_v IdR_out_v IpR_out_v</moments>
 				<![CDATA[
-				// light field intensity distribution in velocity subgroups 
-				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">
-				<dependencies>density_matrix</dependencies>
-				<moments>
-					rbb_out_v rcc_out_v raa_out_v r44_out_v 
-					rbc_re_out_v rbc_im_out_v rba_re_out_v rba_im_out_v r14_re_out_v r14_im_out_v
-					                      rca_re_out_v rca_im_out_v r24_re_out_v r24_im_out_v 
-					                                            r34_re_out_v r34_im_out_v
-				</moments>
-				<![CDATA[
-				// density matrix distribution in velocity subgroups 
-				// populations output 
-				rbb_out_v = rbb.Re();
-				rcc_out_v = rcc.Re();
-				raa_out_v = raa.Re();
-				r44_out_v = r44.Re();
-				// coherences output 
-				rbc_re_out_v = rbc.Re();
-				rbc_im_out_v = rbc.Im();
-				rba_re_out_v = rba.Re();
-				rba_im_out_v = rba.Im();
-				r14_re_out_v = r14.Re();
-				r14_im_out_v = r14.Im();
-				rca_re_out_v = rca.Re();
-				rca_im_out_v = rca.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();
+				IdL_out_v = mod2(EdL);
+				IpL_out_v = mod2(EpL);
+				IdR_out_v = mod2(EdR);
+				IpR_out_v = mod2(EpR);
 				]]>
 			</sampling>
 		</group>