From d9b5b7e0b6de372727ad0ee9fcdad5949365c49c Mon Sep 17 00:00:00 2001 From: Thomas Dehaeze Date: Thu, 2 Jun 2022 19:01:08 +0200 Subject: [PATCH] Remove DCM submodules --- .gitmodules | 3 ++ dcm-feedback-control | 1 - dcm-kinematics | 1 + dcm-metrology | 1 - dcm-simscape-model | 1 - dcm-stepper-calibration | 1 - index.html | 107 ++++++++++++++-------------------------- index.org | 40 ++++++++------- 8 files changed, 61 insertions(+), 94 deletions(-) delete mode 160000 dcm-feedback-control create mode 160000 dcm-kinematics delete mode 160000 dcm-metrology delete mode 160000 dcm-simscape-model delete mode 160000 dcm-stepper-calibration diff --git a/.gitmodules b/.gitmodules index 2362f1f..323bd85 100644 --- a/.gitmodules +++ b/.gitmodules @@ -142,3 +142,6 @@ [submodule "dcm-metrology"] path = dcm-metrology url = https://git.tdehaeze.xyz/tdehaeze/dcm-metrology +[submodule "dcm-kinematics"] + path = dcm-kinematics + url = https://gitlab.esrf.fr/dehaeze/dcm-kinematics diff --git a/dcm-feedback-control b/dcm-feedback-control deleted file mode 160000 index 6324f1d..0000000 --- a/dcm-feedback-control +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 6324f1dafc75dd0a7ee23df12538d74d76042064 diff --git a/dcm-kinematics b/dcm-kinematics new file mode 160000 index 0000000..a36ebdd --- /dev/null +++ b/dcm-kinematics @@ -0,0 +1 @@ +Subproject commit a36ebddf2fe9af4fd18349e4784bacdaf0fd802c diff --git a/dcm-metrology b/dcm-metrology deleted file mode 160000 index 7072b82..0000000 --- a/dcm-metrology +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 7072b826435ad33021a39a53dc78a5b1f321c46f diff --git a/dcm-simscape-model b/dcm-simscape-model deleted file mode 160000 index 431f8e6..0000000 --- a/dcm-simscape-model +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 431f8e66eb0c2a7d4bb94d765139791ef5e06b76 diff --git a/dcm-stepper-calibration b/dcm-stepper-calibration deleted file mode 160000 index a6f93e0..0000000 --- a/dcm-stepper-calibration +++ /dev/null @@ -1 +0,0 @@ -Subproject commit a6f93e0601b6e8394748e3448311150cbfbdc791 diff --git a/index.html b/index.html index 279bbe2..5401553 100644 --- a/index.html +++ b/index.html @@ -3,7 +3,7 @@ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> - + Research Pages @@ -37,13 +37,13 @@ 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 @@ -79,8 +79,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) @@ -99,12 +99,12 @@ Welcome to my research pages.
-
-

2. Useful Pages / Tutorials

+
+

2. Useful Pages / Tutorials

-
-

2.1. General Mechatronics

+
+

2.1. General Mechatronics

Spectral Analysis @@ -133,8 +133,8 @@ Several types of linear filters (low pass, high pass, notch, lead, etc.) are pre

-
-

2.2. System Modeling using Simscape

+
+

2.2. System Modeling using Simscape

Finite Element Models with Simscape @@ -168,12 +168,12 @@ In order to start the simulation at equilibrium, few measured can be employed th

-
-

3. Test Benches / Experiments

+
+

3. Test Benches / Experiments

-
-

3.1. Intrumentation Related

+
+

3.1. Intrumentation Related

Voltage Amplifiers for Piezoelectric Actuators @@ -197,8 +197,8 @@ Its noise characteristics as well as non-linearities are measured.

-
-

3.2. Amplified Piezoelecric Actuator

+
+

3.2. Amplified Piezoelecric Actuator

Amplified Piezoelectric Actuator - Test bench and Finite Element Model @@ -243,8 +243,8 @@ The goal is to form a super sensor that has better noise characteristics

-
-

3.3. Vibration Table

+
+

3.3. Vibration Table

Instrumented Vibration Table used for Modal Testing @@ -258,12 +258,12 @@ A vibration table is developed to perform controlled modal tests.

-
-

4. PhD Project - Nano Active Stabilization System

+
+

4. PhD Project - Nano Active Stabilization System

-
-

4.1. General Reports

+
+

4.1. General Reports

NASS - Report 2020 @@ -276,8 +276,8 @@ General report on the NASS project made in 2020.

-
-

4.2. Measurements, Models and Test Benches

+
+

4.2. Measurements, Models and Test Benches

NASS - Micro Station Measurements @@ -328,8 +328,8 @@ Presentation of the short stroke metrology concept.

-
-

4.3. Nano-Hexapod

+
+

4.3. Nano-Hexapod

Equipments: @@ -361,52 +361,17 @@ Presentation of the short stroke metrology concept.

-
-

5. Double Crystal Monochromator (DCM)

+
+

5. Double Crystal Monochromator (DCM)

-Calibration of stepper motors +Kinematics

-
-

-Analysis of stepper motors’ errors is performed. -Calibration table are computed to compensate for the repeatable errors. -

-
- -

-Metrology -

-
-

-The metrology concept is described. -The calibration of the metrology is performed using an external metrology using the X-ray. -

-
- -

-Feedback Control -

-
-

-System dynamics is identified. -Feedback control using the piezoelectric actuator is designed and experimentally validated. -

-
- -

-Multi-Body (Simscape) model -

-
-

-A multi-body model of the DCM is developed and used to test various control strategies and change of architecture. -

-
-
-

6. Notes

+
+

6. Notes

  • EUSPEN - 2020 - Notes
    • @@ -414,8 +379,8 @@ A multi-body model of the DCM is developed and used to test various control stra
-
-

7. Lectures

+
+

7. Lectures

  • H-Infinity - Robust Control
    • diff --git a/index.org b/index.org index 050a7ae..5e69729 100644 --- a/index.org +++ b/index.org @@ -235,28 +235,30 @@ Presentation of the short stroke metrology concept. - [[file:test-bench-nass-spindle/index.org][Nano-Hexapod on top of Spindle]] * Double Crystal Monochromator (DCM) -[[file:dcm-stepper-calibration/index.html][Calibration of stepper motors]] -#+begin_quote -Analysis of stepper motors' errors is performed. -Calibration table are computed to compensate for the repeatable errors. -#+end_quote +[[file:dcm-kinematics/index.html][Kinematics]] -[[file:dcm-metrology/index.html][Metrology]] -#+begin_quote -The metrology concept is described. -The calibration of the metrology is performed using an external metrology using the X-ray. -#+end_quote +# [[file:dcm-stepper-calibration/index.html][Calibration of stepper motors]] +# #+begin_quote +# Analysis of stepper motors' errors is performed. +# Calibration table are computed to compensate for the repeatable errors. +# #+end_quote -[[file:dcm-feedback-control/index.html][Feedback Control]] -#+begin_quote -System dynamics is identified. -Feedback control using the piezoelectric actuator is designed and experimentally validated. -#+end_quote +# [[file:dcm-metrology/index.html][Metrology]] +# #+begin_quote +# The metrology concept is described. +# The calibration of the metrology is performed using an external metrology using the X-ray. +# #+end_quote -[[file:dcm-simscape-model/index.html][Multi-Body (Simscape) model]] -#+begin_quote -A multi-body model of the DCM is developed and used to test various control strategies and change of architecture. -#+end_quote +# [[file:dcm-feedback-control/index.html][Feedback Control]] +# #+begin_quote +# System dynamics is identified. +# Feedback control using the piezoelectric actuator is designed and experimentally validated. +# #+end_quote + +# [[file:dcm-simscape-model/index.html][Multi-Body (Simscape) model]] +# #+begin_quote +# A multi-body model of the DCM is developed and used to test various control strategies and change of architecture. +# #+end_quote * Notes - [[file:euspen_2020_notes/notes.org][EUSPEN - 2020 - Notes]]