8/12/17 updates.

src/kc/data/gen_mod/gen_mod.py

@@ -63,8 +63,12 @@ initPresetStr = """
    {                 var:lwr0,           val:2.0 },  // lwr has a hardcoded min. of 0.3
    {                 var:lwr1,           val:2.0 },
    
-   {                 var:off0,           val:20 },
-   {                 var:off1,           val:20 },
+   {                 var:ceil0,           val:20 },
+   {                 var:ceil1,           val:20 },
+   {                 var:expo0,           val:2.0 },
+   {                 var:expo1,           val:2.0 },
+   {                 var:mix0,            val:0.0 },
+   {                 var:mix1,            val:0.0 },
 
    {                 var:wet0,           val:0.0 },
    {                 var:wet1,           val:0.0 },
@@ -148,7 +152,9 @@ dfltPresetL = [
               "thr":   60.0,
               "upr":   -1.1,
               "lwr":    2.0,
-              "off":    0.0,
+              "ceil":   0.0,
+              "mix":    0.0,
+              "cbyp":   0.0,
               "cigain": 6.0,
               "wet":    1.0,
               "wgain":  1.75,
@@ -160,7 +166,9 @@ dfltPresetL = [
               "thr":   60.0,
               "upr":   -0.99,
               "lwr":    2.0,
-              "off":    0.0,
+              "ceil":    0.0,
+              "mix":    0.0,
+              "cbyp":    0.0,
               "cigain": 6.0,
               "wet":    1.0,
               "wgain":  1.75,
@@ -176,7 +184,8 @@ dfltPresetL = [
               "thr":   77.0,
               "upr":   -0.5,
               "lwr":    3.0,
-              "off":    0.0,
+              "ceil":    0.0,
+              "mix":    0.0,
               "cigain":10.0,
               "wet":    1.0,
               "wgain":  1.75,
@@ -188,7 +197,8 @@ dfltPresetL = [
               "thr":   74.0,
               "upr":   -0.5,
               "lwr":    2.0,
-              "off":    0.0,
+              "ceil":    0.0,
+              "mix":    0.0,
               "cigain":10.0,
               "wet":    1.0,
               "wgain":  1.75,
@@ -204,7 +214,8 @@ dfltPresetL = [
               "thr":   80.0,
               "upr":   -0.5,
               "lwr":    5.0,
-              "off":    0.0,
+              "ceil":    0.0,
+              "mix":    0.0,
               "cigain":11.0,
               "wet":    1.0,
               "wgain":  1.0,
@@ -216,7 +227,8 @@ dfltPresetL = [
               "thr":   80.0,
               "upr":   -0.5,
               "lwr":    5.0,
-              "off":    0.0,
+              "mix":    0.0,
+              "ceil":    0.0,
               "cigain":11.0,
               "wet":    1.0,
               "wgain":  1.0,
@@ -233,7 +245,8 @@ dfltPresetL = [
               "thr":   70.0,
               "upr":   -3.9,
               "lwr":    4.0,
-              "off":    0.0,
+              "mix":    0.0,
+              "ceil":    0.0,
               "cigain": 9.0,
               "wet":    1.0,
               "wgain":  1.0,
@@ -245,7 +258,8 @@ dfltPresetL = [
               "thr":   70.0,
               "upr":   -4.5,
               "lwr":    4.0,
-              "off":    0.0,
+              "mix":    0.0,
+              "ceil":    0.0,
               "cigain": 9.0,
               "wet":    1.0,
               "wgain":  1.0,
@@ -261,7 +275,9 @@ dfltPresetL = [
               "thr":   50.0,
               "upr":   -3.0,
               "lwr":    1.0,
-              "off":    0.0,
+              "ceil":    0.0,
+              "expo":   1.0,
+              "mix":    0.0,
               "cigain": 6.0,
               "wet":    1.0,
               "wgain":  2.0,
@@ -273,7 +289,9 @@ dfltPresetL = [
               "thr":   50.0,
               "upr":   -3.0,
               "lwr":    1.0,
-              "off":    0.0,
+              "ceil":    0.0,
+              "expo":   1.0,
+              "mix":    0.0,
               "cigain": 6.0,
               "wet":    1.0,
               "wgain":  2.0,
@@ -289,7 +307,8 @@ dfltPresetL = [
               "thr":   60.0,
               "upr":   -3.0,
               "lwr":    1.0,
-              "off":    0.0,
+              "ceil":    0.0,
+              "mix":    0.0,
               "cigain": 6.0,
               "wet":    1.0,
               "wgain":  2.0,
@@ -301,7 +320,8 @@ dfltPresetL = [
               "thr":   60.0,
               "upr":   -3.0,
               "lwr":    1.0,
-              "off":    0.0,
+              "ceil":    0.0,
+              "mix":    0.0,
               "cigain": 6.0,
               "wet":    1.0,
               "wgain":  2.0,
@@ -317,7 +337,8 @@ dfltPresetL = [
               "thr":   55.0,
               "upr":   -3.0,
               "lwr":    1.0,
-              "off":    0.0,
+              "ceil":    0.0,
+              "mix":    0.0,
               "cigain": 6.0,
               "wet":    1.0,
               "wgain":  2.0,
@@ -329,7 +350,8 @@ dfltPresetL = [
               "thr":   55.0,
               "upr":   -3.0,
               "lwr":    1.0,
-              "off":    0.0,
+              "ceil":    0.0,
+              "mix":    0.0,
               "cigain": 6.0,
               "wet":    1.0,
               "wgain":  2.0,
@@ -345,7 +367,8 @@ dfltPresetL = [
               "thr":   55.0,
               "upr":   -5.0,
               "lwr":    1.0,
-              "off":    0.0,
+              "ceil":    0.0,
+              "mix":    0.0,
               "cigain": 6.0,
               "wet":    1.0,
               "wgain":  2.0,
@@ -357,7 +380,8 @@ dfltPresetL = [
               "thr":   55.0,
               "upr":   -5.0,
               "lwr":    1.0,
-              "off":    0.0,
+              "ceil":    0.0,
+              "mix":    0.0,
               "cigain": 6.0,
               "wet":    1.0,
               "wgain":  2.0,
@@ -373,7 +397,9 @@ dfltPresetL = [
               "thr":   60.0,
               "upr":   -0.7,
               "lwr":    8.0,
-              "off":   20.0,
+              "ceil":   20.0,
+              "expo":    8.0,              
+              "mix":    1.0,
               "cigain":10.0,
               "wet":    1.0,
               "wgain":  1.0,
@@ -385,7 +411,9 @@ dfltPresetL = [
               "thr":   64.0,
               "upr":   -0.7,
               "lwr":    8.0,
-              "off":   20.0,
+              "ceil":   20.0,
+              "expo":   8.0,              
+              "mix":    1.0,
               "cigain":10.0,
               "wet":    1.0,
               "wgain":  1.0,
@@ -401,7 +429,9 @@ dfltPresetL = [
               "thr":   50.0,
               "upr":   -0.7,
               "lwr":    2.0,
-              "off":   40.0,
+              "ceil":   40.0,
+              "expo":    2.0,              
+              "mix":    1.0,
               "cigain":10.0,
               "wet":    1.0,
               "wgain":  1.0,
@@ -412,8 +442,10 @@ dfltPresetL = [
               "mod":    4,
               "thr":   54.0,
               "upr":   -0.7,
-              "lwr":    8.0,
-              "off":   40.0,
+              "lwr":    2.0,
+              "ceil":   40.0,
+              "expo":   2.0,              
+              "mix":    1.0,
               "cigain":10.0,
               "wet":    1.0,
               "wgain":  1.0,
@@ -429,7 +461,9 @@ dfltPresetL = [
               "thr":   50.0,
               "upr":   -0.7,
               "lwr":    8.0,
-              "off":   20.0,
+              "ceil":   20.0,
+              "expo":   8.0,              
+              "mix":    1.0,
               "cigain":10.0,
               "wet":    1.0,
               "wgain":  1.0,
@@ -441,7 +475,9 @@ dfltPresetL = [
               "thr":   54.0,
               "upr":   -0.7,
               "lwr":    2.0,
-              "off":   20.0,
+              "ceil":   20.0,
+              "expo":   2.0,
+              "mix":    1.0,
               "cigain":10.0,
               "wet":    1.0,
               "wgain":  1.0,
@@ -457,7 +493,9 @@ dfltPresetL = [
               "thr":   40.0,
               "upr":   -0.4,
               "lwr":    7.0,
-              "off":   60.0,
+              "ceil":   60.0,
+              "expo":   7.0,
+              "mix":    1.0,
               "cigain":10.0,
               "wet":    1.0,
               "wgain":  1.0,
@@ -469,7 +507,9 @@ dfltPresetL = [
               "thr":   34.0,
               "upr":   -0.3,
               "lwr":    5.0,
-              "off":   64.0,
+              "ceil":   64.0,
+              "expo":   5.0,
+              "mix":    1.0,
               "cigain":10.0,
               "wet":    1.0,
               "wgain":  1.0,
@@ -663,7 +703,7 @@ if __name__ == "__main__":
         #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, "ceil", 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)
 
@@ -690,7 +730,7 @@ if __name__ == "__main__":
             presetL = dupl_preset( dfltPresetL, "g_1_a", 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, "ceil",   10.0, 80.0, 10.0, 80.0)
             mod_range( presetL, "upr",  -0.7, -0.2, -0.7, -0.2 )
             mod_range( presetL, "lwr",   2.0, 2.0,   8.0, 4.0 )
         
@@ -710,10 +750,10 @@ if __name__ == "__main__":
         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",   10.0, 80.0, 10.0, 80.0)
+        #mod_range( presetL, "ceil",   10.0, 80.0, 10.0, 80.0)
+        #mod_range( presetL, "ceil",   65.0, 65.0, 65.0, 65.0)      # thr 34, offset should be > 50
+        #mod_range( presetL, "ceil",   50.0, 80.0, 50.0, 80.0)
+        mod_range( presetL, "ceil",   10.0, 80.0, 10.0, 80.0)
         mod_range( presetL, "cigain", 14.0,  14.0,  14.0,  14.0 )
 
     if 0: #  1/28/17
@@ -740,7 +780,7 @@ if __name__ == "__main__":
         presetL = dupl_preset( dfltPresetL, "g_1_a", 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, "ceil",   10.0, 80.0, 10.0, 80.0)
         mod_range( presetL, "upr",  -0.7, -0.2, -0.7, -0.2 )
         mod_range( presetL, "lwr",   2.0, 2.0,   8.0, 4.0 )
         
@@ -786,7 +826,7 @@ if __name__ == "__main__":
         presetL = presetL[0:N]
         
         mod_range( presetL, "thr",   40.0, 40.0, 40.0, 40.0 )  # offs:65 thr:20-50
-        mod_range( presetL, "off",   55.0, 55.0, 55.0, 55.0)
+        mod_range( presetL, "ceil",   55.0, 55.0, 55.0, 55.0)
         mod_range( presetL, "cigain", 14.0,  14.0,  14.0,  14.0 )
 
 
@@ -799,7 +839,7 @@ if __name__ == "__main__":
         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, "ceil",   10.0, 80.0, 10.0, 80.0)
         mod_range( presetL, "cigain", 14.0,  14.0,  14.0,  14.0 )
 
 
@@ -845,7 +885,7 @@ if __name__ == "__main__":
             mod_range( presetL, "lwr",   8.0,  1.0, 8.0, 1.0)    
             mod_range( presetL, "cigain", 10.0,  14.0,  10.0,  14.0 )
         
-    if 1: # 3/11/17
+    if 0: # 3/11/17
 
         seq1L =[
             (1015, None)  # meas 57 (just before section 29)
@@ -859,10 +899,10 @@ if __name__ == "__main__":
         # generate 4 lines connecting the diagnals of a cube
 
         mod_range( presetL, "thr",    10.0, 80.0, 10.0, 80.0 )  # line 1
-        mod_range( presetL, "off",    10.0, 99.0, 10.0, 99.0)
+        mod_range( presetL, "ceil",    10.0, 99.0, 10.0, 99.0)
 
         #mod_range( presetL, "thr",    10.0, 80.0, 10.0, 80.0 )  #  line 2
-        #mod_range( presetL, "off",    99.0, 10.0, 99.0, 10.0)
+        #mod_range( presetL, "ceil",    99.0, 10.0, 99.0, 10.0)
         
         #mod_range( presetL, "upr",  5.0,  -1.5,  5.0,  -1.5 )    
         mod_range( presetL, "upr", -1.5,  5.0,  -1.5, 5.0 )
@@ -871,8 +911,41 @@ if __name__ == "__main__":
         
         mod_range( presetL, "cigain", 14.0, 14.0, 14.0, 14.0 )
 
+    if 0: # 8/12/17 f_1 -> b
+
+        seq1L =[ (875,None) ]
+
+        presetL = dupl_preset( dfltPresetL, "f_1", dfltLabelsL)
+        
+        mod_range( presetL, "thr",    50.0, 77.0, 50.0, 74.0 ) 
+        mod_range( presetL, "upr",    -3.0, -0.5, -3.0, -0.5 ) 
+        mod_range( presetL, "lwr",     1.0,  3.0,  1.0,  2.0 ) 
         
+    if 0: # 8/12/17 f_1 -> g_1_d
+
+        seq1L =[ (894,None) ]
+
+        presetL = dupl_preset( dfltPresetL, "f_1", dfltLabelsL)
+        
+        mod_range( presetL, "thr",    50.0, 40.0, 50.0, 34.0 ) 
+        mod_range( presetL, "upr",    -3.0, -0.4, -3.0, -0.3 ) 
+        mod_range( presetL, "lwr",     1.0,  7.0,  1.0,  5.0 )
+        mod_range( presetL, "ceil",    0.0, 60.0,  0.0, 64.0 )
+        mod_range( presetL, "expo",    1.0,  7.0,  1.0,  5.0 )
+        mod_range( presetL, "mix",     0.0,  1.0,  0.0,  1.0 )
             
+    if 1: # 8/12/17 b -> g_1_d
+
+        seq1L =[ (1001,None) ]
+
+        presetL = dupl_preset( dfltPresetL, "b", dfltLabelsL)
+        
+        mod_range( presetL, "thr",    77.0, 40.0, 74.0, 34.0 ) 
+        mod_range( presetL, "upr",    -0.5, -0.4, -0.5, -0.3 ) 
+        mod_range( presetL, "lwr",     3.0,  7.0,  2.0,  5.0 )
+        mod_range( presetL, "ceil",    0.0, 60.0,  0.0, 64.0 )
+        mod_range( presetL, "expo",    1.0,  7.0,  1.0,  5.0 )
+        mod_range( presetL, "mix",     0.0,  1.0,  0.0,  1.0 )
         
     # thr    upr  lwr   offs
     # 65   -0.05  1.5   0.0

src/kc/data/mod_simple_seq_2u.js

@@ -1,7 +1,7 @@
 {
  seq_a:
  [
-/* 
+ /*
    { loc: -1 type:exec val:init }
    { loc: -1           val:preset_dry }
 
@@ -63,7 +63,7 @@
    { loc:1411          val:preset_g }
    { loc:1427          val:preset_dry } 
    { loc:1447          val:preset_a }
-*/   
+*/
 
    { loc: -1 type:exec val:init }
    { loc: -1           val:preset_dry }