|
@@ -60,7 +60,7 @@ initPresetStr = """
|
60
|
60
|
|
61
|
61
|
{ var:upr0, val:0 },
|
62
|
62
|
{ var:upr1, val:0 },
|
63
|
|
- { var:lwr0, val:2.0 },
|
|
63
|
+ { var:lwr0, val:2.0 }, // lwr has a hardcoded min. of 0.3
|
64
|
64
|
{ var:lwr1, val:2.0 },
|
65
|
65
|
|
66
|
66
|
{ var:off0, val:20 },
|
|
@@ -616,25 +616,41 @@ if __name__ == "__main__":
|
616
|
616
|
]
|
617
|
617
|
|
618
|
618
|
seq1L =[
|
619
|
|
- (301, None) # meas 33
|
|
619
|
+ (1, None) # meas 1
|
|
620
|
+ #(301, None) # meas 33
|
620
|
621
|
#(480, None) # meas 41
|
621
|
622
|
]
|
622
|
623
|
|
623
|
624
|
|
624
|
625
|
# make all presets identical to preset 'a'.
|
625
|
|
- presetL = dupl_preset( dfltPresetL, "f_4", dfltLabelsL)
|
|
626
|
+ presetL = dupl_preset( dfltPresetL, "g_1_d", dfltLabelsL)
|
626
|
627
|
|
627
|
628
|
# assign a sequential range of thresholds to each preset
|
628
|
|
- mod_range( presetL, "thr", 50.0, 90.0, 55.0, 95.0 )
|
629
|
|
- mod_range( presetL, "cigain", 6.0, 12.0, 6.0, 12.0 )
|
630
|
|
- mod_range( presetL, "upr", 2.5, -5.0, 2.3, -5.2)
|
631
|
|
- mod_range( presetL, "lwr", 0.5, 2.0, 0.5, 2.0)
|
632
|
|
-
|
633
|
|
- #mod_range( presetL, "thr", 50.0, 90.0, 55.0, 95.0 )
|
634
|
|
- #mod_range( presetL, "cigain", 6.0, 12.0, 6.0, 12.0 )
|
635
|
|
- #mod_range( presetL, "upr", 2.5, -8.0, 2.3, -8.2)
|
636
|
|
- #mod_range( presetL, "lwr", 0.5, 3.0, 0.5, 3.0)
|
|
629
|
+ if 0: # 12/28/16
|
|
630
|
+ mod_range( presetL, "thr", 50.0, 90.0, 55.0, 95.0 )
|
|
631
|
+ mod_range( presetL, "cigain", 6.0, 12.0, 6.0, 12.0 )
|
|
632
|
+ mod_range( presetL, "upr", 2.5, -5.0, 2.3, -5.2)
|
|
633
|
+ mod_range( presetL, "lwr", 0.5, 2.0, 0.5, 2.0)
|
|
634
|
+
|
637
|
635
|
|
|
636
|
+ #mod_range( presetL, "thr", 30.0, 90.0, 35.0, 95.0 )
|
|
637
|
+ #mod_range( presetL, "cigain", 10.0, 16.0, 10.0, 16.0 )
|
|
638
|
+ mod_range( presetL, "thr", 65.0, 65.0, 65.0, 65.0 )
|
|
639
|
+ #mod_range( presetL, "upr", -0.05, 4.5, -0.05, 4.5) # upr slope min: -0.05
|
|
640
|
+ mod_range( presetL, "upr", -0.05, -0.05, -0.05, -0.05)
|
|
641
|
+ #mod_range( presetL, "lwr", 1.1, 8.0, 1.1, 8.0 ) # 1.5 is good
|
|
642
|
+ #mod_range( presetL, "lwr", 8.0, 8.0, 8.0, 8.0 )
|
|
643
|
+ mod_range( presetL, "lwr", 1.5, 1.5, 1.5, 1.5 )
|
|
644
|
+ mod_range( presetL, "off", 0.0, 99.9, 0.0, 99.9)
|
|
645
|
+ #mod_range( presetL, "upr", 2.5, -5.0, 2.3, -5.2)
|
|
646
|
+ #mod_range( presetL, "lwr", 0.5, 2.0, 0.5, 2.0)
|
|
647
|
+
|
|
648
|
+
|
|
649
|
+ # thr upr lwr offs
|
|
650
|
+ # 65 -0.05 1.5 0.0
|
|
651
|
+ # 99.9
|
|
652
|
+ # 65 -0.05 10.0 0.0
|
|
653
|
+ # 99.0
|
638
|
654
|
|
639
|
655
|
with open(fn,"wt") as f:
|
640
|
656
|
f.write("{\n")
|