changeset 95:132bfea825a2

SwordSounds continue development. Single source working but no azimuth info for source yet.
author Rod Selfridge <r.selfridge@qmul.ac.uk>
date Wed, 22 Jul 2015 18:10:54 +0100
parents 2dea66bf32a1
children 1fc3648f6c34
files SwordSounds/sourceSpeed.pd SwordSounds/sweepTime.pd SwordSounds/tenSource.pd SwordSounds/woosh_D5.pd
diffstat 4 files changed, 472 insertions(+), 395 deletions(-) [+]
line wrap: on
line diff
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/SwordSounds/sourceSpeed.pd	Wed Jul 22 18:10:54 2015 +0100
@@ -0,0 +1,155 @@
+#N canvas 117 23 1408 813 10;
+#X obj 212 -172 bng 50 250 50 0 empty empty empty 17 7 0 10 -4034 -1
+-1;
+#X obj 212 -119 s GO;
+#X obj 152 -172 bng 50 250 50 0 empty empty empty 17 7 0 10 -257985
+-1 -1;
+#X obj 152 -119 s setUp;
+#X obj 333 369 line~;
+#X text 342 -151 Start calculation with elevation = 0 \, arm length
+is constant \, acceleration/deceleration is constant.;
+#X obj 220 418 loadbang;
+#X obj 220 439 tgl 15 0 empty empty empty 17 7 0 10 -262144 -1 -1 1
+1;
+#X obj 220 457 metro 10;
+#X obj 220 479 snapshot~;
+#X floatatom 220 499 5 0 0 0 - - -;
+#X obj 301 515 hsl 128 15 0 80 0 0 empty empty empty -2 -8 0 10 -262144
+-1 -1 0 1;
+#X msg 163 303 \$1 \$2;
+#X obj 163 278 pack;
+#X msg 333 335 0;
+#X obj 162 255 f;
+#X obj 162 210 r GO;
+#X msg 472 337 0 \$1;
+#X obj 471 260 t f b;
+#X obj 472 288 delay;
+#X obj 333 314 r setUp;
+#X text 316 295 Start at 0 speed;
+#X text 514 348 \$1 = time to reach speed of 0;
+#X obj 486 213 r preswingTime;
+#X text 424 173 Trigger once full speed;
+#X obj 333 402 outlet~;
+#X obj 664 -154 inlet;
+#X obj 758 -156 inlet;
+#X obj 664 -131 s \$0_thisGroup;
+#X obj 758 -132 s \$0_thisSource;
+#X text 100 334 \$1 = source speed;
+#X text 100 350 \$2 = time to reach source speed;
+#X obj 188 254 r preswingTime;
+#X obj 667 -35 r \$0_thisGroup;
+#X obj 682 -15 r \$0_thisSource;
+#X obj 667 7 +;
+#X floatatom 621 34 5 0 0 0 - - -;
+#X obj 667 33 s \$0_mySourceNo;
+#X obj 192 -90 r \$0_mySourceNo;
+#X obj 207 -70 r deltaPreCirc;
+#X obj 192 -49 *;
+#X obj 192 -8 +;
+#X obj 207 -29 r minPreCirc;
+#X floatatom 129 13 5 0 0 0 - - -;
+#X obj 207 13 r preswingTime;
+#X obj 192 56 /;
+#X obj 207 34 * 0.001;
+#X obj 192 83 * 2;
+#X text 235 63 Average Speed;
+#X text 232 87 Top Speed for this source;
+#X floatatom 139 109 5 0 0 0 - - -;
+#X obj 454 -84 r \$0_mySourceNo;
+#X obj 454 -43 *;
+#X obj 454 -2 +;
+#X floatatom 391 19 5 0 0 0 - - -;
+#X obj 454 62 /;
+#X obj 469 40 * 0.001;
+#X obj 454 89 * 2;
+#X text 497 69 Average Speed;
+#X text 494 93 Top Speed for this source;
+#X floatatom 401 115 5 0 0 0 - - -;
+#X obj 469 -64 r deltaPostCirc;
+#X obj 469 -23 r minPostCirc;
+#X obj 469 19 r postswingTime;
+#X obj 192 110 s \$0_myPreSourceSpeed;
+#X obj 177 231 r \$0_myPreSourceSpeed;
+#X obj 454 116 s \$0_myPostSourceSpeed;
+#X obj 529 277 r postswingTime;
+#X floatatom 561 300 5 0 0 0 - - -;
+#X obj 471 193 r GO;
+#X obj 471 235 f;
+#X obj 472 315 f;
+#X obj 893 -14 r start_armLength;
+#X obj 878 -36 r length;
+#X obj 878 48 -;
+#X obj 926 29 r NoOfSources;
+#X obj 911 8 r \$0_mySourceNo;
+#X obj 911 51 /;
+#X obj 878 73 *;
+#X floatatom 829 142 5 0 0 0 - - -;
+#X obj 878 116 +;
+#X obj 893 94 r start_armLength;
+#X obj 878 143 outlet;
+#X text 933 142 Distance from centre of arc;
+#X connect 0 0 1 0;
+#X connect 2 0 3 0;
+#X connect 4 0 9 0;
+#X connect 4 0 25 0;
+#X connect 6 0 7 0;
+#X connect 7 0 8 0;
+#X connect 8 0 9 0;
+#X connect 9 0 10 0;
+#X connect 9 0 11 0;
+#X connect 12 0 4 0;
+#X connect 13 0 12 0;
+#X connect 14 0 4 0;
+#X connect 15 0 13 0;
+#X connect 16 0 15 0;
+#X connect 17 0 4 0;
+#X connect 18 0 19 1;
+#X connect 18 1 19 0;
+#X connect 19 0 71 0;
+#X connect 20 0 14 0;
+#X connect 23 0 70 1;
+#X connect 26 0 28 0;
+#X connect 27 0 29 0;
+#X connect 32 0 13 1;
+#X connect 33 0 35 0;
+#X connect 34 0 35 1;
+#X connect 35 0 36 0;
+#X connect 35 0 37 0;
+#X connect 38 0 40 0;
+#X connect 39 0 40 1;
+#X connect 40 0 41 0;
+#X connect 41 0 43 0;
+#X connect 41 0 45 0;
+#X connect 42 0 41 1;
+#X connect 44 0 46 0;
+#X connect 45 0 47 0;
+#X connect 46 0 45 1;
+#X connect 47 0 50 0;
+#X connect 47 0 64 0;
+#X connect 51 0 52 0;
+#X connect 52 0 53 0;
+#X connect 53 0 54 0;
+#X connect 53 0 55 0;
+#X connect 55 0 57 0;
+#X connect 56 0 55 1;
+#X connect 57 0 60 0;
+#X connect 57 0 66 0;
+#X connect 61 0 52 1;
+#X connect 62 0 53 1;
+#X connect 63 0 56 0;
+#X connect 65 0 15 1;
+#X connect 67 0 68 0;
+#X connect 67 0 71 1;
+#X connect 69 0 70 0;
+#X connect 70 0 18 0;
+#X connect 71 0 17 0;
+#X connect 72 0 74 1;
+#X connect 73 0 74 0;
+#X connect 74 0 78 0;
+#X connect 75 0 77 1;
+#X connect 76 0 77 0;
+#X connect 77 0 78 1;
+#X connect 78 0 80 0;
+#X connect 80 0 79 0;
+#X connect 80 0 82 0;
+#X connect 81 0 80 1;
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/SwordSounds/sweepTime.pd	Wed Jul 22 18:10:54 2015 +0100
@@ -0,0 +1,101 @@
+#N canvas 64 60 1299 777 10;
+#X obj 658 -89 r presweepElev;
+#X obj 751 -90 r postsweepElev;
+#X obj 199 19 r presweepAzim;
+#X floatatom 158 51 5 0 0 0 - - -;
+#X floatatom 658 -65 5 0 0 0 - - -;
+#X floatatom 751 -67 5 0 0 0 - - -;
+#X obj 198 -110 bng 50 250 50 0 empty empty empty 17 7 0 10 -4034 -1
+-1;
+#X obj 198 -57 s GO;
+#X obj 138 -110 bng 50 250 50 0 empty empty empty 17 7 0 10 -257985
+-1 -1;
+#X obj 138 -57 s setUp;
+#X obj 852 -90 r start_armLength;
+#X floatatom 852 -69 5 0 0 0 - - -;
+#X obj 968 -90 r bladeLen;
+#X floatatom 968 -67 5 0 0 0 - - -;
+#X obj 214 86 r start_armLength;
+#X obj 229 107 r bladeLen;
+#X obj 214 131 +;
+#X floatatom 232 151 5 0 0 0 - - -;
+#X text 328 -89 Start calculation with elevation = 0 \, arm length
+is constant \, acceleration/deceleration is constant.;
+#X obj 199 64 * 6.28312;
+#X obj 199 42 / 360;
+#X floatatom 156 97 5 0 0 0 - - -;
+#X obj 199 164 *;
+#X floatatom 152 198 5 0 0 0 - - -;
+#X obj 214 185 r topSpeed;
+#X obj 214 210 / 2;
+#X obj 199 234 /;
+#X obj 199 258 * 1000;
+#X floatatom 246 287 5 0 0 0 - - -;
+#X floatatom 542 40 5 0 0 0 - - -;
+#X obj 598 75 r start_armLength;
+#X obj 613 96 r bladeLen;
+#X obj 598 120 +;
+#X floatatom 616 140 5 0 0 0 - - -;
+#X obj 583 53 * 6.28312;
+#X obj 583 31 / 360;
+#X floatatom 540 86 5 0 0 0 - - -;
+#X obj 583 153 *;
+#X floatatom 536 187 5 0 0 0 - - -;
+#X obj 598 174 r topSpeed;
+#X obj 598 199 / 2;
+#X obj 583 223 /;
+#X obj 583 247 * 1000;
+#X obj 583 8 r postsweepAzim;
+#X text 683 252 Time from 0 azimuth to;
+#X text 686 267 stationary at post sweep;
+#X text 637 199 Assuming constant acceleration;
+#X floatatom 635 274 5 0 0 0 - - -;
+#X obj 199 320 s preswingTime;
+#X obj 583 306 s postswingTime;
+#X text 249 211 Assuming constant acceleration;
+#X text 25 240 Time from pre-sweep azimuth;
+#X text 26 253 to centre at top speed;
+#X text 8 186 Pre sweep Circumference;
+#X text 396 167 Post sweep Circumference;
+#X text 315 321 Acceleration time;
+#X text 692 307 Decceleration time;
+#X text 246 130 Full radius;
+#X text 648 119 Full radius;
+#X connect 0 0 4 0;
+#X connect 1 0 5 0;
+#X connect 2 0 3 0;
+#X connect 2 0 20 0;
+#X connect 6 0 7 0;
+#X connect 8 0 9 0;
+#X connect 10 0 11 0;
+#X connect 12 0 13 0;
+#X connect 14 0 16 0;
+#X connect 15 0 16 1;
+#X connect 16 0 17 0;
+#X connect 16 0 22 1;
+#X connect 19 0 21 0;
+#X connect 19 0 22 0;
+#X connect 20 0 19 0;
+#X connect 22 0 23 0;
+#X connect 22 0 26 0;
+#X connect 24 0 25 0;
+#X connect 25 0 26 1;
+#X connect 26 0 27 0;
+#X connect 27 0 28 0;
+#X connect 27 0 48 0;
+#X connect 30 0 32 0;
+#X connect 31 0 32 1;
+#X connect 32 0 33 0;
+#X connect 32 0 37 1;
+#X connect 34 0 36 0;
+#X connect 34 0 37 0;
+#X connect 35 0 34 0;
+#X connect 37 0 38 0;
+#X connect 37 0 41 0;
+#X connect 39 0 40 0;
+#X connect 40 0 41 1;
+#X connect 41 0 42 0;
+#X connect 42 0 47 0;
+#X connect 42 0 49 0;
+#X connect 43 0 29 0;
+#X connect 43 0 35 0;
--- a/SwordSounds/tenSource.pd	Wed Jul 22 15:22:45 2015 +0100
+++ b/SwordSounds/tenSource.pd	Wed Jul 22 18:10:54 2015 +0100
@@ -1,4 +1,4 @@
-#N canvas 116 122 1259 813 10;
+#N canvas 224 110 1259 813 10;
 #X obj 670 10 inlet;
 #X obj 670 31 i;
 #X obj 670 53 - 1;
@@ -149,10 +149,8 @@
 #X obj 102 688 obsPosition;
 #X obj -138 681 obsPosition;
 #X obj -133 428 obsPosition;
-#X obj -137 194 obsPosition;
 #X obj 335 315 obsPosition;
 #X obj -158 336 freqCalcWoo;
-#X obj -159 109 freqCalcWooD2;
 #X obj 77 239 freqCalcWooD2;
 #X obj 313 223 freqCalcWooD2;
 #X obj 537 223 freqCalcWooD2;
@@ -161,19 +159,21 @@
 #X obj 303 595 freqCalcWooD2;
 #X obj 80 596 freqCalcWooD2;
 #X obj -155 598 freqCalcWooD2;
+#X obj -159 109 sourceSpeed;
+#X floatatom 3 169 5 0 0 0 - - -;
 #X connect 0 0 1 0;
 #X connect 0 0 12 0;
 #X connect 1 0 2 0;
 #X connect 2 0 3 0;
 #X connect 3 0 4 0;
-#X connect 5 0 153 0;
+#X connect 5 0 160 0;
 #X connect 6 0 11 1;
 #X connect 7 0 6 1;
 #X connect 8 0 9 0;
 #X connect 9 0 6 0;
-#X connect 9 0 150 0;
 #X connect 10 0 11 0;
 #X connect 11 0 134 1;
+#X connect 11 0 161 0;
 #X connect 12 0 13 0;
 #X connect 12 0 14 0;
 #X connect 12 0 15 0;
@@ -195,8 +195,8 @@
 #X connect 21 0 31 0;
 #X connect 22 0 32 0;
 #X connect 33 0 9 1;
-#X connect 34 0 153 1;
-#X connect 35 0 152 0;
+#X connect 34 0 160 1;
+#X connect 35 0 151 0;
 #X connect 36 0 41 1;
 #X connect 37 0 36 1;
 #X connect 38 0 39 0;
@@ -204,9 +204,9 @@
 #X connect 39 0 149 0;
 #X connect 40 0 41 0;
 #X connect 41 0 123 1;
-#X connect 42 0 152 1;
+#X connect 42 0 151 1;
 #X connect 43 0 39 1;
-#X connect 44 0 161 0;
+#X connect 44 0 159 0;
 #X connect 45 0 50 1;
 #X connect 46 0 45 1;
 #X connect 47 0 48 0;
@@ -214,9 +214,9 @@
 #X connect 48 0 148 0;
 #X connect 49 0 50 0;
 #X connect 50 0 135 1;
-#X connect 51 0 161 1;
+#X connect 51 0 159 1;
 #X connect 52 0 48 1;
-#X connect 53 0 154 0;
+#X connect 53 0 152 0;
 #X connect 54 0 59 1;
 #X connect 55 0 54 1;
 #X connect 56 0 57 0;
@@ -224,9 +224,9 @@
 #X connect 57 0 142 0;
 #X connect 58 0 59 0;
 #X connect 59 0 136 1;
-#X connect 60 0 154 1;
+#X connect 60 0 152 1;
 #X connect 61 0 57 1;
-#X connect 62 0 160 0;
+#X connect 62 0 158 0;
 #X connect 63 0 68 1;
 #X connect 64 0 63 1;
 #X connect 65 0 66 0;
@@ -235,18 +235,18 @@
 #X connect 67 0 68 0;
 #X connect 68 0 137 1;
 #X connect 69 0 66 1;
-#X connect 70 0 160 1;
-#X connect 71 0 155 0;
+#X connect 70 0 158 1;
+#X connect 71 0 153 0;
 #X connect 72 0 77 1;
 #X connect 73 0 72 1;
 #X connect 74 0 75 0;
 #X connect 75 0 72 0;
-#X connect 75 0 151 0;
+#X connect 75 0 150 0;
 #X connect 76 0 77 0;
 #X connect 77 0 133 1;
-#X connect 78 0 155 1;
+#X connect 78 0 153 1;
 #X connect 79 0 75 1;
-#X connect 80 0 159 0;
+#X connect 80 0 157 0;
 #X connect 81 0 86 1;
 #X connect 82 0 81 1;
 #X connect 83 0 84 0;
@@ -254,9 +254,9 @@
 #X connect 84 0 146 0;
 #X connect 85 0 86 0;
 #X connect 86 0 138 1;
-#X connect 87 0 159 1;
+#X connect 87 0 157 1;
 #X connect 88 0 84 1;
-#X connect 89 0 156 0;
+#X connect 89 0 154 0;
 #X connect 90 0 95 1;
 #X connect 91 0 90 1;
 #X connect 92 0 93 0;
@@ -264,9 +264,9 @@
 #X connect 93 0 143 0;
 #X connect 94 0 95 0;
 #X connect 95 0 139 1;
-#X connect 96 0 156 1;
+#X connect 96 0 154 1;
 #X connect 97 0 93 1;
-#X connect 98 0 158 0;
+#X connect 98 0 156 0;
 #X connect 99 0 104 1;
 #X connect 100 0 99 1;
 #X connect 101 0 102 0;
@@ -274,9 +274,9 @@
 #X connect 102 0 145 0;
 #X connect 103 0 104 0;
 #X connect 104 0 140 1;
-#X connect 105 0 158 1;
+#X connect 105 0 156 1;
 #X connect 106 0 102 1;
-#X connect 107 0 157 0;
+#X connect 107 0 155 0;
 #X connect 108 0 113 1;
 #X connect 109 0 108 1;
 #X connect 110 0 111 0;
@@ -284,7 +284,7 @@
 #X connect 111 0 144 0;
 #X connect 112 0 113 0;
 #X connect 113 0 141 1;
-#X connect 114 0 157 1;
+#X connect 114 0 155 1;
 #X connect 115 0 111 1;
 #X connect 116 0 119 0;
 #X connect 117 0 118 0;
@@ -315,15 +315,6 @@
 #X connect 148 1 135 3;
 #X connect 149 0 123 2;
 #X connect 149 1 123 3;
-#X connect 151 0 133 2;
-#X connect 151 1 133 3;
-#X connect 152 0 123 0;
-#X connect 153 0 134 0;
-#X connect 154 0 136 0;
-#X connect 155 0 133 0;
-#X connect 156 0 139 0;
-#X connect 157 0 141 0;
-#X connect 158 0 140 0;
-#X connect 159 0 138 0;
-#X connect 160 0 137 0;
-#X connect 161 0 135 0;
+#X connect 150 0 133 2;
+#X connect 150 1 133 3;
+#X connect 160 0 134 0;
--- a/SwordSounds/woosh_D5.pd	Wed Jul 22 15:22:45 2015 +0100
+++ b/SwordSounds/woosh_D5.pd	Wed Jul 22 18:10:54 2015 +0100
@@ -1,4 +1,4 @@
-#N canvas 0 23 1253 824 10;
+#N canvas 80 23 1253 824 10;
 #X obj 551 -93 vu 15 120 empty empty -1 -8 0 10 -66577 -1 1 0;
 #X obj 614 -93 vu 15 120 empty empty -1 -8 0 10 -66577 -1 1 0;
 #X text 611 -184 Gain;
@@ -132,7 +132,7 @@
 #X obj -178 -183 s NoOfSources;
 #X obj 85 141 s topSpeed;
 #X obj 33 115 hsl 100 20 0 100 0 0 empty empty empty -2 -8 0 10 -262144
--1 -1 4957 1;
+-1 -1 2857 1;
 #X floatatom 30 141 8 0 0 0 - - -;
 #X text 57 -216 Blade Length;
 #X text 56 -150 Arm Length;
@@ -141,46 +141,33 @@
 #X obj 820 -141 hsl 100 20 0 360 0 0 empty empty empty -2 -8 0 10 -262144
 -1 -1 4412 1;
 #X floatatom 817 -109 8 0 0 0 - - -;
-#X obj -142 439 r sweepAngle;
-#X obj -235 395 r bladeLen;
-#X obj -189 418 r armLength;
 #X obj 518 174 s firstSpeed;
 #X obj 613 173 s deltaSpeed;
-#X floatatom -292 490 8 0 0 0 - - -;
-#X floatatom -54 488 8 0 0 0 - - -;
-#N canvas 833 342 426 335 thickCalc 0;
+#N canvas 687 370 426 335 thickCalc 0;
 #X obj 173 139 r NoOfSources;
-#X obj 23 16 inlet;
-#X obj 26 64 inlet;
-#X obj 26 86 s \$0_tipThick;
 #X obj 158 115 -;
 #X obj 158 164 /;
-#X obj 158 187 outlet;
-#X obj 23 39 s \$0_hiltThick;
 #X floatatom 126 147 5 0 0 0 - - -;
-#X obj 173 44 r \$0_tipThick;
-#X obj 158 19 r \$0_hiltThick;
 #X floatatom 94 189 8 0 0 0 - - -;
 #X obj 173 72 t f b;
 #X obj 200 95 delay 9;
 #X text 58 237 Calculates the difference in thickness between sources
 ;
 #X text 59 254 based on the blade tapering in a straight line;
-#X connect 0 0 5 1;
-#X connect 1 0 7 0;
-#X connect 2 0 3 0;
-#X connect 4 0 5 0;
-#X connect 4 0 8 0;
-#X connect 5 0 6 0;
-#X connect 5 0 11 0;
-#X connect 9 0 12 0;
-#X connect 10 0 4 0;
-#X connect 12 0 4 1;
-#X connect 12 1 13 0;
-#X connect 13 0 4 0;
+#X obj 158 19 r hiltThick;
+#X obj 173 44 r tipThick;
+#X obj 158 187 s deltaThick;
+#X connect 0 0 2 1;
+#X connect 1 0 2 0;
+#X connect 1 0 3 0;
+#X connect 2 0 4 0;
+#X connect 2 0 11 0;
+#X connect 5 0 1 1;
+#X connect 5 1 6 0;
+#X connect 6 0 1 0;
+#X connect 9 0 1 0;
+#X connect 10 0 5 0;
 #X restore 382 -113 pd thickCalc;
-#X obj 382 -90 s deltaThick;
-#X floatatom 327 -89 8 0 0 0 - - -;
 #X obj 27 202 hsl 100 20 0 0.03 0 0 empty empty empty -2 -8 0 10 -262144
 -1 -1 2805 1;
 #X obj 26 287 hsl 100 20 0 0.01 0 0 empty empty empty -2 -8 0 10 -262144
@@ -191,8 +178,6 @@
 #X obj 81 314 s tipThick;
 #X text 141 204 Hilt Thickness;
 #X text 133 288 Tip Thickness;
-#X obj 382 -158 r hiltThick;
-#X obj 451 -136 r tipThick;
 #X obj 224 -170 bng 50 250 50 0 empty empty empty 17 7 0 10 -4034 -1
 -1;
 #X obj 224 -117 s GO;
@@ -220,89 +205,101 @@
 #X obj -317 191 r setUp;
 #X obj -203 155 s obsDistance;
 #X obj -207 242 s obsAngle;
-#N canvas 427 69 911 675 circumferCalc 0;
-#X obj 266 13 inlet;
-#X floatatom 365 172 5 0 0 0 - - -;
-#X obj 80 13 inlet;
-#X obj 170 13 inlet;
-#X obj 247 146 +;
-#X obj 316 172 / 360;
-#X obj 247 171 * 3.14159;
-#X obj 247 219 *;
-#X obj 247 195 * 2;
-#X obj 80 36 s \$0_bladeLen;
-#X obj 170 36 s \$0_armLength;
-#X obj 266 36 s \$0_sweepAngle;
-#X obj 247 99 r \$0_bladeLen;
-#X obj 262 123 r \$0_armLength;
-#X obj 316 148 r \$0_sweepAngle;
-#X floatatom 734 192 5 0 0 0 - - -;
-#X obj 685 192 / 360;
-#X floatatom 628 168 5 0 0 0 - - -;
-#X obj 616 191 * 3.14159;
-#X obj 616 239 *;
-#X floatatom 560 267 8 0 0 0 - - -;
-#X obj 616 215 * 2;
-#X obj 616 143 r \$0_armLength;
-#X obj 685 168 r \$0_sweepAngle;
-#X obj 616 267 s \$0_minCirc;
-#X obj 265 459 r \$0_minCirc;
-#X obj 265 481 outlet;
-#X obj 262 279 r \$0_minCirc;
-#X floatatom 188 339 8 0 0 0 - - -;
-#X obj 247 305 -;
-#X obj 247 341 /;
-#X obj 277 317 r NoOfSources;
-#X floatatom 185 370 8 0 0 0 - - -;
-#X obj 247 367 s \$0_deltaCirc;
-#X obj 354 459 r \$0_deltaCirc;
-#X obj 354 481 outlet;
-#X obj 260 246 s maxCirc;
-#X obj 191 172 s length;
-#X text 122 176 Arc radius;
-#X text 318 195 % of circle;
-#X text 323 242 Circumference of arc of tip;
-#X text 692 210 % of circle;
-#X text 601 289 Circumference of arc of hilt;
-#X floatatom 187 243 8 0 0 0 - - -;
-#X text 199 390 Difference of circumference length for each source
-;
-#X text 199 405 based on linear spacing between sources;
-#X connect 0 0 11 0;
-#X connect 2 0 9 0;
-#X connect 3 0 10 0;
-#X connect 4 0 6 0;
-#X connect 4 0 37 0;
-#X connect 5 0 7 1;
-#X connect 6 0 8 0;
-#X connect 7 0 29 0;
-#X connect 7 0 36 0;
-#X connect 7 0 43 0;
-#X connect 8 0 7 0;
-#X connect 12 0 4 0;
-#X connect 13 0 4 1;
-#X connect 14 0 5 0;
-#X connect 14 0 1 0;
-#X connect 16 0 19 1;
-#X connect 18 0 21 0;
-#X connect 19 0 20 0;
-#X connect 19 0 24 0;
-#X connect 21 0 19 0;
-#X connect 22 0 18 0;
+#N canvas 250 113 911 675 circumferCalc 1;
+#X obj 440 104 +;
+#X obj 440 127 s length;
+#X obj 168 153 r start_armLength;
+#X obj 153 86 r presweepAzim;
+#X obj 644 76 bng 50 250 50 0 empty empty empty 17 7 0 10 -4034 -1
+-1;
+#X obj 644 129 s GO;
+#X obj 584 76 bng 50 250 50 0 empty empty empty 17 7 0 10 -257985 -1
+-1;
+#X obj 584 129 s setUp;
+#X obj 153 132 * 6.28312;
+#X obj 153 110 / 360;
+#X obj 153 174 *;
+#X floatatom 91 198 5 0 0 0 - - -;
+#X text 194 175 Circumference of the nearest source on blade;
+#X text 307 191 up to 0 azimuth;
+#X obj 153 200 s minPreCirc;
+#X obj 452 300 r start_armLength;
+#X obj 437 279 * 6.28312;
+#X obj 437 257 / 360;
+#X obj 437 321 *;
+#X floatatom 375 345 5 0 0 0 - - -;
+#X text 478 322 Circumference of the nearest source on blade;
+#X text 914 158 up to 0 azimuth;
+#X obj 437 233 r postsweepAzim;
+#X obj 437 347 s minPostCirc;
+#X obj 149 252 r presweepAzim;
+#X obj 149 298 * 6.28312;
+#X obj 149 276 / 360;
+#X obj 149 342 *;
+#X obj 164 320 r length;
+#X floatatom 111 364 5 0 0 0 - - -;
+#X obj 440 57 r bladeLen;
+#X obj 455 81 r start_armLength;
+#X obj 437 434 * 6.28312;
+#X obj 437 412 / 360;
+#X obj 437 478 *;
+#X obj 452 456 r length;
+#X floatatom 399 501 5 0 0 0 - - -;
+#X obj 437 388 r postsweepAzim;
+#X obj 164 362 r minPreCirc;
+#X obj 149 383 -;
+#X obj 149 426 /;
+#X floatatom 111 454 5 0 0 0 - - -;
+#X obj 164 403 r NoOfSources;
+#X obj 149 454 s deltaPreCirc;
+#X obj 437 519 -;
+#X obj 437 562 /;
+#X obj 452 539 r NoOfSources;
+#X obj 452 498 r minPostCirc;
+#X obj 437 590 s deltaPostCirc;
+#X floatatom 397 591 5 0 0 0 - - -;
+#X text 33 334 Max Circumference;
+#X text 323 472 Max Circumference;
+#X connect 0 0 1 0;
+#X connect 2 0 10 1;
+#X connect 3 0 9 0;
+#X connect 4 0 5 0;
+#X connect 6 0 7 0;
+#X connect 8 0 10 0;
+#X connect 9 0 8 0;
+#X connect 10 0 11 0;
+#X connect 10 0 14 0;
+#X connect 15 0 18 1;
+#X connect 16 0 18 0;
+#X connect 17 0 16 0;
+#X connect 18 0 19 0;
+#X connect 18 0 23 0;
 #X connect 22 0 17 0;
-#X connect 23 0 16 0;
-#X connect 23 0 15 0;
-#X connect 25 0 26 0;
-#X connect 27 0 29 1;
-#X connect 29 0 28 0;
-#X connect 29 0 30 0;
-#X connect 30 0 32 0;
-#X connect 30 0 33 0;
-#X connect 31 0 30 1;
-#X connect 34 0 35 0;
-#X restore -235 463 pd circumferCalc;
-#X obj -235 488 s circumMin;
-#X obj -142 488 s deltaCircum;
+#X connect 24 0 26 0;
+#X connect 25 0 27 0;
+#X connect 26 0 25 0;
+#X connect 27 0 29 0;
+#X connect 27 0 39 0;
+#X connect 28 0 27 1;
+#X connect 30 0 0 0;
+#X connect 31 0 0 1;
+#X connect 32 0 34 0;
+#X connect 33 0 32 0;
+#X connect 34 0 36 0;
+#X connect 34 0 44 0;
+#X connect 35 0 34 1;
+#X connect 37 0 33 0;
+#X connect 38 0 39 1;
+#X connect 39 0 40 0;
+#X connect 40 0 41 0;
+#X connect 40 0 43 0;
+#X connect 42 0 40 1;
+#X connect 44 0 45 0;
+#X connect 45 0 48 0;
+#X connect 45 0 49 0;
+#X connect 46 0 45 1;
+#X connect 47 0 44 1;
+#X restore 357 -36 pd circumferCalc;
 #N canvas 303 28 1094 768 angleCalc 0;
 #X obj -129 105 * 0.75;
 #X obj 325 234 * 0.25;
@@ -446,7 +443,7 @@
 #X connect 75 0 76 1;
 #X connect 76 0 72 0;
 #X connect 76 0 48 0;
-#X restore 441 -210 pd angleCalc;
+#X restore 381 -146 pd angleCalc;
 #X obj 553 -165 hsl 100 25 0 127 0 0 empty empty empty -2 -8 0 10 -262144
 -1 -1 3118 1;
 #X obj 24 -239 loadbang;
@@ -475,8 +472,6 @@
 #X obj -231 -226 r setUp;
 #X obj -27 -172 r setUp;
 #X obj -28 -237 r setUp;
-#X text 361 -72 Calculate thicknes delta;
-#X text -244 513 Circumference calculations;
 #X text 550 195 Speed calculations;
 #X text 384 402 Presets;
 #X msg 456 297 20 160 0.01 0.004 2 0 127;
@@ -498,162 +493,6 @@
 #X obj -269 266 r thisOE;
 #X obj -211 316 s obsElev;
 #X text -148 293 (Elevation);
-#N canvas 71 45 1255 757 sweepTime 1;
-#X obj 648 -99 r presweepElev;
-#X obj 741 -100 r postsweepElev;
-#X obj 189 9 r presweepAzim;
-#X floatatom 148 41 5 0 0 0 - - -;
-#X floatatom 648 -75 5 0 0 0 - - -;
-#X floatatom 741 -77 5 0 0 0 - - -;
-#X obj 188 -120 bng 50 250 50 0 empty empty empty 17 7 0 10 -4034 -1
--1;
-#X obj 188 -67 s GO;
-#X obj 128 -120 bng 50 250 50 0 empty empty empty 17 7 0 10 -257985
--1 -1;
-#X obj 128 -67 s setUp;
-#X obj 309 421 line~;
-#X text 236 120 start radius;
-#X obj 842 -100 r start_armLength;
-#X floatatom 842 -79 5 0 0 0 - - -;
-#X obj 958 -100 r bladeLen;
-#X floatatom 958 -77 5 0 0 0 - - -;
-#X obj 204 76 r start_armLength;
-#X obj 219 97 r bladeLen;
-#X obj 204 121 +;
-#X floatatom 222 141 5 0 0 0 - - -;
-#X text 318 -99 Start calculation with elevation = 0 \, arm length
-is constant \, acceleration/deceleration is constant.;
-#X obj 189 54 * 6.28312;
-#X obj 189 32 / 360;
-#X floatatom 146 87 5 0 0 0 - - -;
-#X obj 189 154 *;
-#X obj 196 470 loadbang;
-#X obj 196 491 tgl 15 0 empty empty empty 17 7 0 10 -262144 -1 -1 1
-1;
-#X obj 196 509 metro 10;
-#X obj 196 531 snapshot~;
-#X floatatom 196 551 5 0 0 0 - - -;
-#X obj 277 567 hsl 128 15 0 80 0 0 empty empty empty -2 -8 0 10 -262144
--1 -1 0 1;
-#X floatatom 142 188 5 0 0 0 - - -;
-#X obj 97 311 r topSpeed;
-#X msg 83 383 \$1 \$2;
-#X obj 83 358 pack;
-#X obj 204 175 r topSpeed;
-#X obj 204 200 / 2;
-#X obj 189 224 /;
-#X obj 189 248 * 1000;
-#X floatatom 236 277 5 0 0 0 - - -;
-#X msg 309 387 0;
-#X obj 82 335 f;
-#X obj 82 290 r GO;
-#X floatatom 532 30 5 0 0 0 - - -;
-#X obj 588 65 r start_armLength;
-#X obj 603 86 r bladeLen;
-#X obj 588 110 +;
-#X floatatom 606 130 5 0 0 0 - - -;
-#X obj 573 43 * 6.28312;
-#X obj 573 21 / 360;
-#X floatatom 530 76 5 0 0 0 - - -;
-#X obj 573 143 *;
-#X floatatom 526 177 5 0 0 0 - - -;
-#X obj 588 164 r topSpeed;
-#X obj 588 189 / 2;
-#X obj 573 213 /;
-#X obj 573 237 * 1000;
-#X obj 573 -2 r postsweepAzim;
-#X text 638 109 start radius;
-#X text 673 242 Time from 0 azimuth to;
-#X text 676 257 stationary at post sweep;
-#X text 627 189 Assuming constant acceleration;
-#X text 627 266;
-#X floatatom 625 264 5 0 0 0 - - -;
-#X obj 448 364 f;
-#X msg 448 389 0 \$1;
-#X obj 447 312 t f b;
-#X obj 448 340 delay;
-#X obj 201 306 f;
-#X obj 309 366 r setUp;
-#X obj 201 328 s preswingTime;
-#X obj 587 304 f;
-#X obj 587 282 r GO;
-#X obj 587 326 s postswingTime;
-#X obj 200 284 r GO;
-#X text 239 201 Assuming constant acceleration;
-#X text 15 230 Time from pre-sweep azimuth;
-#X text 16 243 to centre at top speed;
-#X text -2 176 Pre sweep Circumference;
-#X text 386 157 Post sweep Circumference;
-#X text 292 347 Start at 0 speed;
-#X text 20 414 \$1 = top speed;
-#X text 20 430 \$2 = time to reach top speed;
-#X text 490 400 \$1 = time to reach speed of 0;
-#X obj 447 282 r preswingTime;
-#X text 399 262 Trigger once full speed;
-#X connect 0 0 4 0;
-#X connect 1 0 5 0;
-#X connect 2 0 3 0;
-#X connect 2 0 22 0;
-#X connect 6 0 7 0;
-#X connect 8 0 9 0;
-#X connect 10 0 28 0;
-#X connect 12 0 13 0;
-#X connect 14 0 15 0;
-#X connect 16 0 18 0;
-#X connect 17 0 18 1;
-#X connect 18 0 19 0;
-#X connect 18 0 24 1;
-#X connect 21 0 23 0;
-#X connect 21 0 24 0;
-#X connect 22 0 21 0;
-#X connect 24 0 31 0;
-#X connect 24 0 37 0;
-#X connect 25 0 26 0;
-#X connect 26 0 27 0;
-#X connect 27 0 28 0;
-#X connect 28 0 29 0;
-#X connect 28 0 30 0;
-#X connect 32 0 41 1;
-#X connect 33 0 10 0;
-#X connect 34 0 33 0;
-#X connect 35 0 36 0;
-#X connect 36 0 37 1;
-#X connect 37 0 38 0;
-#X connect 38 0 39 0;
-#X connect 38 0 34 1;
-#X connect 38 0 68 1;
-#X connect 40 0 10 0;
-#X connect 41 0 34 0;
-#X connect 42 0 41 0;
-#X connect 44 0 46 0;
-#X connect 45 0 46 1;
-#X connect 46 0 47 0;
-#X connect 46 0 51 1;
-#X connect 48 0 50 0;
-#X connect 48 0 51 0;
-#X connect 49 0 48 0;
-#X connect 51 0 52 0;
-#X connect 51 0 55 0;
-#X connect 53 0 54 0;
-#X connect 54 0 55 1;
-#X connect 55 0 56 0;
-#X connect 56 0 63 0;
-#X connect 56 0 64 1;
-#X connect 56 0 71 1;
-#X connect 57 0 43 0;
-#X connect 57 0 49 0;
-#X connect 64 0 65 0;
-#X connect 65 0 10 0;
-#X connect 66 0 67 1;
-#X connect 66 1 67 0;
-#X connect 67 0 64 0;
-#X connect 68 0 70 0;
-#X connect 69 0 40 0;
-#X connect 71 0 73 0;
-#X connect 72 0 71 0;
-#X connect 74 0 68 0;
-#X connect 84 0 66 0;
-#X restore 293 151 pd sweepTime;
 #X obj 818 -63 hsl 100 20 0 360 0 0 empty empty empty -2 -8 0 10 -262144
 -1 -1 1100 1;
 #X floatatom 815 -31 8 0 0 0 - - -;
@@ -669,7 +508,7 @@
 #X floatatom 808 160 8 0 0 0 - - -;
 #X obj 750 108 r setUp;
 #X obj 808 107 r thisSA;
-#N canvas 419 64 363 541 allSource 0;
+#N canvas 419 64 363 541 allSource 1;
 #X obj 67 104 r distance;
 #X obj 50 83 r angle;
 #X obj 33 42 bng 15 250 50 0 empty empty empty 17 7 0 10 -262144 -1
@@ -720,6 +559,7 @@
 #X obj 168 470 tenSource;
 #X connect 2 0 4 0;
 #X connect 3 0 2 0;
+#X connect 4 0 36 0;
 #X connect 8 0 11 0;
 #X connect 9 0 8 0;
 #X connect 14 0 29 0;
@@ -730,7 +570,7 @@
 #X connect 25 0 24 0;
 #X connect 32 0 35 0;
 #X connect 33 0 32 0;
-#X restore 670 -209 pd allSource;
+#X restore 381 -85 pd allSource;
 #X obj 865 81 s presweepElev;
 #X obj 863 159 s postsweepElev;
 #X text 924 51 pre-sweep elevation;
@@ -741,14 +581,15 @@
 #X obj 870 -32 s postsweepAzim;
 #X obj 22 -128 s start_armLength;
 #X msg 22 -149 0.35;
+#X obj 400 -60 sweepTime;
 #X connect 3 0 5 0;
 #X connect 4 0 0 0;
 #X connect 4 1 1 0;
-#X connect 5 0 71 0;
+#X connect 5 0 60 0;
 #X connect 6 0 7 0;
-#X connect 6 0 29 0;
+#X connect 6 0 26 0;
 #X connect 6 1 8 0;
-#X connect 6 1 30 0;
+#X connect 6 1 27 0;
 #X connect 9 0 15 0;
 #X connect 10 0 16 0;
 #X connect 11 0 6 0;
@@ -758,85 +599,74 @@
 #X connect 18 0 17 0;
 #X connect 18 0 19 0;
 #X connect 24 0 25 0;
-#X connect 24 0 138 0;
-#X connect 26 0 67 2;
-#X connect 27 0 67 0;
-#X connect 28 0 67 1;
-#X connect 33 0 34 0;
-#X connect 33 0 35 0;
-#X connect 36 0 38 0;
-#X connect 36 0 39 0;
-#X connect 37 0 40 0;
-#X connect 37 0 41 0;
-#X connect 44 0 33 0;
-#X connect 45 0 33 1;
-#X connect 46 0 47 0;
-#X connect 48 0 50 0;
-#X connect 48 0 65 0;
-#X connect 49 0 52 0;
-#X connect 49 0 66 0;
-#X connect 54 0 55 0;
-#X connect 55 0 46 0;
-#X connect 56 0 55 1;
-#X connect 57 0 58 0;
-#X connect 59 0 18 0;
-#X connect 60 0 24 0;
-#X connect 61 0 36 0;
-#X connect 62 0 37 0;
-#X connect 63 0 48 0;
-#X connect 64 0 49 0;
-#X connect 67 0 31 0;
-#X connect 67 0 68 0;
-#X connect 67 1 32 0;
-#X connect 67 1 69 0;
-#X connect 71 0 4 0;
-#X connect 72 0 9 0;
-#X connect 73 0 141 0;
-#X connect 74 0 10 0;
-#X connect 75 0 76 0;
-#X connect 78 0 75 0;
-#X connect 86 0 18 0;
-#X connect 87 0 24 0;
-#X connect 88 0 36 0;
-#X connect 89 0 37 0;
-#X connect 90 0 48 0;
-#X connect 91 0 49 0;
-#X connect 92 0 71 0;
-#X connect 93 0 79 0;
-#X connect 93 1 80 0;
-#X connect 93 2 81 0;
-#X connect 93 3 82 0;
-#X connect 93 4 83 0;
-#X connect 93 5 84 0;
-#X connect 93 6 85 0;
-#X connect 94 0 75 0;
-#X connect 95 0 10 0;
-#X connect 96 0 141 0;
-#X connect 97 0 9 0;
-#X connect 102 0 93 0;
-#X connect 102 0 109 0;
-#X connect 103 0 93 0;
-#X connect 103 0 109 0;
-#X connect 104 0 93 0;
-#X connect 104 0 109 0;
-#X connect 106 0 103 0;
-#X connect 107 0 108 0;
-#X connect 108 0 57 0;
+#X connect 24 0 124 0;
+#X connect 29 0 31 0;
+#X connect 29 0 32 0;
+#X connect 30 0 33 0;
+#X connect 30 0 34 0;
+#X connect 37 0 38 0;
+#X connect 39 0 41 0;
+#X connect 39 0 56 0;
+#X connect 40 0 43 0;
+#X connect 40 0 57 0;
+#X connect 45 0 46 0;
+#X connect 46 0 37 0;
+#X connect 47 0 46 1;
+#X connect 48 0 49 0;
+#X connect 50 0 18 0;
+#X connect 51 0 24 0;
+#X connect 52 0 29 0;
+#X connect 53 0 30 0;
+#X connect 54 0 39 0;
+#X connect 55 0 40 0;
+#X connect 60 0 4 0;
+#X connect 61 0 9 0;
+#X connect 62 0 127 0;
+#X connect 63 0 10 0;
+#X connect 64 0 65 0;
+#X connect 67 0 64 0;
+#X connect 75 0 18 0;
+#X connect 76 0 24 0;
+#X connect 77 0 29 0;
+#X connect 78 0 30 0;
+#X connect 79 0 39 0;
+#X connect 80 0 40 0;
+#X connect 81 0 60 0;
+#X connect 82 0 68 0;
+#X connect 82 1 69 0;
+#X connect 82 2 70 0;
+#X connect 82 3 71 0;
+#X connect 82 4 72 0;
+#X connect 82 5 73 0;
+#X connect 82 6 74 0;
+#X connect 83 0 64 0;
+#X connect 84 0 10 0;
+#X connect 85 0 127 0;
+#X connect 86 0 9 0;
+#X connect 89 0 82 0;
+#X connect 89 0 96 0;
+#X connect 90 0 82 0;
+#X connect 90 0 96 0;
+#X connect 91 0 82 0;
+#X connect 91 0 96 0;
+#X connect 93 0 90 0;
+#X connect 94 0 95 0;
+#X connect 95 0 48 0;
+#X connect 96 0 97 0;
+#X connect 98 0 99 0;
+#X connect 98 0 103 0;
+#X connect 101 0 98 0;
+#X connect 102 0 98 0;
+#X connect 105 0 106 0;
+#X connect 105 0 125 0;
+#X connect 107 0 105 0;
+#X connect 108 0 105 0;
 #X connect 109 0 110 0;
-#X connect 111 0 112 0;
-#X connect 111 0 116 0;
-#X connect 114 0 111 0;
-#X connect 115 0 111 0;
-#X connect 119 0 120 0;
-#X connect 119 0 139 0;
-#X connect 121 0 119 0;
-#X connect 122 0 119 0;
-#X connect 123 0 124 0;
-#X connect 123 0 132 0;
-#X connect 125 0 123 0;
-#X connect 126 0 123 0;
-#X connect 127 0 128 0;
-#X connect 127 0 133 0;
-#X connect 129 0 127 0;
-#X connect 130 0 127 0;
-#X connect 141 0 140 0;
+#X connect 109 0 118 0;
+#X connect 111 0 109 0;
+#X connect 112 0 109 0;
+#X connect 113 0 114 0;
+#X connect 113 0 119 0;
+#X connect 115 0 113 0;
+#X connect 116 0 113 0;
+#X connect 127 0 126 0;