changeset 246:5956d810a83a

More audio signals used for control in aeolian tone
author Rod Selfridge <r.selfridge@qmul.ac.uk>
date Sat, 17 Sep 2016 18:33:01 +0100
parents a671bf445047
children 69d16b108b20
files Propellor/PropTestD2.pd Propellor/freqCalcCyl6HiFi.pd
diffstat 2 files changed, 2210 insertions(+), 2492 deletions(-) [+]
line wrap: on
line diff
--- a/Propellor/PropTestD2.pd	Sat Sep 17 16:43:59 2016 +0100
+++ b/Propellor/PropTestD2.pd	Sat Sep 17 18:33:01 2016 +0100
@@ -1,10 +1,10 @@
-#N canvas 119 35 915 802 10;
-#X obj -46 20 loadbang;
-#X obj -46 42 tgl 15 0 empty empty empty 17 7 0 10 -262144 -1 -1 1
+#N canvas 543 37 915 802 10;
+#X obj 405 16 loadbang;
+#X obj 405 38 tgl 15 0 empty empty empty 17 7 0 10 -262144 -1 -1 1
 1;
-#X obj -46 83 s myMet;
+#X obj 405 79 s myMet;
 #X obj -251 527 hsl 70 15 0 4000 0 0 empty empty RPM 2 8 0 10 -262144
--1 -1 3800 1;
+-1 -1 4025 1;
 #X floatatom 76 540 0 0 0 0 - - -;
 #X obj 143 73 bng 50 250 50 0 empty empty empty 17 7 0 10 -4034 -1
 -1;
@@ -22,11 +22,11 @@
 #X obj 83 21 loadbang;
 #X obj 83 45 delay 13;
 #X obj -286 34 hsl 100 20 -500 500 0 0 empty empty empty -2 -8 0 10
--262144 -1 -1 5857 1;
+-262144 -1 -1 5889 1;
 #X obj -287 164 hsl 100 20 -500 500 0 0 empty empty empty -2 -8 0 10
--262144 -1 -1 5255 1;
+-262144 -1 -1 5299 1;
 #X obj -297 285 hsl 100 20 -500 500 0 0 empty empty empty -2 -8 0 10
--262144 -1 -1 5403 1;
+-262144 -1 -1 4280 1;
 #X floatatom -329 57 0 0 0 0 - - -;
 #X floatatom -329 185 0 0 0 0 - - -;
 #X floatatom -253 309 0 0 0 0 - - -;
@@ -64,7 +64,7 @@
 #X connect 7 0 3 1;
 #X restore 313 542 pd opLevels;
 #X obj 77 426 hsl 100 25 0.01 1e+07 1 0 empty empty Gain 2 13 0 10
--261682 -1 -66577 5500 1;
+-261682 -1 -66577 5169 1;
 #X obj 76 329 r GAIN;
 #X floatatom 227 52 5 0 0 0 - - -;
 #X obj -278 417 hsl 70 15 0.1 3 0 0 empty empty Blade_Length 2 8 0
@@ -82,14 +82,13 @@
 #X obj -217 237 loadbang;
 #X obj -199 374 loadbang;
 #X obj -203 484 loadbang;
-#X obj -46 61 metro 1;
+#X obj 405 57 metro 1;
 #X msg -203 504 0;
 #X obj 78 509 hsl 100 20 0 1 0 0 empty empty Engine_Speed 2 10 0 10
--204800 -1 -1 0 1;
-#X msg 85 375 1000;
+-204800 -1 -1 7700 1;
 #X text 51 541 RPM;
 #X floatatom 244 544 0 0 0 0 - - -;
-#N canvas 683 107 1095 835 rotNoise 1;
+#N canvas 176 25 1095 835 rotNoise 0;
 #X obj 329 -137 noise~;
 #X obj 329 -116 s~ myNoise;
 #X obj 429 -90 r myMet;
@@ -106,32 +105,30 @@
 #X obj 141 131 *~;
 #X obj 141 41 r~ myNoise;
 #X obj 196 104 inlet~;
-#X obj 141 172 *~ 1;
-#X floatatom 203 174 0 0 0 0 - - -;
-#X obj 211 141 inlet;
 #X obj 46 182 r myMet;
 #X obj 46 204 snapshot~;
 #X floatatom 46 227 0 0 0 0 - - -;
 #X obj 74 58 inlet~;
 #X obj 141 83 vcf~ 150;
 #X obj 141 104 vcf~ 150;
+#X obj 169 150 r~ rotBoost;
+#X obj 141 172 *~;
 #X connect 2 0 0 0;
 #X connect 2 1 1 0;
 #X connect 3 0 2 1;
-#X connect 4 0 7 0;
-#X connect 5 0 14 0;
+#X connect 4 0 14 0;
+#X connect 5 0 11 0;
 #X connect 6 0 4 1;
-#X connect 6 0 11 0;
-#X connect 7 0 2 0;
-#X connect 9 0 7 1;
-#X connect 9 0 8 0;
-#X connect 10 0 11 0;
+#X connect 6 0 8 0;
+#X connect 7 0 8 0;
+#X connect 8 0 9 0;
+#X connect 10 0 11 1;
+#X connect 10 0 12 1;
 #X connect 11 0 12 0;
+#X connect 12 0 4 0;
 #X connect 13 0 14 1;
-#X connect 13 0 15 1;
-#X connect 14 0 15 0;
-#X connect 15 0 4 0;
-#X restore 35 -8 pd rotPeak;
+#X connect 14 0 2 0;
+#X restore 35 -48 pd rotPeak;
 #X obj 35 -69 *~ 1;
 #X obj 489 -29 s~ \$0-fundFreq;
 #X obj 35 -134 r~ \$0-fundFreq;
@@ -187,7 +184,6 @@
 #X obj 596 -130 r~ RPM;
 #X obj 596 -90 s~ radsec;
 #X msg 56 -91 1;
-#X obj 92 -28 r rotBoost;
 #X obj 511 397 r myMet;
 #X obj 511 417 snapshot~;
 #X floatatom 511 436 0 0 0 0 - - -;
@@ -903,7 +899,7 @@
 #X connect 130 0 131 0;
 #X connect 131 0 132 0;
 #X restore 330 65 pd step8;
-#X obj 63 -49 r~ harm1G;
+#X obj 92 -67 r~ harm1G;
 #N canvas 40 79 344 352 rotPeak 0;
 #X obj 141 260 throw~ l;
 #X obj 168 237 throw~ r;
@@ -912,37 +908,34 @@
 #X obj 141 131 *~;
 #X obj 141 41 r~ myNoise;
 #X obj 196 104 inlet~;
-#X obj 141 172 *~ 1;
-#X floatatom 203 174 0 0 0 0 - - -;
-#X obj 211 141 inlet;
 #X obj 46 182 r myMet;
 #X obj 46 204 snapshot~;
 #X floatatom 46 227 0 0 0 0 - - -;
 #X obj 74 58 inlet~;
 #X obj 141 83 vcf~ 150;
 #X obj 141 104 vcf~ 150;
+#X obj 141 172 *~;
+#X obj 211 141 r~ rotBoost;
 #X connect 2 0 0 0;
 #X connect 2 1 1 0;
 #X connect 3 0 2 1;
-#X connect 4 0 7 0;
-#X connect 5 0 14 0;
+#X connect 4 0 13 0;
+#X connect 5 0 11 0;
 #X connect 6 0 4 1;
-#X connect 7 0 2 0;
-#X connect 9 0 7 1;
-#X connect 9 0 8 0;
-#X connect 10 0 11 0;
+#X connect 7 0 8 0;
+#X connect 8 0 9 0;
+#X connect 10 0 11 1;
+#X connect 10 0 12 1;
 #X connect 11 0 12 0;
-#X connect 13 0 14 1;
-#X connect 13 0 15 1;
-#X connect 14 0 15 0;
-#X connect 15 0 4 0;
-#X restore 36 155 pd rotPeak;
-#X obj 36 94 *~ 1;
-#X obj 36 29 r~ \$0-fundFreq;
-#X obj 57 51 loadbang;
-#X obj 93 135 r rotBoost;
-#X msg 57 72 2;
-#X obj 64 114 r~ harm2G;
+#X connect 12 0 4 0;
+#X connect 13 0 2 0;
+#X connect 14 0 13 1;
+#X restore 34 67 pd rotPeak;
+#X obj 34 46 *~ 1;
+#X obj 34 -19 r~ \$0-fundFreq;
+#X obj 55 3 loadbang;
+#X msg 55 24 2;
+#X obj 91 46 r~ harm2G;
 #N canvas 40 79 344 352 rotPeak 0;
 #X obj 141 260 throw~ l;
 #X obj 168 237 throw~ r;
@@ -951,35 +944,32 @@
 #X obj 141 131 *~;
 #X obj 141 41 r~ myNoise;
 #X obj 196 104 inlet~;
-#X obj 141 172 *~ 1;
-#X floatatom 203 174 0 0 0 0 - - -;
-#X obj 211 141 inlet;
 #X obj 46 182 r myMet;
 #X obj 46 204 snapshot~;
 #X floatatom 46 227 0 0 0 0 - - -;
 #X obj 74 58 inlet~;
 #X obj 141 83 vcf~ 150;
 #X obj 141 104 vcf~ 150;
+#X obj 211 141 r~ rotBoost;
+#X obj 141 172 *~;
 #X connect 2 0 0 0;
 #X connect 2 1 1 0;
 #X connect 3 0 2 1;
-#X connect 4 0 7 0;
-#X connect 5 0 14 0;
+#X connect 4 0 14 0;
+#X connect 5 0 11 0;
 #X connect 6 0 4 1;
-#X connect 7 0 2 0;
-#X connect 9 0 7 1;
-#X connect 9 0 8 0;
-#X connect 10 0 11 0;
+#X connect 7 0 8 0;
+#X connect 8 0 9 0;
+#X connect 10 0 11 1;
+#X connect 10 0 12 1;
 #X connect 11 0 12 0;
+#X connect 12 0 4 0;
 #X connect 13 0 14 1;
-#X connect 13 0 15 1;
-#X connect 14 0 15 0;
-#X connect 15 0 4 0;
-#X restore 36 306 pd rotPeak;
-#X obj 36 245 *~ 1;
-#X obj 36 180 r~ \$0-fundFreq;
-#X obj 57 202 loadbang;
-#X obj 93 286 r rotBoost;
+#X connect 14 0 2 0;
+#X restore 34 183 pd rotPeak;
+#X obj 34 162 *~ 1;
+#X obj 34 97 r~ \$0-fundFreq;
+#X obj 55 119 loadbang;
 #N canvas 40 79 344 352 rotPeak 0;
 #X obj 141 260 throw~ l;
 #X obj 168 237 throw~ r;
@@ -988,39 +978,36 @@
 #X obj 141 131 *~;
 #X obj 141 41 r~ myNoise;
 #X obj 196 104 inlet~;
-#X obj 141 172 *~ 1;
-#X floatatom 203 174 0 0 0 0 - - -;
-#X obj 211 141 inlet;
 #X obj 46 182 r myMet;
 #X obj 46 204 snapshot~;
 #X floatatom 46 227 0 0 0 0 - - -;
 #X obj 74 58 inlet~;
 #X obj 141 83 vcf~ 150;
 #X obj 141 104 vcf~ 150;
+#X obj 141 172 *~;
+#X obj 211 141 r~ rotBoost;
 #X connect 2 0 0 0;
 #X connect 2 1 1 0;
 #X connect 3 0 2 1;
-#X connect 4 0 7 0;
-#X connect 5 0 14 0;
+#X connect 4 0 13 0;
+#X connect 5 0 11 0;
 #X connect 6 0 4 1;
-#X connect 7 0 2 0;
-#X connect 9 0 7 1;
-#X connect 9 0 8 0;
-#X connect 10 0 11 0;
+#X connect 7 0 8 0;
+#X connect 8 0 9 0;
+#X connect 10 0 11 1;
+#X connect 10 0 12 1;
 #X connect 11 0 12 0;
-#X connect 13 0 14 1;
-#X connect 13 0 15 1;
-#X connect 14 0 15 0;
-#X connect 15 0 4 0;
-#X restore 37 469 pd rotPeak;
-#X obj 37 408 *~ 1;
-#X obj 37 343 r~ \$0-fundFreq;
-#X obj 58 365 loadbang;
-#X obj 94 449 r rotBoost;
-#X msg 57 223 3;
-#X obj 64 265 r~ harm3G;
-#X msg 58 386 4;
-#X obj 65 428 r~ harm4G;
+#X connect 12 0 4 0;
+#X connect 13 0 2 0;
+#X connect 14 0 13 1;
+#X restore 32 296 pd rotPeak;
+#X obj 32 275 *~ 1;
+#X obj 32 210 r~ \$0-fundFreq;
+#X obj 53 232 loadbang;
+#X msg 55 140 3;
+#X obj 91 162 r~ harm3G;
+#X msg 53 253 4;
+#X obj 89 275 r~ harm4G;
 #N canvas 40 79 344 352 rotPeak 0;
 #X obj 141 260 throw~ l;
 #X obj 168 237 throw~ r;
@@ -1029,37 +1016,69 @@
 #X obj 141 131 *~;
 #X obj 141 41 r~ myNoise;
 #X obj 196 104 inlet~;
-#X obj 141 172 *~ 1;
-#X floatatom 203 174 0 0 0 0 - - -;
-#X obj 211 141 inlet;
 #X obj 46 182 r myMet;
 #X obj 46 204 snapshot~;
 #X floatatom 46 227 0 0 0 0 - - -;
 #X obj 74 58 inlet~;
 #X obj 141 83 vcf~ 150;
 #X obj 141 104 vcf~ 150;
+#X obj 141 172 *~;
+#X obj 211 141 r~ rotBoost;
 #X connect 2 0 0 0;
 #X connect 2 1 1 0;
 #X connect 3 0 2 1;
-#X connect 4 0 7 0;
-#X connect 5 0 14 0;
+#X connect 4 0 13 0;
+#X connect 5 0 11 0;
 #X connect 6 0 4 1;
-#X connect 7 0 2 0;
-#X connect 9 0 7 1;
-#X connect 9 0 8 0;
-#X connect 10 0 11 0;
+#X connect 7 0 8 0;
+#X connect 8 0 9 0;
+#X connect 10 0 11 1;
+#X connect 10 0 12 1;
 #X connect 11 0 12 0;
-#X connect 13 0 14 1;
-#X connect 13 0 15 1;
-#X connect 14 0 15 0;
-#X connect 15 0 4 0;
-#X restore 37 623 pd rotPeak;
-#X obj 37 562 *~ 1;
-#X obj 37 497 r~ \$0-fundFreq;
-#X obj 58 519 loadbang;
-#X obj 94 603 r rotBoost;
-#X msg 58 540 5;
-#X obj 65 582 r~ harm5G;
+#X connect 12 0 4 0;
+#X connect 13 0 2 0;
+#X connect 14 0 13 1;
+#X restore 30 410 pd rotPeak;
+#X obj 30 388 *~ 1;
+#X obj 30 323 r~ \$0-fundFreq;
+#X obj 51 345 loadbang;
+#X msg 51 366 5;
+#X obj 87 388 r~ harm5G;
+#N canvas 102 298 344 352 rotPeak 0;
+#X obj 141 260 throw~ l;
+#X obj 168 237 throw~ r;
+#X obj 141 216 fcpan;
+#X obj 168 196 r \$0-thisPan;
+#X obj 141 131 *~;
+#X obj 141 41 r~ myNoise;
+#X obj 196 104 inlet~;
+#X floatatom 203 174 0 0 0 0 - - -;
+#X obj 46 182 r myMet;
+#X obj 46 204 snapshot~;
+#X floatatom 46 227 0 0 0 0 - - -;
+#X obj 74 58 inlet~;
+#X obj 141 83 vcf~ 150;
+#X obj 141 104 vcf~ 150;
+#X obj 141 172 *~;
+#X obj 165 147 r~ rotBoost;
+#X connect 2 0 0 0;
+#X connect 2 1 1 0;
+#X connect 3 0 2 1;
+#X connect 4 0 14 0;
+#X connect 5 0 12 0;
+#X connect 6 0 4 1;
+#X connect 8 0 9 0;
+#X connect 9 0 10 0;
+#X connect 11 0 12 1;
+#X connect 11 0 13 1;
+#X connect 12 0 13 0;
+#X connect 13 0 4 0;
+#X connect 14 0 2 0;
+#X connect 15 0 14 1;
+#X restore 172 -49 pd rotPeak;
+#X obj 172 -70 *~ 1;
+#X obj 172 -135 r~ \$0-fundFreq;
+#X obj 193 -113 loadbang;
 #N canvas 40 79 344 352 rotPeak 0;
 #X obj 141 260 throw~ l;
 #X obj 168 237 throw~ r;
@@ -1068,35 +1087,32 @@
 #X obj 141 131 *~;
 #X obj 141 41 r~ myNoise;
 #X obj 196 104 inlet~;
-#X obj 141 172 *~ 1;
-#X floatatom 203 174 0 0 0 0 - - -;
-#X obj 211 141 inlet;
 #X obj 46 182 r myMet;
 #X obj 46 204 snapshot~;
 #X floatatom 46 227 0 0 0 0 - - -;
 #X obj 74 58 inlet~;
 #X obj 141 83 vcf~ 150;
 #X obj 141 104 vcf~ 150;
+#X obj 141 172 *~;
+#X obj 211 141 r~ rotBoost;
 #X connect 2 0 0 0;
 #X connect 2 1 1 0;
 #X connect 3 0 2 1;
-#X connect 4 0 7 0;
-#X connect 5 0 14 0;
+#X connect 4 0 13 0;
+#X connect 5 0 11 0;
 #X connect 6 0 4 1;
-#X connect 7 0 2 0;
-#X connect 9 0 7 1;
-#X connect 9 0 8 0;
-#X connect 10 0 11 0;
+#X connect 7 0 8 0;
+#X connect 8 0 9 0;
+#X connect 10 0 11 1;
+#X connect 10 0 12 1;
 #X connect 11 0 12 0;
-#X connect 13 0 14 1;
-#X connect 13 0 15 1;
-#X connect 14 0 15 0;
-#X connect 15 0 4 0;
-#X restore 172 -9 pd rotPeak;
-#X obj 172 -70 *~ 1;
-#X obj 172 -135 r~ \$0-fundFreq;
-#X obj 193 -113 loadbang;
-#X obj 229 -29 r rotBoost;
+#X connect 12 0 4 0;
+#X connect 13 0 2 0;
+#X connect 14 0 13 1;
+#X restore 170 65 pd rotPeak;
+#X obj 170 44 *~ 1;
+#X obj 170 -21 r~ \$0-fundFreq;
+#X obj 191 1 loadbang;
 #N canvas 40 79 344 352 rotPeak 0;
 #X obj 141 260 throw~ l;
 #X obj 168 237 throw~ r;
@@ -1105,35 +1121,32 @@
 #X obj 141 131 *~;
 #X obj 141 41 r~ myNoise;
 #X obj 196 104 inlet~;
-#X obj 141 172 *~ 1;
-#X floatatom 203 174 0 0 0 0 - - -;
-#X obj 211 141 inlet;
 #X obj 46 182 r myMet;
 #X obj 46 204 snapshot~;
 #X floatatom 46 227 0 0 0 0 - - -;
 #X obj 74 58 inlet~;
 #X obj 141 83 vcf~ 150;
 #X obj 141 104 vcf~ 150;
+#X obj 141 172 *~;
+#X obj 211 141 r~ rotBoost;
 #X connect 2 0 0 0;
 #X connect 2 1 1 0;
 #X connect 3 0 2 1;
-#X connect 4 0 7 0;
-#X connect 5 0 14 0;
+#X connect 4 0 13 0;
+#X connect 5 0 11 0;
 #X connect 6 0 4 1;
-#X connect 7 0 2 0;
-#X connect 9 0 7 1;
-#X connect 9 0 8 0;
-#X connect 10 0 11 0;
+#X connect 7 0 8 0;
+#X connect 8 0 9 0;
+#X connect 10 0 11 1;
+#X connect 10 0 12 1;
 #X connect 11 0 12 0;
-#X connect 13 0 14 1;
-#X connect 13 0 15 1;
-#X connect 14 0 15 0;
-#X connect 15 0 4 0;
-#X restore 173 154 pd rotPeak;
-#X obj 173 93 *~ 1;
-#X obj 173 28 r~ \$0-fundFreq;
-#X obj 194 50 loadbang;
-#X obj 230 134 r rotBoost;
+#X connect 12 0 4 0;
+#X connect 13 0 2 0;
+#X connect 14 0 13 1;
+#X restore 170 185 pd rotPeak;
+#X obj 170 164 *~ 1;
+#X obj 170 99 r~ \$0-fundFreq;
+#X obj 191 121 loadbang;
 #N canvas 40 79 344 352 rotPeak 0;
 #X obj 141 260 throw~ l;
 #X obj 168 237 throw~ r;
@@ -1142,35 +1155,32 @@
 #X obj 141 131 *~;
 #X obj 141 41 r~ myNoise;
 #X obj 196 104 inlet~;
-#X obj 141 172 *~ 1;
-#X floatatom 203 174 0 0 0 0 - - -;
-#X obj 211 141 inlet;
 #X obj 46 182 r myMet;
 #X obj 46 204 snapshot~;
 #X floatatom 46 227 0 0 0 0 - - -;
 #X obj 74 58 inlet~;
 #X obj 141 83 vcf~ 150;
 #X obj 141 104 vcf~ 150;
+#X obj 141 172 *~;
+#X obj 211 141 r~ rotBoost;
 #X connect 2 0 0 0;
 #X connect 2 1 1 0;
 #X connect 3 0 2 1;
-#X connect 4 0 7 0;
-#X connect 5 0 14 0;
+#X connect 4 0 13 0;
+#X connect 5 0 11 0;
 #X connect 6 0 4 1;
-#X connect 7 0 2 0;
-#X connect 9 0 7 1;
-#X connect 9 0 8 0;
-#X connect 10 0 11 0;
+#X connect 7 0 8 0;
+#X connect 8 0 9 0;
+#X connect 10 0 11 1;
+#X connect 10 0 12 1;
 #X connect 11 0 12 0;
-#X connect 13 0 14 1;
-#X connect 13 0 15 1;
-#X connect 14 0 15 0;
-#X connect 15 0 4 0;
-#X restore 173 305 pd rotPeak;
-#X obj 173 244 *~ 1;
-#X obj 173 179 r~ \$0-fundFreq;
-#X obj 194 201 loadbang;
-#X obj 230 285 r rotBoost;
+#X connect 12 0 4 0;
+#X connect 13 0 2 0;
+#X connect 14 0 13 1;
+#X restore 167 297 pd rotPeak;
+#X obj 167 275 *~ 1;
+#X obj 167 210 r~ \$0-fundFreq;
+#X obj 188 232 loadbang;
 #N canvas 40 79 344 352 rotPeak 0;
 #X obj 141 260 throw~ l;
 #X obj 168 237 throw~ r;
@@ -1179,82 +1189,42 @@
 #X obj 141 131 *~;
 #X obj 141 41 r~ myNoise;
 #X obj 196 104 inlet~;
-#X obj 141 172 *~ 1;
-#X floatatom 203 174 0 0 0 0 - - -;
-#X obj 211 141 inlet;
 #X obj 46 182 r myMet;
 #X obj 46 204 snapshot~;
 #X floatatom 46 227 0 0 0 0 - - -;
 #X obj 74 58 inlet~;
 #X obj 141 83 vcf~ 150;
 #X obj 141 104 vcf~ 150;
+#X obj 141 172 *~;
+#X obj 211 141 r~ rotBoost;
 #X connect 2 0 0 0;
 #X connect 2 1 1 0;
 #X connect 3 0 2 1;
-#X connect 4 0 7 0;
-#X connect 5 0 14 0;
+#X connect 4 0 13 0;
+#X connect 5 0 11 0;
 #X connect 6 0 4 1;
-#X connect 7 0 2 0;
-#X connect 9 0 7 1;
-#X connect 9 0 8 0;
-#X connect 10 0 11 0;
+#X connect 7 0 8 0;
+#X connect 8 0 9 0;
+#X connect 10 0 11 1;
+#X connect 10 0 12 1;
 #X connect 11 0 12 0;
-#X connect 13 0 14 1;
-#X connect 13 0 15 1;
-#X connect 14 0 15 0;
-#X connect 15 0 4 0;
-#X restore 174 468 pd rotPeak;
-#X obj 174 407 *~ 1;
-#X obj 174 342 r~ \$0-fundFreq;
-#X obj 195 364 loadbang;
-#X obj 231 448 r rotBoost;
-#N canvas 40 79 344 352 rotPeak 0;
-#X obj 141 260 throw~ l;
-#X obj 168 237 throw~ r;
-#X obj 141 216 fcpan;
-#X obj 168 196 r \$0-thisPan;
-#X obj 141 131 *~;
-#X obj 141 41 r~ myNoise;
-#X obj 196 104 inlet~;
-#X obj 141 172 *~ 1;
-#X floatatom 203 174 0 0 0 0 - - -;
-#X obj 211 141 inlet;
-#X obj 46 182 r myMet;
-#X obj 46 204 snapshot~;
-#X floatatom 46 227 0 0 0 0 - - -;
-#X obj 74 58 inlet~;
-#X obj 141 83 vcf~ 150;
-#X obj 141 104 vcf~ 150;
-#X connect 2 0 0 0;
-#X connect 2 1 1 0;
-#X connect 3 0 2 1;
-#X connect 4 0 7 0;
-#X connect 5 0 14 0;
-#X connect 6 0 4 1;
-#X connect 7 0 2 0;
-#X connect 9 0 7 1;
-#X connect 9 0 8 0;
-#X connect 10 0 11 0;
-#X connect 11 0 12 0;
-#X connect 13 0 14 1;
-#X connect 13 0 15 1;
-#X connect 14 0 15 0;
-#X connect 15 0 4 0;
-#X restore 174 622 pd rotPeak;
-#X obj 174 561 *~ 1;
-#X obj 174 496 r~ \$0-fundFreq;
-#X obj 195 518 loadbang;
-#X obj 231 602 r rotBoost;
+#X connect 12 0 4 0;
+#X connect 13 0 2 0;
+#X connect 14 0 13 1;
+#X restore 162 407 pd rotPeak;
+#X obj 162 386 *~ 1;
+#X obj 162 321 r~ \$0-fundFreq;
+#X obj 183 343 loadbang;
 #X msg 193 -92 6;
-#X obj 200 -50 r~ harm6G;
-#X msg 194 71 7;
-#X obj 201 113 r~ harm7G;
-#X msg 194 222 8;
-#X obj 201 264 r~ harm8G;
-#X msg 195 385 9;
-#X obj 202 427 r~ harm9G;
-#X msg 195 539 10;
-#X obj 202 581 r~ harm10G;
+#X obj 229 -69 r~ harm6G;
+#X msg 191 22 7;
+#X obj 227 43 r~ harm7G;
+#X msg 191 142 8;
+#X obj 227 164 r~ harm8G;
+#X msg 188 253 9;
+#X obj 224 276 r~ harm9G;
+#X msg 183 364 10;
+#X obj 219 385 r~ harm10G;
 #X obj 489 -140 r~ RPM;
 #X obj 508 -9 r~ Yobs;
 #X obj 559 -9 r~ Xobs;
@@ -1350,12 +1320,13 @@
 #X obj 426 -16 r myMet;
 #X obj 426 4 snapshot~;
 #X floatatom 426 25 0 0 0 0 - - -;
+#X obj 670 -66 s Zobs;
 #X connect 0 0 1 0;
 #X connect 2 0 3 0;
 #X connect 3 0 4 0;
 #X connect 5 0 6 0;
 #X connect 6 0 3 0;
-#X connect 6 0 184 0;
+#X connect 6 0 174 0;
 #X connect 7 0 6 1;
 #X connect 9 0 8 0;
 #X connect 11 0 9 0;
@@ -1369,21 +1340,21 @@
 #X connect 18 0 54 1;
 #X connect 18 0 19 0;
 #X connect 18 0 46 0;
-#X connect 18 0 164 0;
+#X connect 18 0 154 0;
 #X connect 19 1 56 0;
 #X connect 20 0 47 0;
 #X connect 21 1 56 1;
 #X connect 22 0 48 0;
 #X connect 23 0 24 0;
 #X connect 23 0 19 1;
-#X connect 23 0 171 0;
+#X connect 23 0 161 0;
 #X connect 25 0 23 1;
 #X connect 25 1 23 0;
 #X connect 26 0 31 0;
 #X connect 27 0 32 0;
 #X connect 28 0 29 0;
 #X connect 28 0 21 1;
-#X connect 28 0 170 0;
+#X connect 28 0 160 0;
 #X connect 30 0 28 1;
 #X connect 30 1 28 0;
 #X connect 31 0 28 0;
@@ -1392,14 +1363,14 @@
 #X connect 34 0 50 0;
 #X connect 35 0 36 0;
 #X connect 35 0 45 1;
-#X connect 35 0 167 0;
+#X connect 35 0 157 0;
 #X connect 37 0 35 1;
 #X connect 37 1 35 0;
 #X connect 38 0 43 0;
 #X connect 39 0 44 0;
 #X connect 40 0 41 0;
 #X connect 40 0 46 1;
-#X connect 40 0 166 0;
+#X connect 40 0 156 0;
 #X connect 42 0 40 1;
 #X connect 42 1 40 0;
 #X connect 43 0 40 0;
@@ -1417,119 +1388,110 @@
 #X connect 55 0 54 0;
 #X connect 56 0 57 0;
 #X connect 57 0 58 0;
-#X connect 58 0 71 0;
+#X connect 58 0 70 0;
 #X connect 60 0 62 0;
 #X connect 61 0 60 0;
 #X connect 63 0 9 1;
-#X connect 64 0 8 2;
+#X connect 64 0 65 0;
 #X connect 65 0 66 0;
-#X connect 66 0 67 0;
-#X connect 66 0 70 0;
+#X connect 65 0 69 0;
+#X connect 70 0 71 0;
+#X connect 71 0 65 0;
 #X connect 71 0 72 0;
-#X connect 72 0 66 0;
-#X connect 72 0 73 0;
-#X connect 72 0 178 0;
-#X connect 82 0 8 1;
+#X connect 71 0 168 0;
+#X connect 81 0 8 1;
+#X connect 83 0 82 0;
 #X connect 84 0 83 0;
-#X connect 85 0 84 0;
-#X connect 86 0 88 0;
-#X connect 87 0 83 2;
-#X connect 88 0 84 1;
-#X connect 89 0 83 1;
-#X connect 91 0 90 0;
-#X connect 92 0 91 0;
-#X connect 93 0 100 0;
-#X connect 94 0 90 2;
-#X connect 96 0 95 0;
-#X connect 97 0 96 0;
-#X connect 98 0 102 0;
-#X connect 99 0 95 2;
-#X connect 100 0 91 1;
-#X connect 101 0 90 1;
-#X connect 102 0 96 1;
-#X connect 103 0 95 1;
-#X connect 105 0 104 0;
-#X connect 106 0 105 0;
-#X connect 107 0 109 0;
-#X connect 108 0 104 2;
-#X connect 109 0 105 1;
-#X connect 110 0 104 1;
+#X connect 85 0 86 0;
+#X connect 86 0 83 1;
+#X connect 87 0 82 1;
+#X connect 89 0 88 0;
+#X connect 90 0 89 0;
+#X connect 91 0 96 0;
+#X connect 93 0 92 0;
+#X connect 94 0 93 0;
+#X connect 95 0 98 0;
+#X connect 96 0 89 1;
+#X connect 97 0 88 1;
+#X connect 98 0 93 1;
+#X connect 99 0 92 1;
+#X connect 101 0 100 0;
+#X connect 102 0 101 0;
+#X connect 103 0 104 0;
+#X connect 104 0 101 1;
+#X connect 105 0 100 1;
+#X connect 107 0 106 0;
+#X connect 108 0 107 0;
+#X connect 109 0 126 0;
+#X connect 111 0 110 0;
 #X connect 112 0 111 0;
-#X connect 113 0 112 0;
-#X connect 114 0 136 0;
-#X connect 115 0 111 2;
-#X connect 117 0 116 0;
-#X connect 118 0 117 0;
-#X connect 119 0 138 0;
-#X connect 120 0 116 2;
-#X connect 122 0 121 0;
+#X connect 113 0 128 0;
+#X connect 115 0 114 0;
+#X connect 116 0 115 0;
+#X connect 117 0 130 0;
+#X connect 119 0 118 0;
+#X connect 120 0 119 0;
+#X connect 121 0 132 0;
 #X connect 123 0 122 0;
-#X connect 124 0 140 0;
-#X connect 125 0 121 2;
-#X connect 127 0 126 0;
-#X connect 128 0 127 0;
-#X connect 129 0 142 0;
-#X connect 130 0 126 2;
-#X connect 132 0 131 0;
-#X connect 133 0 132 0;
-#X connect 134 0 144 0;
-#X connect 135 0 131 2;
-#X connect 136 0 112 1;
-#X connect 137 0 111 1;
-#X connect 138 0 117 1;
-#X connect 139 0 116 1;
-#X connect 140 0 122 1;
-#X connect 141 0 121 1;
-#X connect 142 0 127 1;
-#X connect 143 0 126 1;
-#X connect 144 0 132 1;
-#X connect 145 0 131 1;
-#X connect 146 0 5 0;
-#X connect 147 0 13 0;
-#X connect 147 0 13 1;
-#X connect 148 0 14 0;
-#X connect 148 0 14 1;
-#X connect 148 0 17 0;
-#X connect 149 0 156 0;
-#X connect 150 0 159 0;
-#X connect 151 0 153 0;
-#X connect 152 0 153 0;
+#X connect 124 0 123 0;
+#X connect 125 0 134 0;
+#X connect 126 0 107 1;
+#X connect 127 0 106 1;
+#X connect 128 0 111 1;
+#X connect 129 0 110 1;
+#X connect 130 0 115 1;
+#X connect 131 0 114 1;
+#X connect 132 0 119 1;
+#X connect 133 0 118 1;
+#X connect 134 0 123 1;
+#X connect 135 0 122 1;
+#X connect 136 0 5 0;
+#X connect 137 0 13 0;
+#X connect 137 0 13 1;
+#X connect 138 0 14 0;
+#X connect 138 0 14 1;
+#X connect 138 0 17 0;
+#X connect 139 0 146 0;
+#X connect 140 0 149 0;
+#X connect 141 0 143 0;
+#X connect 142 0 143 0;
+#X connect 143 0 144 0;
+#X connect 143 0 179 0;
+#X connect 145 0 146 0;
+#X connect 146 0 147 0;
+#X connect 146 0 151 0;
+#X connect 148 0 149 0;
+#X connect 149 0 150 0;
+#X connect 149 0 152 0;
 #X connect 153 0 154 0;
-#X connect 155 0 156 0;
-#X connect 156 0 157 0;
-#X connect 156 0 161 0;
-#X connect 158 0 159 0;
-#X connect 159 0 160 0;
-#X connect 159 0 162 0;
-#X connect 163 0 164 0;
-#X connect 164 0 165 0;
-#X connect 166 0 171 1;
-#X connect 166 1 171 0;
-#X connect 167 0 170 1;
-#X connect 167 1 170 0;
-#X connect 170 0 169 0;
-#X connect 170 0 173 1;
-#X connect 171 0 168 0;
-#X connect 171 0 172 1;
-#X connect 172 1 174 0;
-#X connect 173 1 181 1;
-#X connect 174 0 181 0;
-#X connect 175 0 176 0;
+#X connect 154 0 155 0;
+#X connect 156 0 161 1;
+#X connect 156 1 161 0;
+#X connect 157 0 160 1;
+#X connect 157 1 160 0;
+#X connect 160 0 159 0;
+#X connect 160 0 163 1;
+#X connect 161 0 158 0;
+#X connect 161 0 162 1;
+#X connect 162 1 164 0;
+#X connect 163 1 171 1;
+#X connect 164 0 171 0;
+#X connect 165 0 166 0;
+#X connect 166 0 167 0;
+#X connect 166 0 67 0;
+#X connect 168 0 169 0;
+#X connect 169 0 170 0;
+#X connect 169 0 170 1;
+#X connect 170 0 162 0;
+#X connect 170 0 163 0;
+#X connect 171 0 172 0;
+#X connect 172 0 173 0;
+#X connect 173 0 175 0;
+#X connect 174 0 10 0;
+#X connect 174 0 177 0;
+#X connect 175 0 166 0;
 #X connect 176 0 177 0;
-#X connect 176 0 68 0;
-#X connect 178 0 179 0;
-#X connect 179 0 180 0;
-#X connect 179 0 180 1;
-#X connect 180 0 172 0;
-#X connect 180 0 173 0;
-#X connect 181 0 182 0;
-#X connect 182 0 183 0;
-#X connect 183 0 185 0;
-#X connect 184 0 10 0;
-#X connect 184 0 187 0;
-#X connect 185 0 176 0;
-#X connect 186 0 187 0;
-#X connect 187 0 188 0;
+#X connect 177 0 178 0;
 #X restore 209 487 pd rotNoise;
 #X msg -272 374 0.8;
 #X obj -293 638 hsl 70 15 2 4 0 0 empty empty Blades 2 8 0 10 -262144
@@ -1540,17 +1502,16 @@
 #X msg -296 682 \$1 30;
 #X obj -296 723 s~ noBlad;
 #X obj -296 617 loadbang;
-#X obj -187 683 hsl 70 15 1e-05 1000 1 0 empty empty Rot_Boost 2 8
-0 10 -262144 -1 -1 4050 1;
-#X obj -190 702 s rotBoost;
-#X floatatom -125 702 0 0 0 0 - - -;
+#X obj 392 364 hsl 70 15 1e-05 1000 1 0 empty empty Rot_Boost 2 8 0
+10 -262144 -1 -1 4050 1;
+#X floatatom 454 383 0 0 0 0 - - -;
 #X msg -242 11 -150;
-#X obj -190 642 loadbang;
+#X obj 389 323 loadbang;
 #X msg -217 258 100;
 #X msg -178 -7 150;
 #X floatatom 209 508 0 0 0 0 - - -;
 #X obj -54 660 hsl 70 15 150 500 0 0 empty empty Horse_Power 2 8 0
-10 -262144 -1 -1 0 1;
+10 -262144 -1 -1 1600 1;
 #X obj -57 700 line~;
 #X msg -57 680 \$1 30;
 #X obj -57 721 s~ horseP;
@@ -1587,11 +1548,11 @@
 #X connect 11 0 1 1;
 #X connect 12 0 0 0;
 #X connect 12 0 0 1;
-#X restore -101 271 pd dist;
+#X restore 282 488 pd dist;
 #X msg 22 641 180;
 #X msg -199 394 0.91;
 #X msg -172 504 2000;
-#X msg -190 662 0.1;
+#X msg 389 343 0.1;
 #X msg -182 138 116;
 #X msg -200 6 0;
 #X obj -95 213 line;
@@ -1610,212 +1571,8 @@
 #X obj -289 77 line~;
 #X msg -289 57 \$1 30;
 #X obj -289 97 s~ Xobs;
-#X floatatom -101 291 0 0 0 0 - - -;
+#X floatatom 282 508 0 0 0 0 - - -;
 #N canvas 478 36 1002 525 sources 0;
-#N canvas 163 121 1103 599 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 185 256 -~;
-#X obj 170 283 *~;
-#X obj 256 254 -~;
-#X obj 256 278 *~;
-#X obj 155 317 +~;
-#X obj 155 349 +~;
-#X obj 155 373 sqrt~;
-#X obj 271 235 line~;
-#X msg 271 213 \$1 5;
-#X obj 185 233 line~;
-#X msg 185 212 \$1 5;
-#X obj 101 229 line~;
-#X msg 101 207 \$1 5;
-#X obj 547 414 outlet~;
-#X obj 436 414 outlet~;
-#X obj 155 401 outlet~;
-#X text 150 439 source distance from Observer;
-#X text 362 440 source - Obs Elevation;
-#X text 541 441 source - Obs Azimuth;
-#X obj 831 345 r myMet;
-#X obj 830 370 snapshot~;
-#X obj 738 149 /~;
-#X obj 738 172 atan~;
-#X obj 738 195 /~ 3.14159;
-#X obj 738 219 abs~;
-#X obj 723 285 spigot~;
-#X obj 762 242 >~ 0;
-#X obj 690 230 sig~ 1;
-#X obj 723 262 -~;
-#X obj 858 309 spigot~;
-#X obj 897 265 <~ 0;
-#X obj 830 396 outlet;
-#X text 822 423 Pan Value;
-#X obj 797 242 r myMet;
-#X obj 762 263 snapshot~;
-#X obj 930 264 r myMet;
-#X obj 897 287 snapshot~;
-#X text 171 33 Calculates position of the source.;
-#X obj 86 140 sig~ 0;
-#X obj 170 142 inlet~;
-#X obj 256 150 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 289 166 1084 684 prop________Angs 0;
-#X obj 378 47 inlet~;
-#X obj 461 46 inlet~;
-#X obj 568 43 inlet~;
-#X obj -19 34 inlet~;
-#X text -85 13 Source/Obs distance;
-#X text 364 27 Obs x;
-#X text 426 21 Obs y;
-#X text 539 23 Obs z;
-#X obj 736 49 inlet~;
-#X obj 843 46 inlet~;
-#X text 713 23 source - Obs y;
-#X text 815 27 source - Obs z;
-#X obj 736 78 *~;
-#X obj 843 76 *~;
-#X obj 736 109 +~;
-#X obj 736 134 sqrt~;
-#X obj 169 37 inlet~;
-#X text 155 17 Source radius;
-#X obj 461 71 *~;
-#X obj 568 70 *~;
-#X obj 461 103 +~;
-#X text -65 517 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 obj 168 84 *~ 2;
-#X obj 721 178 *~;
-#X obj 781 448 /~;
-#X obj 431 218 +~;
-#X obj 442 251 -~;
-#X text 808 505 Azimuth;
-#X obj 723 550 outlet~;
-#X obj 708 471 sig~ 90;
-#X obj 722 516 -~;
-#X obj 169 62 sqrt~;
-#X obj 393 452 +~;
-#X obj 405 478 -~;
-#X obj 378 75 *~;
-#X obj -3 58 *~;
-#X obj 556 487 *~ 2;
-#X obj 541 511 *~;
-#X obj 526 534 /~;
-#X obj 526 562 arccos~;
-#X obj 554 598 outlet~;
-#X obj 781 473 arccos~;
-#X connect 0 0 34 0;
-#X connect 0 0 34 1;
-#X connect 1 0 18 0;
-#X connect 1 0 18 1;
-#X connect 2 0 19 0;
-#X connect 2 0 19 1;
-#X connect 3 0 35 0;
-#X connect 3 0 35 1;
-#X connect 3 0 37 0;
-#X connect 8 0 12 1;
-#X connect 8 0 12 0;
-#X connect 9 0 13 0;
-#X connect 9 0 13 1;
-#X connect 12 0 14 0;
-#X connect 13 0 14 1;
-#X connect 14 0 15 0;
-#X connect 14 0 25 1;
-#X connect 14 0 32 1;
-#X connect 15 0 23 1;
-#X connect 15 0 36 0;
-#X connect 16 0 25 0;
-#X connect 16 0 31 0;
-#X connect 18 0 20 0;
-#X connect 19 0 20 1;
-#X connect 20 0 26 1;
-#X connect 22 0 23 0;
-#X connect 23 0 24 1;
-#X connect 24 0 41 0;
-#X connect 25 0 26 0;
-#X connect 26 0 24 0;
-#X connect 29 0 30 0;
-#X connect 30 0 28 0;
-#X connect 31 0 22 0;
-#X connect 32 0 33 0;
-#X connect 33 0 38 0;
-#X connect 34 0 33 1;
-#X connect 35 0 32 0;
-#X connect 36 0 37 1;
-#X connect 37 0 38 1;
-#X connect 38 0 39 0;
-#X connect 39 0 40 0;
-#X connect 41 0 30 1;
-#X restore 436 379 pd prop________Angs;
-#X obj 418 155 inlet~;
-#X obj 38 378 r myMet;
-#X obj 38 400 snapshot~;
-#X floatatom 38 423 0 0 0 0 - - -;
-#X floatatom 881 399 0 0 0 0 - - -;
-#X connect 0 0 13 0;
-#X connect 0 0 46 0;
-#X connect 1 0 15 0;
-#X connect 1 0 47 0;
-#X connect 2 0 17 0;
-#X connect 2 0 48 0;
-#X connect 3 0 4 0;
-#X connect 3 0 4 1;
-#X connect 3 0 26 0;
-#X connect 4 0 9 0;
-#X connect 5 0 6 0;
-#X connect 5 0 6 1;
-#X connect 5 0 26 1;
-#X connect 5 0 31 0;
-#X connect 5 0 35 0;
-#X connect 5 0 49 5;
-#X connect 6 0 9 1;
-#X connect 7 0 8 0;
-#X connect 7 0 8 1;
-#X connect 7 0 49 6;
-#X connect 8 0 10 1;
-#X connect 9 0 10 0;
-#X connect 10 0 11 0;
-#X connect 11 0 20 0;
-#X connect 11 0 49 0;
-#X connect 12 0 7 1;
-#X connect 12 0 49 4;
-#X connect 13 0 12 0;
-#X connect 14 0 5 1;
-#X connect 14 0 49 3;
-#X connect 15 0 14 0;
-#X connect 16 0 3 1;
-#X connect 16 0 49 2;
-#X connect 17 0 16 0;
-#X connect 24 0 25 0;
-#X connect 25 0 36 0;
-#X connect 25 0 54 0;
-#X connect 26 0 27 0;
-#X connect 27 0 28 0;
-#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 43 0 3 0;
-#X connect 44 0 5 0;
-#X connect 45 0 7 0;
-#X connect 49 0 19 0;
-#X connect 49 1 18 0;
-#X connect 50 0 49 1;
-#X connect 51 0 52 0;
-#X connect 52 0 53 0;
-#X restore 65 82 pd sourcePositions;
 #X text 480 -91 Patch that holds all the sources that are used to produce
 the basic aeolian tone.;
 #N canvas 216 23 1030 283 sourceAASpeed 0;
@@ -2053,7 +1810,7 @@
 #X connect 40 0 37 3;
 #X connect 41 0 4 1;
 #X connect 41 0 37 4;
-#X restore 246 85 pd sourcePositions;
+#X restore 236 97 pd sourcePositions;
 #N canvas 232 459 1061 274 sourceBBSpeed 0;
 #X obj 192 185 outlet~;
 #X text 178 211 Source Speed;
@@ -2103,203 +1860,6 @@
 #X connect 28 0 15 0;
 #X restore 224 65 pd sourceBBSpeed;
 #X obj 222 37 r~ \$0-thisPhasor;
-#N canvas 163 121 1103 599 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 185 256 -~;
-#X obj 170 283 *~;
-#X obj 256 254 -~;
-#X obj 256 278 *~;
-#X obj 155 317 +~;
-#X obj 155 349 +~;
-#X obj 155 376 sqrt~;
-#X obj 271 235 line~;
-#X msg 271 213 \$1 5;
-#X obj 185 233 line~;
-#X msg 185 212 \$1 5;
-#X obj 101 229 line~;
-#X msg 101 207 \$1 5;
-#X obj 547 414 outlet~;
-#X obj 436 414 outlet~;
-#X obj 155 401 outlet~;
-#X text 150 439 source distance from Observer;
-#X text 362 440 source - Obs Elevation;
-#X text 541 441 source - Obs Azimuth;
-#X obj 831 345 r myMet;
-#X obj 830 370 snapshot~;
-#X obj 738 149 /~;
-#X obj 738 172 atan~;
-#X obj 738 195 /~ 3.14159;
-#X obj 738 219 abs~;
-#X obj 723 285 spigot~;
-#X obj 762 242 >~ 0;
-#X obj 690 230 sig~ 1;
-#X obj 723 262 -~;
-#X obj 858 309 spigot~;
-#X obj 897 265 <~ 0;
-#X obj 830 396 outlet;
-#X text 822 423 Pan Value;
-#X obj 797 242 r myMet;
-#X obj 762 263 snapshot~;
-#X obj 930 264 r myMet;
-#X obj 897 287 snapshot~;
-#X text 171 33 Calculates position of the source.;
-#X obj 86 140 sig~ 0;
-#X obj 170 142 inlet~;
-#X obj 256 150 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 289 166 1084 684 prop________Angs 0;
-#X obj 378 47 inlet~;
-#X obj 461 46 inlet~;
-#X obj 568 43 inlet~;
-#X obj -19 34 inlet~;
-#X text -85 13 Source/Obs distance;
-#X text 364 27 Obs x;
-#X text 426 21 Obs y;
-#X text 539 23 Obs z;
-#X obj 736 49 inlet~;
-#X obj 843 46 inlet~;
-#X text 713 23 source - Obs y;
-#X text 815 27 source - Obs z;
-#X obj 736 78 *~;
-#X obj 843 76 *~;
-#X obj 736 109 +~;
-#X obj 736 134 sqrt~;
-#X obj 169 37 inlet~;
-#X text 155 17 Source radius;
-#X obj 461 71 *~;
-#X obj 568 70 *~;
-#X obj 461 103 +~;
-#X text -65 517 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 obj 168 84 *~ 2;
-#X obj 721 178 *~;
-#X obj 781 448 /~;
-#X obj 431 218 +~;
-#X obj 442 251 -~;
-#X text 808 505 Azimuth;
-#X obj 723 550 outlet~;
-#X obj 708 471 sig~ 90;
-#X obj 722 516 -~;
-#X obj 169 62 sqrt~;
-#X obj 393 452 +~;
-#X obj 405 478 -~;
-#X obj 378 75 *~;
-#X obj -3 58 *~;
-#X obj 556 487 *~ 2;
-#X obj 541 511 *~;
-#X obj 526 534 /~;
-#X obj 526 562 arccos~;
-#X obj 554 598 outlet~;
-#X obj 781 473 arccos~;
-#X connect 0 0 34 0;
-#X connect 0 0 34 1;
-#X connect 1 0 18 0;
-#X connect 1 0 18 1;
-#X connect 2 0 19 0;
-#X connect 2 0 19 1;
-#X connect 3 0 35 0;
-#X connect 3 0 35 1;
-#X connect 3 0 37 0;
-#X connect 8 0 12 1;
-#X connect 8 0 12 0;
-#X connect 9 0 13 0;
-#X connect 9 0 13 1;
-#X connect 12 0 14 0;
-#X connect 13 0 14 1;
-#X connect 14 0 15 0;
-#X connect 14 0 25 1;
-#X connect 14 0 32 1;
-#X connect 15 0 23 1;
-#X connect 15 0 36 0;
-#X connect 16 0 25 0;
-#X connect 16 0 31 0;
-#X connect 18 0 20 0;
-#X connect 19 0 20 1;
-#X connect 20 0 26 1;
-#X connect 22 0 23 0;
-#X connect 23 0 24 1;
-#X connect 24 0 41 0;
-#X connect 25 0 26 0;
-#X connect 26 0 24 0;
-#X connect 29 0 30 0;
-#X connect 30 0 28 0;
-#X connect 31 0 22 0;
-#X connect 32 0 33 0;
-#X connect 33 0 38 0;
-#X connect 34 0 33 1;
-#X connect 35 0 32 0;
-#X connect 36 0 37 1;
-#X connect 37 0 38 1;
-#X connect 38 0 39 0;
-#X connect 39 0 40 0;
-#X connect 41 0 30 1;
-#X restore 436 379 pd prop________Angs;
-#X obj 418 155 inlet~;
-#X connect 0 0 13 0;
-#X connect 0 0 46 0;
-#X connect 1 0 15 0;
-#X connect 1 0 47 0;
-#X connect 2 0 17 0;
-#X connect 2 0 48 0;
-#X connect 3 0 4 0;
-#X connect 3 0 4 1;
-#X connect 3 0 26 0;
-#X connect 4 0 9 0;
-#X connect 5 0 6 0;
-#X connect 5 0 6 1;
-#X connect 5 0 26 1;
-#X connect 5 0 31 0;
-#X connect 5 0 35 0;
-#X connect 5 0 49 5;
-#X connect 6 0 9 1;
-#X connect 7 0 8 0;
-#X connect 7 0 8 1;
-#X connect 7 0 49 6;
-#X connect 8 0 10 1;
-#X connect 9 0 10 0;
-#X connect 10 0 11 0;
-#X connect 11 0 20 0;
-#X connect 11 0 49 0;
-#X connect 12 0 7 1;
-#X connect 12 0 49 4;
-#X connect 13 0 12 0;
-#X connect 14 0 5 1;
-#X connect 14 0 49 3;
-#X connect 15 0 14 0;
-#X connect 16 0 3 1;
-#X connect 16 0 49 2;
-#X connect 17 0 16 0;
-#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 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 43 0 3 0;
-#X connect 44 0 5 0;
-#X connect 45 0 7 0;
-#X connect 49 0 19 0;
-#X connect 49 1 18 0;
-#X connect 50 0 49 1;
-#X restore 449 89 pd sourcePositions;
 #X obj 425 42 r~ \$0-thisPhasor;
 #N canvas 226 441 1061 274 sourceCCSpeed 0;
 #X obj 192 185 outlet~;
@@ -2349,203 +1909,6 @@
 #X connect 27 0 26 0;
 #X connect 28 0 15 0;
 #X restore 425 63 pd sourceCCSpeed;
-#N canvas 163 121 1103 599 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 185 256 -~;
-#X obj 170 283 *~;
-#X obj 256 254 -~;
-#X obj 256 278 *~;
-#X obj 155 317 +~;
-#X obj 155 349 +~;
-#X obj 155 376 sqrt~;
-#X obj 271 235 line~;
-#X msg 271 213 \$1 5;
-#X obj 185 233 line~;
-#X msg 185 212 \$1 5;
-#X obj 101 229 line~;
-#X msg 101 207 \$1 5;
-#X obj 547 414 outlet~;
-#X obj 436 414 outlet~;
-#X obj 155 401 outlet~;
-#X text 150 439 source distance from Observer;
-#X text 362 440 source - Obs Elevation;
-#X text 541 441 source - Obs Azimuth;
-#X obj 831 345 r myMet;
-#X obj 830 370 snapshot~;
-#X obj 738 149 /~;
-#X obj 738 172 atan~;
-#X obj 738 195 /~ 3.14159;
-#X obj 738 219 abs~;
-#X obj 723 285 spigot~;
-#X obj 762 242 >~ 0;
-#X obj 690 230 sig~ 1;
-#X obj 723 262 -~;
-#X obj 858 309 spigot~;
-#X obj 897 265 <~ 0;
-#X obj 830 396 outlet;
-#X text 822 423 Pan Value;
-#X obj 797 242 r myMet;
-#X obj 762 263 snapshot~;
-#X obj 930 264 r myMet;
-#X obj 897 287 snapshot~;
-#X text 171 33 Calculates position of the source.;
-#X obj 86 140 sig~ 0;
-#X obj 170 142 inlet~;
-#X obj 256 150 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 289 166 1084 684 prop________Angs 0;
-#X obj 378 47 inlet~;
-#X obj 461 46 inlet~;
-#X obj 568 43 inlet~;
-#X obj -19 34 inlet~;
-#X text -85 13 Source/Obs distance;
-#X text 364 27 Obs x;
-#X text 426 21 Obs y;
-#X text 539 23 Obs z;
-#X obj 736 49 inlet~;
-#X obj 843 46 inlet~;
-#X text 713 23 source - Obs y;
-#X text 815 27 source - Obs z;
-#X obj 736 78 *~;
-#X obj 843 76 *~;
-#X obj 736 109 +~;
-#X obj 736 134 sqrt~;
-#X obj 169 37 inlet~;
-#X text 155 17 Source radius;
-#X obj 461 71 *~;
-#X obj 568 70 *~;
-#X obj 461 103 +~;
-#X text -65 517 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 obj 168 84 *~ 2;
-#X obj 721 178 *~;
-#X obj 781 448 /~;
-#X obj 431 218 +~;
-#X obj 442 251 -~;
-#X text 808 505 Azimuth;
-#X obj 723 550 outlet~;
-#X obj 708 471 sig~ 90;
-#X obj 722 516 -~;
-#X obj 169 62 sqrt~;
-#X obj 393 452 +~;
-#X obj 405 478 -~;
-#X obj 378 75 *~;
-#X obj -3 58 *~;
-#X obj 556 487 *~ 2;
-#X obj 541 511 *~;
-#X obj 526 534 /~;
-#X obj 526 562 arccos~;
-#X obj 554 598 outlet~;
-#X obj 781 473 arccos~;
-#X connect 0 0 34 0;
-#X connect 0 0 34 1;
-#X connect 1 0 18 0;
-#X connect 1 0 18 1;
-#X connect 2 0 19 0;
-#X connect 2 0 19 1;
-#X connect 3 0 35 0;
-#X connect 3 0 35 1;
-#X connect 3 0 37 0;
-#X connect 8 0 12 1;
-#X connect 8 0 12 0;
-#X connect 9 0 13 0;
-#X connect 9 0 13 1;
-#X connect 12 0 14 0;
-#X connect 13 0 14 1;
-#X connect 14 0 15 0;
-#X connect 14 0 25 1;
-#X connect 14 0 32 1;
-#X connect 15 0 23 1;
-#X connect 15 0 36 0;
-#X connect 16 0 25 0;
-#X connect 16 0 31 0;
-#X connect 18 0 20 0;
-#X connect 19 0 20 1;
-#X connect 20 0 26 1;
-#X connect 22 0 23 0;
-#X connect 23 0 24 1;
-#X connect 24 0 41 0;
-#X connect 25 0 26 0;
-#X connect 26 0 24 0;
-#X connect 29 0 30 0;
-#X connect 30 0 28 0;
-#X connect 31 0 22 0;
-#X connect 32 0 33 0;
-#X connect 33 0 38 0;
-#X connect 34 0 33 1;
-#X connect 35 0 32 0;
-#X connect 36 0 37 1;
-#X connect 37 0 38 1;
-#X connect 38 0 39 0;
-#X connect 39 0 40 0;
-#X connect 41 0 30 1;
-#X restore 436 379 pd prop________Angs;
-#X obj 418 155 inlet~;
-#X connect 0 0 13 0;
-#X connect 0 0 46 0;
-#X connect 1 0 15 0;
-#X connect 1 0 47 0;
-#X connect 2 0 17 0;
-#X connect 2 0 48 0;
-#X connect 3 0 4 0;
-#X connect 3 0 4 1;
-#X connect 3 0 26 0;
-#X connect 4 0 9 0;
-#X connect 5 0 6 0;
-#X connect 5 0 6 1;
-#X connect 5 0 26 1;
-#X connect 5 0 31 0;
-#X connect 5 0 35 0;
-#X connect 5 0 49 5;
-#X connect 6 0 9 1;
-#X connect 7 0 8 0;
-#X connect 7 0 8 1;
-#X connect 7 0 49 6;
-#X connect 8 0 10 1;
-#X connect 9 0 10 0;
-#X connect 10 0 11 0;
-#X connect 11 0 20 0;
-#X connect 11 0 49 0;
-#X connect 12 0 7 1;
-#X connect 12 0 49 4;
-#X connect 13 0 12 0;
-#X connect 14 0 5 1;
-#X connect 14 0 49 3;
-#X connect 15 0 14 0;
-#X connect 16 0 3 1;
-#X connect 16 0 49 2;
-#X connect 17 0 16 0;
-#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 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 43 0 3 0;
-#X connect 44 0 5 0;
-#X connect 45 0 7 0;
-#X connect 49 0 19 0;
-#X connect 49 1 18 0;
-#X connect 50 0 49 1;
-#X restore 683 85 pd sourcePositions;
 #X obj 660 41 r~ \$0-thisPhasor;
 #N canvas 208 486 1061 274 sourceDDSpeed 0;
 #X obj 192 185 outlet~;
@@ -2595,203 +1958,6 @@
 #X connect 27 0 26 0;
 #X connect 28 0 15 0;
 #X restore 660 62 pd sourceDDSpeed;
-#N canvas 163 121 1103 599 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 185 256 -~;
-#X obj 170 283 *~;
-#X obj 256 254 -~;
-#X obj 256 278 *~;
-#X obj 155 317 +~;
-#X obj 155 349 +~;
-#X obj 155 376 sqrt~;
-#X obj 271 235 line~;
-#X msg 271 213 \$1 5;
-#X obj 185 233 line~;
-#X msg 185 212 \$1 5;
-#X obj 101 229 line~;
-#X msg 101 207 \$1 5;
-#X obj 547 414 outlet~;
-#X obj 436 414 outlet~;
-#X obj 155 401 outlet~;
-#X text 150 439 source distance from Observer;
-#X text 362 440 source - Obs Elevation;
-#X text 541 441 source - Obs Azimuth;
-#X obj 831 345 r myMet;
-#X obj 830 370 snapshot~;
-#X obj 738 149 /~;
-#X obj 738 172 atan~;
-#X obj 738 195 /~ 3.14159;
-#X obj 738 219 abs~;
-#X obj 723 285 spigot~;
-#X obj 762 242 >~ 0;
-#X obj 690 230 sig~ 1;
-#X obj 723 262 -~;
-#X obj 858 309 spigot~;
-#X obj 897 265 <~ 0;
-#X obj 830 396 outlet;
-#X text 822 423 Pan Value;
-#X obj 797 242 r myMet;
-#X obj 762 263 snapshot~;
-#X obj 930 264 r myMet;
-#X obj 897 287 snapshot~;
-#X text 171 33 Calculates position of the source.;
-#X obj 86 140 sig~ 0;
-#X obj 170 142 inlet~;
-#X obj 256 150 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 289 166 1084 684 prop________Angs 0;
-#X obj 378 47 inlet~;
-#X obj 461 46 inlet~;
-#X obj 568 43 inlet~;
-#X obj -19 34 inlet~;
-#X text -85 13 Source/Obs distance;
-#X text 364 27 Obs x;
-#X text 426 21 Obs y;
-#X text 539 23 Obs z;
-#X obj 736 49 inlet~;
-#X obj 843 46 inlet~;
-#X text 713 23 source - Obs y;
-#X text 815 27 source - Obs z;
-#X obj 736 78 *~;
-#X obj 843 76 *~;
-#X obj 736 109 +~;
-#X obj 736 134 sqrt~;
-#X obj 169 37 inlet~;
-#X text 155 17 Source radius;
-#X obj 461 71 *~;
-#X obj 568 70 *~;
-#X obj 461 103 +~;
-#X text -65 517 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 obj 168 84 *~ 2;
-#X obj 721 178 *~;
-#X obj 781 448 /~;
-#X obj 431 218 +~;
-#X obj 442 251 -~;
-#X text 808 505 Azimuth;
-#X obj 723 550 outlet~;
-#X obj 708 471 sig~ 90;
-#X obj 722 516 -~;
-#X obj 169 62 sqrt~;
-#X obj 393 452 +~;
-#X obj 405 478 -~;
-#X obj 378 75 *~;
-#X obj -3 58 *~;
-#X obj 556 487 *~ 2;
-#X obj 541 511 *~;
-#X obj 526 534 /~;
-#X obj 526 562 arccos~;
-#X obj 554 598 outlet~;
-#X obj 781 473 arccos~;
-#X connect 0 0 34 0;
-#X connect 0 0 34 1;
-#X connect 1 0 18 0;
-#X connect 1 0 18 1;
-#X connect 2 0 19 0;
-#X connect 2 0 19 1;
-#X connect 3 0 35 0;
-#X connect 3 0 35 1;
-#X connect 3 0 37 0;
-#X connect 8 0 12 1;
-#X connect 8 0 12 0;
-#X connect 9 0 13 0;
-#X connect 9 0 13 1;
-#X connect 12 0 14 0;
-#X connect 13 0 14 1;
-#X connect 14 0 15 0;
-#X connect 14 0 25 1;
-#X connect 14 0 32 1;
-#X connect 15 0 23 1;
-#X connect 15 0 36 0;
-#X connect 16 0 25 0;
-#X connect 16 0 31 0;
-#X connect 18 0 20 0;
-#X connect 19 0 20 1;
-#X connect 20 0 26 1;
-#X connect 22 0 23 0;
-#X connect 23 0 24 1;
-#X connect 24 0 41 0;
-#X connect 25 0 26 0;
-#X connect 26 0 24 0;
-#X connect 29 0 30 0;
-#X connect 30 0 28 0;
-#X connect 31 0 22 0;
-#X connect 32 0 33 0;
-#X connect 33 0 38 0;
-#X connect 34 0 33 1;
-#X connect 35 0 32 0;
-#X connect 36 0 37 1;
-#X connect 37 0 38 1;
-#X connect 38 0 39 0;
-#X connect 39 0 40 0;
-#X connect 41 0 30 1;
-#X restore 436 379 pd prop________Angs;
-#X obj 418 155 inlet~;
-#X connect 0 0 13 0;
-#X connect 0 0 46 0;
-#X connect 1 0 15 0;
-#X connect 1 0 47 0;
-#X connect 2 0 17 0;
-#X connect 2 0 48 0;
-#X connect 3 0 4 0;
-#X connect 3 0 4 1;
-#X connect 3 0 26 0;
-#X connect 4 0 9 0;
-#X connect 5 0 6 0;
-#X connect 5 0 6 1;
-#X connect 5 0 26 1;
-#X connect 5 0 31 0;
-#X connect 5 0 35 0;
-#X connect 5 0 49 5;
-#X connect 6 0 9 1;
-#X connect 7 0 8 0;
-#X connect 7 0 8 1;
-#X connect 7 0 49 6;
-#X connect 8 0 10 1;
-#X connect 9 0 10 0;
-#X connect 10 0 11 0;
-#X connect 11 0 20 0;
-#X connect 11 0 49 0;
-#X connect 12 0 7 1;
-#X connect 12 0 49 4;
-#X connect 13 0 12 0;
-#X connect 14 0 5 1;
-#X connect 14 0 49 3;
-#X connect 15 0 14 0;
-#X connect 16 0 3 1;
-#X connect 16 0 49 2;
-#X connect 17 0 16 0;
-#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 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 43 0 3 0;
-#X connect 44 0 5 0;
-#X connect 45 0 7 0;
-#X connect 49 0 19 0;
-#X connect 49 1 18 0;
-#X connect 50 0 49 1;
-#X restore 153 242 pd sourcePositions;
 #X obj 122 189 r~ \$0-thisPhasor;
 #N canvas 252 340 1061 274 sourceEESpeed 0;
 #X obj 192 185 outlet~;
@@ -2890,10 +2056,82 @@
 #X connect 26 0 27 0;
 #X connect 28 0 15 0;
 #X restore 345 220 pd sourceFFSpeed;
-#N canvas 163 121 1103 599 sourcePositions 0;
-#X obj 271 193 r Zobs;
-#X obj 185 191 r Yobs;
-#X obj 101 183 r Xobs;
+#X obj 605 211 r~ \$0-thisPhasor;
+#N canvas 514 536 1061 274 sourceGGSpeed 0;
+#X obj 192 185 outlet~;
+#X text 178 211 Source Speed;
+#X obj 408 79 cos~;
+#X obj 475 76 sin~;
+#X text 262 88 2 PI;
+#X text 259 109 Radius of source;
+#X obj 409 162 outlet~;
+#X obj 479 163 outlet~;
+#X text 330 180 y position of source;
+#X text 477 182 z position of source;
+#X text 732 144 diameter;
+#X text 869 172 radius;
+#X obj 817 169 outlet~;
+#X obj 408 50 inlet~;
+#X obj 48 42 r~ length;
+#X obj 48 90 s~ GG1sourceRadius;
+#X obj 816 147 r~ GG1sourceRadius;
+#X obj 192 39 r~ RPM;
+#X obj 191 63 /~ 60;
+#X obj 192 88 *~ 6.28319;
+#X obj 192 151 *~;
+#X obj 207 127 r~ GG1sourceRadius;
+#X obj 409 135 *~;
+#X obj 479 135 *~;
+#X obj 428 97 r~ GG1sourceRadius;
+#X obj 494 114 r~ GG1sourceRadius;
+#X obj 751 76 sig~ 0.1885;
+#X obj 751 121 outlet~;
+#X obj 59 157 r myMet;
+#X obj 59 179 snapshot~;
+#X floatatom 59 202 0 0 0 0 - - -;
+#X obj 48 66 *~ 0.9468;
+#X connect 2 0 22 0;
+#X connect 3 0 23 0;
+#X connect 13 0 2 0;
+#X connect 13 0 3 0;
+#X connect 14 0 31 0;
+#X connect 16 0 12 0;
+#X connect 17 0 18 0;
+#X connect 18 0 19 0;
+#X connect 19 0 20 0;
+#X connect 20 0 0 0;
+#X connect 20 0 29 0;
+#X connect 21 0 20 1;
+#X connect 22 0 6 0;
+#X connect 23 0 7 0;
+#X connect 24 0 22 1;
+#X connect 25 0 23 1;
+#X connect 26 0 27 0;
+#X connect 28 0 29 0;
+#X connect 29 0 30 0;
+#X connect 31 0 15 0;
+#X restore 605 232 pd sourceGGSpeed;
+#X obj 351 -58 *~ 6.2832;
+#X obj 244 -48 *~ 360;
+#X obj 135 123 r~ \$0-PropAzim;
+#X obj 317 124 r~ \$0-PropAzim;
+#X obj 518 123 r~ \$0-PropAzim;
+#X obj 753 121 r~ \$0-PropAzim;
+#X obj 215 268 r~ \$0-PropAzim;
+#X obj 438 278 r~ \$0-PropAzim;
+#X obj 698 288 r~ \$0-PropAzim;
+#X obj 244 -22 s~ \$0-PropAzim;
+#X obj 49 205 r myMet;
+#X obj 49 227 snapshot~;
+#X floatatom 49 250 0 0 0 0 - - -;
+#X obj 224 146 freqCalcCyl6HiFi;
+#X obj 345 301 freqCalcCyl6HiFi;
+#X obj 605 312 freqCalcCyl6HiFi;
+#X obj 42 143 freqCalcCyl6HiFi;
+#X obj 425 145 freqCalcCyl6HiFi;
+#X obj 660 144 freqCalcCyl6HiFi;
+#X obj 122 290 freqCalcCyl6HiFi;
+#N canvas 223 181 1103 599 sourcePositions 0;
 #X obj 86 252 -~;
 #X obj 86 276 *~;
 #X obj 185 256 -~;
@@ -2903,12 +2141,6 @@
 #X obj 155 317 +~;
 #X obj 155 349 +~;
 #X obj 155 376 sqrt~;
-#X obj 271 235 line~;
-#X msg 271 213 \$1 5;
-#X obj 185 233 line~;
-#X msg 185 212 \$1 5;
-#X obj 101 229 line~;
-#X msg 101 207 \$1 5;
 #X obj 547 414 outlet~;
 #X obj 436 414 outlet~;
 #X obj 155 401 outlet~;
@@ -2937,9 +2169,6 @@
 #X obj 86 140 sig~ 0;
 #X obj 170 142 inlet~;
 #X obj 256 150 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 289 166 1084 684 prop________Angs 0;
 #X obj 378 47 inlet~;
 #X obj 461 46 inlet~;
@@ -3029,130 +2258,59 @@
 #X connect 41 0 30 1;
 #X restore 436 379 pd prop________Angs;
 #X obj 418 155 inlet~;
-#X connect 0 0 13 0;
-#X connect 0 0 46 0;
-#X connect 1 0 15 0;
-#X connect 1 0 47 0;
-#X connect 2 0 17 0;
-#X connect 2 0 48 0;
-#X connect 3 0 4 0;
-#X connect 3 0 4 1;
-#X connect 3 0 26 0;
-#X connect 4 0 9 0;
-#X connect 5 0 6 0;
-#X connect 5 0 6 1;
-#X connect 5 0 26 1;
-#X connect 5 0 31 0;
-#X connect 5 0 35 0;
-#X connect 5 0 49 5;
-#X connect 6 0 9 1;
+#X obj 101 229 r~ Xobs;
+#X obj 185 233 r~ Yobs;
+#X obj 271 235 r~ Zobs;
+#X connect 0 0 1 0;
+#X connect 0 0 1 1;
+#X connect 0 0 17 0;
+#X connect 1 0 6 0;
+#X connect 2 0 3 0;
+#X connect 2 0 3 1;
+#X connect 2 0 17 1;
+#X connect 2 0 22 0;
+#X connect 2 0 26 0;
+#X connect 2 0 37 5;
+#X connect 3 0 6 1;
+#X connect 4 0 5 0;
+#X connect 4 0 5 1;
+#X connect 4 0 37 6;
+#X connect 5 0 7 1;
+#X connect 6 0 7 0;
 #X connect 7 0 8 0;
-#X connect 7 0 8 1;
-#X connect 7 0 49 6;
-#X connect 8 0 10 1;
-#X connect 9 0 10 0;
-#X connect 10 0 11 0;
-#X connect 11 0 20 0;
-#X connect 11 0 49 0;
-#X connect 12 0 7 1;
-#X connect 12 0 49 4;
-#X connect 13 0 12 0;
-#X connect 14 0 5 1;
-#X connect 14 0 49 3;
-#X connect 15 0 14 0;
-#X connect 16 0 3 1;
-#X connect 16 0 49 2;
-#X connect 17 0 16 0;
-#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 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 43 0 3 0;
-#X connect 44 0 5 0;
-#X connect 45 0 7 0;
-#X connect 49 0 19 0;
-#X connect 49 1 18 0;
-#X connect 50 0 49 1;
-#X restore 628 257 pd sourcePositions;
-#X obj 605 211 r~ \$0-thisPhasor;
-#N canvas 514 536 1061 274 sourceGGSpeed 0;
-#X obj 192 185 outlet~;
-#X text 178 211 Source Speed;
-#X obj 408 79 cos~;
-#X obj 475 76 sin~;
-#X text 262 88 2 PI;
-#X text 259 109 Radius of source;
-#X obj 409 162 outlet~;
-#X obj 479 163 outlet~;
-#X text 330 180 y position of source;
-#X text 477 182 z position of source;
-#X text 732 144 diameter;
-#X text 869 172 radius;
-#X obj 817 169 outlet~;
-#X obj 408 50 inlet~;
-#X obj 48 42 r~ length;
-#X obj 48 90 s~ GG1sourceRadius;
-#X obj 816 147 r~ GG1sourceRadius;
-#X obj 192 39 r~ RPM;
-#X obj 191 63 /~ 60;
-#X obj 192 88 *~ 6.28319;
-#X obj 192 151 *~;
-#X obj 207 127 r~ GG1sourceRadius;
-#X obj 409 135 *~;
-#X obj 479 135 *~;
-#X obj 428 97 r~ GG1sourceRadius;
-#X obj 494 114 r~ GG1sourceRadius;
-#X obj 751 76 sig~ 0.1885;
-#X obj 751 121 outlet~;
-#X obj 59 157 r myMet;
-#X obj 59 179 snapshot~;
-#X floatatom 59 202 0 0 0 0 - - -;
-#X obj 48 66 *~ 0.9468;
-#X connect 2 0 22 0;
-#X connect 3 0 23 0;
-#X connect 13 0 2 0;
-#X connect 13 0 3 0;
-#X connect 14 0 31 0;
-#X connect 16 0 12 0;
+#X connect 8 0 11 0;
+#X connect 8 0 37 0;
+#X connect 15 0 16 0;
+#X connect 16 0 27 0;
 #X connect 17 0 18 0;
 #X connect 18 0 19 0;
 #X connect 19 0 20 0;
-#X connect 20 0 0 0;
-#X connect 20 0 29 0;
-#X connect 21 0 20 1;
-#X connect 22 0 6 0;
-#X connect 23 0 7 0;
-#X connect 24 0 22 1;
-#X connect 25 0 23 1;
-#X connect 26 0 27 0;
-#X connect 28 0 29 0;
+#X connect 20 0 25 0;
+#X connect 20 0 24 1;
+#X connect 21 1 16 0;
+#X connect 22 0 30 0;
+#X connect 23 0 24 0;
+#X connect 24 0 21 0;
+#X connect 25 1 16 0;
+#X connect 26 0 32 0;
 #X connect 29 0 30 0;
-#X connect 31 0 15 0;
-#X restore 605 232 pd sourceGGSpeed;
-#X obj 351 -58 *~ 6.2832;
-#X obj 244 -48 *~ 360;
-#X obj 113 143 r~ \$0-PropAzim;
-#X obj 311 123 r~ \$0-PropAzim;
-#X obj 521 123 r~ \$0-PropAzim;
-#X obj 756 122 r~ \$0-PropAzim;
-#X obj 220 266 r~ \$0-PropAzim;
-#N canvas 163 121 1103 599 sourcePositions 0;
-#X obj 271 193 r Zobs;
-#X obj 185 191 r Yobs;
-#X obj 101 183 r Xobs;
+#X connect 30 0 21 1;
+#X connect 31 0 32 0;
+#X connect 32 0 25 1;
+#X connect 34 0 0 0;
+#X connect 35 0 2 0;
+#X connect 36 0 4 0;
+#X connect 37 0 10 0;
+#X connect 37 1 9 0;
+#X connect 38 0 37 1;
+#X connect 39 0 0 1;
+#X connect 39 0 37 2;
+#X connect 40 0 2 1;
+#X connect 40 0 37 3;
+#X connect 41 0 4 1;
+#X connect 41 0 37 4;
+#X restore 51 95 pd sourcePositions;
+#N canvas 223 181 1103 599 sourcePositions 0;
 #X obj 86 252 -~;
 #X obj 86 276 *~;
 #X obj 185 256 -~;
@@ -3162,12 +2320,6 @@
 #X obj 155 317 +~;
 #X obj 155 349 +~;
 #X obj 155 376 sqrt~;
-#X obj 271 235 line~;
-#X msg 271 213 \$1 5;
-#X obj 185 233 line~;
-#X msg 185 212 \$1 5;
-#X obj 101 229 line~;
-#X msg 101 207 \$1 5;
 #X obj 547 414 outlet~;
 #X obj 436 414 outlet~;
 #X obj 155 401 outlet~;
@@ -3196,9 +2348,6 @@
 #X obj 86 140 sig~ 0;
 #X obj 170 142 inlet~;
 #X obj 256 150 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 289 166 1084 684 prop________Angs 0;
 #X obj 378 47 inlet~;
 #X obj 461 46 inlet~;
@@ -3288,167 +2437,864 @@
 #X connect 41 0 30 1;
 #X restore 436 379 pd prop________Angs;
 #X obj 418 155 inlet~;
-#X connect 0 0 13 0;
-#X connect 0 0 46 0;
-#X connect 1 0 15 0;
-#X connect 1 0 47 0;
-#X connect 2 0 17 0;
-#X connect 2 0 48 0;
-#X connect 3 0 4 0;
-#X connect 3 0 4 1;
-#X connect 3 0 26 0;
-#X connect 4 0 9 0;
-#X connect 5 0 6 0;
-#X connect 5 0 6 1;
-#X connect 5 0 26 1;
-#X connect 5 0 31 0;
-#X connect 5 0 35 0;
-#X connect 5 0 49 5;
-#X connect 6 0 9 1;
+#X obj 101 229 r~ Xobs;
+#X obj 185 233 r~ Yobs;
+#X obj 271 235 r~ Zobs;
+#X connect 0 0 1 0;
+#X connect 0 0 1 1;
+#X connect 0 0 17 0;
+#X connect 1 0 6 0;
+#X connect 2 0 3 0;
+#X connect 2 0 3 1;
+#X connect 2 0 17 1;
+#X connect 2 0 22 0;
+#X connect 2 0 26 0;
+#X connect 2 0 37 5;
+#X connect 3 0 6 1;
+#X connect 4 0 5 0;
+#X connect 4 0 5 1;
+#X connect 4 0 37 6;
+#X connect 5 0 7 1;
+#X connect 6 0 7 0;
 #X connect 7 0 8 0;
-#X connect 7 0 8 1;
-#X connect 7 0 49 6;
-#X connect 8 0 10 1;
-#X connect 9 0 10 0;
+#X connect 8 0 11 0;
+#X connect 8 0 37 0;
+#X connect 15 0 16 0;
+#X connect 16 0 27 0;
+#X connect 17 0 18 0;
+#X connect 18 0 19 0;
+#X connect 19 0 20 0;
+#X connect 20 0 25 0;
+#X connect 20 0 24 1;
+#X connect 21 1 16 0;
+#X connect 22 0 30 0;
+#X connect 23 0 24 0;
+#X connect 24 0 21 0;
+#X connect 25 1 16 0;
+#X connect 26 0 32 0;
+#X connect 29 0 30 0;
+#X connect 30 0 21 1;
+#X connect 31 0 32 0;
+#X connect 32 0 25 1;
+#X connect 34 0 0 0;
+#X connect 35 0 2 0;
+#X connect 36 0 4 0;
+#X connect 37 0 10 0;
+#X connect 37 1 9 0;
+#X connect 38 0 37 1;
+#X connect 39 0 0 1;
+#X connect 39 0 37 2;
+#X connect 40 0 2 1;
+#X connect 40 0 37 3;
+#X connect 41 0 4 1;
+#X connect 41 0 37 4;
+#X restore 440 93 pd sourcePositions;
+#N canvas 223 181 1103 599 sourcePositions 0;
+#X obj 86 252 -~;
+#X obj 86 276 *~;
+#X obj 185 256 -~;
+#X obj 170 283 *~;
+#X obj 256 254 -~;
+#X obj 256 278 *~;
+#X obj 155 317 +~;
+#X obj 155 349 +~;
+#X obj 155 376 sqrt~;
+#X obj 547 414 outlet~;
+#X obj 436 414 outlet~;
+#X obj 155 401 outlet~;
+#X text 150 439 source distance from Observer;
+#X text 362 440 source - Obs Elevation;
+#X text 541 441 source - Obs Azimuth;
+#X obj 831 345 r myMet;
+#X obj 830 370 snapshot~;
+#X obj 738 149 /~;
+#X obj 738 172 atan~;
+#X obj 738 195 /~ 3.14159;
+#X obj 738 219 abs~;
+#X obj 723 285 spigot~;
+#X obj 762 242 >~ 0;
+#X obj 690 230 sig~ 1;
+#X obj 723 262 -~;
+#X obj 858 309 spigot~;
+#X obj 897 265 <~ 0;
+#X obj 830 396 outlet;
+#X text 822 423 Pan Value;
+#X obj 797 242 r myMet;
+#X obj 762 263 snapshot~;
+#X obj 930 264 r myMet;
+#X obj 897 287 snapshot~;
+#X text 171 33 Calculates position of the source.;
+#X obj 86 140 sig~ 0;
+#X obj 170 142 inlet~;
+#X obj 256 150 inlet~;
+#N canvas 289 166 1084 684 prop________Angs 0;
+#X obj 378 47 inlet~;
+#X obj 461 46 inlet~;
+#X obj 568 43 inlet~;
+#X obj -19 34 inlet~;
+#X text -85 13 Source/Obs distance;
+#X text 364 27 Obs x;
+#X text 426 21 Obs y;
+#X text 539 23 Obs z;
+#X obj 736 49 inlet~;
+#X obj 843 46 inlet~;
+#X text 713 23 source - Obs y;
+#X text 815 27 source - Obs z;
+#X obj 736 78 *~;
+#X obj 843 76 *~;
+#X obj 736 109 +~;
+#X obj 736 134 sqrt~;
+#X obj 169 37 inlet~;
+#X text 155 17 Source radius;
+#X obj 461 71 *~;
+#X obj 568 70 *~;
+#X obj 461 103 +~;
+#X text -65 517 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 obj 168 84 *~ 2;
+#X obj 721 178 *~;
+#X obj 781 448 /~;
+#X obj 431 218 +~;
+#X obj 442 251 -~;
+#X text 808 505 Azimuth;
+#X obj 723 550 outlet~;
+#X obj 708 471 sig~ 90;
+#X obj 722 516 -~;
+#X obj 169 62 sqrt~;
+#X obj 393 452 +~;
+#X obj 405 478 -~;
+#X obj 378 75 *~;
+#X obj -3 58 *~;
+#X obj 556 487 *~ 2;
+#X obj 541 511 *~;
+#X obj 526 534 /~;
+#X obj 526 562 arccos~;
+#X obj 554 598 outlet~;
+#X obj 781 473 arccos~;
+#X connect 0 0 34 0;
+#X connect 0 0 34 1;
+#X connect 1 0 18 0;
+#X connect 1 0 18 1;
+#X connect 2 0 19 0;
+#X connect 2 0 19 1;
+#X connect 3 0 35 0;
+#X connect 3 0 35 1;
+#X connect 3 0 37 0;
+#X connect 8 0 12 1;
+#X connect 8 0 12 0;
+#X connect 9 0 13 0;
+#X connect 9 0 13 1;
+#X connect 12 0 14 0;
+#X connect 13 0 14 1;
+#X connect 14 0 15 0;
+#X connect 14 0 25 1;
+#X connect 14 0 32 1;
+#X connect 15 0 23 1;
+#X connect 15 0 36 0;
+#X connect 16 0 25 0;
+#X connect 16 0 31 0;
+#X connect 18 0 20 0;
+#X connect 19 0 20 1;
+#X connect 20 0 26 1;
+#X connect 22 0 23 0;
+#X connect 23 0 24 1;
+#X connect 24 0 41 0;
+#X connect 25 0 26 0;
+#X connect 26 0 24 0;
+#X connect 29 0 30 0;
+#X connect 30 0 28 0;
+#X connect 31 0 22 0;
+#X connect 32 0 33 0;
+#X connect 33 0 38 0;
+#X connect 34 0 33 1;
+#X connect 35 0 32 0;
+#X connect 36 0 37 1;
+#X connect 37 0 38 1;
+#X connect 38 0 39 0;
+#X connect 39 0 40 0;
+#X connect 41 0 30 1;
+#X restore 436 379 pd prop________Angs;
+#X obj 418 155 inlet~;
+#X obj 101 229 r~ Xobs;
+#X obj 185 233 r~ Yobs;
+#X obj 271 235 r~ Zobs;
+#X connect 0 0 1 0;
+#X connect 0 0 1 1;
+#X connect 0 0 17 0;
+#X connect 1 0 6 0;
+#X connect 2 0 3 0;
+#X connect 2 0 3 1;
+#X connect 2 0 17 1;
+#X connect 2 0 22 0;
+#X connect 2 0 26 0;
+#X connect 2 0 37 5;
+#X connect 3 0 6 1;
+#X connect 4 0 5 0;
+#X connect 4 0 5 1;
+#X connect 4 0 37 6;
+#X connect 5 0 7 1;
+#X connect 6 0 7 0;
+#X connect 7 0 8 0;
+#X connect 8 0 11 0;
+#X connect 8 0 37 0;
+#X connect 15 0 16 0;
+#X connect 16 0 27 0;
+#X connect 17 0 18 0;
+#X connect 18 0 19 0;
+#X connect 19 0 20 0;
+#X connect 20 0 25 0;
+#X connect 20 0 24 1;
+#X connect 21 1 16 0;
+#X connect 22 0 30 0;
+#X connect 23 0 24 0;
+#X connect 24 0 21 0;
+#X connect 25 1 16 0;
+#X connect 26 0 32 0;
+#X connect 29 0 30 0;
+#X connect 30 0 21 1;
+#X connect 31 0 32 0;
+#X connect 32 0 25 1;
+#X connect 34 0 0 0;
+#X connect 35 0 2 0;
+#X connect 36 0 4 0;
+#X connect 37 0 10 0;
+#X connect 37 1 9 0;
+#X connect 38 0 37 1;
+#X connect 39 0 0 1;
+#X connect 39 0 37 2;
+#X connect 40 0 2 1;
+#X connect 40 0 37 3;
+#X connect 41 0 4 1;
+#X connect 41 0 37 4;
+#X restore 675 91 pd sourcePositions;
+#N canvas 223 181 1103 599 sourcePositions 0;
+#X obj 86 252 -~;
+#X obj 86 276 *~;
+#X obj 185 256 -~;
+#X obj 170 283 *~;
+#X obj 256 254 -~;
+#X obj 256 278 *~;
+#X obj 155 317 +~;
+#X obj 155 349 +~;
+#X obj 155 376 sqrt~;
+#X obj 547 414 outlet~;
+#X obj 436 414 outlet~;
+#X obj 155 401 outlet~;
+#X text 150 439 source distance from Observer;
+#X text 362 440 source - Obs Elevation;
+#X text 541 441 source - Obs Azimuth;
+#X obj 831 345 r myMet;
+#X obj 830 370 snapshot~;
+#X obj 738 149 /~;
+#X obj 738 172 atan~;
+#X obj 738 195 /~ 3.14159;
+#X obj 738 219 abs~;
+#X obj 723 285 spigot~;
+#X obj 762 242 >~ 0;
+#X obj 690 230 sig~ 1;
+#X obj 723 262 -~;
+#X obj 858 309 spigot~;
+#X obj 897 265 <~ 0;
+#X obj 830 396 outlet;
+#X text 822 423 Pan Value;
+#X obj 797 242 r myMet;
+#X obj 762 263 snapshot~;
+#X obj 930 264 r myMet;
+#X obj 897 287 snapshot~;
+#X text 171 33 Calculates position of the source.;
+#X obj 86 140 sig~ 0;
+#X obj 170 142 inlet~;
+#X obj 256 150 inlet~;
+#N canvas 289 166 1084 684 prop________Angs 0;
+#X obj 378 47 inlet~;
+#X obj 461 46 inlet~;
+#X obj 568 43 inlet~;
+#X obj -19 34 inlet~;
+#X text -85 13 Source/Obs distance;
+#X text 364 27 Obs x;
+#X text 426 21 Obs y;
+#X text 539 23 Obs z;
+#X obj 736 49 inlet~;
+#X obj 843 46 inlet~;
+#X text 713 23 source - Obs y;
+#X text 815 27 source - Obs z;
+#X obj 736 78 *~;
+#X obj 843 76 *~;
+#X obj 736 109 +~;
+#X obj 736 134 sqrt~;
+#X obj 169 37 inlet~;
+#X text 155 17 Source radius;
+#X obj 461 71 *~;
+#X obj 568 70 *~;
+#X obj 461 103 +~;
+#X text -65 517 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 obj 168 84 *~ 2;
+#X obj 721 178 *~;
+#X obj 781 448 /~;
+#X obj 431 218 +~;
+#X obj 442 251 -~;
+#X text 808 505 Azimuth;
+#X obj 723 550 outlet~;
+#X obj 708 471 sig~ 90;
+#X obj 722 516 -~;
+#X obj 169 62 sqrt~;
+#X obj 393 452 +~;
+#X obj 405 478 -~;
+#X obj 378 75 *~;
+#X obj -3 58 *~;
+#X obj 556 487 *~ 2;
+#X obj 541 511 *~;
+#X obj 526 534 /~;
+#X obj 526 562 arccos~;
+#X obj 554 598 outlet~;
+#X obj 781 473 arccos~;
+#X connect 0 0 34 0;
+#X connect 0 0 34 1;
+#X connect 1 0 18 0;
+#X connect 1 0 18 1;
+#X connect 2 0 19 0;
+#X connect 2 0 19 1;
+#X connect 3 0 35 0;
+#X connect 3 0 35 1;
+#X connect 3 0 37 0;
+#X connect 8 0 12 1;
+#X connect 8 0 12 0;
+#X connect 9 0 13 0;
+#X connect 9 0 13 1;
+#X connect 12 0 14 0;
+#X connect 13 0 14 1;
+#X connect 14 0 15 0;
+#X connect 14 0 25 1;
+#X connect 14 0 32 1;
+#X connect 15 0 23 1;
+#X connect 15 0 36 0;
+#X connect 16 0 25 0;
+#X connect 16 0 31 0;
+#X connect 18 0 20 0;
+#X connect 19 0 20 1;
+#X connect 20 0 26 1;
+#X connect 22 0 23 0;
+#X connect 23 0 24 1;
+#X connect 24 0 41 0;
+#X connect 25 0 26 0;
+#X connect 26 0 24 0;
+#X connect 29 0 30 0;
+#X connect 30 0 28 0;
+#X connect 31 0 22 0;
+#X connect 32 0 33 0;
+#X connect 33 0 38 0;
+#X connect 34 0 33 1;
+#X connect 35 0 32 0;
+#X connect 36 0 37 1;
+#X connect 37 0 38 1;
+#X connect 38 0 39 0;
+#X connect 39 0 40 0;
+#X connect 41 0 30 1;
+#X restore 436 379 pd prop________Angs;
+#X obj 418 155 inlet~;
+#X obj 101 229 r~ Xobs;
+#X obj 185 233 r~ Yobs;
+#X obj 271 235 r~ Zobs;
+#X connect 0 0 1 0;
+#X connect 0 0 1 1;
+#X connect 0 0 17 0;
+#X connect 1 0 6 0;
+#X connect 2 0 3 0;
+#X connect 2 0 3 1;
+#X connect 2 0 17 1;
+#X connect 2 0 22 0;
+#X connect 2 0 26 0;
+#X connect 2 0 37 5;
+#X connect 3 0 6 1;
+#X connect 4 0 5 0;
+#X connect 4 0 5 1;
+#X connect 4 0 37 6;
+#X connect 5 0 7 1;
+#X connect 6 0 7 0;
+#X connect 7 0 8 0;
+#X connect 8 0 11 0;
+#X connect 8 0 37 0;
+#X connect 15 0 16 0;
+#X connect 16 0 27 0;
+#X connect 17 0 18 0;
+#X connect 18 0 19 0;
+#X connect 19 0 20 0;
+#X connect 20 0 25 0;
+#X connect 20 0 24 1;
+#X connect 21 1 16 0;
+#X connect 22 0 30 0;
+#X connect 23 0 24 0;
+#X connect 24 0 21 0;
+#X connect 25 1 16 0;
+#X connect 26 0 32 0;
+#X connect 29 0 30 0;
+#X connect 30 0 21 1;
+#X connect 31 0 32 0;
+#X connect 32 0 25 1;
+#X connect 34 0 0 0;
+#X connect 35 0 2 0;
+#X connect 36 0 4 0;
+#X connect 37 0 10 0;
+#X connect 37 1 9 0;
+#X connect 38 0 37 1;
+#X connect 39 0 0 1;
+#X connect 39 0 37 2;
+#X connect 40 0 2 1;
+#X connect 40 0 37 3;
+#X connect 41 0 4 1;
+#X connect 41 0 37 4;
+#X restore 622 259 pd sourcePositions;
+#N canvas 223 181 1103 599 sourcePositions 0;
+#X obj 86 252 -~;
+#X obj 86 276 *~;
+#X obj 185 256 -~;
+#X obj 170 283 *~;
+#X obj 256 254 -~;
+#X obj 256 278 *~;
+#X obj 155 317 +~;
+#X obj 155 349 +~;
+#X obj 155 376 sqrt~;
+#X obj 547 414 outlet~;
+#X obj 436 414 outlet~;
+#X obj 155 401 outlet~;
+#X text 150 439 source distance from Observer;
+#X text 362 440 source - Obs Elevation;
+#X text 541 441 source - Obs Azimuth;
+#X obj 831 345 r myMet;
+#X obj 830 370 snapshot~;
+#X obj 738 149 /~;
+#X obj 738 172 atan~;
+#X obj 738 195 /~ 3.14159;
+#X obj 738 219 abs~;
+#X obj 723 285 spigot~;
+#X obj 762 242 >~ 0;
+#X obj 690 230 sig~ 1;
+#X obj 723 262 -~;
+#X obj 858 309 spigot~;
+#X obj 897 265 <~ 0;
+#X obj 830 396 outlet;
+#X text 822 423 Pan Value;
+#X obj 797 242 r myMet;
+#X obj 762 263 snapshot~;
+#X obj 930 264 r myMet;
+#X obj 897 287 snapshot~;
+#X text 171 33 Calculates position of the source.;
+#X obj 86 140 sig~ 0;
+#X obj 170 142 inlet~;
+#X obj 256 150 inlet~;
+#N canvas 289 166 1084 684 prop________Angs 0;
+#X obj 378 47 inlet~;
+#X obj 461 46 inlet~;
+#X obj 568 43 inlet~;
+#X obj -19 34 inlet~;
+#X text -85 13 Source/Obs distance;
+#X text 364 27 Obs x;
+#X text 426 21 Obs y;
+#X text 539 23 Obs z;
+#X obj 736 49 inlet~;
+#X obj 843 46 inlet~;
+#X text 713 23 source - Obs y;
+#X text 815 27 source - Obs z;
+#X obj 736 78 *~;
+#X obj 843 76 *~;
+#X obj 736 109 +~;
+#X obj 736 134 sqrt~;
+#X obj 169 37 inlet~;
+#X text 155 17 Source radius;
+#X obj 461 71 *~;
+#X obj 568 70 *~;
+#X obj 461 103 +~;
+#X text -65 517 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 obj 168 84 *~ 2;
+#X obj 721 178 *~;
+#X obj 781 448 /~;
+#X obj 431 218 +~;
+#X obj 442 251 -~;
+#X text 808 505 Azimuth;
+#X obj 723 550 outlet~;
+#X obj 708 471 sig~ 90;
+#X obj 722 516 -~;
+#X obj 169 62 sqrt~;
+#X obj 393 452 +~;
+#X obj 405 478 -~;
+#X obj 378 75 *~;
+#X obj -3 58 *~;
+#X obj 556 487 *~ 2;
+#X obj 541 511 *~;
+#X obj 526 534 /~;
+#X obj 526 562 arccos~;
+#X obj 554 598 outlet~;
+#X obj 781 473 arccos~;
+#X connect 0 0 34 0;
+#X connect 0 0 34 1;
+#X connect 1 0 18 0;
+#X connect 1 0 18 1;
+#X connect 2 0 19 0;
+#X connect 2 0 19 1;
+#X connect 3 0 35 0;
+#X connect 3 0 35 1;
+#X connect 3 0 37 0;
+#X connect 8 0 12 1;
+#X connect 8 0 12 0;
+#X connect 9 0 13 0;
+#X connect 9 0 13 1;
+#X connect 12 0 14 0;
+#X connect 13 0 14 1;
+#X connect 14 0 15 0;
+#X connect 14 0 25 1;
+#X connect 14 0 32 1;
+#X connect 15 0 23 1;
+#X connect 15 0 36 0;
+#X connect 16 0 25 0;
+#X connect 16 0 31 0;
+#X connect 18 0 20 0;
+#X connect 19 0 20 1;
+#X connect 20 0 26 1;
+#X connect 22 0 23 0;
+#X connect 23 0 24 1;
+#X connect 24 0 41 0;
+#X connect 25 0 26 0;
+#X connect 26 0 24 0;
+#X connect 29 0 30 0;
+#X connect 30 0 28 0;
+#X connect 31 0 22 0;
+#X connect 32 0 33 0;
+#X connect 33 0 38 0;
+#X connect 34 0 33 1;
+#X connect 35 0 32 0;
+#X connect 36 0 37 1;
+#X connect 37 0 38 1;
+#X connect 38 0 39 0;
+#X connect 39 0 40 0;
+#X connect 41 0 30 1;
+#X restore 436 379 pd prop________Angs;
+#X obj 418 155 inlet~;
+#X obj 101 229 r~ Xobs;
+#X obj 185 233 r~ Yobs;
+#X obj 271 235 r~ Zobs;
+#X connect 0 0 1 0;
+#X connect 0 0 1 1;
+#X connect 0 0 17 0;
+#X connect 1 0 6 0;
+#X connect 2 0 3 0;
+#X connect 2 0 3 1;
+#X connect 2 0 17 1;
+#X connect 2 0 22 0;
+#X connect 2 0 26 0;
+#X connect 2 0 37 5;
+#X connect 3 0 6 1;
+#X connect 4 0 5 0;
+#X connect 4 0 5 1;
+#X connect 4 0 37 6;
+#X connect 5 0 7 1;
+#X connect 6 0 7 0;
+#X connect 7 0 8 0;
+#X connect 8 0 11 0;
+#X connect 8 0 37 0;
+#X connect 15 0 16 0;
+#X connect 16 0 27 0;
+#X connect 17 0 18 0;
+#X connect 18 0 19 0;
+#X connect 19 0 20 0;
+#X connect 20 0 25 0;
+#X connect 20 0 24 1;
+#X connect 21 1 16 0;
+#X connect 22 0 30 0;
+#X connect 23 0 24 0;
+#X connect 24 0 21 0;
+#X connect 25 1 16 0;
+#X connect 26 0 32 0;
+#X connect 29 0 30 0;
+#X connect 30 0 21 1;
+#X connect 31 0 32 0;
+#X connect 32 0 25 1;
+#X connect 34 0 0 0;
+#X connect 35 0 2 0;
+#X connect 36 0 4 0;
+#X connect 37 0 10 0;
+#X connect 37 1 9 0;
+#X connect 38 0 37 1;
+#X connect 39 0 0 1;
+#X connect 39 0 37 2;
+#X connect 40 0 2 1;
+#X connect 40 0 37 3;
+#X connect 41 0 4 1;
+#X connect 41 0 37 4;
+#X restore 362 247 pd sourcePositions;
+#N canvas 223 181 1103 599 sourcePositions 0;
+#X obj 86 252 -~;
+#X obj 86 276 *~;
+#X obj 185 256 -~;
+#X obj 170 283 *~;
+#X obj 256 254 -~;
+#X obj 256 278 *~;
+#X obj 155 317 +~;
+#X obj 155 349 +~;
+#X obj 155 376 sqrt~;
+#X obj 547 414 outlet~;
+#X obj 436 414 outlet~;
+#X obj 155 401 outlet~;
+#X text 150 439 source distance from Observer;
+#X text 362 440 source - Obs Elevation;
+#X text 541 441 source - Obs Azimuth;
+#X obj 831 345 r myMet;
+#X obj 830 370 snapshot~;
+#X obj 738 149 /~;
+#X obj 738 172 atan~;
+#X obj 738 195 /~ 3.14159;
+#X obj 738 219 abs~;
+#X obj 723 285 spigot~;
+#X obj 762 242 >~ 0;
+#X obj 690 230 sig~ 1;
+#X obj 723 262 -~;
+#X obj 858 309 spigot~;
+#X obj 897 265 <~ 0;
+#X obj 830 396 outlet;
+#X text 822 423 Pan Value;
+#X obj 797 242 r myMet;
+#X obj 762 263 snapshot~;
+#X obj 930 264 r myMet;
+#X obj 897 287 snapshot~;
+#X text 171 33 Calculates position of the source.;
+#X obj 86 140 sig~ 0;
+#X obj 170 142 inlet~;
+#X obj 256 150 inlet~;
+#N canvas 289 166 1084 684 prop________Angs 0;
+#X obj 378 47 inlet~;
+#X obj 461 46 inlet~;
+#X obj 568 43 inlet~;
+#X obj -19 34 inlet~;
+#X text -85 13 Source/Obs distance;
+#X text 364 27 Obs x;
+#X text 426 21 Obs y;
+#X text 539 23 Obs z;
+#X obj 736 49 inlet~;
+#X obj 843 46 inlet~;
+#X text 713 23 source - Obs y;
+#X text 815 27 source - Obs z;
+#X obj 736 78 *~;
+#X obj 843 76 *~;
+#X obj 736 109 +~;
+#X obj 736 134 sqrt~;
+#X obj 169 37 inlet~;
+#X text 155 17 Source radius;
+#X obj 461 71 *~;
+#X obj 568 70 *~;
+#X obj 461 103 +~;
+#X text -65 517 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 obj 168 84 *~ 2;
+#X obj 721 178 *~;
+#X obj 781 448 /~;
+#X obj 431 218 +~;
+#X obj 442 251 -~;
+#X text 808 505 Azimuth;
+#X obj 723 550 outlet~;
+#X obj 708 471 sig~ 90;
+#X obj 722 516 -~;
+#X obj 169 62 sqrt~;
+#X obj 393 452 +~;
+#X obj 405 478 -~;
+#X obj 378 75 *~;
+#X obj -3 58 *~;
+#X obj 556 487 *~ 2;
+#X obj 541 511 *~;
+#X obj 526 534 /~;
+#X obj 526 562 arccos~;
+#X obj 554 598 outlet~;
+#X obj 781 473 arccos~;
+#X connect 0 0 34 0;
+#X connect 0 0 34 1;
+#X connect 1 0 18 0;
+#X connect 1 0 18 1;
+#X connect 2 0 19 0;
+#X connect 2 0 19 1;
+#X connect 3 0 35 0;
+#X connect 3 0 35 1;
+#X connect 3 0 37 0;
+#X connect 8 0 12 1;
+#X connect 8 0 12 0;
+#X connect 9 0 13 0;
+#X connect 9 0 13 1;
+#X connect 12 0 14 0;
+#X connect 13 0 14 1;
+#X connect 14 0 15 0;
+#X connect 14 0 25 1;
+#X connect 14 0 32 1;
+#X connect 15 0 23 1;
+#X connect 15 0 36 0;
+#X connect 16 0 25 0;
+#X connect 16 0 31 0;
+#X connect 18 0 20 0;
+#X connect 19 0 20 1;
+#X connect 20 0 26 1;
+#X connect 22 0 23 0;
+#X connect 23 0 24 1;
+#X connect 24 0 41 0;
+#X connect 25 0 26 0;
+#X connect 26 0 24 0;
+#X connect 29 0 30 0;
+#X connect 30 0 28 0;
+#X connect 31 0 22 0;
+#X connect 32 0 33 0;
+#X connect 33 0 38 0;
+#X connect 34 0 33 1;
+#X connect 35 0 32 0;
+#X connect 36 0 37 1;
+#X connect 37 0 38 1;
+#X connect 38 0 39 0;
+#X connect 39 0 40 0;
+#X connect 41 0 30 1;
+#X restore 436 379 pd prop________Angs;
+#X obj 418 155 inlet~;
+#X obj 101 229 r~ Xobs;
+#X obj 185 233 r~ Yobs;
+#X obj 271 235 r~ Zobs;
+#X connect 0 0 1 0;
+#X connect 0 0 1 1;
+#X connect 0 0 17 0;
+#X connect 1 0 6 0;
+#X connect 2 0 3 0;
+#X connect 2 0 3 1;
+#X connect 2 0 17 1;
+#X connect 2 0 22 0;
+#X connect 2 0 26 0;
+#X connect 2 0 37 5;
+#X connect 3 0 6 1;
+#X connect 4 0 5 0;
+#X connect 4 0 5 1;
+#X connect 4 0 37 6;
+#X connect 5 0 7 1;
+#X connect 6 0 7 0;
+#X connect 7 0 8 0;
+#X connect 8 0 11 0;
+#X connect 8 0 37 0;
+#X connect 15 0 16 0;
+#X connect 16 0 27 0;
+#X connect 17 0 18 0;
+#X connect 18 0 19 0;
+#X connect 19 0 20 0;
+#X connect 20 0 25 0;
+#X connect 20 0 24 1;
+#X connect 21 1 16 0;
+#X connect 22 0 30 0;
+#X connect 23 0 24 0;
+#X connect 24 0 21 0;
+#X connect 25 1 16 0;
+#X connect 26 0 32 0;
+#X connect 29 0 30 0;
+#X connect 30 0 21 1;
+#X connect 31 0 32 0;
+#X connect 32 0 25 1;
+#X connect 34 0 0 0;
+#X connect 35 0 2 0;
+#X connect 36 0 4 0;
+#X connect 37 0 10 0;
+#X connect 37 1 9 0;
+#X connect 38 0 37 1;
+#X connect 39 0 0 1;
+#X connect 39 0 37 2;
+#X connect 40 0 2 1;
+#X connect 40 0 37 3;
+#X connect 41 0 4 1;
+#X connect 41 0 37 4;
+#X restore 138 236 pd sourcePositions;
+#X connect 1 0 34 0;
+#X connect 1 1 38 0;
+#X connect 1 2 38 1;
+#X connect 1 3 34 1;
+#X connect 1 4 38 2;
+#X connect 2 0 3 0;
+#X connect 2 0 19 0;
+#X connect 4 0 1 0;
+#X connect 5 0 31 2;
+#X connect 5 1 31 3;
+#X connect 5 2 31 4;
+#X connect 5 3 31 5;
+#X connect 6 0 31 0;
+#X connect 6 1 5 0;
+#X connect 6 2 5 1;
+#X connect 6 3 31 1;
+#X connect 6 4 5 2;
+#X connect 7 0 6 0;
+#X connect 8 0 9 0;
+#X connect 9 0 35 0;
+#X connect 9 1 39 0;
+#X connect 9 2 39 1;
+#X connect 9 3 35 1;
+#X connect 9 4 39 2;
 #X connect 10 0 11 0;
-#X connect 11 0 20 0;
-#X connect 11 0 49 0;
-#X connect 12 0 7 1;
-#X connect 12 0 49 4;
-#X connect 13 0 12 0;
-#X connect 14 0 5 1;
-#X connect 14 0 49 3;
-#X connect 15 0 14 0;
-#X connect 16 0 3 1;
-#X connect 16 0 49 2;
-#X connect 17 0 16 0;
-#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 11 0 36 0;
+#X connect 11 1 40 0;
+#X connect 11 2 40 1;
+#X connect 11 3 36 1;
+#X connect 11 4 40 2;
+#X connect 12 0 13 0;
+#X connect 13 0 37 0;
+#X connect 13 1 43 0;
+#X connect 13 2 43 1;
+#X connect 13 3 37 1;
+#X connect 13 4 43 2;
+#X connect 14 0 15 0;
+#X connect 15 0 32 0;
+#X connect 15 1 42 0;
+#X connect 15 2 42 1;
+#X connect 15 3 32 1;
+#X connect 15 4 42 2;
+#X connect 16 0 17 0;
+#X connect 17 0 33 0;
+#X connect 17 1 41 0;
+#X connect 17 2 41 1;
+#X connect 17 3 33 1;
+#X connect 17 4 41 2;
+#X connect 19 0 27 0;
+#X connect 20 0 34 6;
+#X connect 21 0 31 6;
+#X connect 22 0 35 6;
+#X connect 23 0 36 6;
+#X connect 24 0 37 6;
+#X connect 25 0 32 6;
+#X connect 26 0 33 6;
 #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 43 0 3 0;
-#X connect 44 0 5 0;
-#X connect 45 0 7 0;
-#X connect 49 0 19 0;
-#X connect 49 1 18 0;
-#X connect 50 0 49 1;
-#X restore 369 246 pd sourcePositions;
-#X obj 441 281 r~ \$0-PropAzim;
-#X obj 700 288 r~ \$0-PropAzim;
-#X obj 244 -22 s~ \$0-PropAzim;
-#X obj 49 205 r myMet;
-#X obj 49 227 snapshot~;
-#X floatatom 49 250 0 0 0 0 - - -;
-#X obj 607 312 freqCalcCyl6HiFi;
-#X obj 20 168 freqCalcCyl6HiFi;
-#X obj 426 145 freqCalcCyl6HiFi;
-#X obj 217 146 freqCalcCyl6HiFi;
-#X obj 662 145 freqCalcCyl6HiFi;
-#X obj 348 304 freqCalcCyl6HiFi;
-#X obj 125 290 freqCalcCyl6HiFi;
-#X connect 0 0 38 2;
-#X connect 0 1 38 3;
-#X connect 0 2 38 4;
-#X connect 0 3 38 5;
-#X connect 2 0 38 0;
-#X connect 2 1 0 0;
-#X connect 2 2 0 1;
-#X connect 2 3 38 1;
-#X connect 2 4 0 2;
-#X connect 3 0 4 0;
-#X connect 3 0 24 0;
-#X connect 5 0 2 0;
-#X connect 6 0 40 2;
-#X connect 6 1 40 3;
-#X connect 6 2 40 4;
-#X connect 6 3 40 5;
-#X connect 7 0 40 0;
-#X connect 7 1 6 0;
-#X connect 7 2 6 1;
-#X connect 7 3 40 1;
-#X connect 7 4 6 2;
-#X connect 8 0 7 0;
-#X connect 9 0 39 2;
-#X connect 9 1 39 3;
-#X connect 9 2 39 4;
-#X connect 9 3 39 5;
-#X connect 10 0 11 0;
-#X connect 11 0 39 0;
-#X connect 11 1 9 0;
-#X connect 11 2 9 1;
-#X connect 11 3 39 1;
-#X connect 11 4 9 2;
-#X connect 12 0 41 2;
-#X connect 12 1 41 3;
-#X connect 12 2 41 4;
-#X connect 12 3 41 5;
-#X connect 13 0 14 0;
-#X connect 14 0 41 0;
-#X connect 14 1 12 0;
-#X connect 14 2 12 1;
-#X connect 14 3 41 1;
-#X connect 14 4 12 2;
-#X connect 15 0 43 2;
-#X connect 15 1 43 3;
-#X connect 15 2 43 4;
-#X connect 15 3 43 5;
-#X connect 16 0 17 0;
-#X connect 17 0 43 0;
-#X connect 17 1 15 0;
-#X connect 17 2 15 1;
-#X connect 17 3 43 1;
-#X connect 17 4 15 2;
-#X connect 18 0 19 0;
-#X connect 19 0 42 0;
-#X connect 19 1 30 0;
-#X connect 19 2 30 1;
-#X connect 19 3 42 1;
-#X connect 19 4 30 2;
-#X connect 20 0 37 2;
-#X connect 20 1 37 3;
-#X connect 20 2 37 4;
-#X connect 20 3 37 5;
-#X connect 21 0 22 0;
-#X connect 22 0 37 0;
-#X connect 22 1 20 0;
-#X connect 22 2 20 1;
-#X connect 22 3 37 1;
-#X connect 22 4 20 2;
-#X connect 24 0 33 0;
-#X connect 25 0 38 6;
-#X connect 26 0 40 6;
-#X connect 27 0 39 6;
-#X connect 28 0 41 6;
-#X connect 29 0 43 6;
-#X connect 30 0 42 2;
-#X connect 30 1 42 3;
-#X connect 30 2 42 4;
-#X connect 30 3 42 5;
-#X connect 31 0 42 6;
-#X connect 32 0 37 6;
-#X connect 34 0 35 0;
-#X connect 35 0 36 0;
-#X restore 298 249 pd sources;
-#X obj 298 218 phasor~;
-#X obj 255 262 wrap~;
-#X obj 255 240 +~ 0.5;
+#X connect 29 0 30 0;
+#X connect 38 0 34 2;
+#X connect 38 1 34 3;
+#X connect 38 2 34 4;
+#X connect 38 3 34 5;
+#X connect 39 0 35 2;
+#X connect 39 1 35 3;
+#X connect 39 2 35 4;
+#X connect 39 3 35 5;
+#X connect 40 0 36 2;
+#X connect 40 1 36 3;
+#X connect 40 2 36 4;
+#X connect 40 3 36 5;
+#X connect 41 0 33 2;
+#X connect 41 1 33 3;
+#X connect 41 2 33 4;
+#X connect 41 3 33 5;
+#X connect 42 0 32 2;
+#X connect 42 1 32 3;
+#X connect 42 2 32 4;
+#X connect 42 3 32 5;
+#X connect 43 0 37 2;
+#X connect 43 1 37 3;
+#X connect 43 2 37 4;
+#X connect 43 3 37 5;
+#X restore 324 92 pd sources;
+#X obj 324 70 phasor~;
+#X obj 281 112 wrap~;
+#X obj 281 92 +~ 0.5;
 #N canvas 828 355 542 473 myMotor 0;
 #X obj 170 159 phasor~;
 #X obj 173 116 hsl 64 12 0 1 0 1 empty empty engine-speed -2 6 1 8
--262144 -1 -1 0 1;
+-262144 -1 -1 4900 1;
 #X obj 92 226 *~ 0.25;
 #N canvas 117 396 733 539 fourstroke 0;
 #X obj 51 336 outlet~;
@@ -3642,11 +3488,12 @@
 #X obj 302 81 inlet;
 #X floatatom 239 142 0 0 0 0 - - -;
 #X obj 10 244 * 200;
-#X obj 220 311 * 100;
+#X obj 220 311 * 1;
 #X connect 0 0 3 1;
 #X connect 1 0 3 0;
 #X connect 1 0 21 0;
 #X connect 1 0 24 0;
+#X connect 2 0 7 0;
 #X connect 3 0 2 0;
 #X connect 3 1 2 0;
 #X connect 3 2 2 0;
@@ -3676,13 +3523,10 @@
 #X connect 26 0 9 0;
 #X connect 26 0 7 1;
 #X restore -30 377 pd myMotor;
-#X obj 298 169 r~ RPM;
-#X obj 298 193 /~ 60;
-#X obj 56 192 r myMet;
-#X obj 56 214 snapshot~;
-#X floatatom 56 237 0 0 0 0 - - -;
-#X obj 392 240 hsl 70 15 1e-09 1 1 0 empty empty Broad_Boost 2 8 0
-10 -262144 -1 -1 366 1;
+#X obj 324 28 r~ RPM;
+#X obj 324 49 /~ 60;
+#X obj 392 240 hsl 70 15 0.01 100 1 0 empty empty Broad_Boost 2 8 0
+10 -262144 -1 -1 700 1;
 #X floatatom 461 257 0 0 0 0 - - -;
 #X obj 389 199 loadbang;
 #X obj 389 280 line~;
@@ -3690,210 +3534,6 @@
 #X obj 389 300 s~ broBoost;
 #X msg -184 258 0;
 #N canvas 98 323 1002 525 sources 0;
-#N canvas 163 121 1103 599 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 185 256 -~;
-#X obj 170 283 *~;
-#X obj 256 254 -~;
-#X obj 256 278 *~;
-#X obj 155 317 +~;
-#X obj 155 349 +~;
-#X obj 155 373 sqrt~;
-#X obj 271 235 line~;
-#X msg 271 213 \$1 5;
-#X obj 185 233 line~;
-#X msg 185 212 \$1 5;
-#X obj 101 229 line~;
-#X msg 101 207 \$1 5;
-#X obj 547 414 outlet~;
-#X obj 436 414 outlet~;
-#X obj 155 401 outlet~;
-#X text 150 439 source distance from Observer;
-#X text 362 440 source - Obs Elevation;
-#X text 541 441 source - Obs Azimuth;
-#X obj 831 345 r myMet;
-#X obj 830 370 snapshot~;
-#X obj 738 149 /~;
-#X obj 738 172 atan~;
-#X obj 738 195 /~ 3.14159;
-#X obj 738 219 abs~;
-#X obj 723 285 spigot~;
-#X obj 762 242 >~ 0;
-#X obj 690 230 sig~ 1;
-#X obj 723 262 -~;
-#X obj 858 309 spigot~;
-#X obj 897 265 <~ 0;
-#X obj 830 396 outlet;
-#X text 822 423 Pan Value;
-#X obj 797 242 r myMet;
-#X obj 762 263 snapshot~;
-#X obj 930 264 r myMet;
-#X obj 897 287 snapshot~;
-#X text 171 33 Calculates position of the source.;
-#X obj 86 140 sig~ 0;
-#X obj 170 142 inlet~;
-#X obj 256 150 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 289 166 1084 684 prop________Angs 0;
-#X obj 378 47 inlet~;
-#X obj 461 46 inlet~;
-#X obj 568 43 inlet~;
-#X obj -19 34 inlet~;
-#X text -85 13 Source/Obs distance;
-#X text 364 27 Obs x;
-#X text 426 21 Obs y;
-#X text 539 23 Obs z;
-#X obj 736 49 inlet~;
-#X obj 843 46 inlet~;
-#X text 713 23 source - Obs y;
-#X text 815 27 source - Obs z;
-#X obj 736 78 *~;
-#X obj 843 76 *~;
-#X obj 736 109 +~;
-#X obj 736 134 sqrt~;
-#X obj 169 37 inlet~;
-#X text 155 17 Source radius;
-#X obj 461 71 *~;
-#X obj 568 70 *~;
-#X obj 461 103 +~;
-#X text -65 517 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 obj 168 84 *~ 2;
-#X obj 721 178 *~;
-#X obj 781 448 /~;
-#X obj 431 218 +~;
-#X obj 442 251 -~;
-#X text 808 505 Azimuth;
-#X obj 723 550 outlet~;
-#X obj 708 471 sig~ 90;
-#X obj 722 516 -~;
-#X obj 169 62 sqrt~;
-#X obj 393 452 +~;
-#X obj 405 478 -~;
-#X obj 378 75 *~;
-#X obj -3 58 *~;
-#X obj 556 487 *~ 2;
-#X obj 541 511 *~;
-#X obj 526 534 /~;
-#X obj 526 562 arccos~;
-#X obj 554 598 outlet~;
-#X obj 781 473 arccos~;
-#X connect 0 0 34 0;
-#X connect 0 0 34 1;
-#X connect 1 0 18 0;
-#X connect 1 0 18 1;
-#X connect 2 0 19 0;
-#X connect 2 0 19 1;
-#X connect 3 0 35 0;
-#X connect 3 0 35 1;
-#X connect 3 0 37 0;
-#X connect 8 0 12 1;
-#X connect 8 0 12 0;
-#X connect 9 0 13 0;
-#X connect 9 0 13 1;
-#X connect 12 0 14 0;
-#X connect 13 0 14 1;
-#X connect 14 0 15 0;
-#X connect 14 0 25 1;
-#X connect 14 0 32 1;
-#X connect 15 0 23 1;
-#X connect 15 0 36 0;
-#X connect 16 0 25 0;
-#X connect 16 0 31 0;
-#X connect 18 0 20 0;
-#X connect 19 0 20 1;
-#X connect 20 0 26 1;
-#X connect 22 0 23 0;
-#X connect 23 0 24 1;
-#X connect 24 0 41 0;
-#X connect 25 0 26 0;
-#X connect 26 0 24 0;
-#X connect 29 0 30 0;
-#X connect 30 0 28 0;
-#X connect 31 0 22 0;
-#X connect 32 0 33 0;
-#X connect 33 0 38 0;
-#X connect 34 0 33 1;
-#X connect 35 0 32 0;
-#X connect 36 0 37 1;
-#X connect 37 0 38 1;
-#X connect 38 0 39 0;
-#X connect 39 0 40 0;
-#X connect 41 0 30 1;
-#X restore 436 379 pd prop________Angs;
-#X obj 418 155 inlet~;
-#X obj 38 378 r myMet;
-#X obj 38 400 snapshot~;
-#X floatatom 38 423 0 0 0 0 - - -;
-#X floatatom 881 399 0 0 0 0 - - -;
-#X connect 0 0 13 0;
-#X connect 0 0 46 0;
-#X connect 1 0 15 0;
-#X connect 1 0 47 0;
-#X connect 2 0 17 0;
-#X connect 2 0 48 0;
-#X connect 3 0 4 0;
-#X connect 3 0 4 1;
-#X connect 3 0 26 0;
-#X connect 4 0 9 0;
-#X connect 5 0 6 0;
-#X connect 5 0 6 1;
-#X connect 5 0 26 1;
-#X connect 5 0 31 0;
-#X connect 5 0 35 0;
-#X connect 5 0 49 5;
-#X connect 6 0 9 1;
-#X connect 7 0 8 0;
-#X connect 7 0 8 1;
-#X connect 7 0 49 6;
-#X connect 8 0 10 1;
-#X connect 9 0 10 0;
-#X connect 10 0 11 0;
-#X connect 11 0 20 0;
-#X connect 11 0 49 0;
-#X connect 12 0 7 1;
-#X connect 12 0 49 4;
-#X connect 13 0 12 0;
-#X connect 14 0 5 1;
-#X connect 14 0 49 3;
-#X connect 15 0 14 0;
-#X connect 16 0 3 1;
-#X connect 16 0 49 2;
-#X connect 17 0 16 0;
-#X connect 24 0 25 0;
-#X connect 25 0 36 0;
-#X connect 25 0 54 0;
-#X connect 26 0 27 0;
-#X connect 27 0 28 0;
-#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 43 0 3 0;
-#X connect 44 0 5 0;
-#X connect 45 0 7 0;
-#X connect 49 0 19 0;
-#X connect 49 1 18 0;
-#X connect 50 0 49 1;
-#X connect 51 0 52 0;
-#X connect 52 0 53 0;
-#X restore 65 82 pd sourcePositions;
 #X text 480 -91 Patch that holds all the sources that are used to produce
 the basic aeolian tone.;
 #N canvas 216 23 1030 283 sourceAASpeed 0;
@@ -3951,6 +3591,322 @@
 #X connect 31 0 12 0;
 #X restore 42 58 pd sourceAASpeed;
 #X obj 29 -70 inlet~;
+#N canvas 232 459 1061 274 sourceBBSpeed 0;
+#X obj 192 185 outlet~;
+#X text 178 211 Source Speed;
+#X obj 408 74 cos~;
+#X obj 479 73 sin~;
+#X text 262 88 2 PI;
+#X text 259 109 Radius of source;
+#X obj 409 162 outlet~;
+#X obj 479 163 outlet~;
+#X text 330 180 y position of source;
+#X text 477 182 z position of source;
+#X text 732 144 diameter;
+#X text 869 172 radius;
+#X obj 817 169 outlet~;
+#X obj 408 50 inlet~;
+#X obj 48 42 r~ length;
+#X obj 192 39 r~ RPM;
+#X obj 192 63 /~ 60;
+#X obj 192 88 *~ 6.28319;
+#X obj 192 157 *~;
+#X obj 409 135 *~;
+#X obj 479 135 *~;
+#X obj 751 121 outlet~;
+#X obj 751 76 sig~ 0.1778;
+#X obj 48 84 s~ BB2sourceRadius;
+#X obj 207 136 r~ BB2sourceRadius;
+#X obj 424 96 r~ BB2sourceRadius;
+#X obj 495 115 r~ BB2sourceRadius;
+#X obj 817 144 r~ BB2sourceRadius;
+#X obj 48 66 *~ 0.3083;
+#X connect 2 0 19 0;
+#X connect 3 0 20 0;
+#X connect 13 0 2 0;
+#X connect 13 0 3 0;
+#X connect 14 0 28 0;
+#X connect 15 0 16 0;
+#X connect 16 0 17 0;
+#X connect 17 0 18 0;
+#X connect 18 0 0 0;
+#X connect 19 0 6 0;
+#X connect 20 0 7 0;
+#X connect 22 0 21 0;
+#X connect 24 0 18 1;
+#X connect 25 0 19 1;
+#X connect 26 0 20 1;
+#X connect 27 0 12 0;
+#X connect 28 0 23 0;
+#X restore 224 65 pd sourceBBSpeed;
+#N canvas 226 441 1061 274 sourceCCSpeed 0;
+#X obj 192 185 outlet~;
+#X text 178 211 Source Speed;
+#X obj 408 75 cos~;
+#X obj 478 76 sin~;
+#X text 262 88 2 PI;
+#X text 259 109 Radius of source;
+#X obj 409 162 outlet~;
+#X obj 479 163 outlet~;
+#X text 330 180 y position of source;
+#X text 477 182 z position of source;
+#X text 732 144 diameter;
+#X text 869 172 radius;
+#X obj 817 169 outlet~;
+#X obj 408 50 inlet~;
+#X obj 48 42 r~ length;
+#X obj 192 39 r~ RPM;
+#X obj 192 63 /~ 60;
+#X obj 192 88 *~ 6.28319;
+#X obj 192 162 *~;
+#X obj 409 135 *~;
+#X obj 479 135 *~;
+#X obj 751 121 outlet~;
+#X obj 750 86 sig~ 0.2108;
+#X obj 48 90 s~ CC2sourceRadius;
+#X obj 206 141 r~ CC2sourceRadius;
+#X obj 426 95 r~ CC2sourceRadius;
+#X obj 493 115 r~ CC2sourceRadius;
+#X obj 817 142 r~ CC2sourceRadius;
+#X obj 48 66 *~ 0.4404;
+#X connect 2 0 19 0;
+#X connect 3 0 20 0;
+#X connect 13 0 2 0;
+#X connect 13 0 3 0;
+#X connect 14 0 28 0;
+#X connect 15 0 16 0;
+#X connect 16 0 17 0;
+#X connect 17 0 18 0;
+#X connect 18 0 0 0;
+#X connect 19 0 6 0;
+#X connect 20 0 7 0;
+#X connect 22 0 21 0;
+#X connect 24 0 18 1;
+#X connect 25 0 19 1;
+#X connect 26 0 20 1;
+#X connect 27 0 12 0;
+#X connect 28 0 23 0;
+#X restore 425 63 pd sourceCCSpeed;
+#N canvas 208 486 1061 274 sourceDDSpeed 0;
+#X obj 192 185 outlet~;
+#X text 178 211 Source Speed;
+#X obj 408 76 cos~;
+#X obj 479 76 sin~;
+#X text 262 88 2 PI;
+#X text 259 109 Radius of source;
+#X obj 409 162 outlet~;
+#X obj 479 163 outlet~;
+#X text 330 180 y position of source;
+#X text 477 182 z position of source;
+#X text 732 144 diameter;
+#X text 869 172 radius;
+#X obj 817 169 outlet~;
+#X obj 408 50 inlet~;
+#X obj 48 42 r~ length;
+#X obj 192 39 r~ RPM;
+#X obj 192 63 /~ 60;
+#X obj 192 88 *~ 6.28319;
+#X obj 192 163 *~;
+#X obj 409 135 *~;
+#X obj 479 135 *~;
+#X obj 751 121 outlet~;
+#X obj 751 59 sig~ 0.2299;
+#X obj 48 90 s~ DD2sourceRadius;
+#X obj 206 139 r~ DD2sourceRadius;
+#X obj 425 111 r~ DD2sourceRadius;
+#X obj 494 113 r~ DD2sourceRadius;
+#X obj 818 142 r~ DD2sourceRadius;
+#X obj 48 66 *~ 0.5945;
+#X connect 2 0 19 0;
+#X connect 3 0 20 0;
+#X connect 13 0 2 0;
+#X connect 13 0 3 0;
+#X connect 14 0 28 0;
+#X connect 15 0 16 0;
+#X connect 16 0 17 0;
+#X connect 17 0 18 0;
+#X connect 18 0 0 0;
+#X connect 19 0 6 0;
+#X connect 20 0 7 0;
+#X connect 22 0 21 0;
+#X connect 24 0 18 1;
+#X connect 25 0 19 1;
+#X connect 26 0 20 1;
+#X connect 27 0 12 0;
+#X connect 28 0 23 0;
+#X restore 660 62 pd sourceDDSpeed;
+#N canvas 252 340 1061 274 sourceEESpeed 0;
+#X obj 192 185 outlet~;
+#X text 178 211 Source Speed;
+#X obj 408 76 cos~;
+#X obj 479 75 sin~;
+#X text 262 88 2 PI;
+#X text 259 109 Radius of source;
+#X obj 409 162 outlet~;
+#X obj 479 163 outlet~;
+#X text 330 180 y position of source;
+#X text 477 182 z position of source;
+#X text 732 144 diameter;
+#X text 869 172 radius;
+#X obj 817 169 outlet~;
+#X obj 408 50 inlet~;
+#X obj 48 42 r~ length;
+#X obj 192 39 r~ RPM;
+#X obj 192 63 /~ 60;
+#X obj 192 88 *~ 6.28319;
+#X obj 192 160 *~;
+#X obj 409 135 *~;
+#X obj 479 135 *~;
+#X obj 751 121 outlet~;
+#X obj 751 99 sig~ 0.2367;
+#X obj 48 90 s~ EE2sourceRadius;
+#X obj 205 136 r~ EE2sourceRadius;
+#X obj 423 97 r~ EE2sourceRadius;
+#X obj 493 115 r~ EE2sourceRadius;
+#X obj 818 147 r~ EE2sourceRadius;
+#X obj 48 66 *~ 0.7486;
+#X connect 2 0 19 0;
+#X connect 3 0 20 0;
+#X connect 13 0 2 0;
+#X connect 13 0 3 0;
+#X connect 14 0 28 0;
+#X connect 15 0 16 0;
+#X connect 16 0 17 0;
+#X connect 17 0 18 0;
+#X connect 18 0 0 0;
+#X connect 19 0 6 0;
+#X connect 20 0 7 0;
+#X connect 22 0 21 0;
+#X connect 24 0 18 1;
+#X connect 25 0 19 1;
+#X connect 26 0 20 1;
+#X connect 27 0 12 0;
+#X connect 28 0 23 0;
+#X restore 122 210 pd sourceEESpeed;
+#N canvas 131 376 1030 283 sourceFFSpeed 0;
+#X obj 192 185 outlet~;
+#X text 178 211 Source Speed;
+#X obj 408 80 cos~;
+#X obj 478 74 sin~;
+#X text 262 88 2 PI;
+#X text 259 109 Radius of source;
+#X obj 409 162 outlet~;
+#X obj 479 163 outlet~;
+#X text 330 180 y position of source;
+#X text 477 182 z position of source;
+#X text 724 152 diameter;
+#X text 861 180 radius;
+#X obj 809 177 outlet~;
+#X obj 408 50 inlet~;
+#X obj 48 42 r~ length;
+#X obj 409 135 *~;
+#X obj 479 135 *~;
+#X obj 192 39 r~ RPM;
+#X obj 191 63 /~ 60;
+#X obj 192 88 *~ 6.28319;
+#X obj 192 153 *~;
+#X obj 743 108 sig~ 0.2123;
+#X obj 743 129 outlet~;
+#X obj 48 90 s~ FF2sourceRadius;
+#X obj 208 130 r~ FF2sourceRadius;
+#X obj 427 99 r~ FF2sourceRadius;
+#X obj 495 116 r~ FF2sourceRadius;
+#X obj 808 154 r~ FF2sourceRadius;
+#X obj 48 66 *~ 0.8807;
+#X connect 2 0 15 0;
+#X connect 3 0 16 0;
+#X connect 13 0 2 0;
+#X connect 13 0 3 0;
+#X connect 14 0 28 0;
+#X connect 15 0 6 0;
+#X connect 16 0 7 0;
+#X connect 17 0 18 0;
+#X connect 18 0 19 0;
+#X connect 19 0 20 0;
+#X connect 20 0 0 0;
+#X connect 21 0 22 0;
+#X connect 24 0 20 1;
+#X connect 25 0 15 1;
+#X connect 26 0 16 1;
+#X connect 27 0 12 0;
+#X connect 28 0 23 0;
+#X restore 345 220 pd sourceFFSpeed;
+#N canvas 175 426 1061 274 sourceGGSpeed 0;
+#X obj 192 185 outlet~;
+#X text 178 211 Source Speed;
+#X obj 408 79 cos~;
+#X obj 475 76 sin~;
+#X text 262 88 2 PI;
+#X text 259 109 Radius of source;
+#X obj 409 162 outlet~;
+#X obj 479 163 outlet~;
+#X text 330 180 y position of source;
+#X text 477 182 z position of source;
+#X text 732 144 diameter;
+#X text 869 172 radius;
+#X obj 817 169 outlet~;
+#X obj 408 50 inlet~;
+#X obj 48 42 r~ length;
+#X obj 192 39 r~ RPM;
+#X obj 191 63 /~ 60;
+#X obj 192 88 *~ 6.28319;
+#X obj 192 151 *~;
+#X obj 409 135 *~;
+#X obj 479 135 *~;
+#X obj 751 76 sig~ 0.1885;
+#X obj 751 121 outlet~;
+#X obj 48 90 s~ GG2sourceRadius;
+#X obj 207 127 r~ GG2sourceRadius;
+#X obj 428 97 r~ GG2sourceRadius;
+#X obj 494 114 r~ GG2sourceRadius;
+#X obj 816 147 r~ GG2sourceRadius;
+#X obj 48 66 *~ 0.9468;
+#X connect 2 0 19 0;
+#X connect 3 0 20 0;
+#X connect 13 0 2 0;
+#X connect 13 0 3 0;
+#X connect 14 0 28 0;
+#X connect 15 0 16 0;
+#X connect 16 0 17 0;
+#X connect 17 0 18 0;
+#X connect 18 0 0 0;
+#X connect 19 0 6 0;
+#X connect 20 0 7 0;
+#X connect 21 0 22 0;
+#X connect 24 0 18 1;
+#X connect 25 0 19 1;
+#X connect 26 0 20 1;
+#X connect 27 0 12 0;
+#X connect 28 0 23 0;
+#X restore 605 232 pd sourceGGSpeed;
+#X obj 351 -58 *~ 6.2832;
+#X obj 244 -48 *~ 360;
+#X obj 49 205 r myMet;
+#X obj 49 227 snapshot~;
+#X floatatom 49 250 0 0 0 0 - - -;
+#X obj 29 -42 s~ \$0-this2Phasor;
+#X obj 42 35 r~ \$0-this2Phasor;
+#X obj 222 37 r~ \$0-this2Phasor;
+#X obj 425 42 r~ \$0-this2Phasor;
+#X obj 660 41 r~ \$0-this2Phasor;
+#X obj 605 211 r~ \$0-this2Phasor;
+#X obj 345 197 r~ \$0-this2Phasor;
+#X obj 122 189 r~ \$0-this2Phasor;
+#X obj 244 -22 s~ \$0-Prop2Azim;
+#X obj 113 143 r~ \$0-Prop2Azim;
+#X obj 311 123 r~ \$0-Prop2Azim;
+#X obj 521 123 r~ \$0-Prop2Azim;
+#X obj 756 122 r~ \$0-Prop2Azim;
+#X obj 700 288 r~ \$0-Prop2Azim;
+#X obj 441 281 r~ \$0-Prop2Azim;
+#X obj 220 266 r~ \$0-Prop2Azim;
+#X obj 426 145 freqCalcCyl6HiFi;
+#X obj 348 304 freqCalcCyl6HiFi;
+#X obj 607 312 freqCalcCyl6HiFi;
+#X obj 20 168 freqCalcCyl6HiFi;
+#X obj 217 146 freqCalcCyl6HiFi;
+#X obj 662 145 freqCalcCyl6HiFi;
+#X obj 125 290 freqCalcCyl6HiFi;
 #N canvas 223 181 1103 599 sourcePositions 0;
 #X obj 86 252 -~;
 #X obj 86 276 *~;
@@ -4129,59 +4085,8 @@
 #X connect 40 0 37 3;
 #X connect 41 0 4 1;
 #X connect 41 0 37 4;
-#X restore 246 85 pd sourcePositions;
-#N canvas 232 459 1061 274 sourceBBSpeed 0;
-#X obj 192 185 outlet~;
-#X text 178 211 Source Speed;
-#X obj 408 74 cos~;
-#X obj 479 73 sin~;
-#X text 262 88 2 PI;
-#X text 259 109 Radius of source;
-#X obj 409 162 outlet~;
-#X obj 479 163 outlet~;
-#X text 330 180 y position of source;
-#X text 477 182 z position of source;
-#X text 732 144 diameter;
-#X text 869 172 radius;
-#X obj 817 169 outlet~;
-#X obj 408 50 inlet~;
-#X obj 48 42 r~ length;
-#X obj 192 39 r~ RPM;
-#X obj 192 63 /~ 60;
-#X obj 192 88 *~ 6.28319;
-#X obj 192 157 *~;
-#X obj 409 135 *~;
-#X obj 479 135 *~;
-#X obj 751 121 outlet~;
-#X obj 751 76 sig~ 0.1778;
-#X obj 48 84 s~ BB2sourceRadius;
-#X obj 207 136 r~ BB2sourceRadius;
-#X obj 424 96 r~ BB2sourceRadius;
-#X obj 495 115 r~ BB2sourceRadius;
-#X obj 817 144 r~ BB2sourceRadius;
-#X obj 48 66 *~ 0.3083;
-#X connect 2 0 19 0;
-#X connect 3 0 20 0;
-#X connect 13 0 2 0;
-#X connect 13 0 3 0;
-#X connect 14 0 28 0;
-#X connect 15 0 16 0;
-#X connect 16 0 17 0;
-#X connect 17 0 18 0;
-#X connect 18 0 0 0;
-#X connect 19 0 6 0;
-#X connect 20 0 7 0;
-#X connect 22 0 21 0;
-#X connect 24 0 18 1;
-#X connect 25 0 19 1;
-#X connect 26 0 20 1;
-#X connect 27 0 12 0;
-#X connect 28 0 23 0;
-#X restore 224 65 pd sourceBBSpeed;
-#N canvas 163 121 1103 599 sourcePositions 0;
-#X obj 271 193 r Zobs;
-#X obj 185 191 r Yobs;
-#X obj 101 183 r Xobs;
+#X restore 54 87 pd sourcePositions;
+#N canvas 223 181 1103 599 sourcePositions 0;
 #X obj 86 252 -~;
 #X obj 86 276 *~;
 #X obj 185 256 -~;
@@ -4191,12 +4096,6 @@
 #X obj 155 317 +~;
 #X obj 155 349 +~;
 #X obj 155 376 sqrt~;
-#X obj 271 235 line~;
-#X msg 271 213 \$1 5;
-#X obj 185 233 line~;
-#X msg 185 212 \$1 5;
-#X obj 101 229 line~;
-#X msg 101 207 \$1 5;
 #X obj 547 414 outlet~;
 #X obj 436 414 outlet~;
 #X obj 155 401 outlet~;
@@ -4225,9 +4124,6 @@
 #X obj 86 140 sig~ 0;
 #X obj 170 142 inlet~;
 #X obj 256 150 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 289 166 1084 684 prop________Angs 0;
 #X obj 378 47 inlet~;
 #X obj 461 46 inlet~;
@@ -4317,116 +4213,59 @@
 #X connect 41 0 30 1;
 #X restore 436 379 pd prop________Angs;
 #X obj 418 155 inlet~;
-#X connect 0 0 13 0;
-#X connect 0 0 46 0;
-#X connect 1 0 15 0;
-#X connect 1 0 47 0;
-#X connect 2 0 17 0;
-#X connect 2 0 48 0;
-#X connect 3 0 4 0;
-#X connect 3 0 4 1;
-#X connect 3 0 26 0;
-#X connect 4 0 9 0;
-#X connect 5 0 6 0;
-#X connect 5 0 6 1;
-#X connect 5 0 26 1;
-#X connect 5 0 31 0;
-#X connect 5 0 35 0;
-#X connect 5 0 49 5;
-#X connect 6 0 9 1;
+#X obj 101 229 r~ Xobs;
+#X obj 185 233 r~ Yobs;
+#X obj 271 235 r~ Zobs;
+#X connect 0 0 1 0;
+#X connect 0 0 1 1;
+#X connect 0 0 17 0;
+#X connect 1 0 6 0;
+#X connect 2 0 3 0;
+#X connect 2 0 3 1;
+#X connect 2 0 17 1;
+#X connect 2 0 22 0;
+#X connect 2 0 26 0;
+#X connect 2 0 37 5;
+#X connect 3 0 6 1;
+#X connect 4 0 5 0;
+#X connect 4 0 5 1;
+#X connect 4 0 37 6;
+#X connect 5 0 7 1;
+#X connect 6 0 7 0;
 #X connect 7 0 8 0;
-#X connect 7 0 8 1;
-#X connect 7 0 49 6;
-#X connect 8 0 10 1;
-#X connect 9 0 10 0;
-#X connect 10 0 11 0;
-#X connect 11 0 20 0;
-#X connect 11 0 49 0;
-#X connect 12 0 7 1;
-#X connect 12 0 49 4;
-#X connect 13 0 12 0;
-#X connect 14 0 5 1;
-#X connect 14 0 49 3;
-#X connect 15 0 14 0;
-#X connect 16 0 3 1;
-#X connect 16 0 49 2;
-#X connect 17 0 16 0;
-#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 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 43 0 3 0;
-#X connect 44 0 5 0;
-#X connect 45 0 7 0;
-#X connect 49 0 19 0;
-#X connect 49 1 18 0;
-#X connect 50 0 49 1;
-#X restore 449 89 pd sourcePositions;
-#N canvas 226 441 1061 274 sourceCCSpeed 0;
-#X obj 192 185 outlet~;
-#X text 178 211 Source Speed;
-#X obj 408 75 cos~;
-#X obj 478 76 sin~;
-#X text 262 88 2 PI;
-#X text 259 109 Radius of source;
-#X obj 409 162 outlet~;
-#X obj 479 163 outlet~;
-#X text 330 180 y position of source;
-#X text 477 182 z position of source;
-#X text 732 144 diameter;
-#X text 869 172 radius;
-#X obj 817 169 outlet~;
-#X obj 408 50 inlet~;
-#X obj 48 42 r~ length;
-#X obj 192 39 r~ RPM;
-#X obj 192 63 /~ 60;
-#X obj 192 88 *~ 6.28319;
-#X obj 192 162 *~;
-#X obj 409 135 *~;
-#X obj 479 135 *~;
-#X obj 751 121 outlet~;
-#X obj 750 86 sig~ 0.2108;
-#X obj 48 90 s~ CC2sourceRadius;
-#X obj 206 141 r~ CC2sourceRadius;
-#X obj 426 95 r~ CC2sourceRadius;
-#X obj 493 115 r~ CC2sourceRadius;
-#X obj 817 142 r~ CC2sourceRadius;
-#X obj 48 66 *~ 0.4404;
-#X connect 2 0 19 0;
-#X connect 3 0 20 0;
-#X connect 13 0 2 0;
-#X connect 13 0 3 0;
-#X connect 14 0 28 0;
+#X connect 8 0 11 0;
+#X connect 8 0 37 0;
 #X connect 15 0 16 0;
-#X connect 16 0 17 0;
+#X connect 16 0 27 0;
 #X connect 17 0 18 0;
-#X connect 18 0 0 0;
-#X connect 19 0 6 0;
-#X connect 20 0 7 0;
-#X connect 22 0 21 0;
-#X connect 24 0 18 1;
-#X connect 25 0 19 1;
-#X connect 26 0 20 1;
-#X connect 27 0 12 0;
-#X connect 28 0 23 0;
-#X restore 425 63 pd sourceCCSpeed;
-#N canvas 163 121 1103 599 sourcePositions 0;
-#X obj 271 193 r Zobs;
-#X obj 185 191 r Yobs;
-#X obj 101 183 r Xobs;
+#X connect 18 0 19 0;
+#X connect 19 0 20 0;
+#X connect 20 0 25 0;
+#X connect 20 0 24 1;
+#X connect 21 1 16 0;
+#X connect 22 0 30 0;
+#X connect 23 0 24 0;
+#X connect 24 0 21 0;
+#X connect 25 1 16 0;
+#X connect 26 0 32 0;
+#X connect 29 0 30 0;
+#X connect 30 0 21 1;
+#X connect 31 0 32 0;
+#X connect 32 0 25 1;
+#X connect 34 0 0 0;
+#X connect 35 0 2 0;
+#X connect 36 0 4 0;
+#X connect 37 0 10 0;
+#X connect 37 1 9 0;
+#X connect 38 0 37 1;
+#X connect 39 0 0 1;
+#X connect 39 0 37 2;
+#X connect 40 0 2 1;
+#X connect 40 0 37 3;
+#X connect 41 0 4 1;
+#X connect 41 0 37 4;
+#X restore 241 91 pd sourcePositions;
+#N canvas 223 181 1103 599 sourcePositions 0;
 #X obj 86 252 -~;
 #X obj 86 276 *~;
 #X obj 185 256 -~;
@@ -4436,12 +4275,6 @@
 #X obj 155 317 +~;
 #X obj 155 349 +~;
 #X obj 155 376 sqrt~;
-#X obj 271 235 line~;
-#X msg 271 213 \$1 5;
-#X obj 185 233 line~;
-#X msg 185 212 \$1 5;
-#X obj 101 229 line~;
-#X msg 101 207 \$1 5;
 #X obj 547 414 outlet~;
 #X obj 436 414 outlet~;
 #X obj 155 401 outlet~;
@@ -4470,9 +4303,6 @@
 #X obj 86 140 sig~ 0;
 #X obj 170 142 inlet~;
 #X obj 256 150 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 289 166 1084 684 prop________Angs 0;
 #X obj 378 47 inlet~;
 #X obj 461 46 inlet~;
@@ -4562,116 +4392,59 @@
 #X connect 41 0 30 1;
 #X restore 436 379 pd prop________Angs;
 #X obj 418 155 inlet~;
-#X connect 0 0 13 0;
-#X connect 0 0 46 0;
-#X connect 1 0 15 0;
-#X connect 1 0 47 0;
-#X connect 2 0 17 0;
-#X connect 2 0 48 0;
-#X connect 3 0 4 0;
-#X connect 3 0 4 1;
-#X connect 3 0 26 0;
-#X connect 4 0 9 0;
-#X connect 5 0 6 0;
-#X connect 5 0 6 1;
-#X connect 5 0 26 1;
-#X connect 5 0 31 0;
-#X connect 5 0 35 0;
-#X connect 5 0 49 5;
-#X connect 6 0 9 1;
+#X obj 101 229 r~ Xobs;
+#X obj 185 233 r~ Yobs;
+#X obj 271 235 r~ Zobs;
+#X connect 0 0 1 0;
+#X connect 0 0 1 1;
+#X connect 0 0 17 0;
+#X connect 1 0 6 0;
+#X connect 2 0 3 0;
+#X connect 2 0 3 1;
+#X connect 2 0 17 1;
+#X connect 2 0 22 0;
+#X connect 2 0 26 0;
+#X connect 2 0 37 5;
+#X connect 3 0 6 1;
+#X connect 4 0 5 0;
+#X connect 4 0 5 1;
+#X connect 4 0 37 6;
+#X connect 5 0 7 1;
+#X connect 6 0 7 0;
 #X connect 7 0 8 0;
-#X connect 7 0 8 1;
-#X connect 7 0 49 6;
-#X connect 8 0 10 1;
-#X connect 9 0 10 0;
-#X connect 10 0 11 0;
-#X connect 11 0 20 0;
-#X connect 11 0 49 0;
-#X connect 12 0 7 1;
-#X connect 12 0 49 4;
-#X connect 13 0 12 0;
-#X connect 14 0 5 1;
-#X connect 14 0 49 3;
-#X connect 15 0 14 0;
-#X connect 16 0 3 1;
-#X connect 16 0 49 2;
-#X connect 17 0 16 0;
-#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 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 43 0 3 0;
-#X connect 44 0 5 0;
-#X connect 45 0 7 0;
-#X connect 49 0 19 0;
-#X connect 49 1 18 0;
-#X connect 50 0 49 1;
-#X restore 683 85 pd sourcePositions;
-#N canvas 208 486 1061 274 sourceDDSpeed 0;
-#X obj 192 185 outlet~;
-#X text 178 211 Source Speed;
-#X obj 408 76 cos~;
-#X obj 479 76 sin~;
-#X text 262 88 2 PI;
-#X text 259 109 Radius of source;
-#X obj 409 162 outlet~;
-#X obj 479 163 outlet~;
-#X text 330 180 y position of source;
-#X text 477 182 z position of source;
-#X text 732 144 diameter;
-#X text 869 172 radius;
-#X obj 817 169 outlet~;
-#X obj 408 50 inlet~;
-#X obj 48 42 r~ length;
-#X obj 192 39 r~ RPM;
-#X obj 192 63 /~ 60;
-#X obj 192 88 *~ 6.28319;
-#X obj 192 163 *~;
-#X obj 409 135 *~;
-#X obj 479 135 *~;
-#X obj 751 121 outlet~;
-#X obj 751 59 sig~ 0.2299;
-#X obj 48 90 s~ DD2sourceRadius;
-#X obj 206 139 r~ DD2sourceRadius;
-#X obj 425 111 r~ DD2sourceRadius;
-#X obj 494 113 r~ DD2sourceRadius;
-#X obj 818 142 r~ DD2sourceRadius;
-#X obj 48 66 *~ 0.5945;
-#X connect 2 0 19 0;
-#X connect 3 0 20 0;
-#X connect 13 0 2 0;
-#X connect 13 0 3 0;
-#X connect 14 0 28 0;
+#X connect 8 0 11 0;
+#X connect 8 0 37 0;
 #X connect 15 0 16 0;
-#X connect 16 0 17 0;
+#X connect 16 0 27 0;
 #X connect 17 0 18 0;
-#X connect 18 0 0 0;
-#X connect 19 0 6 0;
-#X connect 20 0 7 0;
-#X connect 22 0 21 0;
-#X connect 24 0 18 1;
-#X connect 25 0 19 1;
-#X connect 26 0 20 1;
-#X connect 27 0 12 0;
-#X connect 28 0 23 0;
-#X restore 660 62 pd sourceDDSpeed;
-#N canvas 163 121 1103 599 sourcePositions 0;
-#X obj 271 193 r Zobs;
-#X obj 185 191 r Yobs;
-#X obj 101 183 r Xobs;
+#X connect 18 0 19 0;
+#X connect 19 0 20 0;
+#X connect 20 0 25 0;
+#X connect 20 0 24 1;
+#X connect 21 1 16 0;
+#X connect 22 0 30 0;
+#X connect 23 0 24 0;
+#X connect 24 0 21 0;
+#X connect 25 1 16 0;
+#X connect 26 0 32 0;
+#X connect 29 0 30 0;
+#X connect 30 0 21 1;
+#X connect 31 0 32 0;
+#X connect 32 0 25 1;
+#X connect 34 0 0 0;
+#X connect 35 0 2 0;
+#X connect 36 0 4 0;
+#X connect 37 0 10 0;
+#X connect 37 1 9 0;
+#X connect 38 0 37 1;
+#X connect 39 0 0 1;
+#X connect 39 0 37 2;
+#X connect 40 0 2 1;
+#X connect 40 0 37 3;
+#X connect 41 0 4 1;
+#X connect 41 0 37 4;
+#X restore 439 90 pd sourcePositions;
+#N canvas 223 181 1103 599 sourcePositions 0;
 #X obj 86 252 -~;
 #X obj 86 276 *~;
 #X obj 185 256 -~;
@@ -4681,12 +4454,6 @@
 #X obj 155 317 +~;
 #X obj 155 349 +~;
 #X obj 155 376 sqrt~;
-#X obj 271 235 line~;
-#X msg 271 213 \$1 5;
-#X obj 185 233 line~;
-#X msg 185 212 \$1 5;
-#X obj 101 229 line~;
-#X msg 101 207 \$1 5;
 #X obj 547 414 outlet~;
 #X obj 436 414 outlet~;
 #X obj 155 401 outlet~;
@@ -4715,9 +4482,6 @@
 #X obj 86 140 sig~ 0;
 #X obj 170 142 inlet~;
 #X obj 256 150 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 289 166 1084 684 prop________Angs 0;
 #X obj 378 47 inlet~;
 #X obj 461 46 inlet~;
@@ -4807,164 +4571,59 @@
 #X connect 41 0 30 1;
 #X restore 436 379 pd prop________Angs;
 #X obj 418 155 inlet~;
-#X connect 0 0 13 0;
-#X connect 0 0 46 0;
-#X connect 1 0 15 0;
-#X connect 1 0 47 0;
-#X connect 2 0 17 0;
-#X connect 2 0 48 0;
-#X connect 3 0 4 0;
-#X connect 3 0 4 1;
-#X connect 3 0 26 0;
-#X connect 4 0 9 0;
-#X connect 5 0 6 0;
-#X connect 5 0 6 1;
-#X connect 5 0 26 1;
-#X connect 5 0 31 0;
-#X connect 5 0 35 0;
-#X connect 5 0 49 5;
-#X connect 6 0 9 1;
+#X obj 101 229 r~ Xobs;
+#X obj 185 233 r~ Yobs;
+#X obj 271 235 r~ Zobs;
+#X connect 0 0 1 0;
+#X connect 0 0 1 1;
+#X connect 0 0 17 0;
+#X connect 1 0 6 0;
+#X connect 2 0 3 0;
+#X connect 2 0 3 1;
+#X connect 2 0 17 1;
+#X connect 2 0 22 0;
+#X connect 2 0 26 0;
+#X connect 2 0 37 5;
+#X connect 3 0 6 1;
+#X connect 4 0 5 0;
+#X connect 4 0 5 1;
+#X connect 4 0 37 6;
+#X connect 5 0 7 1;
+#X connect 6 0 7 0;
 #X connect 7 0 8 0;
-#X connect 7 0 8 1;
-#X connect 7 0 49 6;
-#X connect 8 0 10 1;
-#X connect 9 0 10 0;
-#X connect 10 0 11 0;
-#X connect 11 0 20 0;
-#X connect 11 0 49 0;
-#X connect 12 0 7 1;
-#X connect 12 0 49 4;
-#X connect 13 0 12 0;
-#X connect 14 0 5 1;
-#X connect 14 0 49 3;
-#X connect 15 0 14 0;
-#X connect 16 0 3 1;
-#X connect 16 0 49 2;
-#X connect 17 0 16 0;
-#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 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 43 0 3 0;
-#X connect 44 0 5 0;
-#X connect 45 0 7 0;
-#X connect 49 0 19 0;
-#X connect 49 1 18 0;
-#X connect 50 0 49 1;
-#X restore 153 242 pd sourcePositions;
-#N canvas 252 340 1061 274 sourceEESpeed 0;
-#X obj 192 185 outlet~;
-#X text 178 211 Source Speed;
-#X obj 408 76 cos~;
-#X obj 479 75 sin~;
-#X text 262 88 2 PI;
-#X text 259 109 Radius of source;
-#X obj 409 162 outlet~;
-#X obj 479 163 outlet~;
-#X text 330 180 y position of source;
-#X text 477 182 z position of source;
-#X text 732 144 diameter;
-#X text 869 172 radius;
-#X obj 817 169 outlet~;
-#X obj 408 50 inlet~;
-#X obj 48 42 r~ length;
-#X obj 192 39 r~ RPM;
-#X obj 192 63 /~ 60;
-#X obj 192 88 *~ 6.28319;
-#X obj 192 160 *~;
-#X obj 409 135 *~;
-#X obj 479 135 *~;
-#X obj 751 121 outlet~;
-#X obj 751 99 sig~ 0.2367;
-#X obj 48 90 s~ EE2sourceRadius;
-#X obj 205 136 r~ EE2sourceRadius;
-#X obj 423 97 r~ EE2sourceRadius;
-#X obj 493 115 r~ EE2sourceRadius;
-#X obj 818 147 r~ EE2sourceRadius;
-#X obj 48 66 *~ 0.7486;
-#X connect 2 0 19 0;
-#X connect 3 0 20 0;
-#X connect 13 0 2 0;
-#X connect 13 0 3 0;
-#X connect 14 0 28 0;
+#X connect 8 0 11 0;
+#X connect 8 0 37 0;
 #X connect 15 0 16 0;
-#X connect 16 0 17 0;
-#X connect 17 0 18 0;
-#X connect 18 0 0 0;
-#X connect 19 0 6 0;
-#X connect 20 0 7 0;
-#X connect 22 0 21 0;
-#X connect 24 0 18 1;
-#X connect 25 0 19 1;
-#X connect 26 0 20 1;
-#X connect 27 0 12 0;
-#X connect 28 0 23 0;
-#X restore 122 210 pd sourceEESpeed;
-#N canvas 131 376 1030 283 sourceFFSpeed 0;
-#X obj 192 185 outlet~;
-#X text 178 211 Source Speed;
-#X obj 408 80 cos~;
-#X obj 478 74 sin~;
-#X text 262 88 2 PI;
-#X text 259 109 Radius of source;
-#X obj 409 162 outlet~;
-#X obj 479 163 outlet~;
-#X text 330 180 y position of source;
-#X text 477 182 z position of source;
-#X text 724 152 diameter;
-#X text 861 180 radius;
-#X obj 809 177 outlet~;
-#X obj 408 50 inlet~;
-#X obj 48 42 r~ length;
-#X obj 409 135 *~;
-#X obj 479 135 *~;
-#X obj 192 39 r~ RPM;
-#X obj 191 63 /~ 60;
-#X obj 192 88 *~ 6.28319;
-#X obj 192 153 *~;
-#X obj 743 108 sig~ 0.2123;
-#X obj 743 129 outlet~;
-#X obj 48 90 s~ FF2sourceRadius;
-#X obj 208 130 r~ FF2sourceRadius;
-#X obj 427 99 r~ FF2sourceRadius;
-#X obj 495 116 r~ FF2sourceRadius;
-#X obj 808 154 r~ FF2sourceRadius;
-#X obj 48 66 *~ 0.8807;
-#X connect 2 0 15 0;
-#X connect 3 0 16 0;
-#X connect 13 0 2 0;
-#X connect 13 0 3 0;
-#X connect 14 0 28 0;
-#X connect 15 0 6 0;
-#X connect 16 0 7 0;
+#X connect 16 0 27 0;
 #X connect 17 0 18 0;
 #X connect 18 0 19 0;
 #X connect 19 0 20 0;
-#X connect 20 0 0 0;
-#X connect 21 0 22 0;
-#X connect 24 0 20 1;
-#X connect 25 0 15 1;
-#X connect 26 0 16 1;
-#X connect 27 0 12 0;
-#X connect 28 0 23 0;
-#X restore 345 220 pd sourceFFSpeed;
-#N canvas 163 121 1103 599 sourcePositions 0;
-#X obj 271 193 r Zobs;
-#X obj 185 191 r Yobs;
-#X obj 101 183 r Xobs;
+#X connect 20 0 25 0;
+#X connect 20 0 24 1;
+#X connect 21 1 16 0;
+#X connect 22 0 30 0;
+#X connect 23 0 24 0;
+#X connect 24 0 21 0;
+#X connect 25 1 16 0;
+#X connect 26 0 32 0;
+#X connect 29 0 30 0;
+#X connect 30 0 21 1;
+#X connect 31 0 32 0;
+#X connect 32 0 25 1;
+#X connect 34 0 0 0;
+#X connect 35 0 2 0;
+#X connect 36 0 4 0;
+#X connect 37 0 10 0;
+#X connect 37 1 9 0;
+#X connect 38 0 37 1;
+#X connect 39 0 0 1;
+#X connect 39 0 37 2;
+#X connect 40 0 2 1;
+#X connect 40 0 37 3;
+#X connect 41 0 4 1;
+#X connect 41 0 37 4;
+#X restore 676 88 pd sourcePositions;
+#N canvas 223 181 1103 599 sourcePositions 0;
 #X obj 86 252 -~;
 #X obj 86 276 *~;
 #X obj 185 256 -~;
@@ -4974,12 +4633,6 @@
 #X obj 155 317 +~;
 #X obj 155 349 +~;
 #X obj 155 376 sqrt~;
-#X obj 271 235 line~;
-#X msg 271 213 \$1 5;
-#X obj 185 233 line~;
-#X msg 185 212 \$1 5;
-#X obj 101 229 line~;
-#X msg 101 207 \$1 5;
 #X obj 547 414 outlet~;
 #X obj 436 414 outlet~;
 #X obj 155 401 outlet~;
@@ -5008,9 +4661,6 @@
 #X obj 86 140 sig~ 0;
 #X obj 170 142 inlet~;
 #X obj 256 150 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 289 166 1084 684 prop________Angs 0;
 #X obj 378 47 inlet~;
 #X obj 461 46 inlet~;
@@ -5100,118 +4750,59 @@
 #X connect 41 0 30 1;
 #X restore 436 379 pd prop________Angs;
 #X obj 418 155 inlet~;
-#X connect 0 0 13 0;
-#X connect 0 0 46 0;
-#X connect 1 0 15 0;
-#X connect 1 0 47 0;
-#X connect 2 0 17 0;
-#X connect 2 0 48 0;
-#X connect 3 0 4 0;
-#X connect 3 0 4 1;
-#X connect 3 0 26 0;
-#X connect 4 0 9 0;
-#X connect 5 0 6 0;
-#X connect 5 0 6 1;
-#X connect 5 0 26 1;
-#X connect 5 0 31 0;
-#X connect 5 0 35 0;
-#X connect 5 0 49 5;
-#X connect 6 0 9 1;
+#X obj 101 229 r~ Xobs;
+#X obj 185 233 r~ Yobs;
+#X obj 271 235 r~ Zobs;
+#X connect 0 0 1 0;
+#X connect 0 0 1 1;
+#X connect 0 0 17 0;
+#X connect 1 0 6 0;
+#X connect 2 0 3 0;
+#X connect 2 0 3 1;
+#X connect 2 0 17 1;
+#X connect 2 0 22 0;
+#X connect 2 0 26 0;
+#X connect 2 0 37 5;
+#X connect 3 0 6 1;
+#X connect 4 0 5 0;
+#X connect 4 0 5 1;
+#X connect 4 0 37 6;
+#X connect 5 0 7 1;
+#X connect 6 0 7 0;
 #X connect 7 0 8 0;
-#X connect 7 0 8 1;
-#X connect 7 0 49 6;
-#X connect 8 0 10 1;
-#X connect 9 0 10 0;
-#X connect 10 0 11 0;
-#X connect 11 0 20 0;
-#X connect 11 0 49 0;
-#X connect 12 0 7 1;
-#X connect 12 0 49 4;
-#X connect 13 0 12 0;
-#X connect 14 0 5 1;
-#X connect 14 0 49 3;
-#X connect 15 0 14 0;
-#X connect 16 0 3 1;
-#X connect 16 0 49 2;
-#X connect 17 0 16 0;
-#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 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 43 0 3 0;
-#X connect 44 0 5 0;
-#X connect 45 0 7 0;
-#X connect 49 0 19 0;
-#X connect 49 1 18 0;
-#X connect 50 0 49 1;
-#X restore 628 257 pd sourcePositions;
-#N canvas 175 426 1061 274 sourceGGSpeed 0;
-#X obj 192 185 outlet~;
-#X text 178 211 Source Speed;
-#X obj 408 79 cos~;
-#X obj 475 76 sin~;
-#X text 262 88 2 PI;
-#X text 259 109 Radius of source;
-#X obj 409 162 outlet~;
-#X obj 479 163 outlet~;
-#X text 330 180 y position of source;
-#X text 477 182 z position of source;
-#X text 732 144 diameter;
-#X text 869 172 radius;
-#X obj 817 169 outlet~;
-#X obj 408 50 inlet~;
-#X obj 48 42 r~ length;
-#X obj 192 39 r~ RPM;
-#X obj 191 63 /~ 60;
-#X obj 192 88 *~ 6.28319;
-#X obj 192 151 *~;
-#X obj 409 135 *~;
-#X obj 479 135 *~;
-#X obj 751 76 sig~ 0.1885;
-#X obj 751 121 outlet~;
-#X obj 48 90 s~ GG2sourceRadius;
-#X obj 207 127 r~ GG2sourceRadius;
-#X obj 428 97 r~ GG2sourceRadius;
-#X obj 494 114 r~ GG2sourceRadius;
-#X obj 816 147 r~ GG2sourceRadius;
-#X obj 48 66 *~ 0.9468;
-#X connect 2 0 19 0;
-#X connect 3 0 20 0;
-#X connect 13 0 2 0;
-#X connect 13 0 3 0;
-#X connect 14 0 28 0;
+#X connect 8 0 11 0;
+#X connect 8 0 37 0;
 #X connect 15 0 16 0;
-#X connect 16 0 17 0;
+#X connect 16 0 27 0;
 #X connect 17 0 18 0;
-#X connect 18 0 0 0;
-#X connect 19 0 6 0;
-#X connect 20 0 7 0;
-#X connect 21 0 22 0;
-#X connect 24 0 18 1;
-#X connect 25 0 19 1;
-#X connect 26 0 20 1;
-#X connect 27 0 12 0;
-#X connect 28 0 23 0;
-#X restore 605 232 pd sourceGGSpeed;
-#X obj 351 -58 *~ 6.2832;
-#X obj 244 -48 *~ 360;
-#N canvas 163 121 1103 599 sourcePositions 0;
-#X obj 271 193 r Zobs;
-#X obj 185 191 r Yobs;
-#X obj 101 183 r Xobs;
+#X connect 18 0 19 0;
+#X connect 19 0 20 0;
+#X connect 20 0 25 0;
+#X connect 20 0 24 1;
+#X connect 21 1 16 0;
+#X connect 22 0 30 0;
+#X connect 23 0 24 0;
+#X connect 24 0 21 0;
+#X connect 25 1 16 0;
+#X connect 26 0 32 0;
+#X connect 29 0 30 0;
+#X connect 30 0 21 1;
+#X connect 31 0 32 0;
+#X connect 32 0 25 1;
+#X connect 34 0 0 0;
+#X connect 35 0 2 0;
+#X connect 36 0 4 0;
+#X connect 37 0 10 0;
+#X connect 37 1 9 0;
+#X connect 38 0 37 1;
+#X connect 39 0 0 1;
+#X connect 39 0 37 2;
+#X connect 40 0 2 1;
+#X connect 40 0 37 3;
+#X connect 41 0 4 1;
+#X connect 41 0 37 4;
+#X restore 133 239 pd sourcePositions;
+#N canvas 223 181 1103 599 sourcePositions 0;
 #X obj 86 252 -~;
 #X obj 86 276 *~;
 #X obj 185 256 -~;
@@ -5221,12 +4812,6 @@
 #X obj 155 317 +~;
 #X obj 155 349 +~;
 #X obj 155 376 sqrt~;
-#X obj 271 235 line~;
-#X msg 271 213 \$1 5;
-#X obj 185 233 line~;
-#X msg 185 212 \$1 5;
-#X obj 101 229 line~;
-#X msg 101 207 \$1 5;
 #X obj 547 414 outlet~;
 #X obj 436 414 outlet~;
 #X obj 155 401 outlet~;
@@ -5255,9 +4840,6 @@
 #X obj 86 140 sig~ 0;
 #X obj 170 142 inlet~;
 #X obj 256 150 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 289 166 1084 684 prop________Angs 0;
 #X obj 378 47 inlet~;
 #X obj 461 46 inlet~;
@@ -5347,197 +4929,342 @@
 #X connect 41 0 30 1;
 #X restore 436 379 pd prop________Angs;
 #X obj 418 155 inlet~;
-#X connect 0 0 13 0;
-#X connect 0 0 46 0;
-#X connect 1 0 15 0;
-#X connect 1 0 47 0;
-#X connect 2 0 17 0;
-#X connect 2 0 48 0;
-#X connect 3 0 4 0;
-#X connect 3 0 4 1;
-#X connect 3 0 26 0;
-#X connect 4 0 9 0;
-#X connect 5 0 6 0;
-#X connect 5 0 6 1;
-#X connect 5 0 26 1;
-#X connect 5 0 31 0;
-#X connect 5 0 35 0;
-#X connect 5 0 49 5;
-#X connect 6 0 9 1;
+#X obj 101 229 r~ Xobs;
+#X obj 185 233 r~ Yobs;
+#X obj 271 235 r~ Zobs;
+#X connect 0 0 1 0;
+#X connect 0 0 1 1;
+#X connect 0 0 17 0;
+#X connect 1 0 6 0;
+#X connect 2 0 3 0;
+#X connect 2 0 3 1;
+#X connect 2 0 17 1;
+#X connect 2 0 22 0;
+#X connect 2 0 26 0;
+#X connect 2 0 37 5;
+#X connect 3 0 6 1;
+#X connect 4 0 5 0;
+#X connect 4 0 5 1;
+#X connect 4 0 37 6;
+#X connect 5 0 7 1;
+#X connect 6 0 7 0;
 #X connect 7 0 8 0;
-#X connect 7 0 8 1;
-#X connect 7 0 49 6;
-#X connect 8 0 10 1;
-#X connect 9 0 10 0;
-#X connect 10 0 11 0;
-#X connect 11 0 20 0;
-#X connect 11 0 49 0;
-#X connect 12 0 7 1;
-#X connect 12 0 49 4;
-#X connect 13 0 12 0;
-#X connect 14 0 5 1;
-#X connect 14 0 49 3;
-#X connect 15 0 14 0;
-#X connect 16 0 3 1;
-#X connect 16 0 49 2;
-#X connect 17 0 16 0;
-#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 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 43 0 3 0;
-#X connect 44 0 5 0;
-#X connect 45 0 7 0;
-#X connect 49 0 19 0;
-#X connect 49 1 18 0;
-#X connect 50 0 49 1;
-#X restore 369 246 pd sourcePositions;
-#X obj 49 205 r myMet;
-#X obj 49 227 snapshot~;
-#X floatatom 49 250 0 0 0 0 - - -;
-#X obj 29 -42 s~ \$0-this2Phasor;
-#X obj 42 35 r~ \$0-this2Phasor;
-#X obj 222 37 r~ \$0-this2Phasor;
-#X obj 425 42 r~ \$0-this2Phasor;
-#X obj 660 41 r~ \$0-this2Phasor;
-#X obj 605 211 r~ \$0-this2Phasor;
-#X obj 345 197 r~ \$0-this2Phasor;
-#X obj 122 189 r~ \$0-this2Phasor;
-#X obj 244 -22 s~ \$0-Prop2Azim;
-#X obj 113 143 r~ \$0-Prop2Azim;
-#X obj 311 123 r~ \$0-Prop2Azim;
-#X obj 521 123 r~ \$0-Prop2Azim;
-#X obj 756 122 r~ \$0-Prop2Azim;
-#X obj 700 288 r~ \$0-Prop2Azim;
-#X obj 441 281 r~ \$0-Prop2Azim;
-#X obj 220 266 r~ \$0-Prop2Azim;
-#X obj 426 145 freqCalcCyl6HiFi;
-#X obj 348 304 freqCalcCyl6HiFi;
-#X obj 607 312 freqCalcCyl6HiFi;
-#X obj 20 168 freqCalcCyl6HiFi;
-#X obj 217 146 freqCalcCyl6HiFi;
-#X obj 662 145 freqCalcCyl6HiFi;
-#X obj 125 290 freqCalcCyl6HiFi;
-#X connect 0 0 40 2;
-#X connect 0 1 40 3;
-#X connect 0 2 40 4;
-#X connect 0 3 40 5;
-#X connect 2 0 40 0;
-#X connect 2 1 0 0;
-#X connect 2 2 0 1;
-#X connect 2 3 40 1;
-#X connect 2 4 0 2;
-#X connect 3 0 16 0;
-#X connect 3 0 21 0;
-#X connect 4 0 41 2;
-#X connect 4 1 41 3;
-#X connect 4 2 41 4;
-#X connect 4 3 41 5;
-#X connect 5 0 41 0;
-#X connect 5 1 4 0;
-#X connect 5 2 4 1;
-#X connect 5 3 41 1;
-#X connect 5 4 4 2;
-#X connect 6 0 37 2;
-#X connect 6 1 37 3;
-#X connect 6 2 37 4;
-#X connect 6 3 37 5;
-#X connect 7 0 37 0;
-#X connect 7 1 6 0;
-#X connect 7 2 6 1;
-#X connect 7 3 37 1;
-#X connect 7 4 6 2;
-#X connect 8 0 42 2;
-#X connect 8 1 42 3;
-#X connect 8 2 42 4;
-#X connect 8 3 42 5;
-#X connect 9 0 42 0;
-#X connect 9 1 8 0;
-#X connect 9 2 8 1;
-#X connect 9 3 42 1;
-#X connect 9 4 8 2;
-#X connect 10 0 43 2;
-#X connect 10 1 43 3;
-#X connect 10 2 43 4;
-#X connect 10 3 43 5;
-#X connect 11 0 43 0;
-#X connect 11 1 10 0;
-#X connect 11 2 10 1;
-#X connect 11 3 43 1;
-#X connect 11 4 10 2;
-#X connect 12 0 38 0;
-#X connect 12 1 17 0;
-#X connect 12 2 17 1;
-#X connect 12 3 38 1;
-#X connect 12 4 17 2;
-#X connect 13 0 39 2;
-#X connect 13 1 39 3;
-#X connect 13 2 39 4;
-#X connect 13 3 39 5;
-#X connect 14 0 39 0;
-#X connect 14 1 13 0;
-#X connect 14 2 13 1;
-#X connect 14 3 39 1;
-#X connect 14 4 13 2;
-#X connect 16 0 29 0;
-#X connect 17 0 38 2;
-#X connect 17 1 38 3;
-#X connect 17 2 38 4;
-#X connect 17 3 38 5;
+#X connect 8 0 11 0;
+#X connect 8 0 37 0;
+#X connect 15 0 16 0;
+#X connect 16 0 27 0;
+#X connect 17 0 18 0;
 #X connect 18 0 19 0;
 #X connect 19 0 20 0;
-#X connect 22 0 2 0;
-#X connect 23 0 5 0;
-#X connect 24 0 7 0;
-#X connect 25 0 9 0;
-#X connect 26 0 14 0;
-#X connect 27 0 12 0;
-#X connect 28 0 11 0;
-#X connect 30 0 40 6;
-#X connect 31 0 41 6;
-#X connect 32 0 37 6;
-#X connect 33 0 42 6;
-#X connect 34 0 39 6;
-#X connect 35 0 38 6;
-#X connect 36 0 43 6;
-#X restore 256 291 pd sources;
+#X connect 20 0 25 0;
+#X connect 20 0 24 1;
+#X connect 21 1 16 0;
+#X connect 22 0 30 0;
+#X connect 23 0 24 0;
+#X connect 24 0 21 0;
+#X connect 25 1 16 0;
+#X connect 26 0 32 0;
+#X connect 29 0 30 0;
+#X connect 30 0 21 1;
+#X connect 31 0 32 0;
+#X connect 32 0 25 1;
+#X connect 34 0 0 0;
+#X connect 35 0 2 0;
+#X connect 36 0 4 0;
+#X connect 37 0 10 0;
+#X connect 37 1 9 0;
+#X connect 38 0 37 1;
+#X connect 39 0 0 1;
+#X connect 39 0 37 2;
+#X connect 40 0 2 1;
+#X connect 40 0 37 3;
+#X connect 41 0 4 1;
+#X connect 41 0 37 4;
+#X restore 358 246 pd sourcePositions;
+#N canvas 223 181 1103 599 sourcePositions 0;
+#X obj 86 252 -~;
+#X obj 86 276 *~;
+#X obj 185 256 -~;
+#X obj 170 283 *~;
+#X obj 256 254 -~;
+#X obj 256 278 *~;
+#X obj 155 317 +~;
+#X obj 155 349 +~;
+#X obj 155 376 sqrt~;
+#X obj 547 414 outlet~;
+#X obj 436 414 outlet~;
+#X obj 155 401 outlet~;
+#X text 150 439 source distance from Observer;
+#X text 362 440 source - Obs Elevation;
+#X text 541 441 source - Obs Azimuth;
+#X obj 831 345 r myMet;
+#X obj 830 370 snapshot~;
+#X obj 738 149 /~;
+#X obj 738 172 atan~;
+#X obj 738 195 /~ 3.14159;
+#X obj 738 219 abs~;
+#X obj 723 285 spigot~;
+#X obj 762 242 >~ 0;
+#X obj 690 230 sig~ 1;
+#X obj 723 262 -~;
+#X obj 858 309 spigot~;
+#X obj 897 265 <~ 0;
+#X obj 830 396 outlet;
+#X text 822 423 Pan Value;
+#X obj 797 242 r myMet;
+#X obj 762 263 snapshot~;
+#X obj 930 264 r myMet;
+#X obj 897 287 snapshot~;
+#X text 171 33 Calculates position of the source.;
+#X obj 86 140 sig~ 0;
+#X obj 170 142 inlet~;
+#X obj 256 150 inlet~;
+#N canvas 289 166 1084 684 prop________Angs 0;
+#X obj 378 47 inlet~;
+#X obj 461 46 inlet~;
+#X obj 568 43 inlet~;
+#X obj -19 34 inlet~;
+#X text -85 13 Source/Obs distance;
+#X text 364 27 Obs x;
+#X text 426 21 Obs y;
+#X text 539 23 Obs z;
+#X obj 736 49 inlet~;
+#X obj 843 46 inlet~;
+#X text 713 23 source - Obs y;
+#X text 815 27 source - Obs z;
+#X obj 736 78 *~;
+#X obj 843 76 *~;
+#X obj 736 109 +~;
+#X obj 736 134 sqrt~;
+#X obj 169 37 inlet~;
+#X text 155 17 Source radius;
+#X obj 461 71 *~;
+#X obj 568 70 *~;
+#X obj 461 103 +~;
+#X text -65 517 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 obj 168 84 *~ 2;
+#X obj 721 178 *~;
+#X obj 781 448 /~;
+#X obj 431 218 +~;
+#X obj 442 251 -~;
+#X text 808 505 Azimuth;
+#X obj 723 550 outlet~;
+#X obj 708 471 sig~ 90;
+#X obj 722 516 -~;
+#X obj 169 62 sqrt~;
+#X obj 393 452 +~;
+#X obj 405 478 -~;
+#X obj 378 75 *~;
+#X obj -3 58 *~;
+#X obj 556 487 *~ 2;
+#X obj 541 511 *~;
+#X obj 526 534 /~;
+#X obj 526 562 arccos~;
+#X obj 554 598 outlet~;
+#X obj 781 473 arccos~;
+#X connect 0 0 34 0;
+#X connect 0 0 34 1;
+#X connect 1 0 18 0;
+#X connect 1 0 18 1;
+#X connect 2 0 19 0;
+#X connect 2 0 19 1;
+#X connect 3 0 35 0;
+#X connect 3 0 35 1;
+#X connect 3 0 37 0;
+#X connect 8 0 12 1;
+#X connect 8 0 12 0;
+#X connect 9 0 13 0;
+#X connect 9 0 13 1;
+#X connect 12 0 14 0;
+#X connect 13 0 14 1;
+#X connect 14 0 15 0;
+#X connect 14 0 25 1;
+#X connect 14 0 32 1;
+#X connect 15 0 23 1;
+#X connect 15 0 36 0;
+#X connect 16 0 25 0;
+#X connect 16 0 31 0;
+#X connect 18 0 20 0;
+#X connect 19 0 20 1;
+#X connect 20 0 26 1;
+#X connect 22 0 23 0;
+#X connect 23 0 24 1;
+#X connect 24 0 41 0;
+#X connect 25 0 26 0;
+#X connect 26 0 24 0;
+#X connect 29 0 30 0;
+#X connect 30 0 28 0;
+#X connect 31 0 22 0;
+#X connect 32 0 33 0;
+#X connect 33 0 38 0;
+#X connect 34 0 33 1;
+#X connect 35 0 32 0;
+#X connect 36 0 37 1;
+#X connect 37 0 38 1;
+#X connect 38 0 39 0;
+#X connect 39 0 40 0;
+#X connect 41 0 30 1;
+#X restore 436 379 pd prop________Angs;
+#X obj 418 155 inlet~;
+#X obj 101 229 r~ Xobs;
+#X obj 185 233 r~ Yobs;
+#X obj 271 235 r~ Zobs;
+#X connect 0 0 1 0;
+#X connect 0 0 1 1;
+#X connect 0 0 17 0;
+#X connect 1 0 6 0;
+#X connect 2 0 3 0;
+#X connect 2 0 3 1;
+#X connect 2 0 17 1;
+#X connect 2 0 22 0;
+#X connect 2 0 26 0;
+#X connect 2 0 37 5;
+#X connect 3 0 6 1;
+#X connect 4 0 5 0;
+#X connect 4 0 5 1;
+#X connect 4 0 37 6;
+#X connect 5 0 7 1;
+#X connect 6 0 7 0;
+#X connect 7 0 8 0;
+#X connect 8 0 11 0;
+#X connect 8 0 37 0;
+#X connect 15 0 16 0;
+#X connect 16 0 27 0;
+#X connect 17 0 18 0;
+#X connect 18 0 19 0;
+#X connect 19 0 20 0;
+#X connect 20 0 25 0;
+#X connect 20 0 24 1;
+#X connect 21 1 16 0;
+#X connect 22 0 30 0;
+#X connect 23 0 24 0;
+#X connect 24 0 21 0;
+#X connect 25 1 16 0;
+#X connect 26 0 32 0;
+#X connect 29 0 30 0;
+#X connect 30 0 21 1;
+#X connect 31 0 32 0;
+#X connect 32 0 25 1;
+#X connect 34 0 0 0;
+#X connect 35 0 2 0;
+#X connect 36 0 4 0;
+#X connect 37 0 10 0;
+#X connect 37 1 9 0;
+#X connect 38 0 37 1;
+#X connect 39 0 0 1;
+#X connect 39 0 37 2;
+#X connect 40 0 2 1;
+#X connect 40 0 37 3;
+#X connect 41 0 4 1;
+#X connect 41 0 37 4;
+#X restore 619 260 pd sourcePositions;
+#X connect 1 0 33 0;
+#X connect 1 1 37 0;
+#X connect 1 2 37 1;
+#X connect 1 3 33 1;
+#X connect 1 4 37 2;
+#X connect 2 0 10 0;
+#X connect 2 0 14 0;
+#X connect 3 0 34 0;
+#X connect 3 1 38 0;
+#X connect 3 2 38 1;
+#X connect 3 3 34 1;
+#X connect 3 4 38 2;
+#X connect 4 0 30 0;
+#X connect 4 1 39 0;
+#X connect 4 2 39 1;
+#X connect 4 3 30 1;
+#X connect 4 4 39 2;
+#X connect 5 0 35 0;
+#X connect 5 1 40 0;
+#X connect 5 2 40 1;
+#X connect 5 3 35 1;
+#X connect 5 4 40 2;
+#X connect 6 0 36 0;
+#X connect 6 1 41 0;
+#X connect 6 2 41 1;
+#X connect 6 3 36 1;
+#X connect 6 4 41 2;
+#X connect 7 0 31 0;
+#X connect 7 1 42 0;
+#X connect 7 2 42 1;
+#X connect 7 3 31 1;
+#X connect 7 4 42 2;
+#X connect 8 0 32 0;
+#X connect 8 1 43 0;
+#X connect 8 2 43 1;
+#X connect 8 3 32 1;
+#X connect 8 4 43 2;
+#X connect 10 0 22 0;
+#X connect 11 0 12 0;
+#X connect 12 0 13 0;
+#X connect 15 0 1 0;
+#X connect 16 0 3 0;
+#X connect 17 0 4 0;
+#X connect 18 0 5 0;
+#X connect 19 0 8 0;
+#X connect 20 0 7 0;
+#X connect 21 0 6 0;
+#X connect 23 0 33 6;
+#X connect 24 0 34 6;
+#X connect 25 0 30 6;
+#X connect 26 0 35 6;
+#X connect 27 0 32 6;
+#X connect 28 0 31 6;
+#X connect 29 0 36 6;
+#X connect 37 0 33 2;
+#X connect 37 1 33 3;
+#X connect 37 2 33 4;
+#X connect 37 3 33 5;
+#X connect 38 0 34 2;
+#X connect 38 1 34 3;
+#X connect 38 2 34 4;
+#X connect 38 3 34 5;
+#X connect 39 0 30 2;
+#X connect 39 1 30 3;
+#X connect 39 2 30 4;
+#X connect 39 3 30 5;
+#X connect 40 0 35 2;
+#X connect 40 1 35 3;
+#X connect 40 2 35 4;
+#X connect 40 3 35 5;
+#X connect 41 0 36 2;
+#X connect 41 1 36 3;
+#X connect 41 2 36 4;
+#X connect 41 3 36 5;
+#X connect 42 0 31 2;
+#X connect 42 1 31 3;
+#X connect 42 2 31 4;
+#X connect 42 3 31 5;
+#X connect 43 0 32 2;
+#X connect 43 1 32 3;
+#X connect 43 2 32 4;
+#X connect 43 3 32 5;
+#X restore 281 133 pd sources;
 #X msg -231 139 5;
 #X msg -75 182 200 5000;
 #X msg -101 167 -100 5000;
-#X obj 138 178 cos~;
-#X obj 177 224 sin~;
-#X obj 23 162 * 100;
-#X obj 164 257 r myMet;
-#X obj 164 279 snapshot~;
-#X floatatom 164 302 0 0 0 0 - - -;
-#X obj -8 223 * 100;
-#X obj 177 199 phasor~ 0.05;
-#X obj 138 158 phasor~ 0.02;
-#X msg 389 219 3e-09;
-#X obj -32 303 sin~;
-#X obj -32 278 phasor~ 0.01;
-#X obj -103 323 r myMet;
-#X obj -103 345 snapshot~;
-#X floatatom -103 368 0 0 0 0 - - -;
-#X obj -29 326 +~ 1.3;
-#X obj -166 325 * 100;
+#X obj -86 16 cos~;
+#X obj -100 113 sin~;
+#X obj -117 277 sin~;
+#X msg 85 375 500;
+#X obj -117 297 -~ 1.3;
+#X msg 389 219 1;
+#X obj -117 258 phasor~ 0.004;
+#X obj -86 -4 phasor~ 0.011;
+#X obj -100 92 phasor~ 0.03;
+#X obj -117 318 *~ 100;
+#X obj -86 36 *~ 100;
+#X obj -100 132 *~ 100;
+#X obj 389 403 line~;
+#X msg 389 383 \$1 30;
+#X obj 389 424 s~ rotBoost;
 #X connect 0 0 1 0;
 #X connect 1 0 51 0;
 #X connect 3 0 4 0;
-#X connect 3 0 89 0;
+#X connect 3 0 87 0;
 #X connect 5 0 6 0;
 #X connect 7 0 8 0;
 #X connect 8 0 5 0;
@@ -5549,11 +5276,11 @@
 #X connect 14 0 15 0;
 #X connect 15 0 10 0;
 #X connect 16 0 19 0;
-#X connect 16 0 101 0;
+#X connect 16 0 99 0;
 #X connect 17 0 20 0;
-#X connect 17 0 98 0;
+#X connect 17 0 96 0;
 #X connect 18 0 21 0;
-#X connect 18 0 95 0;
+#X connect 18 0 93 0;
 #X connect 22 0 16 0;
 #X connect 23 0 16 0;
 #X connect 24 0 17 0;
@@ -5561,96 +5288,88 @@
 #X connect 26 0 16 0;
 #X connect 27 0 17 0;
 #X connect 28 0 18 0;
-#X connect 32 0 54 0;
+#X connect 32 0 123 0;
 #X connect 33 0 29 0;
 #X connect 33 1 30 0;
 #X connect 34 0 33 0;
-#X connect 34 0 56 0;
+#X connect 34 0 55 0;
 #X connect 35 0 34 0;
 #X connect 37 0 38 0;
-#X connect 37 0 92 0;
+#X connect 37 0 90 0;
 #X connect 39 0 37 0;
 #X connect 40 0 37 0;
 #X connect 44 0 11 0;
 #X connect 45 0 10 0;
-#X connect 46 0 85 0;
-#X connect 47 0 69 0;
-#X connect 48 0 71 0;
-#X connect 49 0 82 0;
+#X connect 46 0 83 0;
+#X connect 47 0 67 0;
+#X connect 48 0 69 0;
+#X connect 49 0 80 0;
 #X connect 50 0 52 0;
 #X connect 51 0 2 0;
 #X connect 52 0 3 0;
-#X connect 54 0 34 0;
-#X connect 57 0 73 0;
-#X connect 58 0 37 0;
+#X connect 53 0 106 0;
+#X connect 56 0 71 0;
+#X connect 57 0 37 0;
+#X connect 58 0 59 0;
 #X connect 59 0 60 0;
-#X connect 60 0 61 0;
-#X connect 60 0 63 0;
-#X connect 62 0 64 0;
-#X connect 63 0 62 0;
-#X connect 65 0 59 0;
-#X connect 66 0 67 0;
-#X connect 66 0 68 0;
-#X connect 69 0 16 0;
-#X connect 70 0 84 0;
-#X connect 71 0 18 0;
-#X connect 72 0 16 0;
-#X connect 74 0 76 0;
-#X connect 74 0 78 0;
-#X connect 75 0 77 0;
-#X connect 76 0 75 0;
-#X connect 79 0 74 0;
-#X connect 80 0 103 0;
-#X connect 81 0 74 0;
-#X connect 82 0 37 0;
-#X connect 83 0 3 0;
-#X connect 84 0 66 0;
+#X connect 59 0 62 0;
+#X connect 61 0 63 0;
+#X connect 62 0 61 0;
+#X connect 64 0 58 0;
+#X connect 65 0 66 0;
+#X connect 65 0 133 0;
+#X connect 67 0 16 0;
+#X connect 68 0 82 0;
+#X connect 69 0 18 0;
+#X connect 70 0 16 0;
+#X connect 72 0 74 0;
+#X connect 72 0 76 0;
+#X connect 73 0 75 0;
+#X connect 74 0 73 0;
+#X connect 77 0 72 0;
+#X connect 78 0 101 0;
+#X connect 79 0 72 0;
+#X connect 80 0 37 0;
+#X connect 81 0 3 0;
+#X connect 82 0 65 0;
+#X connect 83 0 17 0;
+#X connect 84 0 16 0;
 #X connect 85 0 17 0;
-#X connect 86 0 16 0;
-#X connect 87 0 17 0;
-#X connect 88 0 90 0;
-#X connect 89 0 88 0;
-#X connect 91 0 93 0;
-#X connect 92 0 91 0;
-#X connect 94 0 96 0;
-#X connect 95 0 94 0;
-#X connect 97 0 99 0;
-#X connect 98 0 97 0;
-#X connect 100 0 102 0;
-#X connect 101 0 100 0;
-#X connect 105 0 107 0;
+#X connect 86 0 88 0;
+#X connect 87 0 86 0;
+#X connect 89 0 91 0;
+#X connect 90 0 89 0;
+#X connect 93 0 92 0;
+#X connect 96 0 95 0;
+#X connect 99 0 98 0;
+#X connect 103 0 105 0;
+#X connect 103 0 102 0;
+#X connect 104 0 116 0;
 #X connect 105 0 104 0;
-#X connect 106 0 121 0;
-#X connect 107 0 106 0;
+#X connect 106 0 3 0;
+#X connect 107 0 108 0;
+#X connect 108 0 103 0;
 #X connect 109 0 110 0;
-#X connect 110 0 105 0;
-#X connect 111 0 112 0;
-#X connect 112 0 113 0;
-#X connect 112 0 127 0;
-#X connect 114 0 115 0;
-#X connect 114 0 118 0;
-#X connect 116 0 134 0;
-#X connect 117 0 119 0;
-#X connect 118 0 117 0;
-#X connect 120 0 18 0;
-#X connect 122 0 17 0;
-#X connect 123 0 87 0;
-#X connect 124 0 87 0;
-#X connect 125 0 112 0;
-#X connect 126 0 129 0;
-#X connect 127 0 16 0;
-#X connect 128 0 129 0;
-#X connect 129 0 130 0;
-#X connect 129 0 131 0;
-#X connect 131 0 17 0;
-#X connect 132 0 126 0;
-#X connect 133 0 125 0;
-#X connect 134 0 114 0;
-#X connect 135 0 140 0;
-#X connect 136 0 135 0;
-#X connect 137 0 138 0;
-#X connect 138 0 139 0;
-#X connect 138 0 141 0;
-#X connect 140 0 138 0;
-#X connect 141 0 18 0;
+#X connect 109 0 113 0;
+#X connect 111 0 125 0;
+#X connect 112 0 114 0;
+#X connect 113 0 112 0;
+#X connect 115 0 18 0;
+#X connect 117 0 17 0;
+#X connect 118 0 85 0;
+#X connect 119 0 85 0;
+#X connect 120 0 130 0;
+#X connect 121 0 131 0;
+#X connect 122 0 124 0;
+#X connect 123 0 34 0;
+#X connect 124 0 129 0;
+#X connect 125 0 109 0;
+#X connect 126 0 122 0;
+#X connect 127 0 120 0;
+#X connect 128 0 121 0;
+#X connect 129 0 94 0;
+#X connect 130 0 100 0;
+#X connect 131 0 97 0;
+#X connect 132 0 134 0;
+#X connect 133 0 132 0;
 #X coords 0 -1 1 1 150 200 2 50 400;
--- a/Propellor/freqCalcCyl6HiFi.pd	Sat Sep 17 16:43:59 2016 +0100
+++ b/Propellor/freqCalcCyl6HiFi.pd	Sat Sep 17 18:33:01 2016 +0100
@@ -1,4 +1,4 @@
-#N canvas 0 22 1227 739 10;
+#N canvas 650 42 1227 739 10;
 #X text 597 188 Mass Density of Air;
 #X obj 719 189 *~ 1.225;
 #X obj 719 264 /~ 1.81e-05;
@@ -327,7 +327,7 @@
 #X restore 719 414 pd doppler;
 #X obj 430 82 s~ \$0-elev;
 #X obj 504 82 s~ \$0-azim;
-#N canvas 425 226 1238 721 GoldfreqGain 0;
+#N canvas 352 152 1238 721 GoldfreqGain 0;
 #N canvas 759 125 172 246 pow6 0;
 #X obj 47 67 *~;
 #X obj 76 67 *~;
@@ -453,9 +453,9 @@
 #X connect 14 0 17 0;
 #X connect 16 0 5 0;
 #X restore 268 15 pd aveTimeCal;
-#X obj 219 59 average~ 1000;
-#X obj 219 122 line~;
-#X msg 219 100 \$1 5;
+#X obj 242 58 average~ 1000;
+#X obj 242 122 line~;
+#X msg 242 100 \$1 5;
 #X obj 219 317 /~ 400;
 #X text -53 316 Scale factor to bring in line with CFD calcs;
 #X obj 567 29 inlet~;
@@ -481,7 +481,7 @@
 #X obj 476 410 r myMet;
 #X obj 476 432 snapshot~;
 #X floatatom 476 455 0 0 0 0 - - -;
-#X floatatom 250 84 0 0 0 0 - - -;
+#X floatatom 273 83 0 0 0 0 - - -;
 #X obj 406 564 r myMet;
 #X obj 406 586 snapshot~;
 #X floatatom 406 609 0 0 0 0 - - -;
@@ -744,7 +744,7 @@
 #X obj -20807 286 inlet~;
 #X obj -20789 393 inlet~;
 #X obj -20861 444 *~;
-#X obj -20861 595 *~ 0.001;
+#X obj -20861 595 *~ 1e-05;
 #X connect 2 0 34 1;
 #X connect 3 0 39 0;
 #X connect 3 0 2 0;
@@ -817,7 +817,6 @@
 #X connect 3 0 2 0;
 #X connect 4 0 92 0;
 #X connect 8 0 3 1;
-#X connect 10 0 24 0;
 #X connect 12 0 44 0;
 #X connect 24 0 22 0;
 #X connect 24 1 23 0;
@@ -843,11 +842,11 @@
 #X connect 54 0 42 1;
 #X connect 55 0 54 0;
 #X connect 57 0 60 0;
+#X connect 57 0 81 0;
 #X connect 58 0 76 0;
 #X connect 59 0 77 0;
 #X connect 61 0 62 0;
 #X connect 61 0 71 0;
-#X connect 61 0 81 0;
 #X connect 62 0 63 0;
 #X connect 64 0 78 5;
 #X connect 65 0 78 6;