From 80b72a51a3f8f0e33bf79a20a4d5fbaca050d920 Mon Sep 17 00:00:00 2001 From: Matt Argao Date: Thu, 18 Oct 2012 17:42:16 -0400 Subject: Added possible permutations of lens choices --- fitness.m | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'fitness.m') diff --git a/fitness.m b/fitness.m index 6c0026b..80835e5 100644 --- a/fitness.m +++ b/fitness.m @@ -1,8 +1,8 @@ -function Energy = fitness( q_0, q_final, x_final, optics_positions ) +function Energy = fitness( q_0, q_final, x_final, optics_positions, optics_focal_length ) %FITNESS Summary of this function goes here % Detailed explanation goes here x0 = 0; - q_f_trial = gbeam_propagation(x_final,q_0,x0,optics_placer(optics_positions)); + q_f_trial = gbeam_propagation(x_final,q_0,x0,optics_placer(optics_positions, optics_focal_length)); Energy = abs(q_final-q_f_trial); @@ -46,7 +46,7 @@ function Energy = fitness( q_0, q_final, x_final, optics_positions ) % make collimated region between 2nd and 3rd lens %intialize intermediate points between lenses intermediate_positions = linspace(optics_positions(2), optics_positions(3),10); - f_q_x = @(x) gbeam_propagation(x,q_0,x0,optics_placer(optics_positions)); + f_q_x = @(x) gbeam_propagation(x,q_0,x0,optics_placer(optics_positions, optics_focal_length)); q_intermediate = arrayfun(f_q_x,intermediate_positions); lambda_over_waist_sq = (-imag(1./q_intermediate)); %with numerical factor -- cgit v1.2.3