diff --git a/2017-11-17 - Marc/index.org b/2017-11-17 - Marc/index.org index 83f8fb9..2a12219 100644 --- a/2017-11-17 - Marc/index.org +++ b/2017-11-17 - Marc/index.org @@ -101,7 +101,7 @@ 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 +#+begin_src matlab :exports none :results silent :noweb yes :var current_dir=(file-name-directory buffer-file-name) <> #+end_src diff --git a/2018-01-12 - Marc/index.org b/2018-01-12 - Marc/index.org index df4b46c..26f5e47 100644 --- a/2018-01-12 - Marc/index.org +++ b/2018-01-12 - Marc/index.org @@ -72,7 +72,7 @@ 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 +#+begin_src matlab :exports none :results silent :noweb yes :var current_dir=(file-name-directory buffer-file-name) <> #+end_src diff --git a/2018-10-12 - Marc/index.org b/2018-10-12 - Marc/index.org index c71d306..e00b41d 100644 --- a/2018-10-12 - Marc/index.org +++ b/2018-10-12 - Marc/index.org @@ -87,7 +87,7 @@ 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 +#+begin_src matlab :exports none :results silent :noweb yes :var current_dir=(file-name-directory buffer-file-name) <> #+end_src diff --git a/2018-10-15 - Marc/index.org b/2018-10-15 - Marc/index.org index 4c04560..09d903b 100644 --- a/2018-10-15 - Marc/index.org +++ b/2018-10-15 - Marc/index.org @@ -23,7 +23,7 @@ [[../index.org][Back to main page]]. -#+begin_src matlab :exports none :results silent +#+begin_src matlab :exports none :results silent :noweb yes :var current_dir=(file-name-directory buffer-file-name) <> #+end_src diff --git a/Ground Motion/index.org b/Ground Motion/index.org index 59fc917..8627bb3 100644 --- a/Ground Motion/index.org +++ b/Ground Motion/index.org @@ -23,7 +23,7 @@ [[../index.org][Back to main page]]. -#+begin_src matlab :exports none :results silent +#+begin_src matlab :exports none :results silent :noweb yes :var current_dir=(file-name-directory buffer-file-name) <> #+end_src diff --git a/Spindle/index.org b/Spindle/index.org index fdc1e74..70920dc 100644 --- a/Spindle/index.org +++ b/Spindle/index.org @@ -31,7 +31,7 @@ The report made by the PEL is accessible [[file:documents/Spindle_report_test.pd [[file:./figs/setup_spindle.png]] * Data Processing -#+begin_src matlab :results none :exports none +#+begin_src matlab :results none :exports none :noweb yes :var current_dir=(file-name-directory buffer-file-name) <> #+end_src diff --git a/actuators-sensors/index.org b/actuators-sensors/index.org index 3ba1530..656c63a 100644 --- a/actuators-sensors/index.org +++ b/actuators-sensors/index.org @@ -160,7 +160,7 @@ We define the parameters of the geophone and we plot its bode plot (figure [[fig | Weight [g] | 2150 | | Sensitivity [V/(m/s)] | 276.8 | -#+begin_src matlab :exports none :results silent +#+begin_src matlab :exports none :results silent :noweb yes :var current_dir=(file-name-directory buffer-file-name) <> #+end_src diff --git a/disturbance-measurement/index.org b/disturbance-measurement/index.org index 751120f..b21b440 100644 --- a/disturbance-measurement/index.org +++ b/disturbance-measurement/index.org @@ -22,7 +22,7 @@ * Signal Processing ** Matlab Init :noexport:ignore: -#+begin_src matlab :exports none :results silent :noweb yes +#+begin_src matlab :exports none :results silent :noweb yes :var current_dir=(file-name-directory buffer-file-name) <> #+end_src diff --git a/equipment/equipment.org b/equipment/equipment.org index c1cf8a6..8d59fac 100644 --- a/equipment/equipment.org +++ b/equipment/equipment.org @@ -1,10 +1,22 @@ #+TITLE: Equipment used to make the measurements +:DRAWER: +#+STARTUP: overview + +#+HTML_HEAD: +#+HTML_HEAD: +#+HTML_HEAD: +#+HTML_HEAD: +#+HTML_HEAD: +#+HTML_HEAD: +#+HTML_HEAD: +:END: * Geophone L22 * Speedgoat -ADC and DAC: +- ADC: 16bits +- DAC: 16bits * Voltage amplifier diff --git a/huddle-test-geophones/index.org b/huddle-test-geophones/index.org index 21c34f5..71c9412 100644 --- a/huddle-test-geophones/index.org +++ b/huddle-test-geophones/index.org @@ -24,7 +24,9 @@ They are placed on the ID31 granite. They are leveled. The signals are amplified using voltage amplifier with a gain of 60dB. -The voltage amplifiers include a low pass filter with a cut-off frequency at 1kHz. +The voltage amplifiers includes: +- an high pass filter with a cut-off frequency at 1.5Hz (AC option) +- a low pass filter with a cut-off frequency at 1kHz #+name: fig:figure_name #+caption: Setup @@ -45,7 +47,7 @@ The Matlab computing file for this part is accessible [[file:signal_processing.m The =mat= file containing the measurement data is accessible [[file:mat/data_001.mat][here]]. ** Matlab Init :noexport:ignore: -#+begin_src matlab :exports none :results silent :noweb yes +#+begin_src matlab :exports none :results silent :noweb yes :var current_dir=(file-name-directory buffer-file-name) <> #+end_src @@ -415,7 +417,7 @@ The =mat= files containing the measurement data are accessible with the followin - north axis: [[file:mat/data_003.mat][here]]. ** Matlab Init :noexport:ignore: -#+begin_src matlab :exports none :results silent :noweb yes +#+begin_src matlab :exports none :results silent :noweb yes :var current_dir=(file-name-directory buffer-file-name) <> #+end_src diff --git a/index.org b/index.org index 3743e3a..3219423 100644 --- a/index.org +++ b/index.org @@ -1,5 +1,5 @@ #+TITLE:Measurement of the ID31 Micro-Station -:drawer: +:DRAWER: #+STARTUP: overview #+HTML_HEAD: @@ -9,7 +9,9 @@ #+HTML_HEAD: #+HTML_HEAD: #+HTML_HEAD: -:end: +:END: + +This web-page gathers all the measurements done on the ID31 Micro Station. * Measurements of the dynamics of the station ** Measurement 1 diff --git a/slip-ring-test/index.org b/slip-ring-test/index.org index b84a876..e329d30 100644 --- a/slip-ring-test/index.org +++ b/slip-ring-test/index.org @@ -60,7 +60,7 @@ The goal is to determine is the signal is altered when the spindle is rotating. Here, the rotation speed of the Slip-Ring is set to 1rpm. ** Matlab Init :noexport:ignore: -#+begin_src matlab :exports none :results silent :noweb yes +#+begin_src matlab :exports none :results silent :noweb yes :var current_dir=(file-name-directory buffer-file-name) <> #+end_src @@ -195,7 +195,7 @@ The data and matlab files are accessible [[file:data/meas_volt_amp.zip][here]]. - =data_006=: Ampli ON set to 60dB ** Matlab Init :noexport:ignore: -#+begin_src matlab :exports none :results silent :noweb yes +#+begin_src matlab :exports none :results silent :noweb yes :var current_dir=(file-name-directory buffer-file-name) <> #+end_src @@ -343,7 +343,7 @@ Second column: Slip-ring measure [[file:./img/VID_20190503_161401.gif]] ** Matlab Init :noexport:ignore: -#+begin_src matlab :exports none :results silent :noweb yes +#+begin_src matlab :exports none :results silent :noweb yes :var current_dir=(file-name-directory buffer-file-name) <> #+end_src @@ -503,7 +503,7 @@ Second column: Slip-ring measure - =data_013=: Slip-Ring ON *** Matlab Init :noexport:ignore: -#+begin_src matlab :exports none :results silent :noweb yes +#+begin_src matlab :exports none :results silent :noweb yes :var current_dir=(file-name-directory buffer-file-name) <> #+end_src @@ -873,7 +873,7 @@ Second measurement (=mat/data_015.mat= file): [[file:./img/IMG_20190503_170936.jpg]] ** Matlab Init :noexport:ignore: -#+begin_src matlab :exports none :results silent :noweb yes +#+begin_src matlab :exports none :results silent :noweb yes :var current_dir=(file-name-directory buffer-file-name) <> #+end_src @@ -1035,7 +1035,7 @@ Which makes a cut-off frequency of $f_c = \frac{1}{RC} = 1000 rad/s = 160Hz$. [[file:./img/IMG_20190507_102756.jpg]] *** Matlab Init :noexport:ignore: -#+begin_src matlab :exports none :results silent :noweb yes +#+begin_src matlab :exports none :results silent :noweb yes :var current_dir=(file-name-directory buffer-file-name) <> #+end_src diff --git a/static-measurements/index.org b/static-measurements/index.org index 75dce84..20c65b4 100644 --- a/static-measurements/index.org +++ b/static-measurements/index.org @@ -48,7 +48,7 @@ Each of the measurement =mat= file contains one =data= array with 3 columns: | 3 | Time | ** Matlab Init :noexport:ignore: -#+begin_src matlab :exports none :results silent :noweb yes +#+begin_src matlab :exports none :results silent :noweb yes :var current_dir=(file-name-directory buffer-file-name) <> #+end_src @@ -166,7 +166,7 @@ Each of the =mat= file contains one array =data= with 3 columns: | 3 | Time | ** Matlab Init :noexport:ignore: -#+begin_src matlab :exports none :results silent :noweb yes +#+begin_src matlab :exports none :results silent :noweb yes :var current_dir=(file-name-directory buffer-file-name) <> #+end_src @@ -471,7 +471,7 @@ Each of the =mat= file contains one array =data= with 3 columns: [[file:./img/IMG_20190507_101459.jpg]] ** Matlab Init :noexport:ignore: -#+begin_src matlab :exports none :results silent :noweb yes +#+begin_src matlab :exports none :results silent :noweb yes :var current_dir=(file-name-directory buffer-file-name) <> #+end_src @@ -702,7 +702,7 @@ Each of the =mat= file contains one array =data= with 3 columns: | 3 | Time | ** Matlab Init :noexport:ignore: -#+begin_src matlab :exports none :results silent :noweb yes +#+begin_src matlab :exports none :results silent :noweb yes :var current_dir=(file-name-directory buffer-file-name) <> #+end_src @@ -869,7 +869,7 @@ The =data= array contains the following columns: [[file:./img/IMG_20190430_170425.jpg]] ** Matlab Init :noexport:ignore: -#+begin_src matlab :exports none :results silent :noweb yes +#+begin_src matlab :exports none :results silent :noweb yes :var current_dir=(file-name-directory buffer-file-name) <> #+end_src @@ -1067,7 +1067,7 @@ For each of the measurements, the data are: Measurements are 50s long. ** Matlab Init :noexport:ignore: -#+begin_src matlab :exports none :results silent :noweb yes +#+begin_src matlab :exports none :results silent :noweb yes :var current_dir=(file-name-directory buffer-file-name) <> #+end_src