# HG changeset patch
# User Rod Selfridge <r.selfridge@qmul.ac.uk>
# Date 1476875777 -3600
# Node ID c3723ca2bf97875a3eae595b9b6c9964659cca90
# Parent  fc487b69ce795a8bb87cedbfc630579701ceaa66
Drag gain correction on Aeolian Tone created

diff -r fc487b69ce79 -r c3723ca2bf97 .DS_Store
Binary file .DS_Store has changed
diff -r fc487b69ce79 -r c3723ca2bf97 Propellor/PropTestD2.pd
--- a/Propellor/PropTestD2.pd	Thu Oct 13 17:24:22 2016 +0100
+++ b/Propellor/PropTestD2.pd	Wed Oct 19 12:16:17 2016 +0100
@@ -8157,7 +8157,7 @@
 #X text 185 618 Fly-by;
 #X text 189 652 Reset;
 #X obj 275 182 * 2;
-#N canvas 163 114 1098 708 observerPosition 1;
+#N canvas 218 23 1098 796 observerPosition 0;
 #X obj -24 366 hsl 100 20 -200 200 0 0 empty empty empty -2 -8 0 10
 -262144 -1 -1 1237 1;
 #X obj 296 366 hsl 100 20 -200 200 0 0 empty empty empty -2 -8 0 10
@@ -8231,6 +8231,9 @@
 #X obj 641 99 delay 25000;
 #X msg 641 120 -40 25000;
 #X msg -26 104 -800 25000;
+#X obj 252 533 r myMet;
+#X obj 252 553 snapshot~;
+#X floatatom 253 576 0 0 0 0 - - -;
 #X connect 0 0 3 0;
 #X connect 0 0 31 0;
 #X connect 1 0 4 0;
@@ -8253,8 +8256,8 @@
 #X connect 24 0 38 0;
 #X connect 27 0 29 0;
 #X connect 27 0 41 0;
+#X connect 30 0 44 0;
 #X connect 30 0 32 0;
-#X connect 30 0 44 0;
 #X connect 33 0 2 0;
 #X connect 34 0 1 0;
 #X connect 35 0 64 0;
@@ -8294,6 +8297,8 @@
 #X connect 67 0 68 0;
 #X connect 68 0 24 0;
 #X connect 69 0 30 0;
+#X connect 70 0 71 0;
+#X connect 71 0 72 0;
 #X restore -264 49 pd observerPosition;
 #N canvas 183 73 1117 782 PropellerAngles 0;
 #X obj 65 29 hsl 80 20 -10 10 0 0 empty empty Yaw 2 10 0 10 -262144
@@ -8551,7 +8556,7 @@
 #X obj 595 549 bng 25 250 50 0 empty empty F 11 11 0 10 -204786 -1
 -1;
 #X obj 622 549 tgl 25 0 empty empty empty 17 7 0 10 -204786 -4034 -4034
-0 1;
+1 1;
 #N canvas 638 23 1079 777 Angles 0;
 #X obj 89 46 *~;
 #X obj 153 47 *~;
diff -r fc487b69ce79 -r c3723ca2bf97 scene demo/freqCalcCyl3No_D4Mach.pd
--- a/scene demo/freqCalcCyl3No_D4Mach.pd	Thu Oct 13 17:24:22 2016 +0100
+++ b/scene demo/freqCalcCyl3No_D4Mach.pd	Wed Oct 19 12:16:17 2016 +0100
@@ -212,7 +212,6 @@
 #X obj 219 385 /~;
 #X obj 133 375 s~ \$0-aGainG;
 #X obj 872 246 r~ \$0-aGainG;
-#X obj 758 512 *~ 0.1;
 #X obj 723 340 +~ 90;
 #X obj 723 363 /~ 360;
 #X obj 723 409 *~;
@@ -313,21 +312,29 @@
 #X msg 219 100 \$1 15;
 #X obj 219 596 *~ 1e+06;
 #X obj 758 544 *~ 1e+06;
+#X obj 977 464 log~;
+#X obj 956 509 pow~;
+#X obj 956 401 sig~ 10;
+#X obj 978 444 /~ 2e-05;
+#X obj 956 532 *~ 2e-05;
+#X obj 977 487 *~ 0.1;
+#X obj 1040 444 sig~ 10;
+#X obj 758 512 *~;
 #X connect 0 0 2 0;
 #X connect 1 0 2 1;
-#X connect 2 0 92 0;
+#X connect 2 0 91 0;
 #X connect 3 0 44 0;
-#X connect 3 0 86 0;
+#X connect 3 0 85 0;
 #X connect 8 0 1 0;
 #X connect 8 0 1 1;
-#X connect 9 0 98 0;
-#X connect 9 0 119 0;
-#X connect 11 0 91 1;
+#X connect 9 0 97 0;
+#X connect 9 0 118 0;
+#X connect 11 0 90 1;
 #X connect 12 0 5 0;
-#X connect 12 0 76 0;
+#X connect 12 0 75 0;
 #X connect 15 0 17 1;
-#X connect 17 0 113 0;
-#X connect 18 0 95 0;
+#X connect 17 0 112 0;
+#X connect 18 0 94 0;
 #X connect 19 0 20 1;
 #X connect 20 0 43 0;
 #X connect 21 0 24 0;
@@ -343,7 +350,7 @@
 #X connect 41 0 43 1;
 #X connect 42 0 41 0;
 #X connect 42 0 41 1;
-#X connect 43 0 121 0;
+#X connect 43 0 120 0;
 #X connect 44 0 46 0;
 #X connect 46 0 52 0;
 #X connect 47 0 48 0;
@@ -354,70 +361,77 @@
 #X connect 52 0 53 0;
 #X connect 53 0 54 1;
 #X connect 54 0 20 0;
-#X connect 56 0 84 0;
-#X connect 57 0 115 0;
-#X connect 57 0 122 0;
-#X connect 58 0 59 0;
-#X connect 59 0 61 0;
-#X connect 60 0 65 0;
-#X connect 61 0 60 0;
-#X connect 61 0 60 1;
-#X connect 62 0 64 0;
-#X connect 63 0 65 1;
-#X connect 64 0 63 0;
-#X connect 64 0 63 1;
-#X connect 65 0 88 0;
+#X connect 56 0 83 0;
+#X connect 57 0 58 0;
+#X connect 58 0 60 0;
+#X connect 59 0 64 0;
+#X connect 60 0 59 0;
+#X connect 60 0 59 1;
+#X connect 61 0 63 0;
+#X connect 62 0 64 1;
+#X connect 63 0 62 0;
+#X connect 63 0 62 1;
+#X connect 64 0 87 0;
+#X connect 67 0 69 0;
+#X connect 67 0 72 0;
 #X connect 68 0 70 0;
 #X connect 68 0 73 0;
-#X connect 69 0 71 0;
-#X connect 69 0 74 0;
-#X connect 72 0 106 0;
-#X connect 75 0 104 0;
-#X connect 77 0 79 0;
-#X connect 77 0 79 1;
-#X connect 78 0 3 0;
-#X connect 78 0 3 1;
-#X connect 79 0 80 0;
-#X connect 80 0 82 0;
-#X connect 82 0 83 0;
-#X connect 83 0 84 1;
-#X connect 84 0 88 1;
-#X connect 87 0 47 0;
-#X connect 88 0 57 0;
-#X connect 90 0 91 0;
-#X connect 91 0 92 1;
-#X connect 92 0 37 0;
-#X connect 93 0 89 0;
-#X connect 95 0 19 0;
-#X connect 95 0 19 1;
-#X connect 97 0 96 0;
-#X connect 97 0 98 0;
-#X connect 98 0 94 0;
-#X connect 98 0 120 0;
-#X connect 99 0 0 0;
-#X connect 100 0 87 0;
-#X connect 101 0 103 0;
-#X connect 102 0 58 0;
-#X connect 103 0 102 0;
-#X connect 104 0 100 0;
-#X connect 105 0 62 0;
-#X connect 106 0 105 0;
-#X connect 107 0 112 0;
-#X connect 108 0 110 0;
-#X connect 109 0 18 0;
-#X connect 110 0 109 0;
-#X connect 111 0 40 0;
-#X connect 112 0 111 0;
-#X connect 113 0 36 0;
-#X connect 116 0 117 0;
-#X connect 118 0 116 0;
-#X connect 119 0 48 1;
-#X connect 120 0 99 0;
-#X connect 121 0 13 0;
-#X connect 121 0 116 0;
-#X connect 122 0 14 0;
+#X connect 71 0 105 0;
+#X connect 74 0 103 0;
+#X connect 76 0 78 0;
+#X connect 76 0 78 1;
+#X connect 77 0 3 0;
+#X connect 77 0 3 1;
+#X connect 78 0 79 0;
+#X connect 79 0 81 0;
+#X connect 81 0 82 0;
+#X connect 82 0 83 1;
+#X connect 83 0 87 1;
+#X connect 86 0 47 0;
+#X connect 87 0 125 0;
+#X connect 89 0 90 0;
+#X connect 90 0 91 1;
+#X connect 91 0 37 0;
+#X connect 92 0 88 0;
+#X connect 94 0 19 0;
+#X connect 94 0 19 1;
+#X connect 96 0 95 0;
+#X connect 96 0 97 0;
+#X connect 97 0 93 0;
+#X connect 97 0 119 0;
+#X connect 98 0 0 0;
+#X connect 99 0 86 0;
+#X connect 100 0 102 0;
+#X connect 101 0 57 0;
+#X connect 102 0 101 0;
+#X connect 103 0 99 0;
+#X connect 104 0 61 0;
+#X connect 105 0 104 0;
+#X connect 106 0 111 0;
+#X connect 107 0 109 0;
+#X connect 108 0 18 0;
+#X connect 109 0 108 0;
+#X connect 110 0 40 0;
+#X connect 111 0 110 0;
+#X connect 112 0 36 0;
+#X connect 115 0 116 0;
+#X connect 117 0 115 0;
+#X connect 118 0 48 1;
+#X connect 119 0 98 0;
+#X connect 120 0 13 0;
+#X connect 120 0 115 0;
+#X connect 121 0 14 0;
+#X connect 122 0 127 0;
+#X connect 123 0 126 0;
+#X connect 124 0 123 0;
+#X connect 125 0 122 0;
+#X connect 126 0 129 1;
+#X connect 127 0 123 1;
+#X connect 128 0 122 1;
+#X connect 129 0 114 0;
+#X connect 129 0 121 0;
 #X restore 313 307 pd GoldfreqGain;
-#N canvas 300 30 1006 797 GoldnoiseGain 1;
+#N canvas 300 30 1006 797 GoldnoiseGain 0;
 #X text -21037 364 Mass Density of Air \, squared;
 #X obj -20777 459 *;
 #X text -20777 412 Distance;
diff -r fc487b69ce79 -r c3723ca2bf97 scene demo/oneToneSingle.pd
--- a/scene demo/oneToneSingle.pd	Thu Oct 13 17:24:22 2016 +0100
+++ b/scene demo/oneToneSingle.pd	Wed Oct 19 12:16:17 2016 +0100
@@ -72,10 +72,10 @@
 #X msg 265 590 \$1 30;
 #X obj 264 625 line~;
 #X obj 100 617 hsl 128 15 0 50 0 0 empty empty empty -2 -8 0 10 -262144
--1 -1 5000 1;
+-1 -1 0 1;
 #X floatatom 125 653 0 0 0 0 - - -;
 #X obj 768 471 hsl 128 15 1 1e+09 1 0 empty empty empty -2 -8 0 10
--262144 -1 -1 4100 1;
+-262144 -1 -1 2400 1;
 #X floatatom 774 489 0 0 0 0 - - -;
 #X msg 383 41 0.004;
 #X msg 378 222 12;