From 08d74abe31bb9350291e01351489dff0df5a1e86 Mon Sep 17 00:00:00 2001 From: Thomas Dehaeze Date: Tue, 3 Nov 2020 14:24:36 +0100 Subject: [PATCH] Add NASS Report 2020 --- .gitmodules | 3 +++ index.html | 67 +++++++++++++++++++++++++++--------------------- index.org | 4 +++ nass-report-2020 | 1 + 4 files changed, 46 insertions(+), 29 deletions(-) create mode 160000 nass-report-2020 diff --git a/.gitmodules b/.gitmodules index 81147f1..d05c2d2 100644 --- a/.gitmodules +++ b/.gitmodules @@ -46,3 +46,6 @@ [submodule "simscape-gravity"] path = simscape-gravity url = https://github.com/tdehaeze/simscape-gravity +[submodule "nass-report-2020"] + path = nass-report-2020 + url = https://git.tdehaeze.xyz/tdehaeze/nass-report-2020 diff --git a/index.html b/index.html index c996b2b..de29380 100644 --- a/index.html +++ b/index.html @@ -3,7 +3,7 @@ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> - + Research Pages @@ -30,12 +30,12 @@ Welcome to my research pages.

-
-

1 Papers

+
+

1 Papers

-
-

1.1 Conference Papers

+
+

1.1 Conference Papers

  • Dehaeze, T., Mattenet, M. M., & Collette, C., Sample Stabilization For Tomography Experiments In Presence Of Large Plant Uncertainty, In MEDSI’18 (pp. 153–157) (2018). Geneva, Switzerland: JACoW Publishing. (link)
    • @@ -45,8 +45,8 @@ Welcome to my research pages.
-
-

1.2 Journal Papers

+
+

1.2 Journal Papers

  • Verma, M., Dehaeze, T., Zhao, G., Watchi, J., & Collette, C., Virtual sensor fusion for high precision control, Mechanical Systems and Signal Processing, 150, 107241 (2020). http://dx.doi.org/10.1016/j.ymssp.2020.107241 (pdf)
    • @@ -56,12 +56,12 @@ Welcome to my research pages.
-
-

2 Useful pages / Tutorials

+
+

2 Useful pages / Tutorials

-
-

2.1 Spectral Analysis

+
+

2.1 Spectral Analysis

-
-

2.2 Finite Element Models and Simscape   simscape

+
+

2.2 Finite Element Models and Simscape   simscape

-
-

2.3 Gravity with Simscape   simscape

+
+

2.3 Gravity with Simscape   simscape

-
-

3 Test Benches / Experiments

+
+

3 Test Benches / Experiments

-
-

3.1 Amplified Piezoelectric Actuator

+
+

3.1 Amplified Piezoelectric Actuator

-
-

3.2 Sensor Fusion

+
+

3.2 Sensor Fusion

  • Sensor Fusion
    • @@ -110,8 +110,8 @@ Welcome to my research pages.
-
-

3.3 Encoder and Interferometer

+
+

3.3 Encoder and Interferometer

-
-

3.4 Attocube

+
+

3.4 Attocube

  • Attocube
    • @@ -128,8 +128,8 @@ Welcome to my research pages.
-
-

3.5 Voltage Amplifiers for Piezoelectric Actuators

+
+

3.5 Voltage Amplifiers for Piezoelectric Actuators

-
-

3.6 Metrology Concept 1

+
+

3.6 Metrology Concept 1

+ +
+

4 Nano Active Stabilization System

+
+ +
+
diff --git a/index.org b/index.org index 7d40868..374a298 100644 --- a/index.org +++ b/index.org @@ -67,3 +67,7 @@ Welcome to my research pages. ** Metrology Concept 1 - [[file:nass-metrology-test-bench/index.org][Metrology Concept 1]] + +* Nano Active Stabilization System + +- [[file:nass-report-2020/index.org][NASS - Report 2020]] diff --git a/nass-report-2020 b/nass-report-2020 new file mode 160000 index 0000000..e06d957 --- /dev/null +++ b/nass-report-2020 @@ -0,0 +1 @@ +Subproject commit e06d9573c096ac07310c5181abd8a95e865fcff0