changeset 212:962accce4b3f

editing propellor for angles using other files
author Rod Selfridge <r.selfridge@qmul.ac.uk>
date Sun, 03 Apr 2016 20:26:49 +0100
parents bf12c520e599
children a52ae0c0bac4
files .DS_Store Propellor/Propellor.pd SwordCorInterp/SwordCorInterp.pd SwordCorInterpWii/SwordCorInterpWii.pd SwordLofIWii/WiiSetUp.oscd scene demo/freqCalcCyl3No_D3Mach.pd scene demo/testBedD4.pd scene demo/testBedD6.pd
diffstat 8 files changed, 684 insertions(+), 457 deletions(-) [+]
line wrap: on
line diff
Binary file .DS_Store has changed
--- a/Propellor/Propellor.pd	Tue Mar 29 20:37:47 2016 +0100
+++ b/Propellor/Propellor.pd	Sun Apr 03 20:26:49 2016 +0100
@@ -1,10 +1,10 @@
-#N canvas 138 40 1146 851 10;
+#N canvas 128 23 1146 851 10;
 #X obj 315 22 loadbang;
 #X obj 315 44 tgl 15 0 empty empty empty 17 7 0 10 -262144 -1 -1 1
 1;
 #X obj 315 85 s myMet;
 #X obj -273 429 hsl 100 20 0 700 0 0 empty empty empty -2 -8 0 10 -262144
--1 -1 295 1;
+-1 -1 14 1;
 #X floatatom -276 455 8 0 0 0 - - -;
 #X text -165 346 Blade Length;
 #X text -9 37 Arm Length;
@@ -45,7 +45,7 @@
 #X obj -276 146 hsl 100 20 -50 50 0 0 empty empty empty -2 -8 0 10
 -262144 -1 -1 5049 1;
 #X obj -276 237 hsl 100 20 -50 50 0 0 empty empty empty -2 -8 0 10
--262144 -1 -1 4999 1;
+-262144 -1 -1 5049 1;
 #X obj -278 75 s Xobs;
 #X obj -279 170 s Yobs;
 #X obj -279 264 s Zobs;
@@ -90,14 +90,13 @@
 #X connect 7 0 4 1;
 #X connect 7 0 3 1;
 #X restore 427 102 pd opLevels;
-#X obj 430 73 hsl 100 25 0.1 1e+07 1 0 empty empty empty -2 -8 0 10
--262144 -1 -1 2627 1;
+#X obj 430 73 hsl 100 25 0.001 1e+07 1 0 empty empty empty -2 -8 0
+10 -262144 -1 -1 9602 1;
 #X obj 427 2 r GAIN;
 #X floatatom 370 103 8 0 0 0 - - -;
 #X obj -227 545 s hiltThick;
-#X obj 315 63 metro 25;
 #X msg -171 120 1;
-#N canvas 186 115 1107 640 sources 1;
+#N canvas 186 115 1107 640 sources 0;
 #X obj 117 -98 sweepTime;
 #N canvas 452 68 1135 756 arcDist 0;
 #X obj 118 59 bng 50 250 50 0 empty empty empty 17 7 0 10 -4034 -1
@@ -325,7 +324,7 @@
 #X connect 30 0 25 0;
 #X connect 30 0 31 0;
 #X restore 34 -121 pd tipRe;
-#N canvas 250 351 1052 473 HiltPositions 0;
+#N canvas 253 280 1052 473 HiltPositions 0;
 #X text -8592 93 z coordinate of tip;
 #X text -8908 239 x coordinate of tip;
 #X text -8680 51 y coordinate of tip;
@@ -776,14 +775,14 @@
 #X connect 47 0 14 0;
 #X connect 48 0 13 0;
 #X connect 49 0 12 0;
-#X restore 384 23 pd sourceHiltPositions;
+#X restore 848 -22 pd sourceHiltPositions;
 #N canvas 144 122 1130 580 sourcePositions 0;
 #X obj 271 193 r Zobs;
 #X obj 185 191 r Yobs;
 #X obj 101 183 r Xobs;
 #X obj 86 252 -~;
 #X obj 86 276 *~;
-#X obj 170 254 -~;
+#X obj 185 256 -~;
 #X obj 170 283 *~;
 #X obj 256 254 -~;
 #X obj 256 278 *~;
@@ -796,9 +795,6 @@
 #X msg 185 212 \$1 5;
 #X obj 101 229 line~;
 #X msg 101 207 \$1 5;
-#X obj 86 163 *~ 1;
-#X obj 170 169 *~ 1;
-#X obj 256 173 *~ 1;
 #X obj 521 414 outlet~;
 #X obj 434 414 outlet~;
 #X obj 155 401 outlet~;
@@ -823,12 +819,8 @@
 #X obj 762 263 snapshot~;
 #X obj 930 264 r myMet;
 #X obj 897 287 snapshot~;
-#X obj 86 136 r~ tipX;
-#X obj 170 145 r~ tipY;
-#X obj 256 150 r~ tipZ;
-#X obj 191 107 inlet;
 #X text 171 33 Calculates position of the source.;
-#N canvas 554 577 1003 782 SourceAngles 0;
+#N canvas 347 99 1003 782 SourceAngles 0;
 #X obj -8305 185 *~;
 #X obj -8274 186 *~;
 #X obj -8245 185 *~;
@@ -1037,64 +1029,235 @@
 #X connect 91 0 2 1;
 #X connect 91 0 43 1;
 #X connect 92 0 91 0;
-#X restore 434 392 pd SourceAngles;
+#X restore 503 87 pd SourceAngles;
+#X obj 86 140 sig~ 0;
+#X obj 170 142 inlet~;
+#X obj 256 150 inlet~;
+#X obj 650 365 r myMet;
+#X obj 650 386 snapshot~;
+#X floatatom 650 407 0 0 0 0 - - -;
+#X obj 547 358 inlet~;
+#X floatatom 338 234 0 0 0 0 - - -;
+#X floatatom 230 223 0 0 0 0 - - -;
+#X floatatom 144 219 0 0 0 0 - - -;
+#N canvas 293 75 1049 610 prop________Angs 0;
+#X obj 356 45 inlet~;
+#X obj 461 46 inlet~;
+#X obj 568 43 inlet~;
+#X obj 859 48 inlet~;
+#X obj 630 80 r myMet;
+#X obj 630 102 snapshot~;
+#X floatatom 630 125 0 0 0 0 - - -;
+#X obj 878 86 r myMet;
+#X obj 878 108 snapshot~;
+#X floatatom 878 131 0 0 0 0 - - -;
+#X obj 405 73 r myMet;
+#X obj 405 95 snapshot~;
+#X floatatom 405 118 0 0 0 0 - - -;
+#X obj 516 69 r myMet;
+#X obj 516 91 snapshot~;
+#X floatatom 516 114 0 0 0 0 - - -;
+#X text 865 29 Prop Angle (2pi);
+#X obj -19 34 inlet~;
+#X obj -40 80 r myMet;
+#X obj -40 102 snapshot~;
+#X floatatom -40 125 0 0 0 0 - - -;
+#X text -85 13 Source/Obs distance;
+#X obj 98 49 inlet~;
+#X obj 203 50 inlet~;
+#X obj 143 68 r myMet;
+#X obj 143 90 snapshot~;
+#X floatatom 143 113 0 0 0 0 - - -;
+#X obj 249 58 r myMet;
+#X obj 249 80 snapshot~;
+#X floatatom 249 103 0 0 0 0 - - -;
+#X text 281 27;
+#X text 168 25 Source z;
+#X text 84 29 Source y;
+#X text 342 25 Obs x;
+#X text 426 21 Obs y;
+#X text 539 23 Obs z;
+#X obj 636 197 inlet~;
+#X obj 741 198 inlet~;
+#X obj 848 195 inlet~;
+#X obj 910 232 r myMet;
+#X obj 910 254 snapshot~;
+#X floatatom 910 277 0 0 0 0 - - -;
+#X obj 685 225 r myMet;
+#X obj 685 247 snapshot~;
+#X floatatom 685 270 0 0 0 0 - - -;
+#X obj 796 221 r myMet;
+#X obj 796 243 snapshot~;
+#X floatatom 796 266 0 0 0 0 - - -;
+#X text 622 177 source - Obs x;
+#X text 718 172 source - Obs y;
+#X text 820 176 source - Obs z;
+#X obj 764 296 *~;
+#X obj 858 297 *~;
+#X obj 38 155 *~;
+#X obj 811 341 +~;
+#X obj 811 366 sqrt~;
+#X obj 848 379 r myMet;
+#X obj 848 401 snapshot~;
+#X floatatom 848 424 0 0 0 0 - - -;
+#X obj 581 436 r myMet;
+#X obj 581 458 snapshot~;
+#X floatatom 581 481 0 0 0 0 - - -;
+#X obj 39 93 inlet~;
+#X obj 84 112 r myMet;
+#X obj 84 134 snapshot~;
+#X floatatom 84 157 0 0 0 0 - - -;
+#X text 25 73 Source radius;
+#X obj 472 159 *~;
+#X obj 566 160 *~;
+#X obj 519 204 +~;
+#X obj 519 229 sqrt~;
+#X obj 556 242 r myMet;
+#X obj 556 264 snapshot~;
+#X floatatom 556 287 0 0 0 0 - - -;
+#X obj 399 284 +~;
+#X obj 398 337 -~;
+#X obj 398 394 /~;
+#X obj 786 409 *~ 2;
+#X obj 770 438 *~;
+#X obj 398 421 arccos~;
+#X obj 398 446 +~ 90;
+#X text -32 379 THis is the angle in the y z plane between a projected
+point of the observer into the plane and the source. Think how to relate
+this to the elevation and azimuth as it is neither at the moment.;
+#X connect 0 0 11 0;
+#X connect 1 0 14 0;
+#X connect 1 0 67 0;
+#X connect 1 0 67 1;
+#X connect 2 0 5 0;
+#X connect 2 0 68 0;
+#X connect 2 0 68 1;
+#X connect 3 0 8 0;
+#X connect 4 0 5 0;
+#X connect 5 0 6 0;
+#X connect 7 0 8 0;
+#X connect 8 0 9 0;
+#X connect 10 0 11 0;
+#X connect 11 0 12 0;
+#X connect 13 0 14 0;
+#X connect 14 0 15 0;
+#X connect 17 0 19 0;
+#X connect 18 0 19 0;
+#X connect 19 0 20 0;
+#X connect 22 0 25 0;
+#X connect 23 0 28 0;
+#X connect 24 0 25 0;
+#X connect 25 0 26 0;
+#X connect 27 0 28 0;
+#X connect 28 0 29 0;
+#X connect 36 0 43 0;
+#X connect 37 0 46 0;
+#X connect 37 0 51 1;
+#X connect 37 0 51 0;
+#X connect 38 0 40 0;
+#X connect 38 0 52 0;
+#X connect 38 0 52 1;
+#X connect 39 0 40 0;
+#X connect 40 0 41 0;
+#X connect 42 0 43 0;
+#X connect 43 0 44 0;
+#X connect 45 0 46 0;
+#X connect 46 0 47 0;
+#X connect 51 0 54 0;
+#X connect 52 0 54 1;
+#X connect 53 0 74 0;
+#X connect 54 0 55 0;
+#X connect 54 0 74 1;
+#X connect 55 0 57 0;
+#X connect 55 0 77 0;
+#X connect 56 0 57 0;
+#X connect 57 0 58 0;
+#X connect 59 0 60 0;
+#X connect 60 0 61 0;
+#X connect 62 0 64 0;
+#X connect 62 0 53 0;
+#X connect 62 0 53 1;
+#X connect 62 0 78 0;
+#X connect 63 0 64 0;
+#X connect 64 0 65 0;
+#X connect 67 0 69 0;
+#X connect 68 0 69 1;
+#X connect 69 0 70 0;
+#X connect 69 0 75 1;
+#X connect 70 0 72 0;
+#X connect 71 0 72 0;
+#X connect 72 0 73 0;
+#X connect 74 0 75 0;
+#X connect 75 0 76 0;
+#X connect 76 0 79 0;
+#X connect 77 0 78 1;
+#X connect 78 0 76 1;
+#X connect 79 0 80 0;
+#X connect 80 0 60 0;
+#X restore 436 379 pd prop________Angs;
+#X obj 418 155 inlet~;
 #X connect 0 0 13 0;
+#X connect 0 0 51 0;
 #X connect 1 0 15 0;
+#X connect 1 0 52 0;
 #X connect 2 0 17 0;
+#X connect 2 0 53 0;
 #X connect 3 0 4 0;
 #X connect 3 0 4 1;
-#X connect 3 0 29 0;
+#X connect 3 0 26 0;
+#X connect 3 0 54 7;
 #X connect 4 0 9 0;
 #X connect 5 0 6 0;
 #X connect 5 0 6 1;
-#X connect 5 0 29 1;
-#X connect 5 0 34 0;
-#X connect 5 0 38 0;
+#X connect 5 0 26 1;
+#X connect 5 0 31 0;
+#X connect 5 0 35 0;
+#X connect 5 0 54 8;
 #X connect 6 0 9 1;
 #X connect 7 0 8 0;
 #X connect 7 0 8 1;
+#X connect 7 0 54 9;
 #X connect 8 0 10 1;
 #X connect 9 0 10 0;
 #X connect 10 0 11 0;
-#X connect 11 0 23 0;
+#X connect 11 0 20 0;
+#X connect 11 0 54 0;
 #X connect 12 0 7 1;
+#X connect 12 0 54 6;
 #X connect 13 0 12 0;
 #X connect 14 0 5 1;
+#X connect 14 0 54 5;
 #X connect 15 0 14 0;
 #X connect 16 0 3 1;
+#X connect 16 0 54 4;
 #X connect 17 0 16 0;
-#X connect 18 0 3 0;
-#X connect 18 0 50 0;
-#X connect 19 0 5 0;
-#X connect 19 0 50 1;
-#X connect 20 0 7 0;
-#X connect 20 0 50 2;
+#X connect 24 0 25 0;
+#X connect 25 0 36 0;
+#X connect 26 0 27 0;
 #X connect 27 0 28 0;
-#X connect 28 0 39 0;
-#X connect 29 0 30 0;
-#X connect 30 0 31 0;
-#X connect 31 0 32 0;
-#X connect 32 0 37 0;
-#X connect 32 0 36 1;
-#X connect 33 1 28 0;
-#X connect 34 0 42 0;
-#X connect 35 0 36 0;
-#X connect 36 0 33 0;
-#X connect 37 1 28 0;
-#X connect 38 0 44 0;
-#X connect 41 0 42 0;
-#X connect 42 0 33 1;
-#X connect 43 0 44 0;
-#X connect 44 0 37 1;
-#X connect 45 0 18 0;
-#X connect 46 0 19 0;
-#X connect 47 0 20 0;
-#X connect 48 0 20 1;
-#X connect 48 0 19 1;
-#X connect 48 0 18 1;
-#X connect 50 0 22 0;
-#X connect 50 1 21 0;
-#X restore 698 30 pd sourcePositions;
+#X connect 28 0 29 0;
+#X connect 29 0 34 0;
+#X connect 29 0 33 1;
+#X connect 30 1 25 0;
+#X connect 31 0 39 0;
+#X connect 32 0 33 0;
+#X connect 33 0 30 0;
+#X connect 34 1 25 0;
+#X connect 35 0 41 0;
+#X connect 38 0 39 0;
+#X connect 39 0 30 1;
+#X connect 40 0 41 0;
+#X connect 41 0 34 1;
+#X connect 44 0 3 0;
+#X connect 45 0 5 0;
+#X connect 45 0 54 2;
+#X connect 46 0 7 0;
+#X connect 46 0 54 3;
+#X connect 47 0 48 0;
+#X connect 48 0 49 0;
+#X connect 50 0 54 10;
+#X connect 55 0 54 1;
+#X restore 82 117 pd sourcePositions;
 #N canvas 42 225 549 568 sourceQuantity 0;
 #X obj 93 81 t f b;
 #X obj 78 104 -;
@@ -1776,17 +1939,91 @@
 #X restore 311 -120 pd contPlaneFind;
 #X text 480 -91 Patch that holds all the sources that are used to produce
 the basic aeolian tone.;
-#N canvas 70 65 1019 293 sourceAASpeed 0;
-#X obj 471 150 outlet~;
-#X text 457 176 Source Speed;
+#N canvas 70 65 1348 413 sourceAASpeed 0;
+#X obj 192 185 outlet~;
+#X text 178 211 Source Speed;
+#X obj 1035 159 outlet;
+#X msg 1035 137 0.12926;
+#X obj 1035 114 loadbang;
+#X obj 409 135 *~ 0.21336;
+#X obj 409 113 cos~;
+#X obj 409 71 phasor~;
+#X obj 479 135 *~ 0.21336;
+#X obj 479 113 sin~;
+#X obj 192 39 r RPM;
+#X obj 192 88 * 6.28319;
+#X obj 192 112 * 0.21336;
+#X obj 192 158 line~;
+#X msg 192 135 \$1 20;
+#X text 262 88 2 PI;
+#X text 259 109 Radius of source;
+#X obj 1101 112 r setUp;
+#X obj 192 63 / 60;
+#X obj 409 162 outlet~;
+#X obj 479 163 outlet~;
+#X obj 1101 160 outlet;
+#X msg 1101 135 0.21336;
+#X text 330 180 y position of source;
+#X text 477 182 z position of source;
+#X obj 562 107 *~ 6.28319;
+#X text 555 86 sweep angle;
+#X obj 562 132 outlet~;
+#X text 1016 182 diameter;
+#X text 1101 182 radius;
+#X obj 365 203 r myMet;
+#X obj 365 225 snapshot~;
+#X floatatom 365 248 0 0 0 0 - - -;
+#X obj 603 213 r myMet;
+#X obj 603 235 snapshot~;
+#X floatatom 603 258 0 0 0 0 - - -;
+#X obj 775 241 r myMet;
+#X obj 775 263 snapshot~;
+#X floatatom 775 286 0 0 0 0 - - -;
+#X obj 1176 215 outlet~;
+#X obj 1176 188 line~;
+#X msg 1176 165 \$1 20;
+#X connect 3 0 2 0;
+#X connect 4 0 3 0;
+#X connect 4 0 22 0;
+#X connect 5 0 19 0;
+#X connect 5 0 31 0;
+#X connect 6 0 5 0;
+#X connect 7 0 6 0;
+#X connect 7 0 9 0;
+#X connect 7 0 25 0;
+#X connect 8 0 20 0;
+#X connect 8 0 34 0;
+#X connect 9 0 8 0;
+#X connect 10 0 18 0;
+#X connect 11 0 12 0;
+#X connect 12 0 14 0;
+#X connect 13 0 0 0;
+#X connect 14 0 13 0;
+#X connect 17 0 3 0;
+#X connect 17 0 22 0;
+#X connect 18 0 11 0;
+#X connect 18 0 7 0;
+#X connect 22 0 21 0;
+#X connect 22 0 41 0;
+#X connect 25 0 27 0;
+#X connect 25 0 37 0;
+#X connect 30 0 31 0;
+#X connect 31 0 32 0;
+#X connect 33 0 34 0;
+#X connect 34 0 35 0;
+#X connect 36 0 37 0;
+#X connect 37 0 38 0;
+#X connect 40 0 39 0;
+#X connect 41 0 40 0;
+#X restore 42 58 pd sourceAASpeed;
+#N canvas 70 65 1019 293 sourceBBSpeed 0;
+#X obj 471 181 outlet~;
+#X text 457 207 Source Speed;
 #X obj 758 119 outlet;
-#X obj 85 15 r RPM;
-#X obj 267 23 r myMet;
-#X obj 267 45 snapshot~;
-#X floatatom 267 68 0 0 0 0 - - -;
-#X msg 758 97 0.12926;
+#X obj 351 202 r myMet;
+#X obj 351 224 snapshot~;
+#X floatatom 351 247 0 0 0 0 - - -;
 #X obj 758 76 loadbang;
-#X obj 85 114 *~ 0.21336;
 #X obj 16 152 r myMet;
 #X obj 16 174 snapshot~;
 #X floatatom 16 196 0 0 0 0 - - -;
@@ -1795,47 +2032,52 @@
 #X obj 189 169 snapshot~;
 #X floatatom 189 192 0 0 0 0 - - -;
 #X obj 85 36 phasor~;
-#X obj 155 114 *~ 0.21336;
 #X obj 155 92 sin~;
 #X obj 471 31 r RPM;
-#X obj 471 53 * 6.28319;
-#X obj 471 77 * 0.21336;
-#X obj 471 123 line~;
-#X msg 471 100 \$1 20;
-#X text 541 53 2 PI;
-#X text 538 74 Radius of source;
-#X connect 3 0 17 0;
+#X obj 471 84 * 6.28319;
+#X obj 471 154 line~;
+#X msg 471 131 \$1 20;
+#X text 541 84 2 PI;
+#X text 538 105 Radius of source;
+#X obj 471 108 * 0.42672;
+#X msg 758 97 0.127899;
+#X obj 103 170 s setUp;
+#X obj 865 92 r setUp;
+#X obj 155 114 *~ 0.42672;
+#X obj 85 114 *~ 0.42672;
+#X obj 471 63 / 60;
+#X connect 3 0 4 0;
 #X connect 4 0 5 0;
-#X connect 5 0 6 0;
-#X connect 7 0 2 0;
-#X connect 8 0 7 0;
-#X connect 9 0 11 0;
-#X connect 10 0 11 0;
+#X connect 6 0 23 0;
+#X connect 7 0 8 0;
+#X connect 8 0 9 0;
+#X connect 10 0 27 0;
 #X connect 11 0 12 0;
-#X connect 13 0 9 0;
+#X connect 12 0 13 0;
+#X connect 14 0 10 0;
 #X connect 14 0 15 0;
-#X connect 15 0 16 0;
-#X connect 17 0 13 0;
-#X connect 17 0 19 0;
-#X connect 18 0 15 0;
+#X connect 15 0 26 0;
+#X connect 16 0 28 0;
+#X connect 17 0 22 0;
+#X connect 18 0 4 0;
+#X connect 18 0 0 0;
 #X connect 19 0 18 0;
-#X connect 20 0 21 0;
-#X connect 21 0 22 0;
-#X connect 22 0 24 0;
-#X connect 23 0 5 0;
-#X connect 23 0 0 0;
-#X connect 24 0 23 0;
-#X restore 31 92 pd sourceAASpeed;
-#N canvas 70 65 1019 293 sourceBBSpeed 0;
-#X obj 471 150 outlet~;
-#X text 457 176 Source Speed;
+#X connect 22 0 19 0;
+#X connect 23 0 2 0;
+#X connect 25 0 23 0;
+#X connect 26 0 12 0;
+#X connect 27 0 8 0;
+#X connect 28 0 17 0;
+#X connect 28 0 14 0;
+#X restore 217 94 pd sourceBBSpeed;
+#N canvas 70 65 1019 293 sourceCCSpeed 0;
+#X obj 471 185 outlet~;
+#X text 457 211 Source Speed;
 #X obj 758 119 outlet;
-#X obj 85 15 r RPM;
-#X obj 267 23 r myMet;
-#X obj 267 45 snapshot~;
-#X floatatom 267 68 0 0 0 0 - - -;
+#X obj 357 190 r myMet;
+#X obj 357 212 snapshot~;
+#X floatatom 357 235 0 0 0 0 - - -;
 #X obj 758 76 loadbang;
-#X obj 85 114 *~ 0.21336;
 #X obj 16 152 r myMet;
 #X obj 16 174 snapshot~;
 #X floatatom 16 196 0 0 0 0 - - -;
@@ -1844,48 +2086,52 @@
 #X obj 189 169 snapshot~;
 #X floatatom 189 192 0 0 0 0 - - -;
 #X obj 85 36 phasor~;
-#X obj 155 114 *~ 0.21336;
 #X obj 155 92 sin~;
 #X obj 471 31 r RPM;
-#X obj 471 53 * 6.28319;
-#X obj 471 123 line~;
-#X msg 471 100 \$1 20;
-#X text 541 53 2 PI;
-#X text 538 74 Radius of source;
-#X obj 471 77 * 0.42672;
-#X msg 758 97 0.127899;
-#X connect 3 0 16 0;
+#X obj 471 88 * 6.28319;
+#X obj 471 158 line~;
+#X msg 471 135 \$1 20;
+#X text 541 88 2 PI;
+#X text 538 109 Radius of source;
+#X obj 471 112 * 0.6096;
+#X msg 758 97 0.127608;
+#X obj 113 180 s setUp;
+#X obj 875 102 r setUp;
+#X obj 155 114 *~ 0.6096;
+#X obj 85 114 *~ 0.6096;
+#X obj 471 60 / 60;
+#X connect 3 0 4 0;
 #X connect 4 0 5 0;
-#X connect 5 0 6 0;
-#X connect 7 0 26 0;
-#X connect 8 0 10 0;
-#X connect 9 0 10 0;
-#X connect 10 0 11 0;
-#X connect 12 0 8 0;
-#X connect 13 0 14 0;
+#X connect 6 0 23 0;
+#X connect 7 0 8 0;
+#X connect 8 0 9 0;
+#X connect 10 0 27 0;
+#X connect 11 0 12 0;
+#X connect 12 0 13 0;
+#X connect 14 0 10 0;
 #X connect 14 0 15 0;
-#X connect 16 0 12 0;
-#X connect 16 0 18 0;
-#X connect 17 0 14 0;
-#X connect 18 0 17 0;
-#X connect 19 0 20 0;
-#X connect 20 0 25 0;
-#X connect 21 0 5 0;
-#X connect 21 0 0 0;
-#X connect 22 0 21 0;
-#X connect 25 0 22 0;
-#X connect 26 0 2 0;
-#X restore 217 94 pd sourceBBSpeed;
-#N canvas 70 65 1019 293 sourceCCSpeed 0;
-#X obj 471 150 outlet~;
-#X text 457 176 Source Speed;
+#X connect 15 0 26 0;
+#X connect 16 0 28 0;
+#X connect 17 0 22 0;
+#X connect 18 0 4 0;
+#X connect 18 0 0 0;
+#X connect 19 0 18 0;
+#X connect 22 0 19 0;
+#X connect 23 0 2 0;
+#X connect 25 0 23 0;
+#X connect 26 0 12 0;
+#X connect 27 0 8 0;
+#X connect 28 0 17 0;
+#X connect 28 0 14 0;
+#X restore 426 93 pd sourceCCSpeed;
+#N canvas 70 65 1019 293 sourceDDSpeed 0;
+#X obj 471 181 outlet~;
+#X text 457 207 Source Speed;
 #X obj 758 119 outlet;
-#X obj 85 15 r RPM;
-#X obj 267 23 r myMet;
-#X obj 267 45 snapshot~;
-#X floatatom 267 68 0 0 0 0 - - -;
+#X obj 338 183 r myMet;
+#X obj 338 205 snapshot~;
+#X floatatom 338 228 0 0 0 0 - - -;
 #X obj 758 76 loadbang;
-#X obj 85 114 *~ 0.21336;
 #X obj 16 152 r myMet;
 #X obj 16 174 snapshot~;
 #X floatatom 16 196 0 0 0 0 - - -;
@@ -1894,48 +2140,51 @@
 #X obj 189 169 snapshot~;
 #X floatatom 189 192 0 0 0 0 - - -;
 #X obj 85 36 phasor~;
-#X obj 155 114 *~ 0.21336;
 #X obj 155 92 sin~;
 #X obj 471 31 r RPM;
-#X obj 471 53 * 6.28319;
-#X obj 471 123 line~;
-#X msg 471 100 \$1 20;
-#X text 541 53 2 PI;
-#X text 538 74 Radius of source;
-#X obj 471 77 * 0.6096;
-#X msg 758 97 0.127608;
-#X connect 3 0 16 0;
+#X obj 471 84 * 6.28319;
+#X obj 471 154 line~;
+#X msg 471 131 \$1 20;
+#X text 541 84 2 PI;
+#X text 538 105 Radius of source;
+#X obj 471 108 * 0.82296;
+#X msg 758 97 0.114935;
+#X obj 885 112 r setUp;
+#X obj 155 114 *~ 0.82296;
+#X obj 85 114 *~ 0.82296;
+#X obj 471 59 / 60;
+#X connect 3 0 4 0;
 #X connect 4 0 5 0;
-#X connect 5 0 6 0;
-#X connect 7 0 26 0;
-#X connect 8 0 10 0;
-#X connect 9 0 10 0;
-#X connect 10 0 11 0;
-#X connect 12 0 8 0;
-#X connect 13 0 14 0;
+#X connect 6 0 23 0;
+#X connect 7 0 8 0;
+#X connect 8 0 9 0;
+#X connect 10 0 26 0;
+#X connect 11 0 12 0;
+#X connect 12 0 13 0;
+#X connect 14 0 10 0;
 #X connect 14 0 15 0;
-#X connect 16 0 12 0;
-#X connect 16 0 18 0;
-#X connect 17 0 14 0;
-#X connect 18 0 17 0;
-#X connect 19 0 20 0;
-#X connect 20 0 25 0;
-#X connect 21 0 5 0;
-#X connect 21 0 0 0;
-#X connect 22 0 21 0;
-#X connect 25 0 22 0;
-#X connect 26 0 2 0;
-#X restore 426 93 pd sourceCCSpeed;
-#N canvas 70 65 1019 293 sourceDDSpeed 0;
-#X obj 471 150 outlet~;
-#X text 457 176 Source Speed;
+#X connect 15 0 25 0;
+#X connect 16 0 27 0;
+#X connect 17 0 22 0;
+#X connect 18 0 4 0;
+#X connect 18 0 0 0;
+#X connect 19 0 18 0;
+#X connect 22 0 19 0;
+#X connect 23 0 2 0;
+#X connect 24 0 23 0;
+#X connect 25 0 12 0;
+#X connect 26 0 8 0;
+#X connect 27 0 17 0;
+#X connect 27 0 14 0;
+#X restore 662 93 pd sourceDDSpeed;
+#N canvas 70 65 1019 293 sourceEESpeed 0;
+#X obj 471 175 outlet~;
+#X text 457 201 Source Speed;
 #X obj 758 119 outlet;
-#X obj 85 15 r RPM;
-#X obj 267 23 r myMet;
-#X obj 267 45 snapshot~;
-#X floatatom 267 68 0 0 0 0 - - -;
+#X obj 356 191 r myMet;
+#X obj 356 213 snapshot~;
+#X floatatom 356 236 0 0 0 0 - - -;
 #X obj 758 76 loadbang;
-#X obj 85 114 *~ 0.21336;
 #X obj 16 152 r myMet;
 #X obj 16 174 snapshot~;
 #X floatatom 16 196 0 0 0 0 - - -;
@@ -1944,48 +2193,51 @@
 #X obj 189 169 snapshot~;
 #X floatatom 189 192 0 0 0 0 - - -;
 #X obj 85 36 phasor~;
-#X obj 155 114 *~ 0.21336;
 #X obj 155 92 sin~;
 #X obj 471 31 r RPM;
-#X obj 471 53 * 6.28319;
-#X obj 471 123 line~;
-#X msg 471 100 \$1 20;
-#X text 541 53 2 PI;
-#X text 538 74 Radius of source;
-#X obj 471 77 * 0.82296;
-#X msg 758 97 0.114935;
-#X connect 3 0 16 0;
+#X obj 471 78 * 6.28319;
+#X obj 471 148 line~;
+#X msg 471 125 \$1 20;
+#X text 541 78 2 PI;
+#X text 538 99 Radius of source;
+#X obj 471 102 * 1.03632;
+#X msg 758 97 0.093257;
+#X obj 895 122 r setUp;
+#X obj 85 114 *~ 1.03632;
+#X obj 155 114 *~ 1.03632;
+#X obj 471 52 / 60;
+#X connect 3 0 4 0;
 #X connect 4 0 5 0;
-#X connect 5 0 6 0;
-#X connect 7 0 26 0;
-#X connect 8 0 10 0;
-#X connect 9 0 10 0;
-#X connect 10 0 11 0;
-#X connect 12 0 8 0;
-#X connect 13 0 14 0;
+#X connect 6 0 23 0;
+#X connect 7 0 8 0;
+#X connect 8 0 9 0;
+#X connect 10 0 25 0;
+#X connect 11 0 12 0;
+#X connect 12 0 13 0;
+#X connect 14 0 10 0;
 #X connect 14 0 15 0;
-#X connect 16 0 12 0;
-#X connect 16 0 18 0;
-#X connect 17 0 14 0;
-#X connect 18 0 17 0;
-#X connect 19 0 20 0;
-#X connect 20 0 25 0;
-#X connect 21 0 5 0;
-#X connect 21 0 0 0;
-#X connect 22 0 21 0;
-#X connect 25 0 22 0;
-#X connect 26 0 2 0;
-#X restore 662 93 pd sourceDDSpeed;
-#N canvas 70 65 1019 293 sourceEESpeed 0;
-#X obj 471 150 outlet~;
-#X text 457 176 Source Speed;
+#X connect 15 0 26 0;
+#X connect 16 0 27 0;
+#X connect 17 0 22 0;
+#X connect 18 0 4 0;
+#X connect 18 0 0 0;
+#X connect 19 0 18 0;
+#X connect 22 0 19 0;
+#X connect 23 0 2 0;
+#X connect 24 0 23 0;
+#X connect 25 0 8 0;
+#X connect 26 0 12 0;
+#X connect 27 0 17 0;
+#X connect 27 0 14 0;
+#X restore 125 238 pd sourceEESpeed;
+#N canvas 70 65 1019 293 sourceFFSpeed 0;
+#X obj 471 171 outlet~;
+#X text 457 197 Source Speed;
 #X obj 758 119 outlet;
-#X obj 85 15 r RPM;
-#X obj 267 23 r myMet;
-#X obj 267 45 snapshot~;
-#X floatatom 267 68 0 0 0 0 - - -;
+#X obj 338 173 r myMet;
+#X obj 338 195 snapshot~;
+#X floatatom 338 218 0 0 0 0 - - -;
 #X obj 758 76 loadbang;
-#X obj 85 114 *~ 0.21336;
 #X obj 16 152 r myMet;
 #X obj 16 174 snapshot~;
 #X floatatom 16 196 0 0 0 0 - - -;
@@ -1994,48 +2246,51 @@
 #X obj 189 169 snapshot~;
 #X floatatom 189 192 0 0 0 0 - - -;
 #X obj 85 36 phasor~;
-#X obj 155 114 *~ 0.21336;
 #X obj 155 92 sin~;
 #X obj 471 31 r RPM;
-#X obj 471 53 * 6.28319;
-#X obj 471 123 line~;
-#X msg 471 100 \$1 20;
-#X text 541 53 2 PI;
-#X text 538 74 Radius of source;
-#X obj 471 77 * 1.03632;
-#X msg 758 97 0.093257;
-#X connect 3 0 16 0;
+#X obj 471 74 * 6.28319;
+#X obj 471 144 line~;
+#X msg 471 121 \$1 20;
+#X text 541 74 2 PI;
+#X text 538 95 Radius of source;
+#X obj 471 98 * 1.2192;
+#X msg 758 97 0.07018;
+#X obj 905 132 r setUp;
+#X obj 85 114 *~ 1.2192;
+#X obj 155 114 *~ 1.2192;
+#X obj 471 52 / 60;
+#X connect 3 0 4 0;
 #X connect 4 0 5 0;
-#X connect 5 0 6 0;
-#X connect 7 0 26 0;
-#X connect 8 0 10 0;
-#X connect 9 0 10 0;
-#X connect 10 0 11 0;
-#X connect 12 0 8 0;
-#X connect 13 0 14 0;
+#X connect 6 0 23 0;
+#X connect 7 0 8 0;
+#X connect 8 0 9 0;
+#X connect 10 0 25 0;
+#X connect 11 0 12 0;
+#X connect 12 0 13 0;
+#X connect 14 0 10 0;
 #X connect 14 0 15 0;
-#X connect 16 0 12 0;
-#X connect 16 0 18 0;
-#X connect 17 0 14 0;
-#X connect 18 0 17 0;
-#X connect 19 0 20 0;
-#X connect 20 0 25 0;
-#X connect 21 0 5 0;
-#X connect 21 0 0 0;
-#X connect 22 0 21 0;
-#X connect 25 0 22 0;
-#X connect 26 0 2 0;
-#X restore 125 238 pd sourceEESpeed;
-#N canvas 70 65 1019 293 sourceFFSpeed 0;
+#X connect 15 0 26 0;
+#X connect 16 0 27 0;
+#X connect 17 0 22 0;
+#X connect 18 0 4 0;
+#X connect 18 0 0 0;
+#X connect 19 0 18 0;
+#X connect 22 0 19 0;
+#X connect 23 0 2 0;
+#X connect 24 0 23 0;
+#X connect 25 0 8 0;
+#X connect 26 0 12 0;
+#X connect 27 0 17 0;
+#X connect 27 0 14 0;
+#X restore 344 234 pd sourceFFSpeed;
+#N canvas 70 65 1111 554 sourceGGSpeed 0;
 #X obj 471 150 outlet~;
 #X text 457 176 Source Speed;
 #X obj 758 119 outlet;
-#X obj 85 15 r RPM;
-#X obj 267 23 r myMet;
-#X obj 267 45 snapshot~;
-#X floatatom 267 68 0 0 0 0 - - -;
+#X obj 382 190 r myMet;
+#X obj 382 212 snapshot~;
+#X floatatom 382 235 0 0 0 0 - - -;
 #X obj 758 76 loadbang;
-#X obj 85 114 *~ 0.21336;
 #X obj 16 152 r myMet;
 #X obj 16 174 snapshot~;
 #X floatatom 16 196 0 0 0 0 - - -;
@@ -2044,59 +2299,8 @@
 #X obj 189 169 snapshot~;
 #X floatatom 189 192 0 0 0 0 - - -;
 #X obj 85 36 phasor~;
-#X obj 155 114 *~ 0.21336;
 #X obj 155 92 sin~;
-#X obj 471 31 r RPM;
-#X obj 471 53 * 6.28319;
-#X obj 471 123 line~;
-#X msg 471 100 \$1 20;
-#X text 541 53 2 PI;
-#X text 538 74 Radius of source;
-#X obj 471 77 * 1.2192;
-#X msg 758 97 0.07018;
-#X connect 3 0 16 0;
-#X connect 4 0 5 0;
-#X connect 5 0 6 0;
-#X connect 7 0 26 0;
-#X connect 8 0 10 0;
-#X connect 9 0 10 0;
-#X connect 10 0 11 0;
-#X connect 12 0 8 0;
-#X connect 13 0 14 0;
-#X connect 14 0 15 0;
-#X connect 16 0 12 0;
-#X connect 16 0 18 0;
-#X connect 17 0 14 0;
-#X connect 18 0 17 0;
-#X connect 19 0 20 0;
-#X connect 20 0 25 0;
-#X connect 21 0 5 0;
-#X connect 21 0 0 0;
-#X connect 22 0 21 0;
-#X connect 25 0 22 0;
-#X connect 26 0 2 0;
-#X restore 344 234 pd sourceFFSpeed;
-#N canvas 70 65 1019 293 sourceGGSpeed 0;
-#X obj 471 150 outlet~;
-#X text 457 176 Source Speed;
-#X obj 758 119 outlet;
-#X obj 85 15 r RPM;
-#X obj 267 23 r myMet;
-#X obj 267 45 snapshot~;
-#X floatatom 267 68 0 0 0 0 - - -;
-#X obj 758 76 loadbang;
-#X obj 85 114 *~ 0.21336;
-#X obj 16 152 r myMet;
-#X obj 16 174 snapshot~;
-#X floatatom 16 196 0 0 0 0 - - -;
-#X obj 85 92 cos~;
-#X obj 189 147 r myMet;
-#X obj 189 169 snapshot~;
-#X floatatom 189 192 0 0 0 0 - - -;
-#X obj 85 36 phasor~;
-#X obj 155 114 *~ 0.21336;
-#X obj 155 92 sin~;
-#X obj 471 31 r RPM;
+#X obj 471 11 r RPM;
 #X obj 471 53 * 6.28319;
 #X obj 471 123 line~;
 #X msg 471 100 \$1 20;
@@ -2104,86 +2308,104 @@
 #X text 538 74 Radius of source;
 #X obj 471 77 * 1.31064;
 #X msg 758 97 0.055417;
-#X connect 3 0 16 0;
+#X obj 915 142 r setUp;
+#X obj 85 114 *~ 1.31064;
+#X obj 155 114 *~ 1.31064;
+#X obj 273 111 r myMet;
+#X obj 273 133 snapshot~;
+#X floatatom 273 156 0 0 0 0 - - -;
+#X obj 471 33 / 60;
+#X connect 3 0 4 0;
 #X connect 4 0 5 0;
-#X connect 5 0 6 0;
-#X connect 7 0 26 0;
-#X connect 8 0 10 0;
-#X connect 9 0 10 0;
-#X connect 10 0 11 0;
-#X connect 12 0 8 0;
-#X connect 13 0 14 0;
+#X connect 6 0 23 0;
+#X connect 7 0 8 0;
+#X connect 8 0 9 0;
+#X connect 10 0 25 0;
+#X connect 11 0 12 0;
+#X connect 12 0 13 0;
+#X connect 14 0 10 0;
 #X connect 14 0 15 0;
-#X connect 16 0 12 0;
-#X connect 16 0 18 0;
-#X connect 17 0 14 0;
-#X connect 18 0 17 0;
-#X connect 19 0 20 0;
-#X connect 20 0 25 0;
-#X connect 21 0 5 0;
-#X connect 21 0 0 0;
-#X connect 22 0 21 0;
-#X connect 25 0 22 0;
-#X connect 26 0 2 0;
+#X connect 14 0 28 0;
+#X connect 15 0 26 0;
+#X connect 16 0 30 0;
+#X connect 17 0 22 0;
+#X connect 18 0 4 0;
+#X connect 18 0 0 0;
+#X connect 19 0 18 0;
+#X connect 22 0 19 0;
+#X connect 23 0 2 0;
+#X connect 24 0 23 0;
+#X connect 25 0 8 0;
+#X connect 26 0 12 0;
+#X connect 27 0 28 0;
+#X connect 28 0 29 0;
+#X connect 30 0 17 0;
+#X connect 30 0 14 0;
 #X restore 576 231 pd sourceGGSpeed;
 #X msg 273 -51 0.5;
 #X obj 273 -72 loadbang;
+#X obj 207 -14 sig~ 20;
+#X obj 367 -31 sig~ 90;
+#X obj 604 -34 sig~ 0;
+#X obj 352 -66 r setUp;
+#X obj 576 283 freqCalcCyl5HiFi;
+#X obj 344 286 freqCalcCyl5HiFi;
+#X obj 662 145 freqCalcCyl5HiFi;
 #X obj 426 145 freqCalcCyl5HiFi;
 #X obj 125 290 freqCalcCyl5HiFi;
 #X obj 31 144 freqCalcCyl5HiFi;
 #X obj 217 146 freqCalcCyl5HiFi;
-#X obj 662 145 freqCalcCyl5HiFi;
-#X obj 576 283 freqCalcCyl5HiFi;
-#X obj 344 286 freqCalcCyl5HiFi;
-#X obj 149 0 sig~ 20;
-#X obj 367 -31 sig~ 90;
-#X obj 604 -34 sig~ 0;
 #X connect 1 0 0 0;
 #X connect 2 0 4 0;
 #X connect 2 1 4 1;
-#X connect 10 0 21 0;
-#X connect 10 1 21 1;
-#X connect 11 0 22 0;
-#X connect 11 1 22 1;
-#X connect 12 0 19 0;
-#X connect 12 1 19 1;
-#X connect 13 0 23 0;
-#X connect 13 1 23 1;
-#X connect 14 0 20 0;
-#X connect 14 1 20 1;
-#X connect 15 0 25 0;
-#X connect 15 1 25 1;
-#X connect 16 0 24 0;
-#X connect 16 1 24 1;
-#X connect 17 0 19 5;
-#X connect 17 0 20 5;
-#X connect 17 0 21 5;
-#X connect 17 0 22 5;
+#X connect 6 0 28 2;
+#X connect 6 1 28 3;
+#X connect 6 2 28 4;
+#X connect 6 3 28 5;
+#X connect 10 0 28 0;
+#X connect 10 1 6 0;
+#X connect 10 2 6 1;
+#X connect 10 3 6 3;
+#X connect 10 4 28 1;
+#X connect 10 6 6 2;
+#X connect 11 0 29 0;
+#X connect 11 1 29 1;
+#X connect 12 0 26 0;
+#X connect 12 1 26 1;
+#X connect 13 0 25 0;
+#X connect 13 1 25 1;
+#X connect 14 0 27 0;
+#X connect 14 1 27 1;
+#X connect 15 0 24 0;
+#X connect 15 1 24 1;
+#X connect 16 0 23 0;
+#X connect 16 1 23 1;
 #X connect 17 0 23 5;
 #X connect 17 0 24 5;
 #X connect 17 0 25 5;
+#X connect 17 0 26 5;
+#X connect 17 0 27 5;
+#X connect 17 0 29 5;
 #X connect 18 0 17 0;
-#X connect 26 0 19 2;
-#X connect 26 0 20 2;
-#X connect 26 0 21 2;
-#X connect 26 0 22 2;
-#X connect 26 0 23 2;
-#X connect 26 0 24 2;
-#X connect 26 0 25 2;
-#X connect 27 0 19 3;
-#X connect 27 0 20 3;
-#X connect 27 0 21 3;
-#X connect 27 0 22 3;
-#X connect 27 0 23 3;
-#X connect 27 0 24 3;
-#X connect 27 0 25 3;
-#X connect 28 0 19 4;
-#X connect 28 0 20 4;
-#X connect 28 0 21 4;
-#X connect 28 0 22 4;
-#X connect 28 0 23 4;
-#X connect 28 0 24 4;
-#X connect 28 0 25 4;
+#X connect 19 0 23 2;
+#X connect 19 0 24 2;
+#X connect 19 0 25 2;
+#X connect 19 0 26 2;
+#X connect 19 0 27 2;
+#X connect 19 0 29 2;
+#X connect 20 0 23 3;
+#X connect 20 0 24 3;
+#X connect 20 0 25 3;
+#X connect 20 0 26 3;
+#X connect 20 0 27 3;
+#X connect 20 0 29 3;
+#X connect 21 0 23 4;
+#X connect 21 0 24 4;
+#X connect 21 0 25 4;
+#X connect 21 0 26 4;
+#X connect 21 0 27 4;
+#X connect 21 0 29 4;
+#X connect 22 0 17 0;
 #X restore 219 144 pd sources;
 #X floatatom 227 52 5 0 0 0 - - -;
 #X obj -276 345 hsl 100 20 0.1 3 0 0 empty empty empty -2 -8 0 10 -262144
@@ -2265,14 +2487,15 @@
 \, PreElev 25 \, PostElev 90 \, Gain 5e+06 \, Trigger bang;
 #X text -165 433 RPM;
 #X obj -221 455 s RPM;
-#X msg -208 400 0.1;
 #X msg -181 383 10;
 #X obj -279 368 s length;
 #X msg -150 320 1.3843;
+#X obj 315 63 metro 1;
+#X msg -208 400 1;
 #X connect 0 0 1 0;
-#X connect 1 0 63 0;
+#X connect 1 0 134 0;
 #X connect 3 0 4 0;
-#X connect 3 0 131 0;
+#X connect 3 0 130 0;
 #X connect 7 0 9 0;
 #X connect 7 0 62 0;
 #X connect 8 0 10 0;
@@ -2281,8 +2504,8 @@
 #X connect 16 0 17 0;
 #X connect 17 0 14 0;
 #X connect 18 0 17 1;
-#X connect 18 0 66 0;
-#X connect 19 0 77 0;
+#X connect 18 0 65 0;
+#X connect 19 0 76 0;
 #X connect 21 0 3 0;
 #X connect 22 0 7 0;
 #X connect 23 0 8 0;
@@ -2294,7 +2517,7 @@
 #X connect 29 0 30 0;
 #X connect 30 0 19 0;
 #X connect 32 0 31 0;
-#X connect 32 0 101 0;
+#X connect 32 0 100 0;
 #X connect 33 0 36 0;
 #X connect 33 0 39 0;
 #X connect 34 0 40 0;
@@ -2313,70 +2536,70 @@
 #X connect 51 0 33 0;
 #X connect 52 0 34 0;
 #X connect 53 0 35 0;
-#X connect 57 0 103 0;
+#X connect 57 0 102 0;
 #X connect 58 0 54 0;
 #X connect 58 1 55 0;
 #X connect 59 0 58 0;
 #X connect 59 0 61 0;
 #X connect 60 0 59 0;
-#X connect 63 0 2 0;
-#X connect 64 0 34 0;
-#X connect 67 0 68 0;
-#X connect 67 0 134 0;
-#X connect 69 0 67 0;
-#X connect 70 0 67 0;
-#X connect 74 0 67 0;
-#X connect 75 0 67 0;
-#X connect 76 0 67 0;
-#X connect 77 0 20 0;
-#X connect 90 0 19 0;
-#X connect 92 0 7 0;
-#X connect 92 0 8 0;
-#X connect 93 0 34 0;
-#X connect 94 0 64 0;
-#X connect 95 0 48 0;
-#X connect 96 0 100 0;
-#X connect 97 0 135 0;
-#X connect 98 0 50 0;
-#X connect 99 0 102 0;
-#X connect 99 0 105 0;
-#X connect 100 0 35 0;
-#X connect 102 0 7 0;
-#X connect 103 0 59 0;
-#X connect 104 0 34 0;
-#X connect 105 0 8 0;
-#X connect 106 0 35 0;
-#X connect 107 0 112 0;
-#X connect 109 0 35 0;
-#X connect 110 0 113 0;
-#X connect 112 0 108 0;
-#X connect 113 0 111 0;
+#X connect 63 0 34 0;
+#X connect 66 0 67 0;
+#X connect 66 0 132 0;
+#X connect 68 0 66 0;
+#X connect 69 0 66 0;
+#X connect 73 0 66 0;
+#X connect 74 0 66 0;
+#X connect 75 0 66 0;
+#X connect 76 0 20 0;
+#X connect 89 0 19 0;
+#X connect 91 0 7 0;
+#X connect 91 0 8 0;
+#X connect 92 0 34 0;
+#X connect 93 0 63 0;
+#X connect 94 0 48 0;
+#X connect 95 0 99 0;
+#X connect 96 0 133 0;
+#X connect 97 0 50 0;
+#X connect 98 0 101 0;
+#X connect 98 0 104 0;
+#X connect 99 0 35 0;
+#X connect 101 0 7 0;
+#X connect 102 0 59 0;
+#X connect 103 0 34 0;
+#X connect 104 0 8 0;
+#X connect 105 0 35 0;
+#X connect 106 0 111 0;
+#X connect 108 0 35 0;
+#X connect 109 0 112 0;
+#X connect 111 0 107 0;
+#X connect 112 0 110 0;
+#X connect 113 0 114 0;
 #X connect 114 0 115 0;
-#X connect 115 0 116 0;
-#X connect 117 0 129 0;
-#X connect 118 0 126 0;
-#X connect 119 0 128 0;
-#X connect 120 0 127 0;
-#X connect 121 0 82 0;
-#X connect 121 1 88 0;
-#X connect 121 2 87 0;
-#X connect 121 3 86 0;
-#X connect 121 4 85 0;
-#X connect 121 5 84 0;
-#X connect 121 6 83 0;
-#X connect 121 7 81 0;
-#X connect 121 8 80 0;
-#X connect 121 9 79 0;
-#X connect 121 10 78 0;
-#X connect 121 11 89 0;
-#X connect 121 12 91 0;
+#X connect 116 0 128 0;
+#X connect 117 0 125 0;
+#X connect 118 0 127 0;
+#X connect 119 0 126 0;
+#X connect 120 0 81 0;
+#X connect 120 1 87 0;
+#X connect 120 2 86 0;
+#X connect 120 3 85 0;
+#X connect 120 4 84 0;
+#X connect 120 5 83 0;
+#X connect 120 6 82 0;
+#X connect 120 7 80 0;
+#X connect 120 8 79 0;
+#X connect 120 9 78 0;
+#X connect 120 10 77 0;
+#X connect 120 11 88 0;
+#X connect 120 12 90 0;
+#X connect 121 0 122 0;
 #X connect 122 0 123 0;
-#X connect 123 0 124 0;
-#X connect 125 0 34 0;
-#X connect 126 0 121 0;
-#X connect 127 0 121 0;
-#X connect 128 0 121 0;
-#X connect 129 0 121 0;
-#X connect 132 0 3 0;
-#X connect 133 0 3 0;
-#X connect 135 0 67 0;
+#X connect 124 0 34 0;
+#X connect 125 0 120 0;
+#X connect 126 0 120 0;
+#X connect 127 0 120 0;
+#X connect 128 0 120 0;
+#X connect 131 0 3 0;
+#X connect 133 0 66 0;
+#X connect 134 0 2 0;
+#X connect 135 0 3 0;
--- a/SwordCorInterp/SwordCorInterp.pd	Tue Mar 29 20:37:47 2016 +0100
+++ b/SwordCorInterp/SwordCorInterp.pd	Sun Apr 03 20:26:49 2016 +0100
@@ -5,18 +5,18 @@
 #X obj 315 85 s myMet;
 #X obj -221 455 s topSpeed;
 #X obj -273 429 hsl 100 20 0 700 0 0 empty empty empty -2 -8 0 10 -262144
--1 -1 566 1;
+-1 -1 495 1;
 #X floatatom -276 455 8 0 0 0 - - -;
 #X text -165 346 Blade Length;
 #X text -9 37 Arm Length;
 #X text -165 433 Top Speed;
 #X obj 21 251 hsl 100 20 0 360 0 0 empty empty empty -2 -8 0 10 -262144
--1 -1 27 1;
+-1 -1 2475 1;
 #X floatatom 18 280 8 0 0 0 - - -;
 #X obj -279 516 hsl 100 20 0 0.09 0 0 empty empty empty -2 -8 0 10
--262144 -1 -1 1672 1;
+-262144 -1 -1 1100 1;
 #X obj -280 601 hsl 100 20 0.0001 0.1 0 0 empty empty empty -2 -8 0
-10 -262144 -1 -1 832 1;
+10 -262144 -1 -1 684 1;
 #X floatatom -282 546 8 0 0 0 - - -;
 #X floatatom -283 629 8 0 0 0 - - -;
 #X obj -225 628 s tipThick;
@@ -45,15 +45,15 @@
 #X obj 83 21 loadbang;
 #X obj 83 45 delay 13;
 #X obj 19 326 hsl 100 20 180 360 0 0 empty empty empty -2 -8 0 10 -262144
--1 -1 3850 1;
+-1 -1 4950 1;
 #X floatatom 16 358 8 0 0 0 - - -;
 #X obj -42 306 r setUp;
 #X obj 14 439 hsl 100 20 0 180 0 0 empty empty empty -2 -8 0 10 -262144
--1 -1 275 1;
+-1 -1 4950 1;
 #X floatatom 11 471 8 0 0 0 - - -;
 #X obj -47 419 r setUp;
 #X obj 12 517 hsl 100 20 0 180 0 0 empty empty empty -2 -8 0 10 -262144
--1 -1 9350 1;
+-1 -1 4950 1;
 #X floatatom 9 549 8 0 0 0 - - -;
 #X obj -49 497 r setUp;
 #X obj 66 470 s presweepElev;
@@ -67,11 +67,11 @@
 #X obj -43 59 s start_armLength;
 #X msg -43 38 0.35;
 #X obj -275 52 hsl 100 20 -50 50 0 0 empty empty empty -2 -8 0 10 -262144
--1 -1 4970 1;
+-1 -1 5346 1;
 #X obj -276 146 hsl 100 20 -50 50 0 0 empty empty empty -2 -8 0 10
+-262144 -1 -1 5049 1;
+#X obj -276 237 hsl 100 20 -50 50 0 0 empty empty empty -2 -8 0 10
 -262144 -1 -1 4999 1;
-#X obj -276 237 hsl 100 20 -50 50 0 0 empty empty empty -2 -8 0 10
--262144 -1 -1 5148 1;
 #X obj -278 75 s Xobs;
 #X obj -279 170 s Yobs;
 #X obj -279 264 s Zobs;
@@ -4328,7 +4328,7 @@
 #X restore 219 144 pd sources;
 #X floatatom 227 52 5 0 0 0 - - -;
 #X obj -276 345 hsl 100 20 0.1 3 0 0 empty empty empty -2 -8 0 10 -262144
--1 -1 3561 1;
+-1 -1 3072 1;
 #X floatatom -319 368 5 0 0 0 - - -;
 #X obj -324 319 r setUp;
 #X obj -279 300 r thisLength;
--- a/SwordCorInterpWii/SwordCorInterpWii.pd	Tue Mar 29 20:37:47 2016 +0100
+++ b/SwordCorInterpWii/SwordCorInterpWii.pd	Sun Apr 03 20:26:49 2016 +0100
@@ -7,12 +7,12 @@
 #X text -165 346 Blade Length;
 #X text -9 37 Arm Length;
 #X obj 21 251 hsl 100 20 0 180 0 0 empty empty empty -2 -8 0 10 -262144
--1 -1 9900 1;
+-1 -1 0 1;
 #X floatatom 18 280 0 0 0 0 - - -;
 #X obj -270 444 hsl 100 20 0 0.1 0 0 empty empty empty -2 -8 0 10 -262144
--1 -1 2891 1;
+-1 -1 2376 1;
 #X obj -271 529 hsl 100 20 0.0001 0.1 0 0 empty empty empty -2 -8 0
-10 -262144 -1 -1 1313 1;
+10 -262144 -1 -1 2368 1;
 #X floatatom -273 474 8 0 0 0 - - -;
 #X floatatom -274 557 8 0 0 0 - - -;
 #X obj -216 556 s tipThick;
@@ -39,17 +39,17 @@
 #X obj 83 21 loadbang;
 #X obj 83 45 delay 13;
 #X obj 15 336 hsl 100 20 0 180 0 0 empty empty empty -2 -8 0 10 -262144
--1 -1 2072 1;
+-1 -1 0 1;
 #X floatatom 12 368 0 0 0 0 - - -;
 #X obj -46 316 r setUp;
 #X obj -43 59 s start_armLength;
 #X msg -43 38 0.35;
 #X obj -275 52 hsl 100 20 -50 50 0 0 empty empty empty -2 -8 0 10 -262144
--1 -1 4970 1;
+-1 -1 5247 1;
 #X obj -276 146 hsl 100 20 -50 50 0 0 empty empty empty -2 -8 0 10
--262144 -1 -1 5049 1;
+-262144 -1 -1 5148 1;
 #X obj -276 237 hsl 100 20 -50 50 0 0 empty empty empty -2 -8 0 10
--262144 -1 -1 5049 1;
+-262144 -1 -1 5247 1;
 #X obj -278 75 s Xobs;
 #X obj -279 166 s Yobs;
 #X obj -279 264 s Zobs;
@@ -114,7 +114,7 @@
 #X restore 427 102 pd opLevels;
 #X msg 436 48 5;
 #X obj 430 73 hsl 100 25 0.1 1e+09 1 0 empty empty empty -2 -8 0 10
--262144 -1 -1 6279 1;
+-262144 -1 -1 6930 1;
 #X obj 427 2 r GAIN;
 #X floatatom 370 103 8 0 0 0 - - -;
 #X obj -218 473 s hiltThick;
@@ -122,7 +122,7 @@
 #X msg -171 120 1;
 #X floatatom 227 52 5 0 0 0 - - -;
 #X obj -276 345 hsl 100 20 0.1 10 0 0 empty empty empty -2 -8 0 10
--262144 -1 -1 950 1;
+-262144 -1 -1 1400 1;
 #X floatatom -319 368 5 0 0 0 - - -;
 #X obj -324 319 r setUp;
 #X obj -279 300 r thisLength;
@@ -258,6 +258,8 @@
 #X obj 69 133 OSCroute /A;
 #X obj 68 159 s strike;
 #X obj 698 355 * 10000;
+#X obj 131 166 bng 15 250 50 0 empty empty empty 17 7 0 10 -262144
+-1 -1;
 #X connect 1 0 6 0;
 #X connect 2 0 1 0;
 #X connect 4 0 7 0;
@@ -385,6 +387,7 @@
 #X connect 116 0 106 3;
 #X connect 117 0 95 0;
 #X connect 118 0 119 0;
+#X connect 118 0 121 0;
 #X connect 120 0 107 0;
 #X connect 120 0 115 0;
 #X restore 270 174 pd WiiCont;
@@ -4915,12 +4918,12 @@
 #X msg 270 621 Xpos 3 \, Ypos 2 \, Zpos 3 \, Len 1.5 \, TopSpeed 35
 \, HiltThick 0.024 \, TipThick 0.024 \, PreAzim 6 \, PostAzim 300 \,
 PreElev 45 \, PostElev 90 \, Gain 1e+06 \, Trigger bang;
-#X msg 263 462 Xpos 0.2 \, Ypos 1 \, Zpos 1 \, Len 1.117 \, TopSpeed
-38 \, HiltThick 0.005 \, TipThick 0.008 \, PreAzim 112 \, PostAzim
-235 \, PreElev 90 \, PostElev 90 \, Gain 1e+06 \, Trigger bang;
 #X msg 265 542 Xpos 3 \, Ypos 1 \, Zpos 0.5 \, Len 0.781 \, TopSpeed
 35 \, HiltThick 0.028 \, TipThick 0.057 \, PreAzim 6 \, PostAzim 300
 \, PreElev 45 \, PostElev 90 \, Gain 2e+08 \, Trigger bang;
+#X msg 263 462 Xpos 0.2 \, Ypos 1 \, Zpos 1 \, Len 1.117 \, TopSpeed
+38 \, HiltThick 0.013 \, TipThick 0.008 \, PreAzim 112 \, PostAzim
+235 \, PreElev 90 \, PostElev 90 \, Gain 1e+06 \, Trigger bang;
 #X connect 0 0 1 0;
 #X connect 1 0 70 0;
 #X connect 5 0 6 0;
@@ -4999,8 +5002,8 @@
 #X connect 102 0 100 0;
 #X connect 103 0 104 0;
 #X connect 104 0 105 0;
-#X connect 106 0 137 0;
-#X connect 107 0 136 0;
+#X connect 106 0 136 0;
+#X connect 107 0 137 0;
 #X connect 108 0 110 0;
 #X connect 109 0 110 0;
 #X connect 110 0 111 0;
Binary file SwordLofIWii/WiiSetUp.oscd has changed
--- a/scene demo/freqCalcCyl3No_D3Mach.pd	Tue Mar 29 20:37:47 2016 +0100
+++ b/scene demo/freqCalcCyl3No_D3Mach.pd	Sun Apr 03 20:26:49 2016 +0100
@@ -77,7 +77,7 @@
 #X obj 313 142 r~ \$0-str;
 #X obj 331 183 r \$0-leng;
 #X obj 356 241 r \$0-dist;
-#N canvas 205 88 1238 721 GoldfreqGain 0;
+#N canvas 205 88 1238 721 GoldfreqGain 1;
 #N canvas 759 125 286 294 pow6 0;
 #X obj 47 67 *~;
 #X obj 76 67 *~;
@@ -407,6 +407,7 @@
 #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;
--- a/scene demo/testBedD4.pd	Tue Mar 29 20:37:47 2016 +0100
+++ b/scene demo/testBedD4.pd	Sun Apr 03 20:26:49 2016 +0100
@@ -11,7 +11,7 @@
 #X obj 35 -90 loadbang;
 #X msg 35 -70 5;
 #X obj 296 26 hsl 128 15 1e-05 1 1 0 empty empty empty -2 -8 0 10 -262144
--1 -1 4013 1;
+-1 -1 6513 1;
 #X floatatom 303 52 8 0 0 0 - - -;
 #X obj 364 302 hsl 128 15 0.01 0.99 0 0 empty empty empty -2 -8 0 10
 -262144 -1 -1 6350 1;
@@ -24,7 +24,7 @@
 -262144 -1 -1 9525 1;
 #X floatatom 380 268 5 0 0 0 - - -;
 #X obj 323 127 hsl 128 15 100 1 1 0 empty empty empty -2 -8 0 10 -262144
--1 -1 8877 1;
+-1 -1 12277 1;
 #X floatatom 339 156 5 0 0 0 - - -;
 #X text 512 303 Pan Value;
 #X obj -189 443 vu 15 120 empty empty -1 -8 0 10 -66577 -1 1 0;
@@ -67,8 +67,8 @@
 #X connect 15 0 0 1;
 #X restore -190 400 pd opLevels;
 #X msg -181 346 5;
-#X obj -187 371 hsl 100 25 0.1 1e+09 0 0 empty empty empty -2 -8 0
-10 -262144 -1 -1 0 1;
+#X obj -187 371 hsl 100 25 0.1 1e+11 1 0 empty empty empty -2 -8 0
+10 -262144 -1 -1 8900 1;
 #N canvas 20 383 344 123 machCalc 0;
 #X text 107 15 Speed of Sound (dry air 20 Degs C);
 #X obj 26 -14 vd~ varwind;
@@ -84,7 +84,7 @@
 #X obj 249 -40 bng 15 250 50 0 empty empty empty 17 7 0 10 -262144
 -1 -1;
 #X obj 309 84 hsl 128 15 1 20 0 0 empty empty empty -2 -8 0 10 -262144
--1 -1 2005 1;
+-1 -1 11205 1;
 #X floatatom 331 103 8 0 0 0 - - -;
 #X msg 215 67 4;
 #X obj -70 374 hsl 100 25 1 127 0 0 empty empty empty -2 -8 0 10 -262144
@@ -224,8 +224,8 @@
 #X msg -379 182 17 0.0015 10 3 -100 7e+08;
 #X msg -372 215 28 0.04 7 6 35 7e+08;
 #X obj 293 577 freqCalcCyl4No_D4Mach;
-#X msg -209 118 10;
 #X msg 411 -27 0.00038;
+#X msg -209 118 15;
 #X connect 0 0 33 0;
 #X connect 2 0 64 0;
 #X connect 2 0 110 0;
@@ -345,5 +345,5 @@
 #X connect 131 0 66 0;
 #X connect 132 0 66 0;
 #X connect 133 0 66 0;
-#X connect 135 0 63 0;
-#X connect 136 0 10 0;
+#X connect 135 0 10 0;
+#X connect 136 0 63 0;
--- a/scene demo/testBedD6.pd	Tue Mar 29 20:37:47 2016 +0100
+++ b/scene demo/testBedD6.pd	Sun Apr 03 20:26:49 2016 +0100
@@ -1,7 +1,7 @@
 #N canvas 99 23 1323 659 10;
 #X obj -154 155 delwrite~ varwind 3000;
 #X obj -44 -36 hsl 128 15 0 150 0 0 empty empty empty -2 -8 0 10 -262144
--1 -1 0 1;
+-1 -1 2032 1;
 #X obj -153 8 *~ 1;
 #X obj -153 34 +~ 1;
 #X obj -283 258 vu 15 120 empty empty -1 -8 0 10 -66577 -1 1 0;
@@ -32,7 +32,7 @@
 #X restore -284 215 pd opLevels;
 #X msg -275 161 5;
 #X obj -281 186 hsl 100 25 0.1 1e+09 1 0 empty empty empty -2 -8 0
-10 -262144 -1 -1 1682 1;
+10 -262144 -1 -1 8182 1;
 #N canvas 20 383 344 123 machCalc 0;
 #X text 107 15 Speed of Sound (dry air 20 Degs C);
 #X obj 26 -14 vd~ varwind;