# HG changeset patch
# User Rod Selfridge <r.selfridge@qmul.ac.uk>
# Date 1494831781 -3600
# Node ID 971da3e2431852059f07c207858311d53eb027f8
# Parent  ba6878e40772229ea1cbec5eaf54668d7bc47676
Gain angle adjusted. Scaling factors consolidated and only on wake noise.

diff -r ba6878e40772 -r 971da3e24318 ATT.pd
--- a/ATT.pd	Tue May 17 09:50:06 2016 +0100
+++ b/ATT.pd	Mon May 15 08:03:01 2017 +0100
@@ -1,18 +1,18 @@
 #N canvas 83 38 1333 826 10;
 #X obj 26 65 hsl 80 25 0.0005 0.5 1 0 empty empty Diameter 2 15 0 10
--261682 -1 -1 2842 1;
+-261682 -1 -1 4791 1;
 #X floatatom 24 95 0 0 0 0 - - -;
 #X obj 24 322 hsl 80 25 0.01 0.99 0 0 empty empty Panning 2 15 0 10
--261682 -1 -1 3950 1;
+-261682 -1 -1 3547 1;
 #X floatatom 21 351 0 0 0 0 - - -;
 #X obj 25 222 hsl 80 25 -90 90 0 0 empty empty Obs_Azimuth 2 15 0 10
--261682 -1 -1 3950 1;
+-261682 -1 -1 3731 1;
 #X floatatom 22 251 0 0 0 0 - - -;
 #X obj 25 272 hsl 80 25 -180 180 0 0 empty empty Obs_Elevation 2 15
-0 10 -261682 -1 -1 5815 1;
+0 10 -261682 -1 -1 4718 1;
 #X floatatom 22 301 0 0 0 0 - - -;
 #X obj 26 171 hsl 80 25 100 1 1 0 empty empty Obs_Distance 2 15 0 10
--261682 -1 -1 5522 1;
+-261682 -1 -1 4826 1;
 #X floatatom 24 200 0 0 0 0 - - -;
 #X obj 157 291 vu 15 120 empty empty -1 -8 0 10 -66577 -1 1 0;
 #X obj 220 291 vu 15 120 empty empty -1 -8 0 10 -66577 -1 1 0;
@@ -41,9 +41,9 @@
 #X connect 10 0 4 1;
 #X restore 316 239 pd opLevels;
 #X obj 24 371 hsl 100 25 0.1 1e+11 1 0 empty empty Gain 2 15 0 10 -203904
--1 -1 8122 1;
+-1 -1 5647 1;
 #X obj 27 117 hsl 80 25 1 20 0 0 empty empty Length 2 15 0 10 -261682
--1 -1 1663 1;
+-1 -1 2495 1;
 #X floatatom 24 149 0 0 0 0 - - -;
 #X obj -352 309 hsl 128 15 -180 180 0 0 empty empty empty -2 -8 0 10
 -262144 -1 -1 0 1;
@@ -96,7 +96,7 @@
 #X msg -156 65 \$1 50;
 #X obj -156 85 line~;
 #X obj 26 14 hsl 80 25 0.1 50 0 0 empty empty Air_Speed 2 15 0 10 -204800
--1 -1 3625 1;
+-1 -1 4417 1;
 #X floatatom 23 43 0 0 0 0 - - -;
 #X text 154 155 Frequency;
 #X floatatom 156 172 0 0 0 0 - - -;
@@ -131,10 +131,6 @@
 #X obj 419 239 unpack f f f f f f f f;
 #X obj 548 263 line \$1 50;
 #X obj 548 282 s AZIM;
-#X msg 418 101 23 0.006 5 4 85 7e+08 0.5 0;
-#X msg 446 186 28 0.033 7 6 35 7e+08 0.45 -5;
-#X msg 439 153 17 0.003 10 3 -100 7e+08 0.8 55;
-#X msg 427 125 24 0.01 15 6 20 7e+08 0.4 -20;
 #X obj 183 113 bng 15 250 50 0 empty empty empty 17 7 0 10 -258113
 -1 -1;
 #X text 178 95 Stop;
@@ -146,6 +142,10 @@
 sources and filters.;
 #X text -398 240 Additional objects should 3D rotation of the source
 be required;
+#X msg 418 101 23 0.006 5 4 85 700000 0.5 0;
+#X msg 427 125 24 0.01 15 6 20 700000 0.4 -20;
+#X msg 439 153 17 0.003 10 3 -100 700000 0.8 55;
+#X msg 446 186 28 0.033 7 6 35 700000 0.45 -5;
 #X connect 0 0 1 0;
 #X connect 0 0 55 0;
 #X connect 2 0 3 0;
@@ -199,10 +199,10 @@
 #X connect 72 0 71 0;
 #X connect 73 0 67 0;
 #X connect 74 0 73 0;
-#X connect 75 0 92 0;
-#X connect 77 0 95 0;
-#X connect 79 0 94 0;
-#X connect 80 0 93 0;
+#X connect 75 0 99 0;
+#X connect 77 0 100 0;
+#X connect 79 0 101 0;
+#X connect 80 0 102 0;
 #X connect 83 0 61 0;
 #X connect 84 0 4 0;
 #X connect 85 0 75 0;
@@ -217,10 +217,10 @@
 #X connect 89 6 87 0;
 #X connect 89 7 90 0;
 #X connect 90 0 91 0;
-#X connect 92 0 89 0;
-#X connect 93 0 89 0;
+#X connect 92 0 94 0;
 #X connect 94 0 89 0;
-#X connect 95 0 89 0;
-#X connect 96 0 98 0;
-#X connect 98 0 89 0;
+#X connect 99 0 89 0;
+#X connect 100 0 89 0;
+#X connect 101 0 89 0;
+#X connect 102 0 89 0;
 #X coords 0 -1 1 1 270 430 2 0 0;
diff -r ba6878e40772 -r 971da3e24318 freqCalcCyl4No_D4Mach.pd
--- a/freqCalcCyl4No_D4Mach.pd	Tue May 17 09:50:06 2016 +0100
+++ b/freqCalcCyl4No_D4Mach.pd	Mon May 15 08:03:01 2017 +0100
@@ -310,8 +310,6 @@
 #X msg 234 423 \$1 5;
 #X obj 306 471 line~;
 #X msg 306 449 \$1 5;
-#X obj 219 317 /~ 400;
-#X text -53 316 Scale factor to bring in line with CFD calcs;
 #X obj 685 572 s~ plotOPD;
 #X msg 219 100 \$1 15;
 #X obj 565 217 r~ MY_MACH;
@@ -326,7 +324,7 @@
 #X connect 12 0 5 0;
 #X connect 12 0 76 0;
 #X connect 15 0 17 1;
-#X connect 17 0 112 0;
+#X connect 17 0 36 0;
 #X connect 18 0 94 0;
 #X connect 19 0 20 1;
 #X connect 20 0 43 0;
@@ -356,7 +354,7 @@
 #X connect 54 0 20 0;
 #X connect 56 0 84 0;
 #X connect 57 0 14 0;
-#X connect 57 0 114 0;
+#X connect 57 0 112 0;
 #X connect 58 0 59 0;
 #X connect 59 0 61 0;
 #X connect 60 0 65 0;
@@ -393,7 +391,7 @@
 #X connect 96 0 95 0;
 #X connect 96 0 97 0;
 #X connect 97 0 93 0;
-#X connect 97 0 115 0;
+#X connect 97 0 113 0;
 #X connect 98 0 0 0;
 #X connect 99 0 86 0;
 #X connect 100 0 102 0;
@@ -408,11 +406,10 @@
 #X connect 109 0 108 0;
 #X connect 110 0 40 0;
 #X connect 111 0 110 0;
-#X connect 112 0 36 0;
-#X connect 115 0 98 0;
-#X connect 116 0 48 1;
+#X connect 113 0 98 0;
+#X connect 114 0 48 1;
 #X restore 313 307 pd GoldfreqGain;
-#N canvas 300 30 1006 797 GoldnoiseGain 0;
+#N canvas 300 30 1006 797 GoldnoiseGain 1;
 #X text -21037 364 Mass Density of Air \, squared;
 #X obj -20777 459 *;
 #X text -20777 412 Distance;
@@ -527,11 +524,7 @@
 #X obj -20720 502 *~;
 #X obj -20777 530 *~;
 #X obj -20861 574 /~;
-#X obj -20624 194 -~;
-#X text -20543 190 Angle goes with the flow in Goldstein hence 90 -
-theta so that theta is same angle as dipole angles.;
-#X obj -20624 149 sig~ 180;
-#X obj -20609 172 r~ \$0-this_elev;
+#X obj -20623 186 r~ \$0-this_elev;
 #X obj -20916 137 inlet~;
 #X obj -20916 164 *~;
 #X obj -20828 253 inlet~;
@@ -593,27 +586,27 @@
 #X obj -20861 595 *~ 1;
 #X obj -20587 262 /~ 360;
 #X obj -20624 306 *~;
-#X text -21131 486 Scale factor to bring in line with CFD calcs;
 #X text -20929 530 Sqrt(2*pi);
-#X obj -20861 488 /~ 10000;
 #X obj -20609 326 r~ MY_MACH;
-#X connect 1 0 61 0;
-#X connect 3 0 46 1;
-#X connect 4 0 53 0;
-#X connect 5 0 45 1;
+#X text -21045 480 Scaling factor between dipoles;
+#X obj -20861 483 /~ 1000;
+#X connect 1 0 58 0;
+#X connect 3 0 43 1;
+#X connect 4 0 50 0;
+#X connect 5 0 42 1;
 #X connect 6 0 1 0;
 #X connect 6 0 1 1;
 #X connect 13 0 17 0;
-#X connect 13 0 63 0;
+#X connect 13 0 60 0;
 #X connect 14 0 16 0;
-#X connect 14 0 59 0;
-#X connect 20 0 49 0;
-#X connect 21 0 66 0;
+#X connect 14 0 56 0;
+#X connect 20 0 46 0;
+#X connect 21 0 63 0;
 #X connect 22 0 35 1;
 #X connect 23 0 22 0;
 #X connect 24 0 34 1;
 #X connect 25 0 26 0;
-#X connect 26 0 67 0;
+#X connect 26 0 64 0;
 #X connect 27 0 29 1;
 #X connect 28 0 29 0;
 #X connect 29 0 24 0;
@@ -625,37 +618,35 @@
 #X connect 34 0 35 0;
 #X connect 35 0 36 1;
 #X connect 36 0 37 1;
-#X connect 37 0 65 0;
+#X connect 37 0 62 0;
 #X connect 38 0 25 0;
-#X connect 40 0 38 0;
-#X connect 41 0 38 1;
-#X connect 42 0 43 0;
-#X connect 42 0 43 1;
-#X connect 43 0 46 0;
-#X connect 44 0 45 0;
-#X connect 45 0 47 1;
-#X connect 46 0 47 0;
-#X connect 47 0 20 0;
-#X connect 48 0 49 1;
-#X connect 49 0 70 0;
-#X connect 50 0 37 0;
-#X connect 53 0 57 0;
-#X connect 55 0 54 0;
-#X connect 55 0 53 0;
-#X connect 56 0 3 0;
-#X connect 57 0 56 0;
-#X connect 58 0 19 0;
-#X connect 59 0 58 0;
-#X connect 60 0 36 0;
-#X connect 61 0 60 0;
-#X connect 62 0 18 0;
-#X connect 63 0 62 0;
-#X connect 64 0 67 1;
-#X connect 65 0 7 0;
-#X connect 66 0 64 0;
-#X connect 67 0 27 0;
-#X connect 70 0 50 0;
-#X connect 71 0 27 1;
+#X connect 39 0 40 0;
+#X connect 39 0 40 1;
+#X connect 40 0 43 0;
+#X connect 41 0 42 0;
+#X connect 42 0 44 1;
+#X connect 43 0 44 0;
+#X connect 44 0 20 0;
+#X connect 45 0 46 1;
+#X connect 46 0 68 0;
+#X connect 47 0 37 0;
+#X connect 50 0 54 0;
+#X connect 52 0 51 0;
+#X connect 52 0 50 0;
+#X connect 53 0 3 0;
+#X connect 54 0 53 0;
+#X connect 55 0 19 0;
+#X connect 56 0 55 0;
+#X connect 57 0 36 0;
+#X connect 58 0 57 0;
+#X connect 59 0 18 0;
+#X connect 60 0 59 0;
+#X connect 61 0 64 1;
+#X connect 62 0 7 0;
+#X connect 63 0 61 0;
+#X connect 64 0 27 0;
+#X connect 66 0 27 1;
+#X connect 68 0 47 0;
 #X restore 304 573 pd GoldnoiseGain;
 #X text 295 620 Calculates the gain of the wake;
 #X obj 460 80 s \$0-azim;
@@ -698,154 +689,6 @@
 #X obj 330 445 r~ \$0-myCor;
 #X obj 636 81 max 0.01;
 #X obj 636 104 min 0.99;
-#N canvas 93 119 976 679 Dipoles 0;
-#X obj 118 66 r~ \$0-myFreq;
-#X obj 397 51 r~ \$0-myFreq;
-#X obj 668 44 r~ \$0-myFreq;
-#X obj 816 126 r~ \$0-liftDiGain;
-#X obj 668 68 *~ 5;
-#X obj 397 75 *~ 3;
-#X obj 139 407 r~ \$0-myFreq;
-#X obj 253 492 r~ \$0-dragDiGain;
-#X obj 139 435 *~ 2;
-#X obj 409 406 r~ \$0-myFreq;
-#X obj 550 464 r~ \$0-dragDiGain;
-#X obj 409 434 *~ 4;
-#X obj 550 487 *~ 0.125;
-#X obj 210 183 *~;
-#X obj 210 248 throw~ l;
-#X obj 237 225 throw~ r;
-#X obj 210 204 fcpan;
-#X obj 210 108 vcf~ 3;
-#X obj 237 182 r \$0-thisPan;
-#X obj 210 67 r~ \$0-thisNoise;
-#X obj 480 192 *~;
-#X obj 480 257 throw~ l;
-#X obj 507 234 throw~ r;
-#X obj 480 213 fcpan;
-#X obj 480 116 vcf~ 3;
-#X obj 507 191 r \$0-thisPan;
-#X obj 480 48 r~ \$0-thisNoise;
-#X obj 750 183 *~;
-#X obj 750 248 throw~ l;
-#X obj 777 225 throw~ r;
-#X obj 750 204 fcpan;
-#X obj 750 107 vcf~ 3;
-#X obj 777 182 r \$0-thisPan;
-#X obj 750 38 r~ \$0-thisNoise;
-#X obj 218 525 *~;
-#X obj 218 590 throw~ l;
-#X obj 245 567 throw~ r;
-#X obj 218 546 fcpan;
-#X obj 218 449 vcf~ 3;
-#X obj 245 524 r \$0-thisPan;
-#X obj 218 405 r~ \$0-thisNoise;
-#X obj 492 523 *~;
-#X obj 492 588 throw~ l;
-#X obj 519 565 throw~ r;
-#X obj 492 544 fcpan;
-#X obj 492 447 vcf~ 3;
-#X obj 519 522 r \$0-thisPan;
-#X obj 492 373 r~ \$0-thisNoise;
-#X text 273 27 Generates the sound associated with the lift dipole.
-;
-#X text 176 373 Generates the sound associated with the drag dipole.
-;
-#X obj 270 87 r \$0-Qval;
-#X obj 523 72 r \$0-Qval;
-#X obj 792 62 r \$0-Qval;
-#X obj 538 394 r \$0-Qval;
-#X obj 263 427 r \$0-Qval;
-#X floatatom 277 122 5 0 0 0 - - -;
-#X obj 210 134 vcf~ 3;
-#X obj 480 138 vcf~ 3;
-#X obj 750 131 vcf~ 3;
-#X obj 492 468 vcf~ 3;
-#X obj 218 470 vcf~ 3;
-#X obj 527 143 r~ \$0-liftDiGain;
-#X obj 225 156 r~ \$0-liftDiGain;
-#X obj 816 148 *~ 0.1;
-#X obj 523 95 * 2;
-#X obj 792 84 * 4;
-#X obj 533 421 * 2;
-#X obj 527 165 *~ 0.6;
-#X text 179 282 Fundamental;
-#X text 444 288 3rd Harmonic;
-#X text 729 288 5th Harmonic;
-#X text 151 618 Fundamental Drag tone = 2nd Harmonic;
-#X text 420 616 2 Harmonic Drag tone = 4th Harmonic;
-#X connect 0 0 17 1;
-#X connect 0 0 56 1;
-#X connect 1 0 5 0;
-#X connect 2 0 4 0;
-#X connect 3 0 63 0;
-#X connect 4 0 31 1;
-#X connect 4 0 58 1;
-#X connect 5 0 24 1;
-#X connect 5 0 57 1;
-#X connect 6 0 8 0;
-#X connect 7 0 34 1;
-#X connect 8 0 38 1;
-#X connect 8 0 60 1;
-#X connect 9 0 11 0;
-#X connect 10 0 12 0;
-#X connect 11 0 45 1;
-#X connect 11 0 59 1;
-#X connect 12 0 41 1;
-#X connect 13 0 16 0;
-#X connect 16 0 14 0;
-#X connect 16 1 15 0;
-#X connect 17 0 56 0;
-#X connect 18 0 16 1;
-#X connect 19 0 17 0;
-#X connect 20 0 23 0;
-#X connect 23 0 21 0;
-#X connect 23 1 22 0;
-#X connect 24 0 57 0;
-#X connect 25 0 23 1;
-#X connect 26 0 24 0;
-#X connect 27 0 30 0;
-#X connect 30 0 28 0;
-#X connect 30 1 29 0;
-#X connect 31 0 58 0;
-#X connect 32 0 30 1;
-#X connect 33 0 31 0;
-#X connect 34 0 37 0;
-#X connect 37 0 35 0;
-#X connect 37 1 36 0;
-#X connect 38 0 60 0;
-#X connect 39 0 37 1;
-#X connect 40 0 38 0;
-#X connect 41 0 44 0;
-#X connect 44 0 42 0;
-#X connect 44 1 43 0;
-#X connect 45 0 59 0;
-#X connect 46 0 44 1;
-#X connect 47 0 45 0;
-#X connect 50 0 17 2;
-#X connect 50 0 55 0;
-#X connect 50 0 56 2;
-#X connect 51 0 64 0;
-#X connect 52 0 65 0;
-#X connect 53 0 66 0;
-#X connect 54 0 38 2;
-#X connect 54 0 60 2;
-#X connect 56 0 13 0;
-#X connect 57 0 20 0;
-#X connect 58 0 27 0;
-#X connect 59 0 41 0;
-#X connect 60 0 34 0;
-#X connect 61 0 67 0;
-#X connect 62 0 13 1;
-#X connect 63 0 27 1;
-#X connect 64 0 24 2;
-#X connect 64 0 57 2;
-#X connect 65 0 31 2;
-#X connect 65 0 58 2;
-#X connect 66 0 45 2;
-#X connect 66 0 59 2;
-#X connect 67 0 20 1;
-#X restore 660 614 pd Dipoles;
 #X obj 1088 69 noise~;
 #X obj 1088 92 s~ \$0-thisNoise;
 #X obj 1067 214 r~ \$0-thisNoise;
@@ -1062,13 +905,183 @@
 #X obj 872 468 outlet~;
 #X obj 931 470 outlet~;
 #X obj 60 84 /~ 343.56;
+#N canvas 121 75 1255 760 Dipoles 0;
+#X obj 101 65 r~ \$0-myFreq;
+#X obj 246 161 r~ \$0-liftDiGain;
+#X obj 393 69 r~ \$0-myFreq;
+#X obj 664 66 r~ \$0-myFreq;
+#X obj 664 90 *~ 5;
+#X obj 393 93 *~ 3;
+#X obj 124 474 r~ \$0-myFreq;
+#X obj 124 502 *~ 2;
+#X obj 397 472 r~ \$0-myFreq;
+#X obj 397 495 *~ 4;
+#X obj 210 199 *~;
+#X obj 210 264 throw~ l;
+#X obj 237 241 throw~ r;
+#X obj 210 220 fcpan;
+#X obj 210 108 vcf~ 3;
+#X obj 237 198 r \$0-thisPan;
+#X obj 210 67 r~ \$0-thisNoise;
+#X obj 480 293 *~;
+#X obj 480 358 throw~ l;
+#X obj 507 335 throw~ r;
+#X obj 480 314 fcpan;
+#X obj 480 116 vcf~ 3;
+#X obj 507 292 r \$0-thisPan;
+#X obj 480 68 r~ \$0-thisNoise;
+#X obj 750 279 *~;
+#X obj 750 344 throw~ l;
+#X obj 777 321 throw~ r;
+#X obj 750 300 fcpan;
+#X obj 750 107 vcf~ 3;
+#X obj 777 278 r \$0-thisPan;
+#X obj 750 65 r~ \$0-thisNoise;
+#X obj 215 592 *~;
+#X obj 215 657 throw~ l;
+#X obj 242 634 throw~ r;
+#X obj 215 613 fcpan;
+#X obj 215 516 vcf~ 3;
+#X obj 242 591 r \$0-thisPan;
+#X obj 215 472 r~ \$0-thisNoise;
+#X obj 489 659 *~;
+#X obj 489 724 throw~ l;
+#X obj 516 701 throw~ r;
+#X obj 489 680 fcpan;
+#X obj 489 514 vcf~ 3;
+#X obj 516 658 r \$0-thisPan;
+#X obj 489 472 r~ \$0-thisNoise;
+#X text 273 27 Generates the sound associated with the lift dipole.
+;
+#X text 173 440 Generates the sound associated with the drag dipole.
+;
+#X obj 270 87 r \$0-Qval;
+#X obj 530 92 r \$0-Qval;
+#X obj 800 87 r \$0-Qval;
+#X obj 535 493 r \$0-Qval;
+#X obj 260 494 r \$0-Qval;
+#X floatatom 277 122 5 0 0 0 - - -;
+#X obj 210 134 vcf~ 3;
+#X obj 480 138 vcf~ 3;
+#X obj 750 131 vcf~ 3;
+#X obj 489 535 vcf~ 3;
+#X obj 215 537 vcf~ 3;
+#X obj 560 141 r~ \$0-liftDiGain;
+#X obj 539 240 pow~;
+#X obj 539 120 sig~ 10;
+#X obj 560 163 /~ 2e-05;
+#X obj 539 263 *~ 2e-05;
+#X obj 560 213 *~ 0.6;
+#X obj 628 555 log~;
+#X obj 607 600 pow~;
+#X obj 607 492 sig~ 10;
+#X obj 629 535 /~ 2e-05;
+#X obj 607 623 *~ 2e-05;
+#X obj 628 578 *~ 0.125;
+#X obj 822 137 r~ \$0-liftDiGain;
+#X obj 821 179 log~;
+#X obj 800 224 pow~;
+#X obj 800 116 sig~ 10;
+#X obj 822 159 /~ 2e-05;
+#X obj 800 247 *~ 2e-05;
+#X obj 821 202 *~ 0.1;
+#X obj 560 190 log~ 10;
+#X obj 632 166 sig~ 10;
+#X obj 884 159 sig~ 10;
+#X obj 254 559 r~ \$0-dragDiGain;
+#X obj 629 515 r~ \$0-dragDiGain;
+#X connect 0 0 14 1;
+#X connect 0 0 53 1;
+#X connect 1 0 10 1;
+#X connect 2 0 5 0;
+#X connect 3 0 4 0;
+#X connect 4 0 28 1;
+#X connect 4 0 55 1;
+#X connect 5 0 21 1;
+#X connect 5 0 54 1;
+#X connect 6 0 7 0;
+#X connect 7 0 35 1;
+#X connect 7 0 57 1;
+#X connect 8 0 9 0;
+#X connect 9 0 42 1;
+#X connect 9 0 56 1;
+#X connect 10 0 13 0;
+#X connect 13 0 11 0;
+#X connect 13 1 12 0;
+#X connect 14 0 53 0;
+#X connect 15 0 13 1;
+#X connect 16 0 14 0;
+#X connect 17 0 20 0;
+#X connect 20 0 18 0;
+#X connect 20 1 19 0;
+#X connect 21 0 54 0;
+#X connect 22 0 20 1;
+#X connect 23 0 21 0;
+#X connect 24 0 27 0;
+#X connect 27 0 25 0;
+#X connect 27 1 26 0;
+#X connect 28 0 55 0;
+#X connect 29 0 27 1;
+#X connect 30 0 28 0;
+#X connect 31 0 34 0;
+#X connect 34 0 32 0;
+#X connect 34 1 33 0;
+#X connect 35 0 57 0;
+#X connect 36 0 34 1;
+#X connect 37 0 35 0;
+#X connect 41 0 39 0;
+#X connect 41 1 40 0;
+#X connect 42 0 56 0;
+#X connect 43 0 41 1;
+#X connect 44 0 42 0;
+#X connect 47 0 14 2;
+#X connect 47 0 52 0;
+#X connect 47 0 53 2;
+#X connect 48 0 21 2;
+#X connect 48 0 54 2;
+#X connect 49 0 28 2;
+#X connect 49 0 55 2;
+#X connect 50 0 42 2;
+#X connect 50 0 56 2;
+#X connect 51 0 35 2;
+#X connect 51 0 57 2;
+#X connect 53 0 10 0;
+#X connect 54 0 17 0;
+#X connect 55 0 24 0;
+#X connect 56 0 38 0;
+#X connect 57 0 31 0;
+#X connect 58 0 61 0;
+#X connect 59 0 62 0;
+#X connect 60 0 59 0;
+#X connect 61 0 77 0;
+#X connect 62 0 17 1;
+#X connect 63 0 59 1;
+#X connect 64 0 69 0;
+#X connect 65 0 68 0;
+#X connect 66 0 65 0;
+#X connect 67 0 64 0;
+#X connect 68 0 38 1;
+#X connect 69 0 65 1;
+#X connect 70 0 74 0;
+#X connect 71 0 76 0;
+#X connect 72 0 75 0;
+#X connect 73 0 72 0;
+#X connect 74 0 71 0;
+#X connect 75 0 24 1;
+#X connect 76 0 72 1;
+#X connect 77 0 63 0;
+#X connect 78 0 77 1;
+#X connect 79 0 71 1;
+#X connect 80 0 31 1;
+#X connect 81 0 67 0;
+#X restore 837 576 pd Dipoles;
 #X connect 1 0 3 0;
 #X connect 2 0 19 0;
 #X connect 2 0 36 0;
-#X connect 2 0 100 0;
+#X connect 2 0 99 0;
 #X connect 3 0 2 0;
 #X connect 4 0 17 0;
-#X connect 4 0 99 0;
+#X connect 4 0 98 0;
 #X connect 5 0 4 0;
 #X connect 6 0 11 0;
 #X connect 9 0 41 0;
@@ -1085,7 +1098,7 @@
 #X connect 34 0 40 0;
 #X connect 36 0 48 0;
 #X connect 36 0 5 0;
-#X connect 36 0 101 0;
+#X connect 36 0 100 0;
 #X connect 39 0 37 0;
 #X connect 39 1 38 0;
 #X connect 44 0 70 0;
@@ -1117,14 +1130,14 @@
 #X connect 83 0 70 2;
 #X connect 84 0 85 0;
 #X connect 85 0 49 0;
-#X connect 87 0 88 0;
-#X connect 89 0 63 0;
-#X connect 91 0 92 0;
-#X connect 92 0 62 1;
-#X connect 92 0 82 1;
-#X connect 93 0 95 0;
-#X connect 94 0 93 0;
-#X connect 96 0 92 0;
-#X connect 97 0 14 0;
-#X connect 97 0 102 0;
-#X connect 102 0 98 0;
+#X connect 86 0 87 0;
+#X connect 88 0 63 0;
+#X connect 90 0 91 0;
+#X connect 91 0 62 1;
+#X connect 91 0 82 1;
+#X connect 92 0 94 0;
+#X connect 93 0 92 0;
+#X connect 95 0 91 0;
+#X connect 96 0 14 0;
+#X connect 96 0 101 0;
+#X connect 101 0 97 0;