diff --git a/.gitignore b/.gitignore
index ccc8aae..75405de 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,8 +1,10 @@
auto/
*.tex
+
**/figs/*.pdf
**/figs/*.svg
-=======
+**/figs/*.tex
+
# Emacs
auto/
diff --git a/2017-11-17 - Marc/index.html b/2017-11-17 - Marc/index.html
index ed05852..d654bd0 100644
Binary files a/2017-11-17 - Marc/index.html and b/2017-11-17 - Marc/index.html differ
diff --git a/2017-11-17 - Marc/index.org b/2017-11-17 - Marc/index.org
index 2a12219..a7c8741 100644
--- a/2017-11-17 - Marc/index.org
+++ b/2017-11-17 - Marc/index.org
@@ -1,27 +1,5 @@
#+TITLE: Measurements
-:drawer:
-#+STARTUP: overview
-
-#+HTML_HEAD:
-#+HTML_HEAD:
-#+HTML_HEAD:
-#+HTML_HEAD:
-#+HTML_HEAD:
-#+HTML_HEAD:
-
-#+LATEX_CLASS: cleanreport
-#+LaTeX_CLASS_OPTIONS: [tocnp, secbreak, minted]
-
-#+PROPERTY: header-args:matlab :session *MATLAB*
-#+PROPERTY: header-args:matlab+ :comments org
-#+PROPERTY: header-args:matlab+ :exports both
-#+PROPERTY: header-args:matlab+ :eval no-export
-#+PROPERTY: header-args:matlab+ :noweb yes
-#+PROPERTY: header-args:matlab+ :mkdirp yes
-#+PROPERTY: header-args:matlab+ :output-dir figs
-:end:
-
-[[../index.org][Back to main page]].
+#+SETUPFILE: ../config.org
* Experimental conditions
- Measurement made in a metrology lab
@@ -33,12 +11,12 @@
#+name: fig:accelerometers
#+caption: Accelerometers position
-#+attr_latex: :width 0.5\linewidth
+#+attr_html: :width 500px
[[file:./figs/accelerometers.png]]
#+name: fig:instrumented_hammer
#+caption: Instrumented Hammer used
-#+attr_latex: :width 0.5\linewidth
+#+attr_html: :width 500px
[[file:./figs/instrumented_hammer.png]]
* Measurements procedure
@@ -101,7 +79,11 @@ For each of the measurement, the measured channels are shown on table [[tab:meas
* Data Analysis
** Loading of the data
-#+begin_src matlab :exports none :results silent :noweb yes :var current_dir=(file-name-directory buffer-file-name)
+#+begin_src matlab :tangle no :exports none :results silent :noweb yes :var current_dir=(file-name-directory buffer-file-name)
+ <>
+#+end_src
+
+#+begin_src matlab :exports none :results silent :noweb yes
<>
#+end_src
diff --git a/2018-01-12 - Marc/index.org b/2018-01-12 - Marc/index.org
index 26f5e47..5db6137 100644
--- a/2018-01-12 - Marc/index.org
+++ b/2018-01-12 - Marc/index.org
@@ -1,27 +1,5 @@
#+TITLE: Measurements
-:drawer:
-#+STARTUP: overview
-
-#+HTML_HEAD:
-#+HTML_HEAD:
-#+HTML_HEAD:
-#+HTML_HEAD:
-#+HTML_HEAD:
-#+HTML_HEAD:
-
-#+LATEX_CLASS: cleanreport
-#+LaTeX_CLASS_OPTIONS: [tocnp, secbreak, minted]
-
-#+PROPERTY: header-args:matlab :session *MATLAB*
-#+PROPERTY: header-args:matlab+ :comments org
-#+PROPERTY: header-args:matlab+ :exports both
-#+PROPERTY: header-args:matlab+ :eval no-export
-#+PROPERTY: header-args:matlab+ :noweb yes
-#+PROPERTY: header-args:matlab+ :mkdirp yes
-#+PROPERTY: header-args:matlab+ :output-dir figs
-:end:
-
-[[../index.org][Back to main page]].
+#+SETUPFILE: ../config.org
* Experimental conditions
- The granite is not glued to the floor
@@ -72,7 +50,11 @@ The structure is excited using an *instrumented hammer* with impacts on
* Data Analysis
** Loading and pre-processing of the data
-#+begin_src matlab :exports none :results silent :noweb yes :var current_dir=(file-name-directory buffer-file-name)
+#+begin_src matlab :tangle no :exports none :results silent :noweb yes :var current_dir=(file-name-directory buffer-file-name)
+ <>
+#+end_src
+
+#+begin_src matlab :exports none :results silent :noweb yes
<>
#+end_src
diff --git a/2018-01-12 - Marc/scripts/id31_microstation_12january2018.m b/2018-01-12 - Marc/scripts/id31_microstation_12january2018.m
index 9c6a0cc..aa78898 100644
--- a/2018-01-12 - Marc/scripts/id31_microstation_12january2018.m
+++ b/2018-01-12 - Marc/scripts/id31_microstation_12january2018.m
@@ -1,14 +1,14 @@
% Title: id31 microstation
% Date: 12 january 2018
-
+
% Description: measure on id31 microstation in room id31-13
-
+
% FS: =512Hz
%% measurements 12 janaury 2018
microstation=['Marble '; 'Tilt '; 'Hexapod '];
-
+
% ch1: hammer
@@ -50,10 +50,10 @@ leg1=['TY ON - RZ OFF - RY OFF - Slip ring OFF - Hexapod OFF'];
% ------------------------------------------------------------------------
% ch_max=16;
% % --------------------------------
-%
+%
% mult=1e6; % --> m/s to micron/s
-%
-% nyqhp=2.56; % nyquist
+%
+% nyqhp=2.56; % nyquist
% f_cut=0.5; % cut frequency for high pass filter
% t_win=4; % window length in sec
% t_ovlp=0; % overlap window in sec
@@ -65,12 +65,12 @@ warning off MATLAB:divideByZero
capt=[1:6];
for i=capt
-
+
eval(['load Measurement',num2str(i)])
for ch=2:4
eval(['freq_frf(:,',num2str(1),')=FFT1_H1_',num2str(2),'_1_RMS_X_Val;'])
%omeg=2*pi*freq;
-
+
eval(['av_spc(:,',num2str(ch),')=FFT1_AvSpc_',num2str(ch),'_RMS_Y_Val;'])
eval(['frf_mod(:,',num2str(ch),')=FFT1_H1_',num2str(ch),'_1_RMS_Y_Mod;'])
eval(['frf_phs(:,',num2str(ch),')=FFT1_H1_',num2str(ch),'_1_RMS_Y_Phas;'])
@@ -90,21 +90,21 @@ proname(2)={'Color'};
proname(3)={'LineStyle'};
val(1,1) = {.5} ;val(1,2) = {[0.6 0.2 1]} ;val(1,3) = {'-'};
-val(2,1) = {2} ;val(2,2) = {[0 0 1]} ;val(2,3) = {'-'};
-val(3,1) = {0.5} ;val(3,2) = {[0.25 0.9 0.65]} ;val(3,3) = {'-'};
-val(4,1) = {2} ;val(4,2) = {[0 1 0]} ;val(4,3) = {'-'};
-val(5,1) = {0.5} ;val(5,2) = {[1 0.4 0.4]} ;val(5,3) = {'-'};
-val(6,1) = {2} ;val(6,2) = {[1 0 0]} ;val(6,3) = {'-'};
-val(7,1) = {1} ;val(7,2) = {[0.8 0.8 0.8]} ;val(7,3) = {'-'};
-val(8,1) = {2} ;val(8,2) = {[0.1 0.1 0.2]} ;val(8,3) = {'-'};
-val(9,1) = {1} ;val(9,2) = {[0.7 0.8 0.4]} ;val(9,3) = {'-'};
-val(10,1) = {2} ;val(10,2) = {[0.7 0.8 0.2]} ;val(10,3) = {'-'};
-val(11,1) = {1} ;val(11,2) = {[0.9 0.7 0.35]} ;val(11,3) = {'-'};
-val(12,1) = {2} ;val(12,2) = {[1 0.8 0.3]} ;val(12,3) = {'-'};
-val(13,1) = {1} ;val(13,2) = {[0.5 0.4 0.3]} ;val(13,3) = {'-'};
-val(14,1) = {2} ;val(14,2) = {[0.5 0.3 0.2]} ;val(14,3) = {'-'};
+val(2,1) = {2} ;val(2,2) = {[0 0 1]} ;val(2,3) = {'-'};
+val(3,1) = {0.5} ;val(3,2) = {[0.25 0.9 0.65]} ;val(3,3) = {'-'};
+val(4,1) = {2} ;val(4,2) = {[0 1 0]} ;val(4,3) = {'-'};
+val(5,1) = {0.5} ;val(5,2) = {[1 0.4 0.4]} ;val(5,3) = {'-'};
+val(6,1) = {2} ;val(6,2) = {[1 0 0]} ;val(6,3) = {'-'};
+val(7,1) = {1} ;val(7,2) = {[0.8 0.8 0.8]} ;val(7,3) = {'-'};
+val(8,1) = {2} ;val(8,2) = {[0.1 0.1 0.2]} ;val(8,3) = {'-'};
+val(9,1) = {1} ;val(9,2) = {[0.7 0.8 0.4]} ;val(9,3) = {'-'};
+val(10,1) = {2} ;val(10,2) = {[0.7 0.8 0.2]} ;val(10,3) = {'-'};
+val(11,1) = {1} ;val(11,2) = {[0.9 0.7 0.35]} ;val(11,3) = {'-'};
+val(12,1) = {2} ;val(12,2) = {[1 0.8 0.3]} ;val(12,3) = {'-'};
+val(13,1) = {1} ;val(13,2) = {[0.5 0.4 0.3]} ;val(13,3) = {'-'};
+val(14,1) = {2} ;val(14,2) = {[0.5 0.3 0.2]} ;val(14,3) = {'-'};
-%
+%
% %--------------------------------Plots
xlab=['Frequency in Hz'];
xlab1=['Hours since start: 06/07/2012 at 19:40'];
@@ -354,7 +354,7 @@ grid
saveas(gcf,'comp_frf_z_hammer_hexa','fig')
print -dpng comp_frf_z_hammer_hexa
-%%
+%%
figure
h=semilogy(freq_frf,abs([ReIm4(:,5) ReIm10(:,5) ReIm11(:,5) ReIm15(:,5)]));
set(h,proname,val([6 4 2 12],1:3))
@@ -378,4 +378,3 @@ legend(leg1,leg6,'Location','SouthEast');
grid
% saveas(gcf,'comp_frf_z_hammer_hexa','fig')
% print -dpng comp_frf_z_hammer_hexa
-
diff --git a/2018-10-12 - Marc/analysis/id31_microstation_raw_12october2018.m b/2018-10-12 - Marc/analysis/id31_microstation_raw_12october2018.m
index a2fb4be..6c89974 100644
--- a/2018-10-12 - Marc/analysis/id31_microstation_raw_12october2018.m
+++ b/2018-10-12 - Marc/analysis/id31_microstation_raw_12october2018.m
@@ -3,9 +3,9 @@
%% NOTE
% With this file you can load the raw mat files
-
+
%% Description: measure on id31 microstation in exp hutch
-
+
% FS: =256Hz
@@ -57,8 +57,8 @@
%%
microstation=['Marble '; 'TY ';'Tilt '; 'Hexapod '];
-%
-%% PARAMETERS
+%
+%% PARAMETERS
beamline='ID31 Nanostation - Hammer testing';
% --------------------------------
@@ -68,7 +68,7 @@ ch_max=16;
%mult=1e6/276*173; % --> m/s to micron/s and sensitivity correction for L4-C
-nyqhp=2.56; % nyquist
+nyqhp=2.56; % nyquist
f_cut=0.5; % cut frequency for high pass filter
t_win=4; % window length in sec
t_ovlp=0; % overlap window in sec
@@ -93,93 +93,93 @@ shock_ch=9;
%% main loop --------
% ------------------
for i=capt
-
-
+
+
eval(['load Measurement_raw',num2str(i)])
freq_max=Track1_TrueBandWidth;
- dts=1/(freq_max*nyqhp);
-
+ dts=1/(freq_max*nyqhp);
+
freq=linspace(0,freq_max,t_win*freq_max);
wo=2*pi*freq;
-
+
for k=1:ch_max
vname=['Track',num2str(k)];
array_exist(k)=ismember(vname,who);
end
non_zero=find(array_exist);
for z=non_zero(1):length(non_zero)
- track_nb=['Track',num2str(z)]';
- eval(['data(:,z)=Track',num2str(z),';']);
+ track_nb=['Track',num2str(z)]';
+ eval(['data(:,z)=Track',num2str(z),';']);
end
c=data*mult;
-
-
+
+
%-------------
nbch=size(c,2);
%-------------
r=length(c);
if r/2~=fix(r/2) % loop to test for odd or even nb of samples
c=c(1:r-1,:); % take only even
- else
+ else
end
%------------------------------
- time=linspace(0,length(c)*dts,length(c));
-
+ time=linspace(0,length(c)*dts,length(c));
+
for j=nbch %shunt_ch
- [c(:,j),c_shut]=shut_c(c(:,j),1/dts); % correct for shunt
+ [c(:,j),c_shut]=shut_c(c(:,j),1/dts); % correct for shunt
end
%c(:,8)=(c(:,5)-c(:,4))/d; % differential Theta Y angle
-
- b=find(no_hammer==i); % if i==1 | i==2 | i==6
+
+ b=find(no_hammer==i); % if i==1 | i==2 | i==6
if b~=0
[psd_v,integ_v,psd_d,integ_d]=integrated_psd(c,t_win,t_ovlp,nyqhp,dts);
[frz_cut,crsp,pwsp,coherz,nsp]=fqresp(c,shock_ch,t_win,t_ovlp,nyqhp,dts);
-
- else
-
+
+ else
+
thresh=0.5; % threshold of max value
sep=2.5; % separation minimum of peaks in sec
pre_ev=2; % pre event delay in sec
pos_ev=2; % post event delay in sec
-
+
[ti,t_impact]=findpeaks(c(:,shock_ch),'minpeakheight',max(c(:,shock_ch))*thresh,'minpeakdistance',ceil(sep/dts));
% find times at which there are impacts (threshold of max and separated by sep sec)
-
+
psd_v=zeros((pre_ev+pos_ev)/dts/nyqhp,nbch);
psd_d=zeros((pre_ev+pos_ev)/dts/nyqhp,nbch);
frz_cut=zeros((pre_ev+pos_ev)/dts/nyqhp,nbch);
-
+
for k=1:length(t_impact)
ibeg=fix(t_impact(k)-(pre_ev/dts));
iend=fix(t_impact(k)+(pos_ev/dts));
freq_s=linspace(0,freq_max,t_win/2*freq_max);
- if ibeg>1 && iend1 && iend
-#+HTML_HEAD:
-#+HTML_HEAD:
-#+HTML_HEAD:
-#+HTML_HEAD:
-#+HTML_HEAD:
-
-#+LATEX_CLASS: cleanreport
-#+LaTeX_CLASS_OPTIONS: [tocnp, secbreak, minted]
-
-#+PROPERTY: header-args:matlab :session *MATLAB*
-#+PROPERTY: header-args:matlab+ :comments org
-#+PROPERTY: header-args:matlab+ :exports both
-#+PROPERTY: header-args:matlab+ :eval no-export
-#+PROPERTY: header-args:matlab+ :noweb yes
-#+PROPERTY: header-args:matlab+ :mkdirp yes
-#+PROPERTY: header-args:matlab+ :output-dir figs
-:end:
-
-[[../index.org][Back to main page]].
+#+SETUPFILE: ../config.org
* Experimental conditions
- Measurement made in the experiment hutch
@@ -87,7 +65,11 @@ Les fichiers xxx_raw sont sans traitement dans le domaine temporel (environ 10 i
* Data Analysis
** Loading of the data
-#+begin_src matlab :exports none :results silent :noweb yes :var current_dir=(file-name-directory buffer-file-name)
+#+begin_src matlab :tangle no :exports none :results silent :noweb yes :var current_dir=(file-name-directory buffer-file-name)
+ <>
+#+end_src
+
+#+begin_src matlab :exports none :results silent :noweb yes
<>
#+end_src
diff --git a/2018-10-15 - Marc/analysis-marc/info.txt b/2018-10-15 - Marc/analysis-marc/info.txt
index 96518de..b8dce76 100644
--- a/2018-10-15 - Marc/analysis-marc/info.txt
+++ b/2018-10-15 - Marc/analysis-marc/info.txt
@@ -1,4 +1,4 @@
contient les mesures de l'effet des différents moteurs ON/OFF, j'ai sorti qq spectrogrammes qui montrent bien que c'est la spindle qui a le plus d'effet
+ une mesure de la réponse du marbre sans excitation.
-Le capteur Y sur le marbre semble faible en basse fréquence (marbre pas de niveau peut être)
\ No newline at end of file
+Le capteur Y sur le marbre semble faible en basse fréquence (marbre pas de niveau peut être)
diff --git a/2018-10-15 - Marc/index.org b/2018-10-15 - Marc/index.org
index 09d903b..e5e3774 100644
--- a/2018-10-15 - Marc/index.org
+++ b/2018-10-15 - Marc/index.org
@@ -1,34 +1,18 @@
#+TITLE: Measurement Analysis
-:drawer:
-#+STARTUP: overview
+#+SETUPFILE: ../config.org
-#+HTML_HEAD:
-#+HTML_HEAD:
-#+HTML_HEAD:
-#+HTML_HEAD:
-#+HTML_HEAD:
-#+HTML_HEAD:
+* Matlab Init :noexport:ignore:
+#+begin_src matlab :tangle no :exports none :results silent :noweb yes :var current_dir=(file-name-directory buffer-file-name)
+ <>
+#+end_src
-#+LATEX_CLASS: cleanreport
-#+LaTeX_CLASS_OPTIONS: [tocnp, secbreak, minted]
-
-#+PROPERTY: header-args:matlab :session *MATLAB*
-#+PROPERTY: header-args:matlab+ :comments org
-#+PROPERTY: header-args:matlab+ :exports both
-#+PROPERTY: header-args:matlab+ :eval no-export
-#+PROPERTY: header-args:matlab+ :noweb yes
-#+PROPERTY: header-args:matlab+ :mkdirp yes
-#+PROPERTY: header-args:matlab+ :output-dir figs
-:end:
-
-[[../index.org][Back to main page]].
-
-#+begin_src matlab :exports none :results silent :noweb yes :var current_dir=(file-name-directory buffer-file-name)
+#+begin_src matlab :exports none :results silent :noweb yes
<>
#+end_src
* Measurement Description
#+name: fig:setup_picture
+#+attr_html: :width 500px
#+caption: Picture of the setup for the measurement
[[file:./figs/setup_picture.png]]
diff --git a/Ground Motion/index.org b/Ground Motion/index.org
index 8627bb3..f80ec5d 100644
--- a/Ground Motion/index.org
+++ b/Ground Motion/index.org
@@ -1,29 +1,12 @@
#+TITLE: Ground Motion Measurements
-:drawer:
-#+STARTUP: overview
+#+SETUPFILE: ../config.org
-#+HTML_HEAD:
-#+HTML_HEAD:
-#+HTML_HEAD:
-#+HTML_HEAD:
-#+HTML_HEAD:
-#+HTML_HEAD:
+* Matlab Init :noexport:ignore:
+#+begin_src matlab :tangle no :exports none :results silent :noweb yes :var current_dir=(file-name-directory buffer-file-name)
+ <>
+#+end_src
-#+LATEX_CLASS: cleanreport
-#+LaTeX_CLASS_OPTIONS: [tocnp, secbreak, minted]
-
-#+PROPERTY: header-args:matlab :session *MATLAB*
-#+PROPERTY: header-args:matlab+ :comments org
-#+PROPERTY: header-args:matlab+ :exports both
-#+PROPERTY: header-args:matlab+ :eval no-export
-#+PROPERTY: header-args:matlab+ :noweb yes
-#+PROPERTY: header-args:matlab+ :mkdirp yes
-#+PROPERTY: header-args:matlab+ :output-dir figs
-:end:
-
-[[../index.org][Back to main page]].
-
-#+begin_src matlab :exports none :results silent :noweb yes :var current_dir=(file-name-directory buffer-file-name)
+#+begin_src matlab :exports none :results silent :noweb yes
<