From 6c14e8d5cba77e3ed7689ec1d495de1bebdc4734 Mon Sep 17 00:00:00 2001 From: Craig Warren Date: Wed, 16 Dec 2015 18:01:12 +0000 Subject: [PATCH] Changed access to Taguchi parameters in input files. --- user_models/antenna_MALA_1200_fs_opt.in | 7 +------ user_models/cylinder_Ascan_2D_opt.in | 2 +- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/user_models/antenna_MALA_1200_fs_opt.in b/user_models/antenna_MALA_1200_fs_opt.in index 47d75c7e..a76f030e 100644 --- a/user_models/antenna_MALA_1200_fs_opt.in +++ b/user_models/antenna_MALA_1200_fs_opt.in @@ -16,10 +16,5 @@ fitness = {'name': 'fitness_xcorr', 'stop': 0.9, 'args': {'refresp': '/Users/cwa #python: from user_libs.antennas import antenna_like_MALA_1200 - -kwargs = {} -for i in ['excitationfreq', 'sourceresistance', 'absorberEr', 'absorbersig']: - kwargs[i] = locals()[i] - -antenna_like_MALA_1200(0.132, 0.095, 0.100, resolution=0.001, **kwargs) +antenna_like_MALA_1200(0.132, 0.095, 0.100, resolution=0.001, **optparams) #end_python: \ No newline at end of file diff --git a/user_models/cylinder_Ascan_2D_opt.in b/user_models/cylinder_Ascan_2D_opt.in index 4446b251..bffd3fb6 100644 --- a/user_models/cylinder_Ascan_2D_opt.in +++ b/user_models/cylinder_Ascan_2D_opt.in @@ -16,7 +16,7 @@ fitness = {'name': 'fitness_max', 'stop': 4000, 'args': {'outputs': 'myRx'}} #end_taguchi: #python: -print('#waveform: ricker {} 1.5e9 my_ricker'.format(rickeramp)) +print('#waveform: ricker {} 1.5e9 my_ricker'.format(optparams['rickeramp'])) #end_python: #hertzian_dipole: z 0.100 0.170 0 my_ricker