From b29287e10b94cf221d16dd4b73e694027d3decb6 Mon Sep 17 00:00:00 2001
From: Thomas Dehaeze <dehaeze.thomas@gmail.com>
Date: Fri, 5 Jul 2019 11:40:22 +0200
Subject: [PATCH] Minor changes

---
 2017-11-17 - Marc/scripts/data.org    |  13 ++---
 disturbance-control-system/index.html | Bin 117939 -> 131833 bytes
 disturbance-control-system/index.org  |  26 +++++++++-
 disturbance-ty/index.html             | Bin 68374 -> 68188 bytes
 static-spindle/spindle_measurements.m |  72 --------------------------
 5 files changed, 31 insertions(+), 80 deletions(-)
 delete mode 100644 static-spindle/spindle_measurements.m

diff --git a/2017-11-17 - Marc/scripts/data.org b/2017-11-17 - Marc/scripts/data.org
index 597a284..bf5d065 100644
--- a/2017-11-17 - Marc/scripts/data.org	
+++ b/2017-11-17 - Marc/scripts/data.org	
@@ -1,8 +1,9 @@
 #+TITLE: Measurements made by Marc Lessourd on the 17th of November 2017 - Matlab
-:drawer:
+:DRAWER:
 #+LATEX_CLASS: cleanreport
 #+LaTeX_CLASS_OPTIONS: [tocnp, secbreak, minted]
 #+STARTUP: overview
+
 #+PROPERTY: header-args:matlab  :session *MATLAB*
 #+PROPERTY: header-args:matlab+ :comments org
 #+PROPERTY: header-args:matlab+ :exports both
@@ -78,17 +79,17 @@ Measurement is in V?
   channel = 12;
 
   figure;
-  ax1 = subaxis(3,1,1);
+  ax1 = subplot(3,1,1);
   plot(freq_frf, abs(frf_hexa_y(:, channel)))
   set(gca, 'Xscale', 'log'); set(gca, 'Yscale', 'log');
 
-  ax2 = subaxis(3,1,2);
+  ax2 = subplot(3,1,2);
   plot(freq_frf, mod(180/pi*phase(frf_hexa_y(:, channel))+180, 360)-180)
   set(gca, 'Xscale', 'log');
   ylim([-180 180]);
   yticks([-180:90:180]);
 
-  ax3 = subaxis(3,1,3);
+  ax3 = subplot(3,1,3);
   plot(freq_frf, coh_hexa_y(:, channel))
   set(gca, 'Xscale', 'log');
 
@@ -99,10 +100,10 @@ Measurement is in V?
 
 #+begin_src matlab :exports none :results none
   figure;
-  ax1 = subaxis(2,1,1);
+  ax1 = subplot(2,1,1);
   plot(freq_frf, abs(frf_marble_z(:, 4)))
   set(gca, 'Xscale', 'log'); set(gca, 'Yscale', 'log')
-  ax2 = subaxis(2,1,2);
+  ax2 = subplot(2,1,2);
   plot(freq_frf, mod(180/pi*phase(frf_marble_z(:, 4))+180, 360)-180)
   linkaxes([ax1,ax2],'x');
   ylim([-180 180]);
diff --git a/disturbance-control-system/index.html b/disturbance-control-system/index.html
index 15dac756b2791643b4bc82f9254771f8be772039..6fdc67778cd4aef7059ab4388f85a088895f3305 100644
GIT binary patch
delta 3314
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
C2_z{1

delta 1824
zcmY*aYlu}<6lUM_?&i*QW^_={z?r$DI1gv$?6c3ax)c2{B_qwC#6UTZeWV}e7>ti#
z2&vStLRi^$M(9B>CS_)axTDnI&>y2D%^nD5&M&j_5d|icw)fd*U+UjpkF)mLYkl8$
zZoPDOI*RxGTDJR$+rE`O)89^vV>jn4!GRS}Ck~*cYaJ%UjF}n1mM*JgTNY!nQyC<1
zqo)fS%%aStaIwoPIffUJD3GDw`|icD=dr}_A?RL)gUBY#v*Aeh3QSFh`f&n(cYBzG
zE~C_k`+ByNBSr`@DuZS}>4y!IbK!K)d>qq|1W^cAdzKb`8ahq{ZM}BU@~l{tSl8?0
zI5Ittcreym#YSk7zzpDG?=tNBzC{BYdX}yz2d3+Kf#}TacL4QJoVZTFya;YDt<EBZ
znPwt_^gkDuh(}$6dcvE%lbK;`xE37k6HWUDbxa$s^;MfglF-PB<j0o${FUKFu)cqB
zDGVv2k$4S-JKc-n<Ni&hm_|{UgmOHW21a0fz`%)39qL)|<3K9DFlpe(Hbi(KOc=ZM
z4tU>L)UFMf9$E-{$qQmKSvmgGS+p5mG#}Ml;#<Z<wqDuvP-ogn-z(rGq}268*g3T;
zUF&Qr;e3%QJvT)0&UD^`;Y__(71c|Y(Jvk<BJ9V8<GBfZzkCfgO^d{Cln$(DZ`A=#
zE+Zq|_0;uN9af$XHe*y&FyTXEr~~JaNvDTa&!_{&8*Z<k#cR`%;g6b179)0SW#f5m
zd|rvThHb=2WzgcYHll0k!9zbZ^AES880U%nvD>H%j_&^)=c(G!2xs1C;UlA{fv?_<
z=7MqDf+qfM9isAf4Oe;lKYVu+b{yupmIr&s=VNg)V<$}CAMc&516gsteiSuA%fy6E
zse8+?<ao2ZbFMgC)(lX?)pQWUg$*Z8LIY{!SI(fS=7!q7CW_qt;ZH|3a@6)GK3i2(
z?8!<N&CKBMe2o^RPfji<G{r#>Suw2)y7vzRgM9is)CO;!ynrpkVAS{1ol^%&I8TzB
zYJ&&9`bBe3)l@{>f2>eRx1WA_W==-+geYg`^iW5->fA&pR`fK~m&#Dxti4%8C7}e=
zV1gSSoL|05V1O~7MKJkSqR(mXt$SK=o|i$VHd01^wCZ@~;-}hC3xBnYX4k}t5iwTN
zU?fn%J!?=a-?j#Qs|6x|My3{UX{b^gdmPajb;+3E9d`-!05aK8o4*#FYHF0QCblW~
zN<ctP)bZRPp|ysMsG$Yt(K@R5BiqoCqRQc`Z=-I3JqfiEuWm;->S`p>rIktSvbJLf
zdaDUD%choV^0qx_!Hg(KoLY4cYHX?dC6*<+n)$8+=rEQUc1W_jYr<VdMWt|xRJqy-
zGI#LfW2g*IpRjoOAesY5PjvC>8FWSKpTd?FL(va^_AE+pE=3YtQ$;0@s&X!svU2VE
zH|U8X&Sg>!R~gxGUq6q=3OH9yg%T~H^5c;U=!lRYL+D5t)db>JA}y;bS!=9J{_<zJ
zs9b45PEemk$A=!iie_WqPKX`)aw5NB({h;MGigwM@QwgU#`b-8(4XRInJ%k-l_8N?
S`Q%*TZS=ptAb-A4c<x^y<yAcZ

diff --git a/disturbance-control-system/index.org b/disturbance-control-system/index.org
index d9919ce..9df0d88 100644
--- a/disturbance-control-system/index.org
+++ b/disturbance-control-system/index.org
@@ -568,7 +568,7 @@ And we compare all the signals (figures [[fig:psd_sample_comp_lpf]] and [[fig:ps
 
 *** Vibrations on the marble
 Now we plot the same curves for the geophone located on the marble.
-#+begin_src matlab :results none
+#+begin_src matlab
   [px_of, f] = pwelch(d_of(:, 1), win, [], [], Fs);
   [px_ty, ~] = pwelch(d_ty(:, 1), win, [], [], Fs);
   [px_ry, ~] = pwelch(d_ry(:, 1), win, [], [], Fs);
@@ -578,7 +578,7 @@ Now we plot the same curves for the geophone located on the marble.
 #+end_src
 
 And we compare the Amplitude Spectral Densities (figures [[fig:psd_marble_comp_lpf]] and [[fig:psd_marble_comp_lpf_high_freq]])
-#+begin_src matlab :results none
+#+begin_src matlab
   figure;
   hold on;
   plot(f, sqrt(px_of), 'DisplayName', 'All OFF');
@@ -623,6 +623,28 @@ And we compare the Amplitude Spectral Densities (figures [[fig:psd_marble_comp_l
 #+RESULTS: fig:psd_marble_comp_lpf_high_freq
 [[file:figs/psd_marble_comp_lpf_high_freq.png]]
 
+** Cumulative Amplitude Spectrum
+#+begin_src matlab
+  figure;
+  hold on;
+  plot(f(2:end), sqrt(cumsum(px_of(2:end)./(2*pi*f(2:end)).^2).*(f(2)-f(1))), 'DisplayName', 'All OFF');
+  plot(f(2:end), sqrt(cumsum(px_ty(2:end)./(2*pi*f(2:end)).^2).*(f(2)-f(1))), 'DisplayName', 'Ty ON');
+  plot(f(2:end), sqrt(cumsum(px_ry(2:end)./(2*pi*f(2:end)).^2).*(f(2)-f(1))), 'DisplayName', 'Ry ON');
+  plot(f(2:end), sqrt(cumsum(px_sr(2:end)./(2*pi*f(2:end)).^2).*(f(2)-f(1))), 'DisplayName', 'S-R ON');
+  plot(f(2:end), sqrt(cumsum(px_rz(2:end)./(2*pi*f(2:end)).^2).*(f(2)-f(1))), 'DisplayName', 'Rz ON');
+  plot(f(2:end), sqrt(cumsum(px_he(2:end)./(2*pi*f(2:end)).^2).*(f(2)-f(1))), 'DisplayName', 'Hexa ON');
+  hold off;
+  set(gca, 'xscale', 'log');
+  set(gca, 'yscale', 'log');
+  xlabel('Frequency [Hz]'); ylabel('Amplitude Spectral Density $\left[\frac{m}{\sqrt{Hz}}\right]$')
+  xlim([0.1, 500]);
+  legend('Location', 'northeast');
+#+end_src
+
+#+begin_src matlab
+
+#+end_src
+
 ** Conclusion
 #+begin_important
   - The Ty stage induces vibrations of the marble and at the sample location above 100Hz
diff --git a/disturbance-ty/index.html b/disturbance-ty/index.html
index 56237b03b28845e384666112322828a76c51bcbd..a161ccc7c2877f9dee87f3348cfe4fc2f50fc962 100644
GIT binary patch
delta 1124
zcmZ8hTSydP6lPqVzt-H{hkA%4cf)Gctoi5m&t%zFY7eQoAVgWzT&0IHlZc=!5xWu;
zC$xv6t)L#PhxmzTA7UTs!63+&Zd61O1Sx{hLl>)=-JM_Q?K@}AH}joyzB9warSC46
zUi=nS>#-i+?;Khk$9OFk@Be(i0!g~7xuygkRuZIJ*ph7vDw8tOB-61B6}BhqkV+(7
zQWZFxRFL2h)m8;~nv{^?2qF=5_?v7%nrdr`sKCaWLEg1pMIi93rUO|DF&syLL@hz4
z_btKFVNY!e5lzFEZo}=`olL@GHO_EsYAJ248w(+iA*-T8E7x4%`9c8Wqj7kvyk~lS
zVxZk4LWt}}wycSk=|DGm#Cka~8E4q9%QckIUM&=24f+K^v%Z2{LmS6;8~YB#*Tap@
zRq&#DKHM9q3fr4@uUpf1&^XWt(U#MYX%rzv%i%?;6{@xj(M)5AEA?rR=p{6g8ZMcQ
zqMPSNv6hk9XAnsZL2hsGu5k}<fR7uWFfv3p&n;+&s;0qw(U&$>)C}j;dbTCMp<rXh
zjv=${0g_}5%dP{vIuxWix=Bn0u5=tmwx$}kfni}<LXxAahHBFGbYGY+5WLARrxRVJ
z<&2chR?{WjJHm|VC$9H4hXXoz35Xth&CKFU3XBshK|3x~Azijb;@P9;>QQ83><Ywz
zDGwWt>sXQmJ=e}4LC|%9VEX6U^9n{tXY1+T(XA1_!16?{rv2HQ5ynhslXTlyeMLa`
zG}XY}mtUD_^TsF|*x&odR|6bx3NEp2+Wp232YCFmG7njjh(%9Z#Y81v!1=LsPE>P&
z^ZO?gsBi=p1U-&TF6P)dbWJDt!e!9dR8xqZM%Q$l;n>u2dS`kOS1wtCEE?vrMl8}x
zGe0<*`<^L7#cY1Q=YQppVabN9n#DMF>(p=WbE>Agn9vI|cRbyNz%Llt!*dUjWMU1Q
kd4``@Fw%y&PwX=NnFLo_?BU_bd0edI|KG^S^)PqjAEiWsTL1t6

delta 1193
zcmZ`(T}TvB6lT))=EkN`JyepbNv*rI&b>2tW;WNKqC%)tA`q2+=FZHDktO{iMG;}-
zTXjOCl&FUuil7*zgeU}!5CUKNp;EHQ9>hv~%A%UPdgr0+?Yrlk@1F16bIyHtIkTf9
z^TK#GU59D7**O#sV{N@c?@te}L6|z0K{Oayt0QKpdP3D8H=-gvWoZ`Hp*9jjrY<|g
zAkZG6NOcTqD+~rA3c>`N%+cX@qy!}xBaUXkhN80pg;L#8VX&wM*`{JL8AE<lM;0b2
zjTx{fT7hh0nh9#at!TY3;jtDL*p0_NXCPUnrl#9&Zt<0XI6z-Z9=xH$zF5u@!sD@g
z2<Y{Q$x1@S7#j6nzmU<FVS(K$V@-x%6?cdVtBlp|KuM(p-;7KcIK2h-ZY+VJeFQ4D
z)xz~lZE4(68G^hWZSa13IeZ;l4EM@cKzV5vwBL?`ygvjFD`(;=w$;It-DiDH)vo_@
z+P4bMJ3qc*d;eVbyJMR>=gsMOSlKbRqkZeYj!WY!p?Pwh-%$PxqPgBPz*tq!l7uD`
zlhJ}Qk}NjMio)gr8_b%eaISh8vMk+D>=cYtA4Rfkt13%DeT{+)i^;Y@-ODwHgJ|{w
zuW5xYX~<mYv$(-b)ddCB?Q3ZY3NGLiKmFn2y2POI_MAE?=ONu2A7VJrbFCHG*fE)<
z0qtr<gm_a$DfD!mM~X!$VTQY@`+3MG@Vv=8I~VyZ&j86gS#E#t%|$+)M_qh|L*fpu
zA0}Q*_*2eBiHYZ;Vy{k00ZLMgsqWp^b`Z^AHC=e}W6pvov7D5aAO&R@^S6u#lf^A%
z!C=yEIu>rSOA8JjYMc#8bFPjTN@!+}Ea2G$=Gn3*mP`I--IxsfI38Q&9{J+Uwpcap
z6qq~5CUYf(9il0^=4MTGBXLMq_~=Itj85M}j9I3m8)+e)O<Kqomon^$SKZLmcgY?4
ybvxj7C2j3IGhcd(tOT*ul*$isCj_Jq{)%(;V%<IU51t|^XWrj`QRk;D>G&U&YoH<k

diff --git a/static-spindle/spindle_measurements.m b/static-spindle/spindle_measurements.m
deleted file mode 100644
index f822860..0000000
--- a/static-spindle/spindle_measurements.m
+++ /dev/null
@@ -1,72 +0,0 @@
-%%
-clear; close all; clc;
-
-%% Load Measurement Data
-spindle_1rpm_table  = readtable('../../Measurements/Spindle/10turns_1rpm_icepap.txt');
-spindle_60rpm_table = readtable('../../Measurements/Spindle/10turns_60rpm_IcepapFIR.txt');
-
-disp(spindle_1rpm_table(1, :));
-
-spindle_1rpm  = table2array(spindle_1rpm_table);
-spindle_60rpm = table2array(spindle_60rpm_table);
-
-%% Convert Signals from [deg] to [sec]
-speed_1rpm = 360/60; % [deg/sec]
-spindle_1rpm(:, 1) = spindle_1rpm(:, 2)/speed_1rpm;  % From position [deg] to time [s]
-
-speed_60rpm = 360/1; % [deg/sec]
-spindle_60rpm(:, 1) = spindle_60rpm(:, 2)/speed_60rpm; % From position [deg] to time [s]
-
-%% Convert Signals
-% scaling = 1/80000; % 80 mV/um
-scaling = 1e-6; % [um] to [m]
-
-spindle_1rpm(:, 3:end) = scaling*spindle_1rpm(:, 3:end); % [V] to [m]
-spindle_1rpm(:, 3:end) = spindle_1rpm(:, 3:end)-mean(spindle_1rpm(:, 3:end)); % Remove mean
-
-spindle_60rpm(:, 3:end) = scaling*spindle_60rpm(:, 3:end); % [V] to [m]
-spindle_60rpm(:, 3:end) = spindle_60rpm(:, 3:end)-mean(spindle_60rpm(:, 3:end)); % Remove mean
-
-%% Ts and Fs for both measurements
-Ts_1rpm = spindle_1rpm(end, 1)/(length(spindle_1rpm(:, 1))-1);
-Fs_1rpm = 1/Ts_1rpm;
-
-Ts_60rpm = spindle_60rpm(end, 1)/(length(spindle_60rpm(:, 1))-1);
-Fs_60rpm = 1/Ts_60rpm;
-
-%% Find Noise of the ADC [m/sqrt(Hz)]
-data = spindle_1rpm(:, 5);
-dV_1rpm = min(abs(data(1) - data(data ~= data(1))));
-noise_1rpm = dV_1rpm/sqrt(12*Fs_1rpm/2);
-
-data = spindle_60rpm(:, 5);
-dV_60rpm = min(abs(data(50) - data(data ~= data(50))));
-noise_60rpm = dV_60rpm/sqrt(12*Fs_60rpm/2);
-
-%% Save all the data under spindle struct
-spindle.rpm1.time = spindle_1rpm(:, 1);
-spindle.rpm1.deg  = spindle_1rpm(:, 2);
-spindle.rpm1.Ts   = Ts_1rpm;
-spindle.rpm1.Fs   = 1/Ts_1rpm;
-spindle.rpm1.x    = spindle_1rpm(:, 3);
-spindle.rpm1.y    = spindle_1rpm(:, 4);
-spindle.rpm1.z    = spindle_1rpm(:, 5);
-spindle.rpm1.adcn = noise_1rpm;
-
-spindle.rpm60.time = spindle_60rpm(:, 1);
-spindle.rpm60.deg  = spindle_60rpm(:, 2);
-spindle.rpm60.Ts   = Ts_60rpm;
-spindle.rpm60.Fs   = 1/Ts_60rpm;
-spindle.rpm60.x    = spindle_60rpm(:, 3);
-spindle.rpm60.y    = spindle_60rpm(:, 4);
-spindle.rpm60.z    = spindle_60rpm(:, 5);
-spindle.rpm60.adcn = noise_60rpm;
-
-%% Compute Asynchronous data
-for direction = {'x', 'y', 'z'}
-    spindle.rpm1.([direction{1}, 'async']) = getAsynchronousError(spindle.rpm1.(direction{1}), 10);
-    spindle.rpm60.([direction{1}, 'async']) = getAsynchronousError(spindle.rpm60.(direction{1}), 10);
-end
-
-%% Save data
-save('./mat/spindle_data.mat', 'spindle');