From 420361d6f32df1374e0cd6441f3ce46f335d8321 Mon Sep 17 00:00:00 2001 From: kevin Date: Sat, 28 Jan 2017 18:18:09 -0500 Subject: [PATCH] gen_mod.py : 1/14/17 and 1/28/17 changes --- src/kc/data/gen_mod/gen_mod.py | 78 ++++++++++++++++++++++++++++------ 1 file changed, 64 insertions(+), 14 deletions(-) diff --git a/src/kc/data/gen_mod/gen_mod.py b/src/kc/data/gen_mod/gen_mod.py index 21adf01..0be4442 100644 --- a/src/kc/data/gen_mod/gen_mod.py +++ b/src/kc/data/gen_mod/gen_mod.py @@ -622,8 +622,7 @@ if __name__ == "__main__": ] - # make all presets identical to preset 'a'. - presetL = dupl_preset( dfltPresetL, "g_1_d", dfltLabelsL) + presetL = [] # assign a sequential range of thresholds to each preset if 0: # 12/28/16 @@ -632,20 +631,71 @@ if __name__ == "__main__": mod_range( presetL, "upr", 2.5, -5.0, 2.3, -5.2) mod_range( presetL, "lwr", 0.5, 2.0, 0.5, 2.0) - - #mod_range( presetL, "thr", 30.0, 90.0, 35.0, 95.0 ) - #mod_range( presetL, "cigain", 10.0, 16.0, 10.0, 16.0 ) - mod_range( presetL, "thr", 65.0, 65.0, 65.0, 65.0 ) - #mod_range( presetL, "upr", -0.05, 4.5, -0.05, 4.5) # upr slope min: -0.05 - mod_range( presetL, "upr", -0.05, -0.05, -0.05, -0.05) - #mod_range( presetL, "lwr", 1.1, 8.0, 1.1, 8.0 ) # 1.5 is good - #mod_range( presetL, "lwr", 8.0, 8.0, 8.0, 8.0 ) - mod_range( presetL, "lwr", 1.5, 1.5, 1.5, 1.5 ) - mod_range( presetL, "off", 0.0, 99.9, 0.0, 99.9) - #mod_range( presetL, "upr", 2.5, -5.0, 2.3, -5.2) - #mod_range( presetL, "lwr", 0.5, 2.0, 0.5, 2.0) + if 0: # 12/28/16 + + # make all presets identical to preset 'a'. + presetL = dupl_preset( dfltPresetL, "g_1_d", dfltLabelsL) + + #mod_range( presetL, "thr", 30.0, 90.0, 35.0, 95.0 ) + #mod_range( presetL, "cigain", 10.0, 16.0, 10.0, 16.0 ) + mod_range( presetL, "thr", 65.0, 65.0, 65.0, 65.0 ) + #mod_range( presetL, "upr", -0.05, 4.5, -0.05, 4.5) # upr slope min: -0.05 + mod_range( presetL, "upr", -0.05, -0.05, -0.05, -0.05) + #mod_range( presetL, "lwr", 1.1, 8.0, 1.1, 8.0 ) # 1.5 is good + #mod_range( presetL, "lwr", 8.0, 8.0, 8.0, 8.0 ) + mod_range( presetL, "lwr", 1.5, 1.5, 1.5, 1.5 ) + mod_range( presetL, "off", 0.0, 99.9, 0.0, 99.9) + #mod_range( presetL, "upr", 2.5, -5.0, 2.3, -5.2) + #mod_range( presetL, "lwr", 0.5, 2.0, 0.5, 2.0) + + if 0: # 1/14/17 + + seq1L =[ + (778, None) # meas 50 + ] + + presetL = dupl_preset( dfltPresetL, "f_3", dfltLabelsL) + + # thr: (40 ok) - (71 0k) upr:-3.0 lwr:1.0 cigain:6.0 vetted trajectory for measure 50 + + mod_range( presetL, "thr", 40.0, 74.0, 40.0, 74.0 ) + #mod_range( presetL, "thr", 68.0, 68.0, 68.0, 68.0 ) + #mod_range( presetL, "upr", -4.0, 0.0, -4.0, 0.0) + mod_range( presetL, "upr", -3.0, -3.0, -3.0, -3.0) + mod_range( presetL, "lwr", 1.0, 1.0, 1.0, 1.0 ) + mod_range( presetL, "cigain", 6.0, 6.0, 6.0, 6.0 ) + if 0: # 1/14/17 and 1/28/17 + + seq1L =[ + (917, None) # meas 53 + ] + + # make all presets identical to preset 'a'. + presetL = dupl_preset( dfltPresetL, "g_1_d", dfltLabelsL) + + mod_range( presetL, "thr", 20.0, 50.0, 20.0, 50.0 ) # offs:65 thr:20-50 + #mod_range( presetL, "off", 10.0, 80.0, 10.0, 80.0) + #mod_range( presetL, "off", 65.0, 65.0, 65.0, 65.0) # thr 34, offset should be > 50 + #mod_range( presetL, "off", 50.0, 80.0, 50.0, 80.0) + mod_range( presetL, "off", 80.0, 50.0, 80.0, 50.0) + mod_range( presetL, "cigain", 14.0, 14.0, 14.0, 14.0 ) + + if 1: # 1/28/17 + + seq1L =[ + (917, None) # meas 53 + ] + + # make all presets identical to preset 'a'. + presetL = dupl_preset( dfltPresetL, "f_3", dfltLabelsL) + + mod_range( presetL, "thr", 40.0, 90.0, 40.0, 90.0 ) + mod_range( presetL, "upr", 0.0, 0.0, 0.0, 0.0 ) + mod_range( presetL, "lwr", 4.0, 4.0, 4.0, 4.0) # vocal artifacts come in with lwr < 4 + mod_range( presetL, "cigain", 3.0, 8.0, 3.0, 8.0 ) + # thr upr lwr offs # 65 -0.05 1.5 0.0 # 99.9