changeset 206:04851f917542

Corr length set to 7 in both normal and LoFi models
author Rod Selfridge <r.selfridge@qmul.ac.uk>
date Wed, 16 Mar 2016 15:52:48 +0000
parents f5d2de6f054a
children cf95fa45a0de
files SwordCorInterp/SwordCorInterp.pd SwordCorInterp/freqCalcCyl4HiFi.pd SwordCorLoFi/SwordCorLoFi.pd SwordCorLoFi/centreAngles.pd SwordCorLoFi/freqCalcCyl4_Lofi.pd
diffstat 5 files changed, 303 insertions(+), 225 deletions(-) [+]
line wrap: on
line diff
--- a/SwordCorInterp/SwordCorInterp.pd	Wed Mar 16 14:53:28 2016 +0000
+++ b/SwordCorInterp/SwordCorInterp.pd	Wed Mar 16 15:52:48 2016 +0000
@@ -1,22 +1,22 @@
-#N canvas 367 35 1146 851 10;
+#N canvas 138 40 1146 851 10;
 #X obj 315 22 loadbang;
 #X obj 315 44 tgl 15 0 empty empty empty 17 7 0 10 -262144 -1 -1 1
 1;
 #X obj 315 85 s myMet;
 #X obj -221 455 s topSpeed;
 #X obj -273 429 hsl 100 20 0 700 0 0 empty empty empty -2 -8 0 10 -262144
--1 -1 566 1;
+-1 -1 509 1;
 #X floatatom -276 455 8 0 0 0 - - -;
 #X text -165 346 Blade Length;
 #X text -9 37 Arm Length;
 #X text -165 433 Top Speed;
 #X obj 21 251 hsl 100 20 0 360 0 0 empty empty empty -2 -8 0 10 -262144
--1 -1 27 1;
+-1 -1 3080 1;
 #X floatatom 18 280 8 0 0 0 - - -;
 #X obj -279 516 hsl 100 20 0 0.09 0 0 empty empty empty -2 -8 0 10
--262144 -1 -1 1672 1;
+-262144 -1 -1 1430 1;
 #X obj -280 601 hsl 100 20 0.0001 0.1 0 0 empty empty empty -2 -8 0
-10 -262144 -1 -1 832 1;
+10 -262144 -1 -1 783 1;
 #X floatatom -282 546 8 0 0 0 - - -;
 #X floatatom -283 629 8 0 0 0 - - -;
 #X obj -225 628 s tipThick;
@@ -45,15 +45,15 @@
 #X obj 83 21 loadbang;
 #X obj 83 45 delay 13;
 #X obj 19 326 hsl 100 20 180 360 0 0 empty empty empty -2 -8 0 10 -262144
--1 -1 3850 1;
+-1 -1 3025 1;
 #X floatatom 16 358 8 0 0 0 - - -;
 #X obj -42 306 r setUp;
 #X obj 14 439 hsl 100 20 0 180 0 0 empty empty empty -2 -8 0 10 -262144
--1 -1 275 1;
+-1 -1 4950 1;
 #X floatatom 11 471 8 0 0 0 - - -;
 #X obj -47 419 r setUp;
 #X obj 12 517 hsl 100 20 0 180 0 0 empty empty empty -2 -8 0 10 -262144
--1 -1 9350 1;
+-1 -1 4950 1;
 #X floatatom 9 549 8 0 0 0 - - -;
 #X obj -49 497 r setUp;
 #X obj 66 470 s presweepElev;
@@ -69,9 +69,9 @@
 #X obj -275 52 hsl 100 20 -50 50 0 0 empty empty empty -2 -8 0 10 -262144
 -1 -1 4970 1;
 #X obj -276 146 hsl 100 20 -50 50 0 0 empty empty empty -2 -8 0 10
--262144 -1 -1 4999 1;
+-262144 -1 -1 5049 1;
 #X obj -276 237 hsl 100 20 -50 50 0 0 empty empty empty -2 -8 0 10
--262144 -1 -1 5148 1;
+-262144 -1 -1 5049 1;
 #X obj -278 75 s Xobs;
 #X obj -279 170 s Yobs;
 #X obj -279 264 s Zobs;
@@ -124,7 +124,7 @@
 #X connect 7 0 3 1;
 #X restore 427 102 pd opLevels;
 #X obj 430 73 hsl 100 25 0.1 1e+07 1 0 empty empty empty -2 -8 0 10
--262144 -1 -1 9900 1;
+-262144 -1 -1 9527 1;
 #X obj 427 2 r GAIN;
 #X floatatom 370 103 8 0 0 0 - - -;
 #X obj -227 545 s hiltThick;
@@ -4249,10 +4249,10 @@
 #X connect 30 0 11 0;
 #X connect 31 0 6 0;
 #X restore 359 -21 pd strike;
+#X obj 745 233 freqCalcCyl4HiFi;
 #X obj 458 232 freqCalcCyl4HiFi;
 #X obj 29 40 freqCalcCyl4HiFi;
 #X obj 315 236 freqCalcCyl4HiFi;
-#X obj 745 233 freqCalcCyl4HiFi;
 #X obj 27 134 freqCalcCyl4HiFi;
 #X obj 594 233 freqCalcCyl4HiFi;
 #X obj 170 235 freqCalcCyl4HiFi;
@@ -4260,29 +4260,29 @@
 #X connect 1 0 0 0;
 #X connect 2 0 4 0;
 #X connect 2 1 4 1;
-#X connect 5 0 26 0;
-#X connect 5 1 26 1;
-#X connect 6 0 28 0;
+#X connect 5 0 27 0;
+#X connect 5 1 27 1;
+#X connect 6 0 25 0;
 #X connect 6 1 13 0;
 #X connect 6 2 13 1;
-#X connect 6 3 28 1;
-#X connect 7 0 28 2;
-#X connect 7 1 28 3;
-#X connect 7 2 28 4;
-#X connect 7 3 28 5;
-#X connect 8 0 26 2;
-#X connect 8 1 26 3;
-#X connect 8 2 26 4;
-#X connect 8 3 26 5;
-#X connect 9 0 27 0;
+#X connect 6 3 25 1;
+#X connect 7 0 25 2;
+#X connect 7 1 25 3;
+#X connect 7 2 25 4;
+#X connect 7 3 25 5;
+#X connect 8 0 27 2;
+#X connect 8 1 27 3;
+#X connect 8 2 27 4;
+#X connect 8 3 27 5;
+#X connect 9 0 28 0;
 #X connect 9 1 10 0;
 #X connect 9 2 19 0;
 #X connect 9 3 19 1;
-#X connect 9 3 27 1;
-#X connect 10 0 27 2;
-#X connect 10 1 27 3;
-#X connect 10 2 27 4;
-#X connect 10 3 27 5;
+#X connect 9 3 28 1;
+#X connect 10 0 28 2;
+#X connect 10 1 28 3;
+#X connect 10 2 28 4;
+#X connect 10 3 28 5;
 #X connect 11 0 29 0;
 #X connect 11 1 12 0;
 #X connect 11 2 29 1;
@@ -4299,15 +4299,15 @@
 #X connect 14 1 30 3;
 #X connect 14 2 30 4;
 #X connect 14 3 30 5;
-#X connect 15 0 25 0;
+#X connect 15 0 26 0;
 #X connect 15 1 16 0;
 #X connect 15 2 9 0;
 #X connect 15 3 9 1;
-#X connect 15 3 25 1;
-#X connect 16 0 25 2;
-#X connect 16 1 25 3;
-#X connect 16 2 25 4;
-#X connect 16 3 25 5;
+#X connect 15 3 26 1;
+#X connect 16 0 26 2;
+#X connect 16 1 26 3;
+#X connect 16 2 26 4;
+#X connect 16 3 26 5;
 #X connect 19 0 31 0;
 #X connect 19 1 20 0;
 #X connect 19 2 21 0;
@@ -4328,7 +4328,7 @@
 #X restore 219 144 pd sources;
 #X floatatom 227 52 5 0 0 0 - - -;
 #X obj -276 345 hsl 100 20 0.1 3 0 0 empty empty empty -2 -8 0 10 -262144
--1 -1 3561 1;
+-1 -1 3475 1;
 #X floatatom -319 368 5 0 0 0 - - -;
 #X obj -324 319 r setUp;
 #X obj -279 300 r thisLength;
@@ -4399,19 +4399,19 @@
 -1 -1;
 #X obj 634 132 uzi 20;
 #X obj 634 152 s PGA;
+#X msg -128 120 0.35;
 #X msg 425 464 Xpos 0.2 \, Ypos 1 \, Zpos 1 \, Len 1.118 \, TopSpeed
 36 \, HiltThick 0.013 \, TipThick 0.008 \, PreAzim 112 \, PostAzim
-235 \, PreElev 90 \, PostElev 90 \, Gain 1e+07 \, Trigger bang;
+235 \, PreElev 90 \, PostElev 90 \, Gain 5e+06 \, Trigger bang;
+#X msg 424 390 Xpos 0.2 \, Ypos 0.5 \, Zpos 1 \, Len 1.2 \, TopSpeed
+36 \, HiltThick 0.016 \, TipThick 0.013 \, PreAzim 60 \, PostAzim 235
+\, PreElev 45 \, PostElev 120 \, Gain 5e+06 \, Trigger bang;
+#X msg 424 317 Xpos 0.2 \, Ypos 0.5 \, Zpos 2 \, Len 1.143 \, TopSpeed
+40 \, HiltThick 0.0152 \, TipThick 0.0085 \, PreAzim 1 \, PostAzim
+250 \, PreElev 5 \, PostElev 170 \, Gain 5e+06 \, Trigger bang;
 #X msg 426 541 Xpos 3 \, Ypos 1 \, Zpos 0.5 \, Len 0.781 \, TopSpeed
 35 \, HiltThick 0.028 \, TipThick 0.057 \, PreAzim 6 \, PostAzim 300
-\, PreElev 25 \, PostElev 90 \, Gain 1e+07 \, Trigger bang;
-#X msg 424 317 Xpos 0.2 \, Ypos 0.5 \, Zpos 2 \, Len 1.143 \, TopSpeed
-40 \, HiltThick 0.0152 \, TipThick 0.0085 \, PreAzim 1 \, PostAzim
-250 \, PreElev 5 \, PostElev 170 \, Gain 1e+07 \, Trigger bang;
-#X msg 424 390 Xpos 0.2 \, Ypos 0.5 \, Zpos 1 \, Len 1.2 \, TopSpeed
-36 \, HiltThick 0.016 \, TipThick 0.013 \, PreAzim 60 \, PostAzim 235
-\, PreElev 45 \, PostElev 120 \, Gain 1e+07 \, Trigger bang;
-#X msg -128 120 0.35;
+\, PreElev 25 \, PostElev 90 \, Gain 5e+06 \, Trigger bang;
 #X connect 0 0 1 0;
 #X connect 1 0 92 0;
 #X connect 4 0 3 0;
@@ -4529,10 +4529,10 @@
 #X connect 155 0 153 0;
 #X connect 156 0 157 0;
 #X connect 157 0 158 0;
-#X connect 159 0 168 0;
-#X connect 160 0 167 0;
-#X connect 161 0 169 0;
-#X connect 162 0 170 0;
+#X connect 159 0 171 0;
+#X connect 160 0 168 0;
+#X connect 161 0 170 0;
+#X connect 162 0 169 0;
 #X connect 163 0 119 0;
 #X connect 163 1 125 0;
 #X connect 163 2 124 0;
@@ -4548,8 +4548,8 @@
 #X connect 163 12 128 0;
 #X connect 164 0 165 0;
 #X connect 165 0 166 0;
-#X connect 167 0 163 0;
+#X connect 167 0 56 0;
 #X connect 168 0 163 0;
 #X connect 169 0 163 0;
 #X connect 170 0 163 0;
-#X connect 171 0 56 0;
+#X connect 171 0 163 0;
--- a/SwordCorInterp/freqCalcCyl4HiFi.pd	Wed Mar 16 14:53:28 2016 +0000
+++ b/SwordCorInterp/freqCalcCyl4HiFi.pd	Wed Mar 16 15:52:48 2016 +0000
@@ -443,7 +443,6 @@
 #X obj 525 194 /~ 360;
 #X obj 758 475 *~;
 #X obj 478 95 s~ \$0-thisColL;
-#X obj 270 150 r~ \$0-thisColL;
 #X obj 270 190 *~ 1;
 #X obj 219 210 *~;
 #X obj 478 72 inlet~;
@@ -472,15 +471,17 @@
 #X obj 774 99 s~ \$0-gain_azim;
 #X obj 332 444 r~ \$0-gain_azim;
 #X obj 773 294 r~ \$0-gain_azim;
+#X obj 270 150 sig~ 7;
+#X text 293 139 Set Corr Length;
 #X connect 0 0 2 0;
 #X connect 1 0 2 1;
-#X connect 2 0 56 0;
+#X connect 2 0 55 0;
 #X connect 6 0 1 0;
 #X connect 6 0 1 1;
 #X connect 7 0 0 0;
-#X connect 9 0 55 1;
-#X connect 13 0 59 0;
-#X connect 14 0 58 0;
+#X connect 9 0 54 1;
+#X connect 13 0 58 0;
+#X connect 14 0 57 0;
 #X connect 15 0 16 1;
 #X connect 16 0 26 0;
 #X connect 19 0 34 0;
@@ -513,33 +514,33 @@
 #X connect 49 0 52 1;
 #X connect 51 0 28 0;
 #X connect 52 0 37 0;
-#X connect 54 0 55 0;
-#X connect 55 0 56 1;
-#X connect 56 0 20 0;
-#X connect 57 0 53 0;
-#X connect 58 0 15 0;
-#X connect 58 0 15 1;
-#X connect 59 0 19 0;
-#X connect 61 0 29 1;
-#X connect 62 0 66 0;
-#X connect 63 0 65 0;
-#X connect 64 0 80 0;
-#X connect 67 0 51 0;
+#X connect 54 0 55 1;
+#X connect 55 0 20 0;
+#X connect 56 0 53 0;
+#X connect 57 0 15 0;
+#X connect 57 0 15 1;
+#X connect 58 0 19 0;
+#X connect 60 0 29 1;
+#X connect 61 0 65 0;
+#X connect 62 0 64 0;
+#X connect 63 0 79 0;
+#X connect 66 0 51 0;
+#X connect 67 0 68 0;
+#X connect 67 0 68 1;
 #X connect 68 0 69 0;
-#X connect 68 0 69 1;
 #X connect 69 0 70 0;
-#X connect 70 0 71 0;
-#X connect 71 0 33 0;
-#X connect 72 0 14 0;
-#X connect 73 0 38 0;
+#X connect 70 0 33 0;
+#X connect 71 0 14 0;
+#X connect 72 0 38 0;
+#X connect 73 0 74 0;
 #X connect 74 0 75 0;
-#X connect 75 0 76 0;
-#X connect 76 0 49 1;
-#X connect 77 0 74 0;
-#X connect 77 0 74 1;
-#X connect 79 0 13 1;
-#X connect 81 0 23 0;
-#X connect 82 0 42 0;
+#X connect 75 0 49 1;
+#X connect 76 0 73 0;
+#X connect 76 0 73 1;
+#X connect 78 0 13 1;
+#X connect 80 0 23 0;
+#X connect 81 0 42 0;
+#X connect 82 0 54 0;
 #X restore 313 307 pd GoldfreqGainSword;
 #N canvas 300 30 1006 797 GoldnoiseGainSword 0;
 #X text -21037 364 Mass Density of Air \, squared;
--- a/SwordCorLoFi/SwordCorLoFi.pd	Wed Mar 16 14:53:28 2016 +0000
+++ b/SwordCorLoFi/SwordCorLoFi.pd	Wed Mar 16 15:52:48 2016 +0000
@@ -1,22 +1,22 @@
-#N canvas 227 23 1070 736 10;
+#N canvas 22 23 1285 787 10;
 #X obj 315 22 loadbang;
 #X obj 315 44 tgl 15 0 empty empty empty 17 7 0 10 -262144 -1 -1 1
 1;
 #X obj 315 85 s myMet;
 #X obj -221 455 s topSpeed;
 #X obj -273 429 hsl 100 20 0 70 0 0 empty empty empty -2 -8 0 10 -262144
--1 -1 4667 1;
+-1 -1 5091 1;
 #X floatatom -276 455 8 0 0 0 - - -;
 #X text -165 346 Blade Length;
 #X text -9 37 Arm Length;
 #X text -165 433 Top Speed;
 #X obj 21 251 hsl 100 20 0 360 0 0 empty empty empty -2 -8 0 10 -262144
--1 -1 3712 1;
+-1 -1 3080 1;
 #X floatatom 18 280 8 0 0 0 - - -;
 #X obj -279 516 hsl 100 20 0 0.09 0 0 empty empty empty -2 -8 0 10
--262144 -1 -1 1760 1;
+-262144 -1 -1 1430 1;
 #X obj -280 601 hsl 100 20 0.0001 0.05 0 0 empty empty empty -2 -8
-0 10 -262144 -1 -1 2559 1;
+0 10 -262144 -1 -1 1567 1;
 #X floatatom -282 546 8 0 0 0 - - -;
 #X floatatom -283 629 8 0 0 0 - - -;
 #X obj -225 628 s tipThick;
@@ -49,11 +49,11 @@
 #X floatatom 16 358 8 0 0 0 - - -;
 #X obj -42 306 r setUp;
 #X obj 14 439 hsl 100 20 0 180 0 0 empty empty empty -2 -8 0 10 -262144
--1 -1 2475 1;
+-1 -1 4950 1;
 #X floatatom 11 471 8 0 0 0 - - -;
 #X obj -47 419 r setUp;
 #X obj 12 517 hsl 100 20 0 180 0 0 empty empty empty -2 -8 0 10 -262144
--1 -1 6600 1;
+-1 -1 4950 1;
 #X floatatom 9 549 8 0 0 0 - - -;
 #X obj -49 497 r setUp;
 #X obj 66 470 s presweepElev;
@@ -124,7 +124,7 @@
 #X connect 7 0 3 1;
 #X restore 427 102 pd opLevels;
 #X obj 430 73 hsl 100 25 0.1 1e+07 1 0 empty empty empty -2 -8 0 10
--262144 -1 -1 5815 1;
+-262144 -1 -1 5540 1;
 #X obj 427 2 r GAIN;
 #X floatatom 370 103 8 0 0 0 - - -;
 #X obj -227 545 s hiltThick;
@@ -4125,6 +4125,7 @@
 #X restore 49 210 pd sourcePositions;
 #X text 480 -91 Patch that holds all the sources that are used to produce
 the basic aeolian tone.;
+#X obj 745 233 freqCalcCyl4_Lofi;
 #X obj 29 40 freqCalcCyl4_Lofi;
 #X obj 27 134 freqCalcCyl4_Lofi;
 #X obj 29 236 freqCalcCyl4_Lofi;
@@ -4132,79 +4133,78 @@
 #X obj 315 236 freqCalcCyl4_Lofi;
 #X obj 458 232 freqCalcCyl4_Lofi;
 #X obj 594 233 freqCalcCyl4_Lofi;
-#X obj 745 233 freqCalcCyl4_Lofi;
 #X connect 1 0 0 0;
 #X connect 2 0 4 0;
 #X connect 2 1 4 1;
-#X connect 5 0 24 0;
-#X connect 5 1 24 1;
-#X connect 6 0 31 0;
+#X connect 5 0 25 0;
+#X connect 5 1 25 1;
+#X connect 6 0 24 0;
 #X connect 6 1 13 0;
 #X connect 6 2 13 1;
-#X connect 6 2 31 1;
-#X connect 7 0 31 2;
-#X connect 7 1 31 3;
-#X connect 7 2 31 4;
-#X connect 7 3 31 5;
-#X connect 8 0 24 2;
-#X connect 8 1 24 3;
-#X connect 8 2 24 4;
-#X connect 8 3 24 5;
-#X connect 9 0 28 0;
+#X connect 6 2 24 1;
+#X connect 7 0 24 2;
+#X connect 7 1 24 3;
+#X connect 7 2 24 4;
+#X connect 7 3 24 5;
+#X connect 8 0 25 2;
+#X connect 8 1 25 3;
+#X connect 8 2 25 4;
+#X connect 8 3 25 5;
+#X connect 9 0 29 0;
 #X connect 9 1 10 0;
 #X connect 9 2 19 0;
 #X connect 9 3 19 1;
-#X connect 9 3 28 1;
-#X connect 10 0 28 2;
-#X connect 10 1 28 3;
-#X connect 10 2 28 4;
-#X connect 10 3 28 5;
-#X connect 11 0 25 0;
+#X connect 9 3 29 1;
+#X connect 10 0 29 2;
+#X connect 10 1 29 3;
+#X connect 10 2 29 4;
+#X connect 10 3 29 5;
+#X connect 11 0 26 0;
 #X connect 11 1 12 0;
-#X connect 11 2 25 1;
-#X connect 12 0 25 2;
-#X connect 12 1 25 3;
-#X connect 12 2 25 4;
-#X connect 12 3 25 5;
-#X connect 13 0 30 0;
+#X connect 11 2 26 1;
+#X connect 12 0 26 2;
+#X connect 12 1 26 3;
+#X connect 12 2 26 4;
+#X connect 12 3 26 5;
+#X connect 13 0 31 0;
 #X connect 13 1 14 0;
 #X connect 13 2 15 0;
 #X connect 13 3 15 1;
-#X connect 13 3 30 1;
-#X connect 14 0 30 2;
-#X connect 14 1 30 3;
-#X connect 14 2 30 4;
-#X connect 14 3 30 5;
-#X connect 15 0 29 0;
+#X connect 13 3 31 1;
+#X connect 14 0 31 2;
+#X connect 14 1 31 3;
+#X connect 14 2 31 4;
+#X connect 14 3 31 5;
+#X connect 15 0 30 0;
 #X connect 15 1 16 0;
 #X connect 15 2 9 0;
 #X connect 15 3 9 1;
-#X connect 15 3 29 1;
-#X connect 16 0 29 2;
-#X connect 16 1 29 3;
-#X connect 16 2 29 4;
-#X connect 16 3 29 5;
-#X connect 19 0 27 0;
+#X connect 15 3 30 1;
+#X connect 16 0 30 2;
+#X connect 16 1 30 3;
+#X connect 16 2 30 4;
+#X connect 16 3 30 5;
+#X connect 19 0 28 0;
 #X connect 19 1 20 0;
 #X connect 19 2 21 0;
 #X connect 19 3 21 1;
-#X connect 19 3 27 1;
-#X connect 20 0 27 2;
-#X connect 20 1 27 3;
-#X connect 20 2 27 4;
-#X connect 20 3 27 5;
-#X connect 21 0 26 0;
+#X connect 19 3 28 1;
+#X connect 20 0 28 2;
+#X connect 20 1 28 3;
+#X connect 20 2 28 4;
+#X connect 20 3 28 5;
+#X connect 21 0 27 0;
 #X connect 21 1 22 0;
 #X connect 21 2 11 0;
-#X connect 21 3 26 1;
-#X connect 22 0 26 2;
-#X connect 22 1 26 3;
-#X connect 22 2 26 4;
-#X connect 22 3 26 5;
+#X connect 21 3 27 1;
+#X connect 22 0 27 2;
+#X connect 22 1 27 3;
+#X connect 22 2 27 4;
+#X connect 22 3 27 5;
 #X restore 219 144 pd sources;
 #X floatatom 227 52 5 0 0 0 - - -;
 #X obj -276 345 hsl 100 20 0.1 3 0 0 empty empty empty -2 -8 0 10 -262144
--1 -1 3072 1;
+-1 -1 3475 1;
 #X floatatom -319 368 5 0 0 0 - - -;
 #X obj -324 319 r setUp;
 #X obj -279 300 r thisLength;
@@ -4218,21 +4218,7 @@
 #X obj 83 126 Uzi 20;
 #X msg 79 416 45;
 #X msg 109 492 135;
-#X obj 547 497 s thisPoE;
-#X obj 531 516 s thisPrE;
-#X obj 516 535 s thisPoA;
-#X obj 500 555 s thisPrA;
-#X obj 390 698 s thisXobs;
-#X obj 484 575 s thisTT;
-#X obj 468 596 s thisHT;
-#X obj 453 617 s thisTS;
-#X obj 437 638 s thisLength;
-#X obj 421 659 s thisZobs;
-#X obj 405 678 s thisYobs;
-#X obj 563 478 s GAIN;
 #X obj 62 0 r preswing;
-#X obj 390 439 unpack f f f f f f f f f f f f s;
-#X obj 579 459 s preswing;
 #X msg -131 561 0.025;
 #X msg -78 119 -3;
 #X obj -170 100 loadbang;
@@ -4257,23 +4243,47 @@
 #X obj 584 32 bng 25 250 50 0 empty empty empty 17 7 0 10 -261234 -1
 -1;
 #X obj 584 80 s MLB;
-#X obj 394 395 r MLB;
 #X msg -228 211 1;
 #X obj 637 33 bng 25 250 50 0 empty empty empty 17 7 0 10 -262130 -1
 -1;
 #X obj 637 81 s SWD1;
-#X obj 388 352 r SWD1;
 #X obj 584 60 uzi 20;
 #X obj 637 61 uzi 20;
 #X obj 584 104 bng 25 250 50 0 empty empty empty 17 7 0 10 -204786
 -1 -1;
 #X obj 584 132 uzi 20;
 #X obj 584 152 s SWD2;
-#X obj 382 310 r SWD2;
-#X msg 382 331 0.2 1 1 1 33 0.016 0.013 135 235 45 120 5000 bang;
-#X msg 388 373 0.2 1 1 1.117 38 0.013 0.008 112 235 90 90 5000 bang
-;
-#X msg 394 416 3 1 0.5 0.781 35 0.057 0.028 6 300 45 90 5000 bang;
+#X obj 562 715 s thisPoE;
+#X obj 538 736 s thisPrE;
+#X obj 515 757 s thisPoA;
+#X obj 491 675 s thisPrA;
+#X obj 325 741 s thisXobs;
+#X obj 467 697 s thisTT;
+#X obj 443 719 s thisHT;
+#X obj 420 742 s thisTS;
+#X obj 396 674 s thisLength;
+#X obj 372 697 s thisZobs;
+#X obj 348 719 s thisYobs;
+#X obj 586 695 s GAIN;
+#X obj 610 674 s preswing;
+#X obj 436 528 r MLB;
+#X obj 435 453 r SWD1;
+#X obj 434 306 r PGA;
+#X obj 434 380 r SWD2;
+#X obj 325 637 route Xpos Ypos Zpos Len TopSpeed HiltThick TipThick
+PreAzim PostAzim PreElev PostElev Gain Trigger;
+#X msg 434 327 Xpos 0.2 \, Ypos 0.5 \, Zpos 2 \, Len 1.143 \, TopSpeed
+40 \, HiltThick 0.0152 \, TipThick 0.0085 \, PreAzim 1 \, PostAzim
+250 \, PreElev 5 \, PostElev 170 \, Gain 4000 \, Trigger bang;
+#X msg 436 551 Xpos 3 \, Ypos 1 \, Zpos 0.5 \, Len 0.781 \, TopSpeed
+35 \, HiltThick 0.028 \, TipThick 0.057 \, PreAzim 6 \, PostAzim 300
+\, PreElev 25 \, PostElev 90 \, Gain 4000 \, Trigger bang;
+#X msg 434 400 Xpos 0.2 \, Ypos 0.5 \, Zpos 1 \, Len 1.2 \, TopSpeed
+36 \, HiltThick 0.016 \, TipThick 0.013 \, PreAzim 60 \, PostAzim 235
+\, PreElev 45 \, PostElev 120 \, Gain 3000 \, Trigger bang;
+#X msg 435 474 Xpos 0.2 \, Ypos 1 \, Zpos 1 \, Len 1.118 \, TopSpeed
+36 \, HiltThick 0.013 \, TipThick 0.008 \, PreAzim 112 \, PostAzim
+235 \, PreElev 90 \, PostElev 90 \, Gain 3000 \, Trigger bang;
 #X connect 0 0 1 0;
 #X connect 1 0 92 0;
 #X connect 4 0 3 0;
@@ -4311,7 +4321,7 @@
 #X connect 42 0 46 0;
 #X connect 44 0 42 0;
 #X connect 54 0 53 0;
-#X connect 54 0 141 0;
+#X connect 54 0 127 0;
 #X connect 55 0 58 0;
 #X connect 55 0 61 0;
 #X connect 56 0 62 0;
@@ -4337,7 +4347,7 @@
 #X connect 80 0 39 0;
 #X connect 81 0 42 0;
 #X connect 82 0 9 0;
-#X connect 86 0 146 0;
+#X connect 86 0 132 0;
 #X connect 87 0 83 0;
 #X connect 87 1 84 0;
 #X connect 88 0 87 0;
@@ -4361,53 +4371,55 @@
 #X connect 112 0 24 0;
 #X connect 113 0 39 0;
 #X connect 114 0 42 0;
-#X connect 127 0 23 0;
-#X connect 128 0 119 0;
-#X connect 128 1 125 0;
-#X connect 128 2 124 0;
-#X connect 128 3 123 0;
-#X connect 128 4 122 0;
-#X connect 128 5 121 0;
-#X connect 128 6 120 0;
-#X connect 128 7 118 0;
-#X connect 128 8 117 0;
-#X connect 128 9 116 0;
-#X connect 128 10 115 0;
-#X connect 128 11 126 0;
-#X connect 128 12 129 0;
-#X connect 130 0 11 0;
-#X connect 130 0 12 0;
-#X connect 131 0 56 0;
-#X connect 132 0 98 0;
-#X connect 133 0 71 0;
-#X connect 134 0 140 0;
-#X connect 135 0 110 0;
-#X connect 136 0 74 0;
-#X connect 137 0 145 0;
-#X connect 137 0 148 0;
-#X connect 138 0 70 0;
-#X connect 138 0 96 0;
-#X connect 139 0 97 0;
-#X connect 140 0 57 0;
-#X connect 142 0 56 0;
-#X connect 143 0 9 0;
-#X connect 144 0 9 0;
-#X connect 145 0 11 0;
-#X connect 146 0 88 0;
-#X connect 147 0 56 0;
-#X connect 148 0 12 0;
-#X connect 149 0 57 0;
-#X connect 150 0 101 0;
-#X connect 151 0 158 0;
-#X connect 153 0 166 0;
-#X connect 154 0 57 0;
-#X connect 155 0 159 0;
-#X connect 157 0 165 0;
-#X connect 158 0 152 0;
-#X connect 159 0 156 0;
-#X connect 160 0 161 0;
-#X connect 161 0 162 0;
-#X connect 163 0 164 0;
-#X connect 164 0 128 0;
-#X connect 165 0 128 0;
-#X connect 166 0 128 0;
+#X connect 115 0 23 0;
+#X connect 116 0 11 0;
+#X connect 116 0 12 0;
+#X connect 117 0 56 0;
+#X connect 118 0 98 0;
+#X connect 119 0 71 0;
+#X connect 120 0 126 0;
+#X connect 121 0 110 0;
+#X connect 122 0 74 0;
+#X connect 123 0 131 0;
+#X connect 123 0 134 0;
+#X connect 124 0 70 0;
+#X connect 124 0 96 0;
+#X connect 125 0 97 0;
+#X connect 126 0 57 0;
+#X connect 128 0 56 0;
+#X connect 129 0 9 0;
+#X connect 130 0 9 0;
+#X connect 131 0 11 0;
+#X connect 132 0 88 0;
+#X connect 133 0 56 0;
+#X connect 134 0 12 0;
+#X connect 135 0 57 0;
+#X connect 136 0 101 0;
+#X connect 137 0 142 0;
+#X connect 139 0 57 0;
+#X connect 140 0 143 0;
+#X connect 142 0 138 0;
+#X connect 143 0 141 0;
+#X connect 144 0 145 0;
+#X connect 145 0 146 0;
+#X connect 160 0 166 0;
+#X connect 161 0 168 0;
+#X connect 162 0 165 0;
+#X connect 163 0 167 0;
+#X connect 164 0 151 0;
+#X connect 164 1 157 0;
+#X connect 164 2 156 0;
+#X connect 164 3 155 0;
+#X connect 164 4 154 0;
+#X connect 164 5 153 0;
+#X connect 164 6 152 0;
+#X connect 164 7 150 0;
+#X connect 164 8 149 0;
+#X connect 164 9 148 0;
+#X connect 164 10 147 0;
+#X connect 164 11 158 0;
+#X connect 164 12 159 0;
+#X connect 165 0 164 0;
+#X connect 166 0 164 0;
+#X connect 167 0 164 0;
+#X connect 168 0 164 0;
--- a/SwordCorLoFi/centreAngles.pd	Wed Mar 16 14:53:28 2016 +0000
+++ b/SwordCorLoFi/centreAngles.pd	Wed Mar 16 15:52:48 2016 +0000
@@ -61,6 +61,7 @@
 #X obj 1018 252 line~;
 #X text 283 237 Current Sword Azimuth angle;
 #X text 1081 271 Current Sword Elevation angle;
+#X obj 115 246 s~ currentAzim;
 #X connect 0 0 54 0;
 #X connect 1 0 0 0;
 #X connect 2 0 0 1;
@@ -116,4 +117,5 @@
 #X connect 53 0 52 1;
 #X connect 54 0 57 0;
 #X connect 57 0 55 0;
+#X connect 57 0 61 0;
 #X connect 58 0 56 0;
--- a/SwordCorLoFi/freqCalcCyl4_Lofi.pd	Wed Mar 16 14:53:28 2016 +0000
+++ b/SwordCorLoFi/freqCalcCyl4_Lofi.pd	Wed Mar 16 15:52:48 2016 +0000
@@ -6,10 +6,10 @@
 #X obj 540 445 r \$0-diameter;
 #X obj 130 95 s~ \$0-windSpeed;
 #X obj 534 406 r~ \$0-windSpeed;
-#X obj 519 493 s~ \$0-myFreq;
+#X obj 519 524 s~ \$0-myFreq;
 #X obj 646 67 inlet;
-#X text 483 512 Calculates the frequency;
-#X text 484 524 based on the physics of;
+#X text 483 543 Calculates the frequency;
+#X text 484 555 based on the physics of;
 #X text 107 382 Calculates the gain of the dipole source;
 #X text 469 47 Azimuth;
 #X text 651 49 Pan;
@@ -24,7 +24,7 @@
 #X obj 154 236 r \$0-diameter;
 #X obj 646 91 max 0.01;
 #X obj 646 114 min 0.99;
-#X text 484 537 the object and environment;
+#X text 484 568 the object and environment;
 #X obj 130 75 inlet~;
 #X obj 398 71 inlet~;
 #X obj 403 94 s~ \$0-dist;
@@ -178,7 +178,7 @@
 -1 -1;
 #X obj 378 245 s setUp;
 #X obj 378 221 Uzi 20;
-#N canvas 181 90 1238 721 GoldfreqGainLoFi 1;
+#N canvas 181 90 1238 721 GoldfreqGainLoFi 0;
 #N canvas 759 125 286 294 pow6 0;
 #X obj 47 67 *~;
 #X obj 76 67 *~;
@@ -337,14 +337,14 @@
 #X obj 240 258 r bladeLen;
 #X text 25 173 St ^2 * mass air * sqrt(2*pi);
 #X obj 218 171 *~ 0.1228;
-#X obj 293 192 *~ 5;
 #X obj 293 170 sig~;
 #X obj 551 191 /~ 343.56;
 #X obj 773 336 r~ \$0-gain_azim;
+#X obj 293 192 *~ 7;
 #X connect 0 0 68 0;
 #X connect 4 0 0 0;
-#X connect 4 0 71 0;
-#X connect 6 0 70 0;
+#X connect 4 0 70 0;
+#X connect 6 0 69 0;
 #X connect 10 0 27 0;
 #X connect 10 0 28 0;
 #X connect 11 0 47 0;
@@ -399,14 +399,76 @@
 #X connect 65 0 11 0;
 #X connect 66 0 10 1;
 #X connect 68 0 46 0;
-#X connect 69 0 46 1;
-#X connect 70 0 69 0;
-#X connect 71 0 22 1;
-#X connect 72 0 35 0;
+#X connect 69 0 72 0;
+#X connect 70 0 22 1;
+#X connect 71 0 35 0;
+#X connect 72 0 46 1;
 #X restore 127 322 pd GoldfreqGainLoFi;
 #X obj 519 387 sig~ 0.2;
-#X connect 0 0 7 0;
+#N canvas 305 116 823 563 doppler 0;
+#X obj 88 329 inlet~;
+#X obj 88 467 outlet~;
+#X obj 186 256 r~ \$0-azim;
+#X obj 186 279 /~ 360;
+#X obj 186 301 cos~;
+#X obj 171 322 *~;
+#X obj 286 114 atan;
+#X obj 286 93 /;
+#X obj 286 137 * 57.2958;
+#X floatatom 326 161 0 0 0 0 - - -;
+#X obj 286 183 line~;
+#X msg 286 161 \$1 15;
+#X obj 286 247 -~;
+#X obj 286 267 >~ 0;
+#X obj 286 289 snapshot~;
+#X floatatom 286 311 0 0 0 0 - - -;
+#X obj 301 227 r~ currentAzim;
+#X obj 286 207 +~ 90;
+#X obj 210 370 *~ -1;
+#X obj 171 349 spigot~;
+#X obj 96 359 sig~ 323.56;
+#X obj 156 389 +~;
+#X obj 141 411 /~;
+#X obj 88 435 *~;
+#X obj 333 267 r myMet;
+#X obj 286 53 r conProX;
+#X obj 301 73 r conProY;
+#X text 423 61 Calculate the azimuth angle from the projected position
+of the oberver in the plane of the sword. Peak position is when the
+current azimuth is the same as the observer azimuth.;
+#X obj 171 233 r~ \$0-windSpeed;
+#X connect 0 0 23 0;
+#X connect 2 0 3 0;
+#X connect 3 0 4 0;
+#X connect 4 0 5 1;
+#X connect 5 0 19 0;
+#X connect 6 0 8 0;
+#X connect 7 0 6 0;
+#X connect 8 0 9 0;
+#X connect 8 0 11 0;
+#X connect 10 0 17 0;
+#X connect 11 0 10 0;
+#X connect 12 0 13 0;
+#X connect 13 0 14 0;
+#X connect 14 0 15 0;
+#X connect 14 0 19 1;
+#X connect 16 0 12 1;
+#X connect 17 0 12 0;
+#X connect 18 0 21 1;
+#X connect 19 0 21 1;
+#X connect 19 1 18 0;
+#X connect 20 0 21 0;
+#X connect 20 0 22 0;
+#X connect 21 0 22 1;
+#X connect 22 0 23 1;
+#X connect 23 0 1 0;
+#X connect 24 0 14 0;
+#X connect 25 0 7 0;
+#X connect 26 0 7 1;
+#X connect 28 0 5 0;
+#X restore 519 491 pd doppler;
 #X connect 0 0 38 0;
+#X connect 0 0 47 0;
 #X connect 1 0 0 0;
 #X connect 2 0 3 0;
 #X connect 4 0 0 1;
@@ -431,3 +493,4 @@
 #X connect 45 0 19 0;
 #X connect 45 1 18 0;
 #X connect 46 0 1 0;
+#X connect 47 0 7 0;