bmarechal / octave_scripts

Download as
Browse Code ยป

Commit 88a86ac7331c5a006d69a23ad5c63ab773598304

Authored by bmarechal
1 parent 9a89127b66
Exists in master

...

Showing 2 changed files with 11 additions and 13 deletions Side-by-side Diff

... ... @@ -13,7 +13,7 @@
13 13 cc = 'bkcgmry';
14 14 for i = [1:length(col)]
15 15 data.freq = diff(load(filename)(:,col(i)).*mult(i), d)*data.rate**d;
16   - [p, f] = pwelch(data.freq, hanning(length(data.freq)/1), 0.5, [], data.rate, 'onesided', 'power');
  16 + [p, f] = pwelch(data.freq, hanning(length(data.freq)/100), 0.5, [], data.rate, 'onesided', 'power');
17 17 semilogx(f, 10*log10(p), cc(mod(i, length(cc))))
18 18 leg{i} = strcat(filename, ' col', num2str(col(i)));
19 19 hold on
... ... @@ -12,18 +12,16 @@
12 12 if length(col) == length(mult)
13 13 for i = [1:length(col)]
14 14 data.freq = load(filename)(:,col(i)).*mult(i);
15   - if nargin == 4
16   - if ad_opt(i) == 1
17   - printf(strcat(filename, ' col', num2str(col(i)), ' drift removed\n\n'))
18   - data.freq = detrend(data.freq);
19   - elseif ad_opt(i) == 2
20   - printf(strcat(filename, ' col', num2str(col(i)), ' relative ad : mean=', num2str(mean(data.freq)), '\n\n'))
21   - data.freq = data.freq./mean(data.freq);
22   - elseif ad_opt(i) == 3
23   - printf(strcat(filename, ' col', num2str(col(i)), ' drift removed relative ad\n\n'))
24   - data.freq = detrend(data.freq./mean(data.freq));
25   - end
26   - endif
  15 + if ad_opt(i) == 1
  16 + printf(strcat(filename, ' col', num2str(col(i)), ' drift removed\n\n'))
  17 + data.freq = detrend(data.freq);
  18 + elseif ad_opt(i) == 2
  19 + printf(strcat(filename, ' col', num2str(col(i)), ' relative ad : mean=', num2str(mean(data.freq)), '\n\n'))
  20 + data.freq = data.freq./mean(data.freq);
  21 + elseif ad_opt(i) == 3
  22 + printf(strcat(filename, ' col', num2str(col(i)), ' drift removed relative ad\n\n'))
  23 + data.freq = detrend(data.freq./mean(data.freq));
  24 + end
27 25 data.rate = 1;
28 26 [ad, S, err, tau] = allan(data, 2.^[0:nextpow2(length(data.freq))-3]./data.rate, strcat(strsplit(filename, '/'){end}, num2str(i)), 0);
29 27 ad_tosave{i} = vertcat(ad, err)';