From 48765f6e25b90e967a250b3407086821ab087390 Mon Sep 17 00:00:00 2001 From: kevin Date: Sat, 31 Dec 2016 13:11:30 -0500 Subject: [PATCH] gen_mod.py : begin setting xform extents --- src/kc/data/gen_mod/gen_mod.py | 38 ++++++++++++++++++++++++---------- 1 file changed, 27 insertions(+), 11 deletions(-) diff --git a/src/kc/data/gen_mod/gen_mod.py b/src/kc/data/gen_mod/gen_mod.py index a0c5380..21adf01 100644 --- a/src/kc/data/gen_mod/gen_mod.py +++ b/src/kc/data/gen_mod/gen_mod.py @@ -60,7 +60,7 @@ initPresetStr = """ { var:upr0, val:0 }, { var:upr1, val:0 }, - { var:lwr0, val:2.0 }, + { var:lwr0, val:2.0 }, // lwr has a hardcoded min. of 0.3 { var:lwr1, val:2.0 }, { var:off0, val:20 }, @@ -616,25 +616,41 @@ if __name__ == "__main__": ] seq1L =[ - (301, None) # meas 33 + (1, None) # meas 1 + #(301, None) # meas 33 #(480, None) # meas 41 ] # make all presets identical to preset 'a'. - presetL = dupl_preset( dfltPresetL, "f_4", dfltLabelsL) + presetL = dupl_preset( dfltPresetL, "g_1_d", dfltLabelsL) # assign a sequential range of thresholds to each preset - mod_range( presetL, "thr", 50.0, 90.0, 55.0, 95.0 ) - mod_range( presetL, "cigain", 6.0, 12.0, 6.0, 12.0 ) - 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 + mod_range( presetL, "thr", 50.0, 90.0, 55.0, 95.0 ) + mod_range( presetL, "cigain", 6.0, 12.0, 6.0, 12.0 ) + 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", 50.0, 90.0, 55.0, 95.0 ) - #mod_range( presetL, "cigain", 6.0, 12.0, 6.0, 12.0 ) - #mod_range( presetL, "upr", 2.5, -8.0, 2.3, -8.2) - #mod_range( presetL, "lwr", 0.5, 3.0, 0.5, 3.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) + + + # thr upr lwr offs + # 65 -0.05 1.5 0.0 + # 99.9 + # 65 -0.05 10.0 0.0 + # 99.0 with open(fn,"wt") as f: f.write("{\n")