From e7f9feea33c3a4f10a4581c64f0077f7588cf76f Mon Sep 17 00:00:00 2001
From: Eugeniy Mikhailov <evgmik@gmail.com>
Date: Tue, 15 Dec 2009 06:53:47 +0000
Subject: small modification and removing redundant initialization

---
 four_levels_with_polarization.m | 10 ++++++----
 liouville.m                     | 17 +++++++++++------
 2 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/four_levels_with_polarization.m b/four_levels_with_polarization.m
index 6bf3d44..ab22148 100644
--- a/four_levels_with_polarization.m
+++ b/four_levels_with_polarization.m
@@ -1,11 +1,13 @@
 1;
 
 Nlevels=4;
-w1=1e9;
+w_hpf_ground=6834;
+w_hpf_exited=817;
+w_pf1=1e9; % largest transition frequency
+w1=w_pf1;
 w2=0;
-w_hpf=6800;
-w3=w_hpf;
-w4=w_hpf+.1; % separation of levels |3> and |4> somewhat like Zeeman splitting
+w3=w_hpf_ground;
+w4=w_hpf_ground+.1; % separation of levels |3> and |4> somewhat like Zeeman splitting
 w12=w1-w2;
 w13=w1-w3;
 
diff --git a/liouville.m b/liouville.m
index c6603b4..1225304 100644
--- a/liouville.m
+++ b/liouville.m
@@ -10,7 +10,9 @@ useful_functions;
 useful_constants;
 
 % load atom energy levels and decay description
+%rb87_D1_line;
 four_levels_with_polarization;
+%four_levels_with_polarization;
 %four_levels;
 %three_levels;
 %two_levels;
@@ -18,7 +20,7 @@ four_levels_with_polarization;
 % load EM field description
 field_description;
 
-Nfreq=length(modulation_freq);
+%Nfreq=length(modulation_freq);
 
 
 
@@ -32,10 +34,8 @@ kappa_p      =zeros(1,N_detun_steps+1);
 kappa_m      =zeros(1,N_detun_steps+1);
 detun_step=(detuning_p_max-detuning_p_min)/N_detun_steps;
 
-% now we create Liouville indexes list
-[N, rhoLiouville_w, rhoLiouville_r, rhoLiouville_c]=unfold_density_matrix(Nlevels,Nfreq);
-rhoLiouville=zeros(N,1);
-
+fprintf (stderr, "calculating atom properties\n");
+fflush (stderr);
 % calculate E_field independent properties of the atom
 % to be used as sub matrix templates for Liouville operator matrix
 [L0m, polarizability_m]=L0_and_polarization_submatrices( ...
@@ -48,8 +48,11 @@ atom_properties.L0m=L0m;
 atom_properties.polarizability_m=polarizability_m;
 atom_properties.dipole_elements=dipole_elements;
 
+fprintf (stderr, "tuning laser in forloop to set conditions vs detuning\n");
+fflush (stderr);
 for detuning_p_cntr=1:N_detun_steps+1;
-	wp0=w12;
+	wp0=w_pf1;
+	wd=w_pf1-w_hpf_ground;
 	detuning_p=detuning_p_min+detun_step*(detuning_p_cntr-1);
 	wp=wp0+detuning_p;
 	wm=wd-(wp-wd);
@@ -72,6 +75,8 @@ for detuning_p_cntr=1:N_detun_steps+1;
 	detuning_freq(detuning_p_cntr)=detuning_p;
 endfor
 
+fprintf (stderr, "now really hard calculations begin\n");
+fflush (stderr);
 % once we define all problems the main job is done here
 %kappa_p=cellfun( @susceptibility_steady_state_at_freq, problems_cell_array);
 %kappa_p=parcellfun(2, @susceptibility_steady_state_at_freq, problems_cell_array);
-- 
cgit v1.2.3