Rename folders. Put data in correct folder

disturbance-sr-rz/index.org

@@ -1,5 +1,33 @@
 #+TITLE: Vibrations induced by the Slip-Ring and the Spindle
-#+SETUPFILE: ../config.org
+: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: <link rel="stylesheet" type="text/css" href="../css/htmlize.css"/>
+#+HTML_HEAD: <link rel="stylesheet" type="text/css" href="../css/readtheorg.css"/>
+#+HTML_HEAD: <link rel="stylesheet" type="text/css" href="../css/zenburn.css"/>
+#+HTML_HEAD: <script type="text/javascript" src="../js/jquery.min.js"></script>
+#+HTML_HEAD: <script type="text/javascript" src="../js/bootstrap.min.js"></script>
+#+HTML_HEAD: <script type="text/javascript" src="../js/jquery.stickytableheaders.min.js"></script>
+#+HTML_HEAD: <script type="text/javascript" src="../js/readtheorg.js"></script>
+
+#+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
+:END:
 
 * Experimental Setup
 All the stages are OFF.

disturbance-ty-sr/index.org

@@ -0,0 +1,48 @@
+#+TITLE:Measurements
+: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: <link rel="stylesheet" type="text/css" href="../css/htmlize.css"/>
+#+HTML_HEAD: <link rel="stylesheet" type="text/css" href="../css/readtheorg.css"/>
+#+HTML_HEAD: <link rel="stylesheet" type="text/css" href="../css/zenburn.css"/>
+#+HTML_HEAD: <script type="text/javascript" src="../js/jquery.min.js"></script>
+#+HTML_HEAD: <script type="text/javascript" src="../js/bootstrap.min.js"></script>
+#+HTML_HEAD: <script type="text/javascript" src="../js/jquery.stickytableheaders.min.js"></script>
+#+HTML_HEAD: <script type="text/javascript" src="../js/readtheorg.js"></script>
+
+#+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
+:END:
+
+* Measurement description
+All the stages are OFF except Ty and Slip-Ring.
+
+Each of the signal is amplified by voltage amplifier:
+- 40db!!!
+- AC
+- 1kHz
+
+col1: marble
+col2: sample
+
+Rotating the slip-ring at 60rpm and scans with the Ty at 1Hz.
+Everything on the Z direction
+
+- meas 50: Slip-Ring at 1Hz, Ty OFF
+- meas 51: Slip-Ring at 1Hz, Ty ON (The current and cnt error of Ty is also registered)
+- meas 52: Slip-Ring at 1Hz, Ty 1Hz 600000cnt

disturbance-ty/index.org

@@ -0,0 +1,49 @@
+#+TITLE: Vibrations induced by the Slip-Ring and the Spindle
+: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: <link rel="stylesheet" type="text/css" href="../css/htmlize.css"/>
+#+HTML_HEAD: <link rel="stylesheet" type="text/css" href="../css/readtheorg.css"/>
+#+HTML_HEAD: <link rel="stylesheet" type="text/css" href="../css/zenburn.css"/>
+#+HTML_HEAD: <script type="text/javascript" src="../js/jquery.min.js"></script>
+#+HTML_HEAD: <script type="text/javascript" src="../js/bootstrap.min.js"></script>
+#+HTML_HEAD: <script type="text/javascript" src="../js/jquery.stickytableheaders.min.js"></script>
+#+HTML_HEAD: <script type="text/javascript" src="../js/readtheorg.js"></script>
+
+#+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
+:END:
+
+* Measurement description
+One geophone at the sample position
+One geophone on the marble
+
+Each of the signal is amplified by voltage amplifier:
+- 40db!!!
+- AC
+- 1kHz
+
+col1: marble
+col2: sample
+
+Ty Scans:
+- sin @ 1Hz with amplitude = 600 000 cnt (= 3mm)
+
+- meas 40: Z direction
+- meas 41: E direction
+- meas 42: E direction without any motion (Ty OFF)

dynamical-meas-granite/index.org

@@ -0,0 +1,45 @@
+#+TITLE: Vibrations induced by the Slip-Ring and the Spindle
+: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: <link rel="stylesheet" type="text/css" href="../css/htmlize.css"/>
+#+HTML_HEAD: <link rel="stylesheet" type="text/css" href="../css/readtheorg.css"/>
+#+HTML_HEAD: <link rel="stylesheet" type="text/css" href="../css/zenburn.css"/>
+#+HTML_HEAD: <script type="text/javascript" src="../js/jquery.min.js"></script>
+#+HTML_HEAD: <script type="text/javascript" src="../js/bootstrap.min.js"></script>
+#+HTML_HEAD: <script type="text/javascript" src="../js/jquery.stickytableheaders.min.js"></script>
+#+HTML_HEAD: <script type="text/javascript" src="../js/readtheorg.js"></script>
+
+#+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
+:END:
+
+
+One geophone is located on the marble, the other one on the floor.
+
+col1: floor
+col2: marble
+
+Each of the signal is amplified by voltage amplifier:
+- 60db
+- AC
+- 1kHz
+
+- meas 37: Z direction
+- meas 38: N direction
+- meas 39: E direction

slip-ring-electrical-noise/index.org

@@ -573,6 +573,28 @@ Finally, we compare the Amplitude Spectral Density of the signals (figure [[fig:
 #+end_important
 
 * TODO New LPF at 1kHz
+Voltage amplifier:
+- 60db
+- AC
+- 1kHz
+
+Additionnal LPF at 1kHz
+
+- meas35: All off
+- meas36: slip-ring ON
+
+geophone at the sample location
+slit into 2 BNC:
+- first one (column one): direct wire
+- second one (second column): slip-ring wire
+
+Each of the signal is amplified by voltage amplifier:
+- 60db
+- AC
+- 1kHz
+
+Additionnal LPF is added before the voltage amplifiers
+
 * Effect of the rotation of the Slip-Ring - Noise
   :PROPERTIES:
   :header-args:matlab+: :tangle matlab/meas_effect_sr.m
@@ -939,3 +961,20 @@ And we plot the ASD of the measured signals (figure [[fig:sr_psd_compare]]);
 #+begin_note
   All the files (data and Matlab scripts) are accessible [[file:data/meas_slip_ring_lpf.zip][here]].
 #+end_note
+
+** Description
+
+Voltage amplifier:
+- 60db
+- AC
+- 1kHz
+
+Additionnal LPF at 1kHz
+
+- meas30: All off
+- meas31: Slip-ring on
+- meas32: slip-ring 6rpm
+- meas33: slip-ring 60rpm
+
+Channel 1: direct
+Channel 2: slip-ring

speedgoat-measurement/meas.org

@@ -1,6 +1,7 @@
 #+TITLE: Measurements
 
-* Measurement of the slip-ring noise when turning
+* DONE Measurement of the slip-ring noise when turning
+  CLOSED: [2019-05-14 mar. 10:36]
 
 Voltage amplifier:
 - 60db
@@ -17,7 +18,8 @@ Additionnal LPF at 1kHz
 Channel 1: direct
 Channel 2: slip-ring
 
-* Measuremeent of the noise of the slip-ring when turned ON using geophones
+* DONE Measuremeent of the noise of the slip-ring when turned ON using geophones
+  CLOSED: [2019-05-14 mar. 10:36]
 
 Voltage amplifier:
 - 60db
@@ -41,7 +43,8 @@ Each of the signal is amplified by voltage amplifier:
 
 Additionnal LPF is added before the voltage amplifiers
 
-* Measure of the ground and marble velocity
+* DONE Measure of the ground and marble velocity
+  CLOSED: [2019-05-14 mar. 10:34]
 
 One geophone is located on the marble, the other one on the floor.
 
@@ -57,7 +60,8 @@ Each of the signal is amplified by voltage amplifier:
 - meas 38: N direction
 - meas 39: E direction
 
-* Measure of the vibration when rotating the Slip-ring and Ty
+* DONE Measure of the vibration when rotating the Slip-ring and Ty
+  CLOSED: [2019-05-14 mar. 10:39]
 
 All the stages are OFF except Ty and Slip-Ring.
 
@@ -72,11 +76,12 @@ col2: sample
 Rotating the slip-ring at 60rpm and scans with the Ty at 1Hz.
 Everything on the Z direction
 
-- meas 50: Rz at 1Hz, Ty OFF
-- meas 51: Rz at 1Hz, Ty ON (The current and cnt error of Ty is also registered)
-- meas 52: Rz at 1Hz, Ty 1Hz 600000cnt
+- meas 50: Slip-Ring at 1Hz, Ty OFF
+- meas 51: Slip-Ring at 1Hz, Ty ON (The current and cnt error of Ty is also registered)
+- meas 52: Slip-Ring at 1Hz, Ty 1Hz 600000cnt
 
-* Measure of the vibration induced by Ty motion
+* DONE Measure of the vibration induced by Ty motion
+  CLOSED: [2019-05-14 mar. 10:42]
 
 One geophone at the sample position
 One geophone on the marble
@@ -95,6 +100,3 @@ Ty Scans:
 - meas 40: Z direction
 - meas 41: E direction
 - meas 42: E direction without any motion (Ty OFF)
-
-
-