# HG changeset patch
# User Rod Selfridge <r.selfridge@qmul.ac.uk>
# Date 1435435126 -3600
# Node ID 93856d88950542ca2e061c69f6b7d05df64efa38
# Parent  c21ae30cfdbbf699a75c889649b6b69532950d3d
Cylinder model updated. Arccos object created.

diff -r c21ae30cfdbb -r 93856d889505 .DS_Store
Binary file .DS_Store has changed
diff -r c21ae30cfdbb -r 93856d889505 June/.DS_Store
Binary file June/.DS_Store has changed
diff -r c21ae30cfdbb -r 93856d889505 June/Gen2_D7.pd
--- a/June/Gen2_D7.pd	Fri Jun 26 17:38:23 2015 +0100
+++ b/June/Gen2_D7.pd	Sat Jun 27 20:58:46 2015 +0100
@@ -1,4 +1,4 @@
-#N canvas 129 76 1321 763 10;
+#N canvas 118 111 1321 763 10;
 #X declare -lib mrpeach;
 #N canvas 236 158 426 423 windspeed 0;
 #X obj 3 -19 +~ 1;
@@ -85,12 +85,12 @@
 #X obj 54 475 vu 15 120 empty empty -1 -8 0 10 -66577 -1 1 0;
 #X obj 117 475 vu 15 120 empty empty -1 -8 0 10 -66577 -1 1 0;
 #X obj 208 475 vsl 15 128 0 127 0 0 empty empty empty 0 -9 0 10 -262144
--1 -1 10700 1;
+-1 -1 500 1;
 #X text 237 494 Gain;
 #X obj 208 411 loadbang;
 #X obj 260 78 delwrite~ varwind 3000;
 #X obj 343 -114 hsl 128 15 0 50 0 0 empty empty empty -2 -8 0 10 -262144
--1 -1 3170 1;
+-1 -1 1270 1;
 #X obj 303 -11 snapshot~;
 #X obj 303 -36 metro 100;
 #X obj 303 -58 tgl 15 0 empty empty empty 17 7 0 10 -262144 -1 -1 1
@@ -146,7 +146,7 @@
 #X floatatom 982 -54 5 0 0 0 - - -;
 #X obj 683 -101 udpreceive 9000;
 #X obj 683 -74 unpackOSC;
-#N canvas 1099 641 205 101 Fence 1;
+#N canvas 1099 641 205 101 Fence 0;
 #N canvas 90 23 1345 580 Posts 0;
 #X obj 78 40 bng 15 250 50 0 empty empty empty 17 7 0 10 -262144 -1
 -1;
@@ -1072,15 +1072,15 @@
 #X connect 101 0 27 0;
 #X connect 102 0 0 0;
 #X restore 42 36 pd Posts;
-#N canvas 271 23 769 794 Wires 1;
-#X floatatom -579 232 8 0 0 0 - - -;
-#X msg -584 115 300;
-#X obj -584 33 loadbang;
-#X obj -558 58 r WirLX;
-#X obj -548 97 r WirX;
-#X obj -494 139 r WirZ;
-#X obj -521 118 r WirY;
-#X obj -467 160 r WirLY;
+#N canvas 162 33 1084 775 Wires 1;
+#X floatatom -581 327 8 0 0 0 - - -;
+#X msg -581 37 300;
+#X obj -581 12 loadbang;
+#X obj -566 60 r WirLX;
+#X obj -551 80 r WirX;
+#X obj -534 121 r WirZ;
+#X obj -543 101 r WirY;
+#X obj -526 141 r WirLY;
 #X floatatom -395 236 8 0 0 0 - - -;
 #X msg -400 119 300;
 #X obj -400 37 loadbang;
@@ -1097,180 +1097,190 @@
 #X obj -136 132 r Wir2Y;
 #X obj -109 153 r Wir2Z;
 #X obj -82 174 r Wir2LY;
-#X floatatom -579 475 8 0 0 0 - - -;
-#X msg -584 358 300;
-#X obj -584 276 loadbang;
-#X obj -558 301 r Wir3LX;
-#X obj -537 340 r Wir3X;
-#X obj -510 361 r Wir3Y;
-#X obj -483 382 r Wir3Z;
-#X obj -456 403 r Wir3LY;
-#X floatatom -387 475 8 0 0 0 - - -;
-#X msg -392 358 300;
-#X obj -392 276 loadbang;
-#X obj -366 301 r Wir4LX;
-#X obj -345 340 r Wir4X;
-#X obj -318 361 r Wir4Y;
-#X obj -291 382 r Wir4Z;
-#X obj -264 403 r Wir4LY;
-#X floatatom -199 483 8 0 0 0 - - -;
-#X msg -204 366 300;
-#X obj -204 284 loadbang;
-#X obj -178 309 r Wir5LX;
-#X obj -157 348 r Wir5X;
-#X obj -130 369 r Wir5Y;
-#X obj -103 390 r Wir5Z;
-#X obj -76 411 r Wir5LY;
-#X floatatom -580 712 8 0 0 0 - - -;
-#X msg -585 595 300;
-#X obj -585 513 loadbang;
-#X obj -559 538 r Wir6LX;
-#X obj -538 577 r Wir6X;
-#X obj -511 598 r Wir6Y;
-#X obj -484 619 r Wir6Z;
-#X obj -457 640 r Wir6LY;
-#X floatatom -392 711 8 0 0 0 - - -;
-#X msg -397 594 300;
-#X obj -397 512 loadbang;
-#X obj -371 537 r Wir7LX;
-#X obj -350 576 r Wir7X;
-#X obj -323 597 r Wir7Y;
-#X obj -296 618 r Wir7Z;
-#X obj -269 639 r Wir7LY;
-#X floatatom -194 710 8 0 0 0 - - -;
-#X msg -199 593 300;
-#X obj -199 511 loadbang;
-#X obj -173 536 r Wir8LX;
-#X obj -152 575 r Wir8X;
-#X obj -125 596 r Wir8Y;
-#X obj -98 617 r Wir8Z;
-#X obj -71 638 r Wir8LY;
-#X obj -553 178 wirePosition;
-#X obj -174 194 wirePosition;
-#X obj -537 423 wirePosition;
-#X obj -364 186 wirePosition;
-#X obj -345 423 wirePosition;
-#X obj -162 426 wirePosition;
-#X obj -157 655 wirePosition;
-#X obj -360 653 wirePosition;
-#X obj -541 653 wirePosition;
-#X obj -579 207 freqCalcCylD4;
+#X floatatom 26 240 8 0 0 0 - - -;
+#X msg 21 123 300;
+#X obj 21 41 loadbang;
+#X obj 47 66 r Wir3LX;
+#X obj 68 105 r Wir3X;
+#X obj 95 126 r Wir3Y;
+#X obj 122 147 r Wir3Z;
+#X obj 149 168 r Wir3LY;
+#X floatatom 218 240 8 0 0 0 - - -;
+#X msg 213 123 300;
+#X obj 213 41 loadbang;
+#X obj 239 66 r Wir4LX;
+#X obj 260 105 r Wir4X;
+#X obj 287 126 r Wir4Y;
+#X obj 314 147 r Wir4Z;
+#X obj 341 168 r Wir4LY;
+#X floatatom -529 656 8 0 0 0 - - -;
+#X msg -534 539 300;
+#X obj -534 457 loadbang;
+#X obj -508 482 r Wir5LX;
+#X obj -487 521 r Wir5X;
+#X obj -460 542 r Wir5Y;
+#X obj -433 563 r Wir5Z;
+#X obj -406 584 r Wir5LY;
+#X floatatom -334 670 8 0 0 0 - - -;
+#X msg -339 553 300;
+#X obj -339 471 loadbang;
+#X obj -313 496 r Wir6LX;
+#X obj -292 535 r Wir6X;
+#X obj -265 556 r Wir6Y;
+#X obj -238 577 r Wir6Z;
+#X obj -211 598 r Wir6LY;
+#X floatatom -146 669 8 0 0 0 - - -;
+#X msg -151 552 300;
+#X obj -151 470 loadbang;
+#X obj -125 495 r Wir7LX;
+#X obj -104 534 r Wir7X;
+#X obj -77 555 r Wir7Y;
+#X obj -50 576 r Wir7Z;
+#X obj -23 597 r Wir7LY;
+#X floatatom 52 668 8 0 0 0 - - -;
+#X msg 47 551 300;
+#X obj 47 469 loadbang;
+#X obj 73 494 r Wir8LX;
+#X obj 94 533 r Wir8X;
+#X obj 121 554 r Wir8Y;
+#X obj 148 575 r Wir8Z;
+#X obj 160 593 r Wir8LY;
+#X obj -551 270 wirePosition;
+#X obj -581 302 freqCalcCylD4;
 #X obj -395 213 freqCalcCylD4;
 #X obj -205 221 freqCalcCylD4;
-#X obj -199 458 freqCalcCylD4;
-#X obj -387 453 freqCalcCylD4;
-#X obj -579 452 freqCalcCylD4;
-#X obj -579 689 freqCalcCylD4;
-#X obj -392 686 freqCalcCylD4;
-#X obj -194 688 freqCalcCylD4;
-#X connect 1 0 81 0;
+#X obj -529 631 freqCalcCylD4;
+#X obj 218 218 freqCalcCylD4;
+#X obj 26 217 freqCalcCylD4;
+#X obj -333 647 freqCalcCylD4;
+#X obj -146 644 freqCalcCylD4;
+#X obj 52 646 freqCalcCylD4;
+#X obj -508 181 r WirLZ;
+#X obj -517 160 r WirLX;
+#X obj -482 242 r WirRZ;
+#X obj -491 221 r WirRX;
+#X obj -500 202 r WirRY;
+#X obj -174 194 wirePosition;
+#X obj 68 188 wirePosition;
+#X obj -364 186 wirePosition;
+#X obj 260 188 wirePosition;
+#X obj -492 599 wirePosition;
+#X obj 89 613 wirePosition;
+#X obj -114 611 wirePosition;
+#X obj -295 611 wirePosition;
+#X connect 1 0 73 0;
 #X connect 2 0 1 0;
-#X connect 3 0 81 1;
+#X connect 3 0 73 1;
 #X connect 4 0 72 0;
 #X connect 5 0 72 2;
 #X connect 6 0 72 1;
 #X connect 7 0 72 3;
-#X connect 9 0 82 0;
+#X connect 9 0 74 0;
 #X connect 10 0 9 0;
-#X connect 11 0 82 1;
-#X connect 12 0 75 0;
-#X connect 13 0 75 1;
-#X connect 14 0 75 2;
-#X connect 15 0 75 3;
-#X connect 17 0 83 0;
+#X connect 11 0 74 1;
+#X connect 12 0 89 0;
+#X connect 13 0 89 1;
+#X connect 14 0 89 2;
+#X connect 15 0 89 3;
+#X connect 17 0 75 0;
 #X connect 18 0 17 0;
-#X connect 19 0 83 1;
-#X connect 20 0 73 0;
-#X connect 21 0 73 1;
-#X connect 22 0 73 2;
-#X connect 23 0 73 3;
-#X connect 25 0 86 0;
+#X connect 19 0 75 1;
+#X connect 20 0 87 0;
+#X connect 21 0 87 1;
+#X connect 22 0 87 2;
+#X connect 23 0 87 3;
+#X connect 25 0 78 0;
 #X connect 26 0 25 0;
-#X connect 27 0 86 1;
-#X connect 28 0 74 0;
-#X connect 29 0 74 1;
-#X connect 30 0 74 2;
-#X connect 31 0 74 3;
-#X connect 33 0 85 0;
+#X connect 27 0 78 1;
+#X connect 28 0 88 0;
+#X connect 29 0 88 1;
+#X connect 30 0 88 2;
+#X connect 31 0 88 3;
+#X connect 33 0 77 0;
 #X connect 34 0 33 0;
-#X connect 35 0 85 1;
-#X connect 36 0 76 0;
-#X connect 37 0 76 1;
-#X connect 38 0 76 2;
-#X connect 39 0 76 3;
-#X connect 41 0 84 0;
+#X connect 35 0 77 1;
+#X connect 36 0 90 0;
+#X connect 37 0 90 1;
+#X connect 38 0 90 2;
+#X connect 39 0 90 3;
+#X connect 41 0 76 0;
 #X connect 42 0 41 0;
-#X connect 43 0 84 1;
-#X connect 44 0 77 0;
-#X connect 45 0 77 1;
-#X connect 46 0 77 2;
-#X connect 47 0 77 3;
-#X connect 49 0 87 0;
+#X connect 43 0 76 1;
+#X connect 44 0 91 0;
+#X connect 45 0 91 1;
+#X connect 46 0 91 2;
+#X connect 47 0 91 3;
+#X connect 49 0 79 0;
 #X connect 50 0 49 0;
-#X connect 51 0 87 1;
-#X connect 52 0 80 0;
-#X connect 53 0 80 1;
-#X connect 54 0 80 2;
-#X connect 55 0 80 3;
-#X connect 57 0 88 0;
+#X connect 51 0 79 1;
+#X connect 52 0 94 0;
+#X connect 53 0 94 1;
+#X connect 54 0 94 2;
+#X connect 55 0 94 3;
+#X connect 57 0 80 0;
 #X connect 58 0 57 0;
-#X connect 59 0 88 1;
-#X connect 60 0 79 0;
-#X connect 61 0 79 1;
-#X connect 62 0 79 2;
-#X connect 63 0 79 3;
-#X connect 65 0 89 0;
+#X connect 59 0 80 1;
+#X connect 60 0 93 0;
+#X connect 61 0 93 1;
+#X connect 62 0 93 2;
+#X connect 63 0 93 3;
+#X connect 65 0 81 0;
 #X connect 66 0 65 0;
-#X connect 67 0 89 1;
-#X connect 68 0 78 0;
-#X connect 69 0 78 1;
-#X connect 70 0 78 2;
-#X connect 71 0 78 3;
-#X connect 72 0 81 4;
-#X connect 72 1 81 5;
-#X connect 72 2 81 3;
-#X connect 72 3 81 2;
-#X connect 73 0 83 4;
-#X connect 73 1 83 5;
-#X connect 73 2 83 3;
-#X connect 73 3 83 2;
-#X connect 74 0 86 4;
-#X connect 74 1 86 5;
-#X connect 74 2 86 3;
-#X connect 74 3 86 2;
-#X connect 75 0 82 4;
-#X connect 75 1 82 5;
-#X connect 75 2 82 3;
-#X connect 75 3 82 2;
-#X connect 76 0 85 4;
-#X connect 76 1 85 5;
-#X connect 76 2 85 3;
-#X connect 76 3 85 2;
-#X connect 77 0 84 4;
-#X connect 77 1 84 5;
-#X connect 77 2 84 3;
-#X connect 77 3 84 2;
-#X connect 78 0 89 4;
-#X connect 78 1 89 5;
-#X connect 78 2 89 3;
-#X connect 78 3 89 2;
-#X connect 79 0 88 4;
-#X connect 79 1 88 5;
-#X connect 79 2 88 3;
-#X connect 79 3 88 2;
-#X connect 80 0 87 4;
-#X connect 80 1 87 5;
-#X connect 80 2 87 3;
-#X connect 80 3 87 2;
-#X connect 81 0 0 0;
-#X connect 82 0 8 0;
-#X connect 83 0 16 0;
-#X connect 84 0 40 0;
-#X connect 85 0 32 0;
-#X connect 86 0 24 0;
-#X connect 87 0 48 0;
-#X connect 88 0 56 0;
-#X connect 89 0 64 0;
+#X connect 67 0 81 1;
+#X connect 68 0 92 0;
+#X connect 69 0 92 1;
+#X connect 70 0 92 2;
+#X connect 71 0 92 3;
+#X connect 72 0 73 4;
+#X connect 72 1 73 5;
+#X connect 72 2 73 3;
+#X connect 72 3 73 2;
+#X connect 73 0 0 0;
+#X connect 74 0 8 0;
+#X connect 75 0 16 0;
+#X connect 76 0 40 0;
+#X connect 77 0 32 0;
+#X connect 78 0 24 0;
+#X connect 79 0 48 0;
+#X connect 80 0 56 0;
+#X connect 81 0 64 0;
+#X connect 82 0 72 5;
+#X connect 83 0 72 4;
+#X connect 84 0 72 8;
+#X connect 85 0 72 7;
+#X connect 86 0 72 6;
+#X connect 87 0 75 4;
+#X connect 87 1 75 5;
+#X connect 87 2 75 3;
+#X connect 87 3 75 2;
+#X connect 88 0 78 4;
+#X connect 88 1 78 5;
+#X connect 88 2 78 3;
+#X connect 88 3 78 2;
+#X connect 89 0 74 4;
+#X connect 89 1 74 5;
+#X connect 89 2 74 3;
+#X connect 89 3 74 2;
+#X connect 90 0 77 4;
+#X connect 90 1 77 5;
+#X connect 90 2 77 3;
+#X connect 90 3 77 2;
+#X connect 91 0 76 4;
+#X connect 91 1 76 5;
+#X connect 91 2 76 3;
+#X connect 91 3 76 2;
+#X connect 92 0 81 4;
+#X connect 92 1 81 5;
+#X connect 92 2 81 3;
+#X connect 92 3 81 2;
+#X connect 93 0 80 4;
+#X connect 93 1 80 5;
+#X connect 93 2 80 3;
+#X connect 93 3 80 2;
+#X connect 94 0 79 4;
+#X connect 94 1 79 5;
+#X connect 94 2 79 3;
+#X connect 94 3 79 2;
 #X restore 110 36 pd Wires;
 #X restore 903 78 pd Fence;
 #N canvas 126 27 1258 808 OSC_FenceValues 0;
@@ -1863,8 +1873,116 @@
 #X obj 230 679 OSCroute /wire8LY;
 #X obj 232 625 s Wir7LY;
 #X obj 230 703 s Wir8LY;
-#X text 861 361 Obtains the X -Y- Z position and scale of the wires
+#X text 437 748 Obtains the X -Y- Z position and scale of the wires
 (fence);
+#X floatatom 925 70 7 0 0 0 - - -;
+#X floatatom 1050 72 7 0 0 0 - - -;
+#X obj 987 26 r \$0_MyOsc;
+#X obj 862 27 r \$0_MyOsc;
+#X floatatom 1164 72 7 0 0 0 - - -;
+#X obj 1101 26 r \$0_MyOsc;
+#X floatatom 927 145 7 0 0 0 - - -;
+#X floatatom 1052 147 7 0 0 0 - - -;
+#X obj 989 101 r \$0_MyOsc;
+#X obj 864 102 r \$0_MyOsc;
+#X floatatom 1166 147 7 0 0 0 - - -;
+#X obj 1103 101 r \$0_MyOsc;
+#X floatatom 923 221 7 0 0 0 - - -;
+#X floatatom 1048 223 7 0 0 0 - - -;
+#X obj 985 177 r \$0_MyOsc;
+#X obj 860 178 r \$0_MyOsc;
+#X floatatom 1162 223 7 0 0 0 - - -;
+#X obj 1099 177 r \$0_MyOsc;
+#X floatatom 925 300 7 0 0 0 - - -;
+#X floatatom 1050 302 7 0 0 0 - - -;
+#X obj 987 256 r \$0_MyOsc;
+#X obj 862 257 r \$0_MyOsc;
+#X floatatom 1164 302 7 0 0 0 - - -;
+#X obj 1101 256 r \$0_MyOsc;
+#X floatatom 923 378 7 0 0 0 - - -;
+#X floatatom 1048 380 7 0 0 0 - - -;
+#X obj 985 334 r \$0_MyOsc;
+#X obj 860 335 r \$0_MyOsc;
+#X floatatom 1162 380 7 0 0 0 - - -;
+#X obj 1099 334 r \$0_MyOsc;
+#X floatatom 916 461 7 0 0 0 - - -;
+#X floatatom 1041 463 7 0 0 0 - - -;
+#X obj 978 417 r \$0_MyOsc;
+#X obj 853 418 r \$0_MyOsc;
+#X floatatom 1155 463 7 0 0 0 - - -;
+#X obj 1092 417 r \$0_MyOsc;
+#X floatatom 914 542 7 0 0 0 - - -;
+#X floatatom 1039 544 7 0 0 0 - - -;
+#X obj 976 498 r \$0_MyOsc;
+#X obj 851 499 r \$0_MyOsc;
+#X floatatom 1153 544 7 0 0 0 - - -;
+#X obj 1090 498 r \$0_MyOsc;
+#X floatatom 916 621 7 0 0 0 - - -;
+#X floatatom 1041 623 7 0 0 0 - - -;
+#X obj 978 577 r \$0_MyOsc;
+#X obj 853 578 r \$0_MyOsc;
+#X floatatom 1155 623 7 0 0 0 - - -;
+#X obj 1092 577 r \$0_MyOsc;
+#X floatatom 914 699 7 0 0 0 - - -;
+#X floatatom 1039 701 7 0 0 0 - - -;
+#X obj 976 655 r \$0_MyOsc;
+#X obj 851 656 r \$0_MyOsc;
+#X floatatom 1153 701 7 0 0 0 - - -;
+#X obj 1090 655 r \$0_MyOsc;
+#X obj 862 48 OSCroute /wireRZ;
+#X obj 862 70 s WirRZ;
+#X obj 987 48 OSCroute /wireRX;
+#X obj 987 72 s WirRX;
+#X obj 1101 48 OSCroute /wireRY;
+#X obj 1101 72 s WirRY;
+#X obj 1103 123 OSCroute /wire1RY;
+#X obj 1103 147 s Wir1RY;
+#X obj 989 147 s Wir1RX;
+#X obj 989 123 OSCroute /wire1RX;
+#X obj 864 123 OSCroute /wire1RZ;
+#X obj 864 145 s Wir1RZ;
+#X obj 860 199 OSCroute /wire2RZ;
+#X obj 860 221 s Wir2RZ;
+#X obj 985 223 s Wir2RX;
+#X obj 985 199 OSCroute /wire2RX;
+#X obj 1099 199 OSCroute /wire2RY;
+#X obj 1099 223 s Wir2RY;
+#X obj 1101 278 OSCroute /wire3RY;
+#X obj 1101 302 s Wir3RY;
+#X obj 987 302 s Wir3RX;
+#X obj 987 278 OSCroute /wire3RX;
+#X obj 862 278 OSCroute /wire3RZ;
+#X obj 862 300 s Wir3RZ;
+#X obj 860 356 OSCroute /wire4RZ;
+#X obj 860 378 s Wir4RZ;
+#X obj 985 356 OSCroute /wire4RX;
+#X obj 985 380 s Wir4RX;
+#X obj 1099 356 OSCroute /wire4RY;
+#X obj 1099 380 s Wir4RY;
+#X obj 1092 439 OSCroute /wire5RY;
+#X obj 1092 463 s Wir5RY;
+#X obj 978 463 s Wir5RX;
+#X obj 978 439 OSCroute /wire5RX;
+#X obj 853 439 OSCroute /wire5RZ;
+#X obj 853 461 s Wir5RZ;
+#X obj 851 520 OSCroute /wire6RZ;
+#X obj 851 542 s Wir6RZ;
+#X obj 976 520 OSCroute /wire6RX;
+#X obj 976 544 s Wir6RX;
+#X obj 1090 520 OSCroute /wire6RY;
+#X obj 1090 544 s Wir6RY;
+#X obj 1092 599 OSCroute /wire7RY;
+#X obj 1092 623 s Wir7RY;
+#X obj 978 623 s Wir7RX;
+#X obj 978 599 OSCroute /wire7RX;
+#X obj 853 599 OSCroute /wire7RZ;
+#X obj 853 621 s Wir7RZ;
+#X obj 851 676 OSCroute /wire8RZ;
+#X obj 851 699 s Wir8RZ;
+#X obj 976 677 OSCroute /wire8RX;
+#X obj 976 701 s Wir8RX;
+#X obj 1090 677 OSCroute /wire8RY;
+#X obj 1090 701 s Wir8RSY;
 #X connect 0 0 1 0;
 #X connect 6 0 11 0;
 #X connect 7 0 10 0;
@@ -2028,6 +2146,87 @@
 #X connect 214 0 216 0;
 #X connect 215 0 198 0;
 #X connect 215 0 217 0;
+#X connect 221 0 275 0;
+#X connect 222 0 273 0;
+#X connect 224 0 277 0;
+#X connect 227 0 282 0;
+#X connect 228 0 283 0;
+#X connect 230 0 279 0;
+#X connect 233 0 288 0;
+#X connect 234 0 285 0;
+#X connect 236 0 289 0;
+#X connect 239 0 294 0;
+#X connect 240 0 295 0;
+#X connect 242 0 291 0;
+#X connect 245 0 299 0;
+#X connect 246 0 297 0;
+#X connect 248 0 301 0;
+#X connect 251 0 306 0;
+#X connect 252 0 307 0;
+#X connect 254 0 303 0;
+#X connect 257 0 311 0;
+#X connect 258 0 309 0;
+#X connect 260 0 313 0;
+#X connect 263 0 318 0;
+#X connect 264 0 319 0;
+#X connect 266 0 315 0;
+#X connect 269 0 323 0;
+#X connect 270 0 321 0;
+#X connect 272 0 325 0;
+#X connect 273 0 219 0;
+#X connect 273 0 274 0;
+#X connect 275 0 220 0;
+#X connect 275 0 276 0;
+#X connect 277 0 223 0;
+#X connect 277 0 278 0;
+#X connect 279 0 229 0;
+#X connect 279 0 280 0;
+#X connect 282 0 226 0;
+#X connect 282 0 281 0;
+#X connect 283 0 225 0;
+#X connect 283 0 284 0;
+#X connect 285 0 231 0;
+#X connect 285 0 286 0;
+#X connect 288 0 232 0;
+#X connect 288 0 287 0;
+#X connect 289 0 235 0;
+#X connect 289 0 290 0;
+#X connect 291 0 241 0;
+#X connect 291 0 292 0;
+#X connect 294 0 238 0;
+#X connect 294 0 293 0;
+#X connect 295 0 237 0;
+#X connect 295 0 296 0;
+#X connect 297 0 243 0;
+#X connect 297 0 298 0;
+#X connect 299 0 244 0;
+#X connect 299 0 300 0;
+#X connect 301 0 247 0;
+#X connect 301 0 302 0;
+#X connect 303 0 253 0;
+#X connect 303 0 304 0;
+#X connect 306 0 250 0;
+#X connect 306 0 305 0;
+#X connect 307 0 249 0;
+#X connect 307 0 308 0;
+#X connect 309 0 255 0;
+#X connect 309 0 310 0;
+#X connect 311 0 256 0;
+#X connect 311 0 312 0;
+#X connect 313 0 259 0;
+#X connect 313 0 314 0;
+#X connect 315 0 265 0;
+#X connect 315 0 316 0;
+#X connect 318 0 262 0;
+#X connect 318 0 317 0;
+#X connect 319 0 261 0;
+#X connect 319 0 320 0;
+#X connect 321 0 267 0;
+#X connect 321 0 322 0;
+#X connect 323 0 268 0;
+#X connect 323 0 324 0;
+#X connect 325 0 271 0;
+#X connect 325 0 326 0;
 #X restore 730 -21 pd OSC_WireValues;
 #X obj 57 392 hsl 128 15 1 100 0 0 empty empty empty -2 -8 0 10 -262144
 -1 -1 513 1;
@@ -2472,7 +2671,7 @@
 #X connect 33 0 36 0;
 #X connect 34 0 29 0;
 #X connect 34 0 35 0;
-#X restore 577 -42 pd OSC_PlayerValues;
+#X restore 576 -42 pd OSC_PlayerValues;
 #N canvas 163 38 554 492 OSC_Tree 0;
 #X obj 35 21 inlet;
 #X obj 35 45 s \$0_MyOsc;
@@ -3733,6 +3932,8 @@
 #X text 76 371 Manually adjust to represent the number of sources;
 #X text 419 312 Alt Equation for Strouhal Number;
 #X text 421 324 St = 0.2684 - 1.0356(Re) ^ -1/2;
+#N canvas 957 23 450 300 orientation 0;
+#X restore 692 118 pd orientation;
 #X connect 0 0 25 0;
 #X connect 16 0 31 1;
 #X connect 18 0 33 0;
diff -r c21ae30cfdbb -r 93856d889505 June/arccos.pd
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/June/arccos.pd	Sat Jun 27 20:58:46 2015 +0100
@@ -0,0 +1,30 @@
+#N canvas 88 45 313 368 10;
+#X obj 112 255 * 360;
+#X floatatom 159 306 5 0 0 0 - - -;
+#X obj 112 279 / 6.28319;
+#X obj 70 47 *;
+#X obj 70 79 swap 1;
+#X obj 70 112 -;
+#X obj 70 141 sqrt;
+#X obj 112 172 /;
+#X obj 112 200 atan;
+#X obj 112 226 * 2;
+#X text 152 108 Arccos of angle;
+#X obj 127 48 + 1;
+#X obj 112 306 outlet;
+#X obj 70 20 inlet;
+#X connect 0 0 2 0;
+#X connect 2 0 1 0;
+#X connect 2 0 12 0;
+#X connect 3 0 4 0;
+#X connect 4 0 5 0;
+#X connect 4 1 5 1;
+#X connect 5 0 6 0;
+#X connect 6 0 7 0;
+#X connect 7 0 8 0;
+#X connect 8 0 9 0;
+#X connect 9 0 0 0;
+#X connect 11 0 7 1;
+#X connect 13 0 3 1;
+#X connect 13 0 3 0;
+#X connect 13 0 11 0;
diff -r c21ae30cfdbb -r 93856d889505 June/freqCalcCylD6.pd
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/June/freqCalcCylD6.pd	Sat Jun 27 20:58:46 2015 +0100
@@ -0,0 +1,680 @@
+#N canvas 0 129 1263 724 10;
+#X text 808 -23 Mass Density of Air;
+#X text 117 292 Frequency (Hz);
+#X obj 885 425 throw~ l;
+#X obj 912 406 throw~ r;
+#X obj 900 279 osc~;
+#X obj 930 -22 *~ 1.225;
+#X obj 930 53 /~ 1.81e-05;
+#X obj 930 8 *~ 1;
+#X obj 900 228 /~ 1;
+#X floatatom 211 272 10 0 0 0 - - -;
+#X obj 915 96 /~;
+#X obj 900 204 *~;
+#X obj 900 253 clip~ 0 20000;
+#X obj 222 -81 inlet;
+#X text 771 46 Reynolds Number;
+#X text 784 220 Strouhal Number;
+#X obj 383 -83 inlet;
+#X obj 900 309 *~;
+#X text 960 33 Viscosity;
+#X obj 664 230 *~ 2;
+#X obj 664 257 osc~;
+#X obj 664 279 *~;
+#X obj 885 338 +~;
+#X obj 222 -57 s \$0-diameter;
+#X obj 991 -23 r \$0-diameter;
+#X obj 980 177 r \$0-diameter;
+#X obj 139 -19 s~ \$0-windSpeed;
+#X obj 328 50 r~ \$0-windSpeed;
+#X obj 979 146 r~ \$0-windSpeed;
+#X obj 930 -50 r~ \$0-windSpeed;
+#X obj 835 203 s~ \$0_str;
+#X obj 318 29 r~ \$0_str;
+#X obj 697 257 r~ \$0_dragDiGain;
+#X obj 815 279 s~ \$0-myFreq;
+#X obj 664 209 r~ \$0-myFreq;
+#X obj 938 279 r~ \$0_liftDiGain;
+#X obj 139 -61 sig~;
+#X obj 139 -39 vd~ varwind;
+#X obj 139 -85 inlet;
+#X obj 1359 8 r~ \$0-myFreq;
+#X obj 1325 -42 noise~;
+#X obj 1402 192 throw~ l;
+#X obj 1429 171 throw~ r;
+#X obj 1402 99 *~;
+#X obj 133 94 snapshot~;
+#X obj 133 69 metro 100;
+#X obj 133 47 tgl 15 0 empty empty empty 17 7 0 10 -262144 -1 -1 1
+1;
+#X floatatom 133 120 10 0 0 0 - - -;
+#X obj 133 21 loadbang;
+#X obj 59 69 r~ \$0-myRey;
+#X obj 943 77 s~ \$0-myRey;
+#X obj 1540 9 snapshot~;
+#X floatatom 1540 35 10 0 0 0 - - -;
+#X obj 1540 -64 loadbang;
+#X obj 1540 -39 tgl 15 0 empty empty empty 17 7 0 10 -262144 -1 -1
+1 1;
+#X obj 1451 -93 r~ \$0-myRey;
+#X obj 1367 360 r~ \$0-myFreq;
+#X obj 1333 289 noise~;
+#X obj 1410 549 throw~ l;
+#X obj 1437 526 throw~ r;
+#X obj 1410 457 *~;
+#X obj 1548 369 snapshot~;
+#X floatatom 1548 395 10 0 0 0 - - -;
+#X obj 1548 296 loadbang;
+#X obj 1548 321 tgl 15 0 empty empty empty 17 7 0 10 -262144 -1 -1
+1 1;
+#X obj 1459 267 r~ \$0-myRey;
+#X obj 1367 386 *~ 2;
+#X text 118 140 Reynolds Number;
+#X obj 1325 51 vcf~ 1000 10;
+#X obj 1333 411 vcf~ 1000 10;
+#X obj 885 381 fcpan;
+#X obj 1402 148 fcpan;
+#X obj 1410 501 fcpan;
+#X obj 1417 72 *~ 1;
+#X obj 1425 432 *~ 1;
+#X obj 1459 342 clip~ 2 400;
+#X obj 1451 -18 clip~ 2 400;
+#X obj 1459 291 *~ -0.003;
+#X obj 1451 -69 *~ -0.003;
+#X obj 1451 -44 +~ 20;
+#X obj 1459 316 +~ 20;
+#X obj 1540 -16 metro 10;
+#X obj 1548 344 metro 10;
+#X obj 383 -63 s \$0_dist;
+#X obj 616 -90 inlet;
+#X obj 616 -21 s \$0_thisPan;
+#X obj 912 352 r \$0_thisPan;
+#X obj 1429 124 r \$0_thisPan;
+#X obj 1437 479 r \$0_thisPan;
+#X floatatom 561 -21 8 0 0 0 - - -;
+#X obj 616 -66 max 0.1;
+#X obj 616 -43 min 0.9;
+#X text 1461 445 Drag Dipole spectrum calculation;
+#X text 1456 89 Lift Dipole spectrum calculation;
+#X text 651 92 Calculates the frequency;
+#X text 651 105 based on the physics of;
+#X text 652 118 the object and environment;
+#X obj 325 309 r~ \$0-windSpeed;
+#X obj 314 286 r~ \$0_str;
+#X obj 1425 409 r~ \$0_dragNoiseGain;
+#X obj 1417 30 r~ \$0_liftNoiseGain;
+#X obj 881 57 sig~ 1;
+#X obj 915 122 sqrt~;
+#X obj 915 147 *~ 1.0356;
+#X obj 841 138 sig~ 0.2684;
+#X obj 900 177 -~;
+#X obj 134 416 snapshot~;
+#X obj 134 391 metro 100;
+#X obj 134 369 tgl 15 0 empty empty empty 17 7 0 10 -262144 -1 -1 1
+1;
+#X floatatom 134 442 10 0 0 0 - - -;
+#X obj 134 343 loadbang;
+#X obj 70 392 r~ \$0_str;
+#N canvas 1955 100 622 660 noiseGain 0;
+#X text -21205 129 Mass Density of Air \, squared;
+#X text -20857 164 Speed of Sound to power 2;
+#X obj -21070 29 *~;
+#X obj -21022 70 *~;
+#X obj -21022 104 *~ 1;
+#X obj -21022 132 *~ 1.50063;
+#X obj -20859 118 *;
+#X obj -20859 141 * 118033;
+#X obj -21022 193 /~ 1;
+#X obj -21021 422 *~ 0.27;
+#X text -20859 71 Distance;
+#X obj -20890 352 cos;
+#X obj -20890 307 / 360;
+#X floatatom -20863 403 5 0 0 0 - - -;
+#X obj -20890 376 *;
+#X obj -20911 435 *~ 0.27;
+#X obj -20890 329 * 6.28319;
+#X obj -21000 282 + 90;
+#X text -20895 510 Calculates Drag Dipole gain;
+#X text -21175 486 Calculates Lift Dipole gain;
+#N canvas 759 125 286 289 pow8 0;
+#X obj 47 67 *~;
+#X obj 76 67 *~;
+#X obj 76 35 inlet~;
+#X obj 47 170 outlet~;
+#X obj 136 173 snapshot~;
+#X obj 136 148 metro 100;
+#X obj 136 126 tgl 15 0 empty empty empty 17 7 0 10 -262144 -1 -1 1
+1;
+#X floatatom 136 200 10 0 0 0 - - -;
+#X obj 136 100 loadbang;
+#X obj 106 67 *~;
+#X obj 47 93 *~;
+#X obj 47 118 *~;
+#X obj 136 67 *~;
+#X obj 47 144 *~;
+#X connect 0 0 10 0;
+#X connect 1 0 10 1;
+#X connect 2 0 0 0;
+#X connect 2 0 0 1;
+#X connect 2 0 1 1;
+#X connect 2 0 9 0;
+#X connect 2 0 9 1;
+#X connect 2 0 1 0;
+#X connect 2 0 12 0;
+#X connect 2 0 12 1;
+#X connect 4 0 7 0;
+#X connect 5 0 4 0;
+#X connect 6 0 5 0;
+#X connect 8 0 6 0;
+#X connect 9 0 11 1;
+#X connect 10 0 11 0;
+#X connect 11 0 13 0;
+#X connect 12 0 13 1;
+#X connect 13 0 3 0;
+#X connect 13 0 4 0;
+#X restore -21022 32 pd pow8;
+#X obj -21005 222 s~ \$0-c;
+#X obj -20948 385 r~ \$0-c;
+#X obj -21021 444 *~ 1;
+#X obj -20911 460 *~ 0.1;
+#X obj -21070 7 inlet~;
+#X obj -21022 7 inlet~;
+#X obj -20989 55 inlet;
+#X obj -20942 229 inlet;
+#X obj -20873 229 inlet;
+#X obj -20859 92 inlet;
+#X obj -21021 465 outlet~;
+#X obj -20911 485 outlet~;
+#X text -20947 211 Azimuth;
+#X text -20871 210 Elevation;
+#X text -20961 26 Gain proportional to windspeed to power 8 for spectrum
+;
+#X text -20981 74 Diameter;
+#N canvas 1567 153 479 552 angleCalc 0;
+#X obj 307 116 hsl 100 20 -90 90 0 0 empty empty empty -2 -8 0 10 -262144
+-1 -1 9705 1;
+#X text 287 77 Elevation Angle;
+#X obj 236 118 / 360;
+#X obj 236 140 * 6.28319;
+#X obj 164 80 / 360;
+#X obj 164 102 * 6.28319;
+#X floatatom 49 106 5 0 0 0 - - -;
+#X floatatom 304 140 5 0 0 0 - - -;
+#X obj 278 443 * 360;
+#X floatatom 325 494 5 0 0 0 - - -;
+#X obj 278 467 / 6.28319;
+#X obj 236 235 *;
+#X obj 236 267 swap 1;
+#X obj 236 300 -;
+#X obj 236 329 sqrt;
+#X obj 278 360 /;
+#X obj 278 388 atan;
+#X obj 278 414 * 2;
+#X text 318 296 Arccos of angle;
+#X obj 293 236 + 1;
+#X obj 164 126 cos;
+#X obj 236 171 cos;
+#X obj 236 205 *;
+#X obj 164 149 t f b;
+#X obj 162 174 delay 9;
+#X obj 278 494 outlet;
+#X obj 236 90 inlet;
+#X obj 164 57 inlet;
+#X obj 52 80 hsl 100 20 -90 90 0 0 empty empty empty -2 -8 0 10 -262144
+-1 -1 1715 1;
+#X text 56 42 Azimuth Angle;
+#X connect 0 0 7 0;
+#X connect 2 0 3 0;
+#X connect 3 0 21 0;
+#X connect 4 0 5 0;
+#X connect 5 0 20 0;
+#X connect 8 0 10 0;
+#X connect 10 0 9 0;
+#X connect 10 0 25 0;
+#X connect 11 0 12 0;
+#X connect 12 0 13 0;
+#X connect 12 1 13 1;
+#X connect 13 0 14 0;
+#X connect 14 0 15 0;
+#X connect 15 0 16 0;
+#X connect 16 0 17 0;
+#X connect 17 0 8 0;
+#X connect 19 0 15 1;
+#X connect 20 0 23 0;
+#X connect 21 0 22 0;
+#X connect 22 0 11 0;
+#X connect 22 0 11 1;
+#X connect 22 0 19 0;
+#X connect 23 0 22 1;
+#X connect 23 1 24 0;
+#X connect 24 0 22 0;
+#X connect 26 0 2 0;
+#X connect 26 0 0 0;
+#X connect 27 0 4 0;
+#X connect 27 0 28 0;
+#X connect 28 0 6 0;
+#X restore -20942 252 pd angleCalc;
+#X obj -20951 117 inlet;
+#X obj -20951 142 *;
+#X obj -21022 167 *~ 1;
+#X text -20953 99 Length;
+#X obj -21000 305 / 360;
+#X obj -21000 351 cos;
+#X obj -21000 375 *;
+#X obj -21000 328 * 6.28319;
+#X obj -21021 397 *~ 1;
+#X obj -20911 411 *~ 1;
+#X connect 2 0 3 1;
+#X connect 3 0 4 0;
+#X connect 4 0 5 0;
+#X connect 5 0 40 0;
+#X connect 6 0 7 0;
+#X connect 7 0 8 1;
+#X connect 8 0 21 0;
+#X connect 8 0 46 0;
+#X connect 9 0 23 0;
+#X connect 11 0 14 0;
+#X connect 11 0 14 1;
+#X connect 12 0 16 0;
+#X connect 14 0 13 0;
+#X connect 14 0 47 1;
+#X connect 15 0 24 0;
+#X connect 16 0 11 0;
+#X connect 17 0 42 0;
+#X connect 20 0 3 0;
+#X connect 22 0 47 0;
+#X connect 23 0 31 0;
+#X connect 24 0 32 0;
+#X connect 25 0 2 0;
+#X connect 25 0 2 1;
+#X connect 26 0 20 0;
+#X connect 27 0 4 1;
+#X connect 28 0 37 0;
+#X connect 29 0 37 1;
+#X connect 30 0 6 0;
+#X connect 30 0 6 1;
+#X connect 37 0 17 0;
+#X connect 37 0 12 0;
+#X connect 38 0 39 0;
+#X connect 38 0 39 1;
+#X connect 39 0 40 1;
+#X connect 40 0 8 0;
+#X connect 42 0 45 0;
+#X connect 43 0 44 0;
+#X connect 43 0 44 1;
+#X connect 44 0 46 1;
+#X connect 45 0 43 0;
+#X connect 46 0 9 0;
+#X connect 47 0 15 0;
+#X restore 314 438 pd noiseGain;
+#X obj 337 330 r \$0-diameter;
+#X obj 383 414 r \$0_dist;
+#X obj 371 392 r \$0_azim;
+#X obj 360 371 r \$0_elev;
+#X obj 314 483 s~ \$0_liftNoiseGain;
+#X obj 383 461 s~ \$0_dragNoiseGain;
+#N canvas 613 23 702 650 freqGain 1;
+#X text 36 127 Mass Density of Air \, squared;
+#X text 508 93 Speed of Sound to power 2;
+#N canvas 759 125 286 289 pow6 0;
+#X obj 47 67 *~;
+#X obj 76 67 *~;
+#X obj 76 35 inlet~;
+#X obj 47 163 outlet~;
+#X obj 136 184 snapshot~;
+#X obj 136 159 metro 100;
+#X obj 136 137 tgl 15 0 empty empty empty 17 7 0 10 -262144 -1 -1 1
+1;
+#X floatatom 136 211 10 0 0 0 - - -;
+#X obj 216 210 outlet;
+#X obj 136 111 loadbang;
+#X obj 106 67 *~;
+#X obj 47 93 *~;
+#X obj 47 118 *~;
+#X connect 0 0 11 0;
+#X connect 1 0 11 1;
+#X connect 2 0 0 0;
+#X connect 2 0 0 1;
+#X connect 2 0 1 1;
+#X connect 2 0 10 0;
+#X connect 2 0 10 1;
+#X connect 2 0 1 0;
+#X connect 4 0 7 0;
+#X connect 4 0 8 0;
+#X connect 5 0 4 0;
+#X connect 6 0 5 0;
+#X connect 9 0 6 0;
+#X connect 10 0 12 1;
+#X connect 11 0 12 0;
+#X connect 12 0 4 0;
+#X connect 12 0 3 0;
+#X restore 219 30 pd pow6;
+#X obj 173 32 *~;
+#X obj 219 68 *~;
+#X obj 219 102 *~ 1;
+#X obj 219 130 *~ 1.50063;
+#X obj 506 45 *;
+#X obj 506 70 * 118033;
+#X obj 219 240 /~ 1;
+#X obj 219 506 *~ 0.27;
+#X text 380 261 Azimuth;
+#X text 497 1 Distance;
+#X obj 419 420 cos;
+#X obj 419 375 / 360;
+#X floatatom 446 466 8 0 0 0 - - -;
+#X obj 419 444 *;
+#X obj 398 491 *~ 0.27;
+#X obj 236 269 s~ \$0-a;
+#X obj 357 441 r~ \$0-a;
+#X obj 419 397 * 6.28319;
+#X floatatom 471 46 5 0 0 0 - - -;
+#N canvas 131 175 479 552 angleCalc 1;
+#X obj 307 116 hsl 100 20 -90 90 0 0 empty empty empty -2 -8 0 10 -262144
+-1 -1 1700 1;
+#X text 287 77 Elevation Angle;
+#X obj 236 118 / 360;
+#X obj 236 140 * 6.28319;
+#X obj 164 80 / 360;
+#X obj 164 102 * 6.28319;
+#X floatatom 49 106 5 0 0 0 - - -;
+#X floatatom 304 140 5 0 0 0 - - -;
+#X obj 278 443 * 360;
+#X floatatom 325 494 5 0 0 0 - - -;
+#X obj 278 467 / 6.28319;
+#X obj 236 235 *;
+#X obj 236 267 swap 1;
+#X obj 236 300 -;
+#X obj 236 329 sqrt;
+#X obj 278 360 /;
+#X obj 278 388 atan;
+#X obj 278 414 * 2;
+#X text 318 296 Arccos of angle;
+#X obj 293 236 + 1;
+#X obj 164 126 cos;
+#X obj 236 171 cos;
+#X obj 236 205 *;
+#X obj 164 149 t f b;
+#X obj 162 174 delay 9;
+#X obj 278 494 outlet;
+#X obj 236 90 inlet;
+#X obj 164 57 inlet;
+#X obj 52 80 hsl 100 20 -90 90 0 0 empty empty empty -2 -8 0 10 -262144
+-1 -1 3300 1;
+#X text 56 42 Azimuth Angle;
+#X connect 0 0 7 0;
+#X connect 0 0 2 0;
+#X connect 2 0 3 0;
+#X connect 3 0 21 0;
+#X connect 4 0 5 0;
+#X connect 5 0 20 0;
+#X connect 8 0 10 0;
+#X connect 10 0 9 0;
+#X connect 10 0 25 0;
+#X connect 11 0 12 0;
+#X connect 12 0 13 0;
+#X connect 12 1 13 1;
+#X connect 13 0 14 0;
+#X connect 14 0 15 0;
+#X connect 15 0 16 0;
+#X connect 16 0 17 0;
+#X connect 17 0 8 0;
+#X connect 19 0 15 1;
+#X connect 20 0 23 0;
+#X connect 21 0 22 0;
+#X connect 22 0 11 0;
+#X connect 22 0 11 1;
+#X connect 22 0 19 0;
+#X connect 23 0 22 1;
+#X connect 23 1 24 0;
+#X connect 24 0 22 0;
+#X connect 26 0 2 0;
+#X connect 27 0 4 0;
+#X connect 28 0 6 0;
+#X connect 28 0 4 0;
+#X restore 365 297 pd angleCalc;
+#X text 451 260 Elevation;
+#X text 476 498 Calculates Drag Dipole gain;
+#X text 48 445 Calculates Lift Dipole gain;
+#X obj 398 516 *~ 0.1;
+#X obj 173 8 inlet~;
+#X obj 219 7 inlet~;
+#X text 256 54 Diameter;
+#X obj 250 69 inlet;
+#X obj 506 20 inlet;
+#X obj 365 276 inlet;
+#X obj 434 275 inlet;
+#X obj 219 530 outlet~;
+#X obj 398 541 outlet~;
+#X obj 297 125 inlet;
+#X obj 297 149 *;
+#X obj 219 193 *~ 1;
+#X text 292 106 Length;
+#X obj 240 388 / 360;
+#X obj 240 434 cos;
+#X obj 240 458 *;
+#X obj 240 411 * 6.28319;
+#X obj 398 467 *~ 1;
+#X obj 219 481 *~ 1;
+#X obj 305 247 arccos;
+#X obj 305 223 r sigMac;
+#X obj 240 362 +;
+#X obj 305 269 t f b;
+#X obj 240 323 delay 9;
+#X floatatom 305 302 5 0 0 0 - - -;
+#X text 309 203 Replicates Doppler effect;
+#X floatatom 370 338 5 0 0 0 - - -;
+#X connect 2 0 4 0;
+#X connect 3 0 4 1;
+#X connect 4 0 5 0;
+#X connect 5 0 6 0;
+#X connect 6 0 38 0;
+#X connect 7 0 8 0;
+#X connect 8 0 9 1;
+#X connect 9 0 18 0;
+#X connect 9 0 45 0;
+#X connect 10 0 34 0;
+#X connect 13 0 16 0;
+#X connect 13 0 16 1;
+#X connect 14 0 20 0;
+#X connect 16 0 15 0;
+#X connect 16 0 44 1;
+#X connect 17 0 26 0;
+#X connect 19 0 44 0;
+#X connect 20 0 13 0;
+#X connect 22 0 14 0;
+#X connect 22 0 48 0;
+#X connect 22 0 53 0;
+#X connect 26 0 35 0;
+#X connect 27 0 3 0;
+#X connect 27 0 3 1;
+#X connect 28 0 2 0;
+#X connect 30 0 5 1;
+#X connect 31 0 7 1;
+#X connect 31 0 7 0;
+#X connect 31 0 21 0;
+#X connect 32 0 22 0;
+#X connect 33 0 22 1;
+#X connect 36 0 37 0;
+#X connect 36 0 37 1;
+#X connect 37 0 38 1;
+#X connect 38 0 9 0;
+#X connect 40 0 43 0;
+#X connect 41 0 42 0;
+#X connect 41 0 42 1;
+#X connect 42 0 45 1;
+#X connect 43 0 41 0;
+#X connect 44 0 17 0;
+#X connect 45 0 10 0;
+#X connect 46 0 49 0;
+#X connect 47 0 46 0;
+#X connect 48 0 40 0;
+#X connect 49 0 48 1;
+#X connect 49 0 51 0;
+#X connect 49 1 50 0;
+#X connect 50 0 48 0;
+#X restore 318 180 pd freqGain;
+#X obj 452 -83 inlet;
+#X obj 452 -63 s \$0_elev;
+#X obj 339 71 r \$0-diameter;
+#X obj 520 -85 inlet;
+#X obj 520 -63 s \$0_azim;
+#X obj 381 159 r \$0_dist;
+#X obj 360 116 r \$0_azim;
+#X obj 370 137 r \$0_elev;
+#X obj 381 204 s~ \$0_dragDiGain;
+#X obj 318 224 s~ \$0_liftDiGain;
+#X floatatom 383 -36 5 0 0 0 - - -;
+#X floatatom 453 -37 5 0 0 0 - - -;
+#X floatatom 521 -41 5 0 0 0 - - -;
+#X obj 82 272 outlet;
+#X obj 1325 5 hip~;
+#X obj 126 245 snapshot~;
+#X obj 126 198 tgl 15 0 empty empty empty 17 7 0 10 -262144 -1 -1 1
+1;
+#X obj 126 172 loadbang;
+#X obj 126 220 metro 10;
+#X obj 1333 386 hip~;
+#X obj 47 222 r~ \$0-myFreq;
+#X obj 126 272 s \$0_contFreq;
+#X obj 1346 -18 r \$0_contFreq;
+#X obj 1354 310 r \$0_contFreq;
+#X obj 1354 333 * 2;
+#X text 122 463 Strouhal Number;
+#X text 308 241 Calculates the gain of the dipole source;
+#X text 305 502 Calculates the gain of the source;
+#X text 512 -104 Azimuth;
+#X text 621 -108 Pan;
+#X text 446 -102 Elevation;
+#X text 379 -102 Distance;
+#X text 217 -102 Diameter;
+#X text 132 -103 Wind Speed;
+#X obj 314 -82 inlet;
+#X floatatom 315 -38 5 0 0 0 - - -;
+#X text 310 -101 Length;
+#X obj 314 -60 s \$0_leng;
+#X obj 348 351 r \$0_leng;
+#X obj 349 94 r \$0_leng;
+#X connect 4 0 17 0;
+#X connect 5 0 7 0;
+#X connect 6 0 10 1;
+#X connect 6 0 50 0;
+#X connect 7 0 6 0;
+#X connect 8 0 12 0;
+#X connect 10 0 102 0;
+#X connect 11 0 8 0;
+#X connect 12 0 4 0;
+#X connect 12 0 33 0;
+#X connect 13 0 23 0;
+#X connect 16 0 83 0;
+#X connect 16 0 130 0;
+#X connect 17 0 22 1;
+#X connect 19 0 20 0;
+#X connect 20 0 21 0;
+#X connect 21 0 22 0;
+#X connect 22 0 70 0;
+#X connect 24 0 7 1;
+#X connect 25 0 8 1;
+#X connect 27 0 119 1;
+#X connect 28 0 11 1;
+#X connect 29 0 5 0;
+#X connect 31 0 119 0;
+#X connect 32 0 21 1;
+#X connect 34 0 19 0;
+#X connect 35 0 17 1;
+#X connect 36 0 37 0;
+#X connect 37 0 26 0;
+#X connect 38 0 36 0;
+#X connect 39 0 68 1;
+#X connect 40 0 134 0;
+#X connect 43 0 71 0;
+#X connect 44 0 47 0;
+#X connect 45 0 44 0;
+#X connect 46 0 45 0;
+#X connect 48 0 46 0;
+#X connect 49 0 44 0;
+#X connect 51 0 52 0;
+#X connect 51 0 68 2;
+#X connect 53 0 54 0;
+#X connect 54 0 81 0;
+#X connect 55 0 78 0;
+#X connect 56 0 66 0;
+#X connect 57 0 139 0;
+#X connect 60 0 72 0;
+#X connect 61 0 62 0;
+#X connect 61 0 69 2;
+#X connect 63 0 64 0;
+#X connect 64 0 82 0;
+#X connect 65 0 77 0;
+#X connect 66 0 69 1;
+#X connect 68 0 43 0;
+#X connect 69 0 60 0;
+#X connect 70 0 2 0;
+#X connect 70 1 3 0;
+#X connect 71 0 41 0;
+#X connect 71 1 42 0;
+#X connect 72 0 58 0;
+#X connect 72 1 59 0;
+#X connect 73 0 43 1;
+#X connect 74 0 60 1;
+#X connect 75 0 61 0;
+#X connect 76 0 51 0;
+#X connect 77 0 80 0;
+#X connect 78 0 79 0;
+#X connect 79 0 76 0;
+#X connect 80 0 75 0;
+#X connect 81 0 51 0;
+#X connect 82 0 61 0;
+#X connect 84 0 90 0;
+#X connect 86 0 70 1;
+#X connect 87 0 71 1;
+#X connect 88 0 72 1;
+#X connect 90 0 91 0;
+#X connect 91 0 85 0;
+#X connect 91 0 89 0;
+#X connect 97 0 112 1;
+#X connect 98 0 112 0;
+#X connect 99 0 74 0;
+#X connect 100 0 73 0;
+#X connect 101 0 10 0;
+#X connect 102 0 103 0;
+#X connect 103 0 105 1;
+#X connect 104 0 105 0;
+#X connect 105 0 30 0;
+#X connect 105 0 11 0;
+#X connect 106 0 109 0;
+#X connect 107 0 106 0;
+#X connect 108 0 107 0;
+#X connect 110 0 108 0;
+#X connect 111 0 106 0;
+#X connect 112 0 117 0;
+#X connect 112 1 118 0;
+#X connect 113 0 112 2;
+#X connect 114 0 112 6;
+#X connect 115 0 112 5;
+#X connect 116 0 112 4;
+#X connect 119 0 129 0;
+#X connect 119 1 128 0;
+#X connect 120 0 121 0;
+#X connect 120 0 131 0;
+#X connect 122 0 119 2;
+#X connect 123 0 124 0;
+#X connect 123 0 132 0;
+#X connect 125 0 119 6;
+#X connect 126 0 119 4;
+#X connect 127 0 119 5;
+#X connect 134 0 68 0;
+#X connect 135 0 141 0;
+#X connect 135 0 133 0;
+#X connect 135 0 9 0;
+#X connect 136 0 138 0;
+#X connect 137 0 136 0;
+#X connect 138 0 135 0;
+#X connect 139 0 69 0;
+#X connect 140 0 135 0;
+#X connect 142 0 134 1;
+#X connect 143 0 144 0;
+#X connect 144 0 139 1;
+#X connect 154 0 155 0;
+#X connect 154 0 157 0;
+#X connect 158 0 112 3;
+#X connect 159 0 119 3;
diff -r c21ae30cfdbb -r 93856d889505 June/testBed.pd
--- a/June/testBed.pd	Fri Jun 26 17:38:23 2015 +0100
+++ b/June/testBed.pd	Sat Jun 27 20:58:46 2015 +0100
@@ -1,4 +1,4 @@
-#N canvas 310 161 842 605 10;
+#N canvas 12 177 842 605 10;
 #X msg 88 -43 300;
 #X obj 59 -86 loadbang;
 #N canvas 236 158 426 423 windspeed 0;
@@ -72,7 +72,7 @@
 #X restore -376 -133 pd windspeed;
 #X obj -376 61 delwrite~ varwind 3000;
 #X obj -293 -131 hsl 128 15 0 50 0 0 empty empty empty -2 -8 0 10 -262144
--1 -1 4700 1;
+-1 -1 2900 1;
 #X obj -333 -28 snapshot~;
 #X obj -333 -53 metro 100;
 #X obj -333 -75 tgl 15 0 empty empty empty 17 7 0 10 -262144 -1 -1
@@ -93,10 +93,10 @@
 #X floatatom 192 309 5 0 0 0 - - -;
 #X text 238 7 Diameter;
 #X obj 141 162 hsl 128 15 -90 90 0 0 empty empty empty -2 -8 0 10 -262144
--1 -1 6500 1;
+-1 -1 2200 1;
 #X floatatom 162 191 5 0 0 0 - - -;
 #X obj 153 217 hsl 128 15 -180 180 0 0 empty empty empty -2 -8 0 10
--262144 -1 -1 5300 1;
+-262144 -1 -1 9400 1;
 #X floatatom 177 246 5 0 0 0 - - -;
 #X obj 128 105 hsl 128 15 100 1 0 0 empty empty empty -2 -8 0 10 -262144
 -1 -1 11989 1;
@@ -142,7 +142,7 @@
 #X restore -385 184 pd opLevels;
 #X msg -385 133 5;
 #X obj -382 155 hsl 100 25 0 127 0 0 empty empty empty -2 -8 0 10 -262144
--1 -1 4690 1;
+-1 -1 7590 1;
 #X obj -115 -25 snapshot~;
 #X obj -115 -50 metro 100;
 #X floatatom -115 2 10 0 0 0 - - -;
@@ -175,18 +175,19 @@
 #X msg -54 265 0.5;
 #X obj 59 -62 bng 15 250 50 0 empty empty empty 17 7 0 10 -262144 -1
 -1;
-#X obj 88 305 freqCalcCylD5;
 #X obj 116 62 hsl 128 15 1 10 0 0 empty empty empty -2 -8 0 10 -262144
--1 -1 2933 1;
+-1 -1 4233 1;
 #X floatatom 137 81 8 0 0 0 - - -;
 #X obj 175 40 r setUp;
 #X msg 25 47 4;
 #X obj -265 158 hsl 100 25 0 127 0 0 empty empty empty -2 -8 0 10 -262144
--1 -1 1800 1;
+-1 -1 400 1;
 #X obj -264 111 loadbang;
 #X msg -264 134 5;
 #X text -203 137 No Of Sources;
-#X connect 0 0 60 0;
+#X obj -173 1 s sigMac;
+#X obj 88 305 freqCalcCylD6;
+#X connect 0 0 69 0;
 #X connect 1 0 59 0;
 #X connect 2 0 9 0;
 #X connect 4 0 9 1;
@@ -202,21 +203,22 @@
 #X connect 14 0 15 0;
 #X connect 15 0 4 0;
 #X connect 16 0 17 0;
-#X connect 16 0 60 1;
+#X connect 16 0 69 1;
 #X connect 18 0 19 0;
-#X connect 18 0 60 6;
+#X connect 18 0 69 6;
 #X connect 21 0 22 0;
-#X connect 21 0 60 4;
+#X connect 21 0 69 4;
 #X connect 23 0 24 0;
-#X connect 23 0 60 5;
+#X connect 23 0 69 5;
 #X connect 25 0 26 0;
-#X connect 25 0 60 3;
+#X connect 25 0 69 3;
 #X connect 34 0 36 0;
 #X connect 35 0 31 0;
 #X connect 35 1 32 0;
 #X connect 36 0 37 0;
 #X connect 37 0 35 0;
 #X connect 38 0 40 0;
+#X connect 38 0 68 0;
 #X connect 39 0 38 0;
 #X connect 41 0 42 0;
 #X connect 42 0 39 0;
@@ -238,12 +240,12 @@
 #X connect 59 0 56 0;
 #X connect 59 0 57 0;
 #X connect 59 0 58 0;
-#X connect 59 0 64 0;
-#X connect 60 0 53 0;
-#X connect 61 0 62 0;
-#X connect 61 0 60 2;
-#X connect 63 0 61 0;
-#X connect 64 0 61 0;
-#X connect 65 0 35 1;
-#X connect 66 0 67 0;
-#X connect 67 0 65 0;
+#X connect 59 0 63 0;
+#X connect 60 0 61 0;
+#X connect 60 0 69 2;
+#X connect 62 0 60 0;
+#X connect 63 0 60 0;
+#X connect 64 0 35 1;
+#X connect 65 0 66 0;
+#X connect 66 0 64 0;
+#X connect 69 0 53 0;
diff -r c21ae30cfdbb -r 93856d889505 June/wirePosition.pd
--- a/June/wirePosition.pd	Fri Jun 26 17:38:23 2015 +0100
+++ b/June/wirePosition.pd	Sat Jun 27 20:58:46 2015 +0100
@@ -1,69 +1,69 @@
-#N canvas 573 45 889 625 10;
-#X obj 200 -47 -;
-#X obj 200 -20 *;
-#X obj 215 52 *;
-#X obj 200 107 sqrt;
-#X floatatom 260 140 5 0 0 0 - - -;
-#X obj 200 140 outlet;
-#X obj 200 -98 r Xpos;
+#N canvas -21 52 1440 721 10;
+#X obj 197 -11 -;
+#X obj 197 16 *;
+#X obj 212 88 *;
+#X obj 197 143 sqrt;
+#X floatatom 257 176 5 0 0 0 - - -;
+#X obj 197 176 outlet;
+#X obj 197 -62 r Xpos;
 #X obj -135 119 outlet;
-#X obj 500 3 inlet;
-#X obj 215 -75 inlet;
-#X obj 200 83 +;
-#X obj 558 4 inlet;
-#X obj 485 58 +;
-#X obj 558 25 * -1;
-#X obj 558 62 +;
-#X obj 543 124 <;
-#X obj 470 120 >;
-#X obj 510 154 spigot;
-#X obj 437 153 spigot;
-#X floatatom 471 212 5 0 0 0 - - -;
-#X obj 510 182 f;
-#X floatatom 608 82 5 0 0 0 - - -;
-#X floatatom 390 83 5 0 0 0 - - -;
-#X obj 436 76 r Zpos;
-#X obj 509 77 r Zpos;
-#X obj 543 97 r Zpos;
-#X obj 470 98 r Zpos;
-#X obj 437 127 -;
-#X obj 510 126 -;
-#X obj 595 25 t b;
-#X msg 595 152 0;
-#X obj 271 -74 inlet;
-#X obj 256 -51 -;
-#X obj 256 -23 *;
-#X text 305 6 Height Calc;
-#X floatatom 271 2 5 0 0 0 - - -;
-#X obj 200 7 +;
-#X text 423 243 Calculates if the ball is between;
-#X text 424 255 the end of the fence and then the;
-#X text 423 267 distance in the z direction;
-#X obj 444 27 s \$0_myZp;
-#X obj 256 -96 r Ypos;
-#X obj 510 209 s \$0_zRel;
+#X obj 532 -28 inlet;
+#X obj 212 -39 inlet;
+#X obj 197 119 +;
+#X obj 590 -27 inlet;
+#X obj 517 27 +;
+#X obj 590 -6 * -1;
+#X obj 590 31 +;
+#X obj 575 93 <;
+#X obj 502 89 >;
+#X obj 542 123 spigot;
+#X obj 469 122 spigot;
+#X floatatom 503 181 5 0 0 0 - - -;
+#X obj 542 151 f;
+#X floatatom 640 51 5 0 0 0 - - -;
+#X floatatom 422 52 5 0 0 0 - - -;
+#X obj 468 45 r Zpos;
+#X obj 541 46 r Zpos;
+#X obj 575 66 r Zpos;
+#X obj 502 67 r Zpos;
+#X obj 469 96 -;
+#X obj 542 95 -;
+#X obj 627 -6 t b;
+#X msg 627 121 0;
+#X obj 268 -38 inlet;
+#X obj 253 -15 -;
+#X obj 253 13 *;
+#X text 302 42 Height Calc;
+#X floatatom 268 38 5 0 0 0 - - -;
+#X obj 197 43 +;
+#X text 455 212 Calculates if the ball is between;
+#X text 456 224 the end of the fence and then the;
+#X text 455 236 distance in the z direction;
+#X obj 476 -4 s \$0_myZp;
+#X obj 253 -60 r Ypos;
+#X obj 542 178 s \$0_zRel;
 #X obj -136 -74 r \$0_zRel;
 #X obj -135 38 atan;
 #X obj -135 16 /;
 #X floatatom -170 119 5 0 0 0 - - -;
 #X obj -135 62 * 360;
 #X obj -135 86 / 6.28319;
-#X obj 166 383 outlet;
-#X obj 166 302 atan;
-#X obj 166 280 /;
-#X floatatom 131 383 5 0 0 0 - - -;
-#X obj 166 326 * 360;
-#X obj 166 350 / 6.28319;
-#X obj 139 -23 s \$0_xRel;
-#X obj 181 255 r \$0_xRel;
-#X obj 302 -19 s \$0_yRel;
-#X obj 166 232 r \$0_yRel;
-#X obj 215 29 r \$0_zRel;
+#X obj 163 419 outlet;
+#X obj 163 338 atan;
+#X obj 163 316 /;
+#X floatatom 128 419 5 0 0 0 - - -;
+#X obj 163 362 * 360;
+#X obj 163 386 / 6.28319;
+#X obj 136 13 s \$0_xRel;
+#X obj 178 291 r \$0_xRel;
+#X obj 299 17 s \$0_yRel;
+#X obj 163 268 r \$0_yRel;
+#X obj 212 65 r \$0_zRel;
 #X obj -120 -53 r \$0_xRel;
-#X text 131 -137 Calculates the distance between;
-#X text 149 -124 the wire and the ball;
+#X text 128 -101 Calculates the distance between;
+#X text 146 -88 the wire and the ball;
 #X text -139 -95 Calculates the azimuth;
-#X text 120 209 Calculates the elevation;
+#X text 117 245 Calculates the elevation;
 #X obj -110 255 r \$0_xRel;
 #X obj -74 281 > 0;
 #X obj -110 281 <= 0;
@@ -78,9 +78,93 @@
 #X obj -42 255 - 0.5;
 #X obj -42 277 * -1;
 #X obj -101 352 outlet;
-#X text -2 312 Calculates the pan value;
+#X text -5 348 Calculates the pan value;
 #X obj -120 -30 t f b;
 #X obj -93 -4 delay 9;
+#X obj 664 -6 s \$0_myLY;
+#N canvas 583 169 806 722 thisOrent 0;
+#X obj 219 21 inlet;
+#X floatatom 243 48 8 0 0 0 - - -;
+#X floatatom 63 53 8 0 0 0 - - -;
+#X obj 121 33 r \$0_myLY;
+#X obj 337 27 inlet;
+#X floatatom 361 54 8 0 0 0 - - -;
+#X obj 429 326 inlet;
+#X floatatom 461 353 5 0 0 0 - - -;
+#X obj 479 324 inlet;
+#X floatatom 511 351 5 0 0 0 - - -;
+#X obj 527 323 inlet;
+#X floatatom 559 350 5 0 0 0 - - -;
+#X text 120 11 Y-Length;
+#X text 210 1 X-Length;
+#X text 333 9 Z-Length;
+#X text 415 305 Y-Rota;
+#X text 474 303 X-Rota;
+#X text 522 304 Z-Rota;
+#X floatatom 220 232 5 0 0 0 - - -;
+#X floatatom 77 231 5 0 0 0 - - -;
+#X obj 337 141 t f b;
+#X obj 364 168 delay 9;
+#X obj 135 149 t f b;
+#X obj 162 176 delay 9;
+#X obj 235 145 t f b;
+#X obj 262 172 delay 9;
+#X obj 322 193 >;
+#X obj 220 197 >;
+#X obj 121 201 >;
+#X floatatom 349 229 5 0 0 0 - - -;
+#X obj 122 277 +;
+#X obj 122 308 +;
+#X floatatom 77 333 5 0 0 0 - - -;
+#X text 176 278 0 = z longest;
+#X text 176 293 1 = x longest;
+#X text 176 310 2 = y longest;
+#X obj 122 335 select 0 1 2;
+#X obj 412 404 r azim;
+#X floatatom 344 431 5 0 0 0 - - -;
+#X msg 168 370 \; azim 10;
+#X msg 145 417 \; azim 20;
+#X msg 122 464 \; azim 12;
+#X connect 0 0 1 0;
+#X connect 0 0 22 0;
+#X connect 0 0 26 0;
+#X connect 3 0 2 0;
+#X connect 3 0 27 0;
+#X connect 3 0 28 0;
+#X connect 4 0 5 0;
+#X connect 4 0 20 0;
+#X connect 4 0 24 0;
+#X connect 6 0 7 0;
+#X connect 8 0 9 0;
+#X connect 10 0 11 0;
+#X connect 20 0 26 1;
+#X connect 20 1 21 0;
+#X connect 21 0 26 0;
+#X connect 22 0 28 1;
+#X connect 22 1 23 0;
+#X connect 23 0 28 0;
+#X connect 24 0 27 1;
+#X connect 24 1 25 0;
+#X connect 25 0 27 0;
+#X connect 26 0 29 0;
+#X connect 26 0 31 1;
+#X connect 27 0 18 0;
+#X connect 27 0 30 1;
+#X connect 28 0 19 0;
+#X connect 28 0 30 0;
+#X connect 30 0 31 0;
+#X connect 31 0 32 0;
+#X connect 31 0 36 0;
+#X connect 36 0 41 0;
+#X connect 36 1 40 0;
+#X connect 36 2 39 0;
+#X connect 37 0 38 0;
+#X restore 800 7 pd thisOrent;
+#X obj 817 -79 inlet;
+#X obj 851 -37 inlet;
+#X obj 800 -102 inlet;
+#X obj 834 -58 inlet;
+#X obj 869 -16 inlet;
 #X connect 0 0 1 0;
 #X connect 0 0 1 1;
 #X connect 0 0 55 0;
@@ -97,6 +181,7 @@
 #X connect 11 0 12 0;
 #X connect 11 0 13 0;
 #X connect 11 0 29 0;
+#X connect 11 0 82 0;
 #X connect 12 0 16 1;
 #X connect 12 0 22 0;
 #X connect 12 0 27 1;
@@ -162,3 +247,8 @@
 #X connect 80 0 45 1;
 #X connect 80 1 81 0;
 #X connect 81 0 45 0;
+#X connect 84 0 83 1;
+#X connect 85 0 83 3;
+#X connect 86 0 83 0;
+#X connect 87 0 83 2;
+#X connect 88 0 83 4;