""

svn path=/trunk/; revision=681

2 files changed, 83 insertions, 69 deletions

diff --git a/externals/grill/vasp/pd-ex/freeze1.pd b/externals/grill/vasp/pd-ex/freeze1.pd
index 0e1cbd7d..c7a43f8e 100644
--- a/externals/grill/vasp/pd-ex/freeze1.pd
+++ b/externals/grill/vasp/pd-ex/freeze1.pd
@@ -1,43 +1,47 @@
-#N canvas 33 61 977 513 12;

-#N canvas 387 42 569 658 freeze 0;

+#N canvas 14 73 985 521 12;

+#N canvas 387 42 591 680 freeze 0;

 #X obj 26 130 vasp.split 2;

-#X obj 27 404 vasp.join 2;

+#X obj 30 459 vasp.join 2;

 #X obj 27 74 vasp.cfft @detach 1;

-#X obj 27 461 vasp.c!fft @detach 1;

+#X obj 30 516 vasp.c!fft @detach 1;

 #X obj 25 13 inlet;

-#X obj 27 589 outlet;

-#X obj 173 236 * 0.01;

+#X obj 32 617 outlet;

+#X obj 91 230 * 0.01;

 #X obj 302 17 inlet;

 #X obj 26 100 vasp.polar @detach 1;

-#X obj 27 432 vasp.rect @detach 1;

-#X obj 26 261 vasp.gate @detach 1;

-#X obj 92 319 vasp.noise @detach 1;

-#X obj 26 371 vasp.sync;

-#X obj 25 209 vasp.max? @detach 1;

+#X obj 30 487 vasp.rect @detach 1;

+#X obj 29 316 vasp.gate @detach 1;

+#X obj 95 374 vasp.noise @detach 1;

+#X obj 29 426 vasp.sync;

+#X obj 91 208 vasp.max? @detach 1;

 #X obj 381 17 inlet;

-#X obj 162 591 outlet;

-#X obj 29 536 vasp.opt;

-#N canvas 238 212 458 308 non0 0;

-#X obj 58 187 outlet;

+#X obj 167 619 outlet;

+#X obj 32 591 vasp.opt;

+#N canvas 238 212 466 316 non0 0;

+#X obj 58 254 outlet;

 #X obj 60 158 / 1;

 #X obj 26 21 inlet;

 #X obj 26 49 t a a;

 #X obj 234 77 vasp.f?;

 #X obj 26 80 vasp.!= 0 @detach 1;

 #X obj 27 109 vasp.sum?;

-#X connect 1 0 0 0;

+#X obj 60 195 rmstodb;

+#X obj 60 225 - 100;

+#X connect 1 0 7 0;

 #X connect 2 0 3 0;

 #X connect 3 0 5 0;

 #X connect 3 1 4 0;

 #X connect 4 0 1 1;

 #X connect 5 0 6 0;

 #X connect 6 1 1 0;

-#X restore 161 498 pd non0;

-#X obj 29 509 vasp.n 0;

+#X connect 7 0 8 0;

+#X connect 8 0 0 0;

+#X restore 164 553 pd non0;

+#X obj 32 564 vasp.n 0;

 #X obj 302 45 + 100;

 #X obj 326 117 expr pow(2. \, -$f1/1200);

 #X obj 300 76 dbtorms;

-#N canvas 445 282 476 326 cplx 0;

+#N canvas 445 282 478 328 cplx 0;

 #X obj 19 229 vasp.join;

 #X obj 19 73 t a b a;

 #X obj 149 137 vasp.f?;

@@ -59,32 +63,35 @@
 #X connect 10 0 0 0;

 #X connect 10 1 0 1;

 #X restore 27 43 pd cplx;

-#X text 280 169 resample;

-#X text 185 211 find spectral peak;

-#X text 188 260 gate spectrum below threshold;

-#X text 107 371 wait for threads to finish;

-#X obj 92 344 vasp.* 3.14159 @detach 1;

+#X text 280 159 resample;

+#X text 146 230 find spectral peak;

+#X text 191 315 gate spectrum below threshold;

+#X text 110 426 wait for threads to finish;

+#X obj 95 399 vasp.* 3.14159 @detach 1;

 #X text 193 75 FFT;

 #X text 195 100 -> polar;

-#X text 188 432 -> cartesian;

-#X text 198 460 inverse FFT;

-#X text 263 316 randomize complex arguments;

-#X text 225 496 get spectral density;

-#X obj 25 171 vasp.xtilt 1 @detach 1 @inter 2;

-#X obj 27 290 vasp.pow @detach 1;

+#X text 191 487 -> cartesian;

+#X text 201 515 inverse FFT;

+#X text 266 371 randomize complex arguments;

+#X text 228 551 get spectral density;

+#X obj 25 156 vasp.xtilt 1 @detach 1 @inter 2;

+#X obj 30 345 vasp.pow @detach 1;

 #X obj 441 21 inlet;

-#X text 181 289 treat spectrum exponentially;

-#X obj 395 389 loadbang;

-#X msg 395 414 detach 1;

-#X text 102 536 normalize result;

-#X text 388 435 no attributes yet;

+#X text 184 344 treat spectrum exponentially;

+#X obj 398 444 loadbang;

+#X msg 398 469 detach 1;

+#X text 105 591 normalize result;

+#X text 391 490 no attributes yet;

+#X obj 26 179 t a a;

+#X obj 28 288 vasp;

+#X obj 89 257 t b f;

 #X connect 0 0 34 0;

 #X connect 0 1 11 0;

 #X connect 1 0 9 0;

 #X connect 2 0 8 0;

 #X connect 3 0 18 0;

 #X connect 4 0 22 0;

-#X connect 6 0 10 1;

+#X connect 6 0 44 0;

 #X connect 7 0 19 0;

 #X connect 8 0 0 0;

 #X connect 9 0 3 0;

@@ -93,8 +100,7 @@
 #X connect 12 0 1 0;

 #X connect 12 0 17 0;

 #X connect 12 1 1 1;

-#X connect 13 0 10 0;

-#X connect 13 1 6 0;

+#X connect 13 0 6 0;

 #X connect 14 0 20 0;

 #X connect 16 0 5 0;

 #X connect 17 0 15 0;

@@ -104,14 +110,19 @@
 #X connect 21 0 6 1;

 #X connect 22 0 2 0;

 #X connect 27 0 12 1;

-#X connect 34 0 13 0;

+#X connect 34 0 42 0;

 #X connect 35 0 12 0;

 #X connect 36 0 35 1;

 #X connect 38 0 39 0;

 #X connect 39 0 16 0;

+#X connect 42 0 13 0;

+#X connect 42 1 43 1;

+#X connect 43 0 10 0;

+#X connect 44 0 43 0;

+#X connect 44 1 10 1;

 #X restore 18 331 pd freeze;

 #X obj 104 214 nbx 6 18 -100 0 0 1 empty empty noise_rejection(dB)

-0 -8 0 12 -225271 -1 -1 -61 256;

+0 -8 0 12 -225271 -1 -1 -13 256;

 #X obj 104 257 nbx 7 18 -10000 10000 0 1 empty empty transpose(cents)

 0 -8 0 12 -225271 -1 -1 0 256;

 #X obj 448 278 bng 15 250 50 0 empty empty empty 0 -6 0 8 -262144 -1

@@ -138,13 +149,12 @@
 #X connect 7 0 1 0;

 #X connect 8 0 0 0;

 #X restore 729 250 pd save;

-#N canvas 205 58 331 468 open 0;

+#N canvas 205 58 335 472 open 0;

 #X obj 18 192 soundfiler;

 #X obj 19 96 openpanel;

 #X obj 21 6 inlet;

 #X obj 15 390 outlet;

 #X obj 20 123 symbol;

-#X obj 15 313 vasp.opt;

 #X obj 17 345 vasp.u;

 #X obj 17 233 t b;

 #X obj 22 33 route new again;

@@ -153,25 +163,26 @@
 #X msg 19 152 read -resize \$1 src;

 #X msg 16 281 vasp src;

 #X obj 74 230 s \$0-srclen;

-#X connect 0 0 7 0;

-#X connect 0 0 13 0;

+#X obj 15 313 vasp.opt;

+#X connect 0 0 6 0;

+#X connect 0 0 12 0;

 #X connect 1 0 4 0;

-#X connect 2 0 8 0;

-#X connect 4 0 11 0;

-#X connect 5 0 6 0;

-#X connect 6 0 3 0;

-#X connect 7 0 12 0;

-#X connect 8 0 9 0;

-#X connect 8 1 10 0;

-#X connect 9 0 1 0;

-#X connect 10 0 4 0;

-#X connect 11 0 0 0;

-#X connect 12 0 5 0;

+#X connect 2 0 7 0;

+#X connect 4 0 10 0;

+#X connect 5 0 3 0;

+#X connect 6 0 11 0;

+#X connect 7 0 8 0;

+#X connect 7 1 9 0;

+#X connect 8 0 1 0;

+#X connect 9 0 4 0;

+#X connect 10 0 0 0;

+#X connect 11 0 13 0;

+#X connect 13 0 5 0;

 #X restore 448 250 pd open;

 #X msg 381 222 stop;

 #N canvas 0 0 450 300 graph10 0;

-#X array src 1e+006 float 0;

-#X coords 0 1 999999 -1 600 150 1;

+#X array src 4e+006 float 0;

+#X coords 0 1 4e+006 -1 600 150 1;

 #X restore 322 20 graph;

 #X msg 447 222 new;

 #X msg 482 222 again;

@@ -184,9 +195,9 @@
 #X obj 18 108 bng 25 250 50 0 empty empty empty 0 -6 0 8 -24198 -1

 -1;

 #X obj 105 115 nbx 12 18 0 1e+008 0 1 empty empty length(frames) 0

--8 0 12 -225271 -1 -1 1e+006 256;

+-8 0 12 -225271 -1 -1 4e+006 256;

 #X obj 85 368 nbx 9 14 -1e+037 1e+037 0 0 empty empty spectral_density

-0 -6 0 10 -262131 -1 -1 0 256;

+0 -6 0 10 -262131 -1 -1 0.00090725 256;

 #X obj 332 197 cnv 15 100 20 empty empty play_src 5 8 0 10 -261681

 -66577 0;

 #X obj 447 197 cnv 15 100 20 empty empty read_src 5 8 0 10 -261681

@@ -194,8 +205,8 @@
 #X obj 727 197 cnv 15 100 20 empty empty write_dst 5 8 0 10 -261681

 -66577 0;

 #N canvas 0 0 450 300 graph10 0;

-#X array dst 1e+006 float 0;

-#X coords 0 1 999999 -1 600 150 1;

+#X array dst 4e+006 float 0;

+#X coords 0 1 4e+006 -1 600 150 1;

 #X restore 325 304 graph;

 #X msg 663 223 stop;

 #X msg 614 223 play;

@@ -250,7 +261,7 @@
 #X connect 3 0 0 1;

 #X connect 3 1 4 0;

 #X restore 614 251 pd playdst;

-#N canvas 249 202 529 472 copy 0;

+#N canvas 249 202 537 480 copy 0;

 #X obj 27 26 inlet;

 #X obj 27 51 t b b;

 #X obj 316 19 inlet;

@@ -301,10 +312,10 @@
 #X restore 18 159 pd copy;

 #X text 85 160 copy and resize;

 #X obj 323 170 hsl 600 15 0 1 0 1 \$0-r2 empty empty -2 -6 1152 8 -262131

--1 -1 59900 1;

+-1 -1 15700 1;

 #X obj 323 5 hsl 600 15 0 1 0 1 \$0-r1 empty empty -2 -6 1152 8 -262131

--1 -1 0 1;

-#N canvas 148 330 297 257 sel 0;

+-1 -1 13000 1;

+#N canvas 148 330 301 261 sel 0;

 #X obj 30 25 r \$0-r1;

 #X obj 110 25 r \$0-r2;

 #X obj 30 100 min;

@@ -336,6 +347,8 @@
 #X text 10 35 (needs zexy!);

 #X obj 18 410 vasp.u;

 #X text 76 412 update graphics;

+#X obj 28 381 bng 15 250 50 0 empty empty empty 0 -6 0 8 -262144 -1

+-1;

 #X connect 0 0 37 0;

 #X connect 0 1 18 0;

 #X connect 1 0 0 1;

@@ -354,3 +367,4 @@
 #X connect 24 0 27 0;

 #X connect 28 0 0 0;

 #X connect 35 0 0 3;

+#X connect 39 0 37 0;

diff --git a/externals/grill/vasp/pd/vasp.opt.pd b/externals/grill/vasp/pd/vasp.opt.pd
index 9e4b69a9..4f6dc597 100644
--- a/externals/grill/vasp/pd/vasp.opt.pd
+++ b/externals/grill/vasp/pd/vasp.opt.pd
@@ -1,9 +1,9 @@
-#N canvas 504 38 464 478 12;

+#N canvas 504 38 466 480 12;

 #X obj 27 11 inlet;

 #X obj 90 158 vasp.amax?;

 #X obj 35 206 route 0 1;

 #X obj 107 415 outlet;

-#X obj 165 415 outlet;

+#X obj 256 418 outlet;

 #X obj 27 306 vasp;

 #X obj 47 255 t b;

 #X obj 90 116 vasp.m 2;

@@ -14,8 +14,8 @@
 #X text 131 79 catch messages ("to" not handled);

 #X obj 28 41 vasp.radio;

 #X connect 0 0 13 0;

-#X connect 1 1 2 0;

-#X connect 1 1 4 0;

+#X connect 1 0 2 0;

+#X connect 1 0 4 0;

 #X connect 2 0 6 0;

 #X connect 2 1 6 0;

 #X connect 2 2 9 0;