diff --git a/.gitignore b/.gitignore index 34ab0a6..4c39510 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,3 @@ -auto/ *.tex **/figs/*.pdf diff --git a/actuators-sensors/index.html b/actuators-sensors/index.html index 5c2d1a0..ace984f 100644 Binary files a/actuators-sensors/index.html and b/actuators-sensors/index.html differ diff --git a/actuators-sensors/index.org b/actuators-sensors/index.org index 911fdb1..1fc0752 100644 --- a/actuators-sensors/index.org +++ b/actuators-sensors/index.org @@ -36,12 +36,16 @@ *** Suppliers - https://micromega-dynamics.com/products/ +- https://www.mmf.de/seismic_accelerometers.htm +- https://www.pcb.com/products/productfinder.aspx?tx=14 ** Geophones *** Suppliers - http://www.sercel.com/products/Pages/seismometers.aspx ** Force Sensors +- https://www.pcb.com/products/productfinder.aspx?tx=17 + ** Strain Gauge ** Interferometers *** Suppliers @@ -68,7 +72,7 @@ cite:fleming13_review_nanom_resol_posit_sensor - https://www.celeramotion.com/ - http://www.beikimco.com/ - https://www.electromate.com/ -- https://www.magneticinnovations.com/ +- https://www.magneticinnovations.com/: Netherlands ** Shaker *** Suppliers diff --git a/config.org b/config.org deleted file mode 100644 index 387490a..0000000 --- a/config.org +++ /dev/null @@ -1,27 +0,0 @@ -#+STARTUP: overview - -#+LANGUAGE: en -#+EMAIL: dehaeze.thomas@gmail.com -#+AUTHOR: Dehaeze Thomas - -#+HTML_LINK_HOME: ../index.html -#+HTML_LINK_UP: ../index.html - -#+HTML_HEAD: -#+HTML_HEAD: -#+HTML_HEAD: -#+HTML_HEAD: -#+HTML_HEAD: -#+HTML_HEAD: -#+HTML_HEAD: - -#+HTML_MATHJAX: align: center tagside: right font: TeX - -#+PROPERTY: header-args:matlab :session *MATLAB* -#+PROPERTY: header-args:matlab+ :comments org -#+PROPERTY: header-args:matlab+ :results none -#+PROPERTY: header-args:matlab+ :exports both -#+PROPERTY: header-args:matlab+ :eval no-export -#+PROPERTY: header-args:matlab+ :output-dir figs - -#+PROPERTY: header-args:shell :eval no-export diff --git a/disturbance-control-system/index.html b/disturbance-control-system/index.html index 6fdc677..3ec0cae 100644 Binary files a/disturbance-control-system/index.html and b/disturbance-control-system/index.html differ diff --git a/disturbance-control-system/index.org b/disturbance-control-system/index.org index 9df0d88..90edfb7 100644 --- a/disturbance-control-system/index.org +++ b/disturbance-control-system/index.org @@ -397,7 +397,7 @@ We load the data of the z axis of two geophones. #+end_src ** Voltage to Velocity -We convert the measured voltage to velocity using the function =voltageToVelocityL22= (accessible [[file:~/MEGA/These/meas/src/index.org][here]]). +We convert the measured voltage to velocity using the function =voltageToVelocityL22= (accessible [[file:~/Cloud/These/meas/src/index.org][here]]). #+begin_src matlab gain = 60; % [dB] diff --git a/disturbance-sr-rz/index.org b/disturbance-sr-rz/index.org index 631e6a0..eba519e 100644 --- a/disturbance-sr-rz/index.org +++ b/disturbance-sr-rz/index.org @@ -113,7 +113,7 @@ A movie showing the experiment is shown on figure [[fig:exp_sl_sp_gif]]. #+end_src ** Voltage to Velocity -We convert the measured voltage to velocity using the function =voltageToVelocityL22= (accessible [[file:~/MEGA/These/meas/src/index.org][here]]). +We convert the measured voltage to velocity using the function =voltageToVelocityL22= (accessible [[file:~/Cloud/These/meas/src/index.org][here]]). #+begin_src matlab gain = 60; % [dB] diff --git a/disturbance-ty-sr/index.html b/disturbance-ty-sr/index.html index 6967647..d8ac7ea 100644 Binary files a/disturbance-ty-sr/index.html and b/disturbance-ty-sr/index.html differ diff --git a/disturbance-ty-sr/index.org b/disturbance-ty-sr/index.org index c131ce1..6802c8a 100644 --- a/disturbance-ty-sr/index.org +++ b/disturbance-ty-sr/index.org @@ -108,7 +108,7 @@ Each of the measurement =mat= file contains one =data= array with 3 columns: #+end_src ** Voltage to Velocity -We convert the measured voltage to velocity using the function =voltageToVelocityL22= (accessible [[file:~/MEGA/These/meas/src/index.org][here]]). +We convert the measured voltage to velocity using the function =voltageToVelocityL22= (accessible [[file:~/Cloud/These/meas/src/index.org][here]]). #+begin_src matlab gain = 40; % [dB] diff --git a/disturbance-ty/index.html b/disturbance-ty/index.html index a161ccc..e2a942e 100644 Binary files a/disturbance-ty/index.html and b/disturbance-ty/index.html differ diff --git a/disturbance-ty/index.org b/disturbance-ty/index.org index 2b86a9b..6298cc5 100644 --- a/disturbance-ty/index.org +++ b/disturbance-ty/index.org @@ -118,7 +118,7 @@ Each of the measurement =mat= file contains one =data= array with 3 columns: #+end_src ** Voltage to Velocity -We convert the measured voltage to velocity using the function =voltageToVelocityL22= (accessible [[file:~/MEGA/These/meas/src/index.org][here]]). +We convert the measured voltage to velocity using the function =voltageToVelocityL22= (accessible [[file:~/Cloud/These/meas/src/index.org][here]]). #+begin_src matlab gain = 40; % [dB] diff --git a/index.html b/index.html index 536b6a9..d56cc25 100644 Binary files a/index.html and b/index.html differ diff --git a/index.org b/index.org index c68b3f7..59601cb 100644 --- a/index.org +++ b/index.org @@ -50,3 +50,4 @@ Noise coming from the Slip-Ring: - [[file:actuators-sensors/index.org][Actuators and Sensors]] - [[file:equipment/index.org][Equipment used for the measurements]] - [[file:src/index.org][Matlab functions used for the data analysis]] +- [[file:speedgoat-measurement/index.org][Speedgoat]] diff --git a/instrumentation/index.org b/instrumentation/index.org index 5b50f2b..bd074b2 100644 --- a/instrumentation/index.org +++ b/instrumentation/index.org @@ -349,7 +349,7 @@ The values of the components are: Which makes a cut-off frequency of $f_c = \frac{1}{RC} = 1000 rad/s = 160Hz$. #+NAME: fig:lpf -#+HEADER: :headers '("\\usepackage{tikz}" "\\usepackage{import}" "\\import{$HOME/MEGA/These/LaTeX/}{config.tex}") +#+HEADER: :headers '("\\usepackage{tikz}" "\\usepackage{import}" "\\import{$HOME/Cloud/These/LaTeX/}{config.tex}") #+HEADER: :imagemagick t :fit yes :iminoptions -scale 100% -density 150 :imoutoptions -quality 100 #+HEADER: :results raw replace :buffer no :eval no-export :exports both :mkdirp yes #+HEADER: :output-dir figs diff --git a/modal-analysis/frf_processing.org b/modal-analysis/frf_processing.org index 0808ffc..b83ae70 100644 --- a/modal-analysis/frf_processing.org +++ b/modal-analysis/frf_processing.org @@ -30,7 +30,7 @@ #+PROPERTY: header-args:shell :eval no-export -#+PROPERTY: header-args:latex :headers '("\\usepackage{tikz}" "\\usepackage{import}" "\\import{$HOME/MEGA/These/LaTeX/}{config.tex}") +#+PROPERTY: header-args:latex :headers '("\\usepackage{tikz}" "\\usepackage{import}" "\\import{$HOME/Cloud/These/LaTeX/}{config.tex}") #+PROPERTY: header-args:latex+ :imagemagick t :fit yes #+PROPERTY: header-args:latex+ :iminoptions -scale 100% -density 150 #+PROPERTY: header-args:latex+ :imoutoptions -quality 100 @@ -772,3 +772,6 @@ Then, as we know the positions of the accelerometers on each solid body, and we #+begin_src matlab save('mat/frf_com.mat', 'FRFs_CoM'); #+end_src +* Bibliography :ignore: +bibliographystyle:unsrt +bibliography:ref.bib diff --git a/modal-analysis/mathematical_model.html b/modal-analysis/mathematical_model.html index 462171d..b57a48b 100644 Binary files a/modal-analysis/mathematical_model.html and b/modal-analysis/mathematical_model.html differ diff --git a/modal-analysis/mathematical_model.org b/modal-analysis/mathematical_model.org index e6a2842..bd62c38 100644 --- a/modal-analysis/mathematical_model.org +++ b/modal-analysis/mathematical_model.org @@ -28,7 +28,7 @@ #+PROPERTY: header-args:shell :eval no-export -#+PROPERTY: header-args:latex :headers '("\\usepackage{tikz}" "\\usepackage{import}" "\\import{$HOME/MEGA/These/LaTeX/}{config.tex}") +#+PROPERTY: header-args:latex :headers '("\\usepackage{tikz}" "\\usepackage{import}" "\\import{$HOME/Cloud/These/LaTeX/}{config.tex}") #+PROPERTY: header-args:latex+ :imagemagick t :fit yes #+PROPERTY: header-args:latex+ :iminoptions -scale 100% -density 150 #+PROPERTY: header-args:latex+ :imoutoptions -quality 100 @@ -134,3 +134,6 @@ Is it meaningful to compare mode shapes as they give no information about the am | | 9 | 9 | 18 | | #+TBLFM: $4=vsum($2..$3) #+TBLFM: @>$2..$>=vsum(@I..@II) +* Bibliography :ignore: +bibliographystyle:unsrt +bibliography:ref.bib diff --git a/modal-analysis/measurement.org b/modal-analysis/measurement.org index d323376..7f7dab6 100644 --- a/modal-analysis/measurement.org +++ b/modal-analysis/measurement.org @@ -30,7 +30,7 @@ #+PROPERTY: header-args:shell :eval no-export -#+PROPERTY: header-args:latex :headers '("\\usepackage{tikz}" "\\usepackage{import}" "\\import{$HOME/MEGA/These/LaTeX/}{config.tex}") +#+PROPERTY: header-args:latex :headers '("\\usepackage{tikz}" "\\usepackage{import}" "\\import{$HOME/Cloud/These/LaTeX/}{config.tex}") #+PROPERTY: header-args:latex+ :imagemagick t :fit yes #+PROPERTY: header-args:latex+ :iminoptions -scale 100% -density 150 #+PROPERTY: header-args:latex+ :imoutoptions -quality 100 diff --git a/modal-analysis/modal_extraction.org b/modal-analysis/modal_extraction.org index a39caa8..bf872a9 100644 --- a/modal-analysis/modal_extraction.org +++ b/modal-analysis/modal_extraction.org @@ -30,7 +30,7 @@ #+PROPERTY: header-args:shell :eval no-export -#+PROPERTY: header-args:latex :headers '("\\usepackage{tikz}" "\\usepackage{import}" "\\import{$HOME/MEGA/These/LaTeX/}{config.tex}") +#+PROPERTY: header-args:latex :headers '("\\usepackage{tikz}" "\\usepackage{import}" "\\import{$HOME/Cloud/These/LaTeX/}{config.tex}") #+PROPERTY: header-args:latex+ :imagemagick t :fit yes #+PROPERTY: header-args:latex+ :iminoptions -scale 100% -density 150 #+PROPERTY: header-args:latex+ :imoutoptions -quality 100 diff --git a/speedgoat-measurement/index.html b/speedgoat-measurement/index.html new file mode 100644 index 0000000..38c81a6 Binary files /dev/null and b/speedgoat-measurement/index.html differ diff --git a/speedgoat-measurement/readme.org b/speedgoat-measurement/index.org similarity index 79% rename from speedgoat-measurement/readme.org rename to speedgoat-measurement/index.org index 22fca2c..7d268b4 100644 --- a/speedgoat-measurement/readme.org +++ b/speedgoat-measurement/index.org @@ -1,4 +1,22 @@ -* Usefull Simulink Real Time commands +#+TITLE: Vibrations induced by the translation stage motion +:DRAWER: +#+STARTUP: overview + +#+LANGUAGE: en +#+EMAIL: dehaeze.thomas@gmail.com +#+AUTHOR: Dehaeze Thomas + +#+HTML_LINK_HOME: ../index.html +#+HTML_LINK_UP: ../index.html + +#+HTML_HEAD: +#+HTML_HEAD: +#+HTML_HEAD: +#+HTML_HEAD: +#+HTML_HEAD: +#+HTML_HEAD: +#+HTML_HEAD: +:END: * Get data from the target computer @@ -67,14 +85,11 @@ First run the following commands to have the =FTP= Object: #+end_src Then, the =f= object can be used to access the filesystem on the target computer. -| cd | | | -| dir | | | -| mget | Used to download data from the target host | =f.mget('data.dat', 'local_folder')= | -| mkdir | | | -| mput | | | -| rename | | | -| rmdir | | | -| close | | | - -* ELMO -tutorials: https://www.elmomc.com/products/application-studio/easii/easii-tutorials/ +- =cd= +- =dir= +- =mget=: Used to download data from the target host. =f.mget('data.dat', 'local_folder')= +- =mkdir= +- =mput= +- =rename= +- =rmdir= +- =close=