From 34aedf610f9d35ff2b2b50ab74c0fc9580a5fab3 Mon Sep 17 00:00:00 2001 From: Thierry Zamofing Date: Fri, 1 Feb 2019 14:18:05 +0100 Subject: [PATCH] restructure doc --- .gitignore | 16 +++++---- .../MXfastStage.tex | 32 +++++++++--------- .../helicalscan1.svg | 0 .../helicalscan1a.eps | 0 .../helicalscan2.svg | 0 .../helicalscan2a.eps | 0 .../helicalscan3.svg | 0 .../helicalscan3a.eps | 0 .../MXTuningDoc => MXfastStageDoc}/model.svg | 0 .../MXTuningDoc => MXfastStageDoc}/model1.eps | 0 .../MXTuningDoc => MXfastStageDoc}/model2.eps | 0 .../MXTuningDoc => MXfastStageDoc}/model3.eps | 0 .../MXTuningDoc => MXfastStageDoc}/myBib.bib | 0 .../observer.png | Bin .../observer_statefeedback.png | Bin 15 files changed, 25 insertions(+), 23 deletions(-) rename python/MXTuningDoc/fastStageTune.tex => MXfastStageDoc/MXfastStage.tex (90%) rename {python/helicalscanDoc => MXfastStageDoc}/helicalscan1.svg (100%) rename {python/helicalscanDoc => MXfastStageDoc}/helicalscan1a.eps (100%) rename {python/helicalscanDoc => MXfastStageDoc}/helicalscan2.svg (100%) rename {python/helicalscanDoc => MXfastStageDoc}/helicalscan2a.eps (100%) rename {python/helicalscanDoc => MXfastStageDoc}/helicalscan3.svg (100%) rename {python/helicalscanDoc => MXfastStageDoc}/helicalscan3a.eps (100%) rename {python/MXTuningDoc => MXfastStageDoc}/model.svg (100%) rename {python/MXTuningDoc => MXfastStageDoc}/model1.eps (100%) rename {python/MXTuningDoc => MXfastStageDoc}/model2.eps (100%) rename {python/MXTuningDoc => MXfastStageDoc}/model3.eps (100%) rename {python/MXTuningDoc => MXfastStageDoc}/myBib.bib (100%) rename {python/MXTuningDoc => MXfastStageDoc}/observer.png (100%) rename {python/MXTuningDoc => MXfastStageDoc}/observer_statefeedback.png (100%) diff --git a/.gitignore b/.gitignore index 1ad7393..4769bab 100644 --- a/.gitignore +++ b/.gitignore @@ -21,10 +21,12 @@ python/MXTuning/ python/old_npz/ python/PBMotionAnalyzer/records/ -*/*Doc/*.aux -*/*Doc/*.log -*/*Doc/*.out -*/*Doc/fastStageTune.pdf -*/*Doc/*.synctex.gz -*/*Doc/*.toc -*/*Doc/*-eps-converted-to.pdf +*Doc/*.aux +*Doc/*.log +*Doc/*.out +*Doc/fastStageTune.pdf +*Doc/*.synctex.gz +*Doc/*.toc +*Doc/*-eps-converted-to.pdf +*Doc/*.bbl +*Doc/*.blg \ No newline at end of file diff --git a/python/MXTuningDoc/fastStageTune.tex b/MXfastStageDoc/MXfastStage.tex similarity index 90% rename from python/MXTuningDoc/fastStageTune.tex rename to MXfastStageDoc/MXfastStage.tex index 708f7e0..23b7f31 100644 --- a/python/MXTuningDoc/fastStageTune.tex +++ b/MXfastStageDoc/MXfastStage.tex @@ -53,7 +53,7 @@ It should be save to set 0.92Amp DC and 2.8Amp DC. \subsection{Measure Current Step} \verb|MXTuning.py –mode 1| $\rightarrow$ \verb|identifyFxFyStage.m|\\ -\includegraphics[scale=.5]{../../matlab/figures/currstep_1.eps} +\includegraphics[scale=.5]{../matlab/figures/currstep_1.eps} \includegraphics[scale=.5]{/home/zamofing_t/Documents/doc-ext/DeltaTau/UsrMan257.png} The current step looks similar for both motors. The transfer function is: $k \cdot {w_0}^2/({w_0}^2+2 \cdot damp \cdot w_0 \cdot s+s^2)$\\ @@ -71,8 +71,8 @@ The images have been generated with \verb|./MXTuning.py --dir MXTuning/19_01_29 --mode 32|.\\ \begin{figure}[h] -\includegraphics[scale=.45]{../MXTuning/19_01_29/img/bode_model_plot0.eps} -\includegraphics[scale=.45]{../MXTuning/19_01_29/img/bode_model_plot2.eps} +\includegraphics[scale=.45]{../python/MXTuning/19_01_29/img/bode_model_plot0.eps} +\includegraphics[scale=.45]{../python/MXTuning/19_01_29/img/bode_model_plot2.eps} \caption{open loop of motor 1 and 2} \end{figure} @@ -100,9 +100,9 @@ resonances 60Hz,142Hz,414Hz,231Hz\\ \subsection{Closed Loop} \subsubsection{Deltatau schematics} -\includegraphics[scale=.7]{../../../../../../doc-ext/DeltaTau/UsrMan290.png} +\includegraphics[scale=.7]{/home/zamofing_t/Documents/doc-ext/DeltaTau/UsrMan290.png} -\includegraphics[scale=.2]{../../../../../../doc-ext/DeltaTau/ServoBlockDiag.png} +\includegraphics[scale=.2]{/home/zamofing_t/Documents/doc-ext/DeltaTau/ServoBlockDiag.png} \\ Closed loops have been measured with the following control loop settings. @@ -123,27 +123,27 @@ The parameters for that sweep is:\\ \begin{figure}[h!] -\includegraphics[scale=.45]{../MXTuning/19_01_29/img/chirp_all_1b0.eps} -\includegraphics[scale=.45]{../MXTuning/19_01_29/img/chirp_all_1b1.eps} +\includegraphics[scale=.45]{../python/MXTuning/19_01_29/img/chirp_all_1b0.eps} +\includegraphics[scale=.45]{../python/MXTuning/19_01_29/img/chirp_all_1b1.eps} \caption{DesPos->ActPos of motor 1} \end{figure} \begin{figure}[h!] -\includegraphics[scale=.45]{../MXTuning/19_01_29/img/chirp_all_2b0.eps} -\includegraphics[scale=.45]{../MXTuning/19_01_29/img/chirp_all_2b1.eps} +\includegraphics[scale=.45]{../python/MXTuning/19_01_29/img/chirp_all_2b0.eps} +\includegraphics[scale=.45]{../python/MXTuning/19_01_29/img/chirp_all_2b1.eps} \caption{DesPos->ActPos of motor 2} \end{figure} \begin{figure}[h!] -\includegraphics[scale=.45]{../MXTuning/19_01_29/img/chirp_all_1b2.eps} -\includegraphics[scale=.45]{../MXTuning/19_01_29/img/chirp_all_1b3.eps} +\includegraphics[scale=.45]{../python/MXTuning/19_01_29/img/chirp_all_1b2.eps} +\includegraphics[scale=.45]{../python/MXTuning/19_01_29/img/chirp_all_1b3.eps} \caption{DesPos->IqCmd of motor 1} \end{figure} \begin{figure}[h!] -\includegraphics[scale=.45]{../MXTuning/19_01_29/img/chirp_all_2b2.eps} -\includegraphics[scale=.45]{../MXTuning/19_01_29/img/chirp_all_2b3.eps} +\includegraphics[scale=.45]{../python/MXTuning/19_01_29/img/chirp_all_2b2.eps} +\includegraphics[scale=.45]{../python/MXTuning/19_01_29/img/chirp_all_2b3.eps} \caption{DesPos->IqCmd of motor 2} \end{figure} @@ -361,9 +361,9 @@ Therefore the model seems good enough \begin{figure}[h!] -\includegraphics[scale=.4]{../helicalscanDoc/helicalscan1a.eps} -\includegraphics[scale=.4]{../helicalscanDoc/helicalscan2a.eps} -\includegraphics[scale=.4]{../helicalscanDoc/helicalscan3a.eps} +\includegraphics[scale=.4]{helicalscan1a.eps} +\includegraphics[scale=.4]{helicalscan2a.eps} +\includegraphics[scale=.4]{helicalscan3a.eps} \caption{coordinate transformation} \end{figure} diff --git a/python/helicalscanDoc/helicalscan1.svg b/MXfastStageDoc/helicalscan1.svg similarity index 100% rename from python/helicalscanDoc/helicalscan1.svg rename to MXfastStageDoc/helicalscan1.svg diff --git a/python/helicalscanDoc/helicalscan1a.eps b/MXfastStageDoc/helicalscan1a.eps similarity index 100% rename from python/helicalscanDoc/helicalscan1a.eps rename to MXfastStageDoc/helicalscan1a.eps diff --git a/python/helicalscanDoc/helicalscan2.svg b/MXfastStageDoc/helicalscan2.svg similarity index 100% rename from python/helicalscanDoc/helicalscan2.svg rename to MXfastStageDoc/helicalscan2.svg diff --git a/python/helicalscanDoc/helicalscan2a.eps b/MXfastStageDoc/helicalscan2a.eps similarity index 100% rename from python/helicalscanDoc/helicalscan2a.eps rename to MXfastStageDoc/helicalscan2a.eps diff --git a/python/helicalscanDoc/helicalscan3.svg b/MXfastStageDoc/helicalscan3.svg similarity index 100% rename from python/helicalscanDoc/helicalscan3.svg rename to MXfastStageDoc/helicalscan3.svg diff --git a/python/helicalscanDoc/helicalscan3a.eps b/MXfastStageDoc/helicalscan3a.eps similarity index 100% rename from python/helicalscanDoc/helicalscan3a.eps rename to MXfastStageDoc/helicalscan3a.eps diff --git a/python/MXTuningDoc/model.svg b/MXfastStageDoc/model.svg similarity index 100% rename from python/MXTuningDoc/model.svg rename to MXfastStageDoc/model.svg diff --git a/python/MXTuningDoc/model1.eps b/MXfastStageDoc/model1.eps similarity index 100% rename from python/MXTuningDoc/model1.eps rename to MXfastStageDoc/model1.eps diff --git a/python/MXTuningDoc/model2.eps b/MXfastStageDoc/model2.eps similarity index 100% rename from python/MXTuningDoc/model2.eps rename to MXfastStageDoc/model2.eps diff --git a/python/MXTuningDoc/model3.eps b/MXfastStageDoc/model3.eps similarity index 100% rename from python/MXTuningDoc/model3.eps rename to MXfastStageDoc/model3.eps diff --git a/python/MXTuningDoc/myBib.bib b/MXfastStageDoc/myBib.bib similarity index 100% rename from python/MXTuningDoc/myBib.bib rename to MXfastStageDoc/myBib.bib diff --git a/python/MXTuningDoc/observer.png b/MXfastStageDoc/observer.png similarity index 100% rename from python/MXTuningDoc/observer.png rename to MXfastStageDoc/observer.png diff --git a/python/MXTuningDoc/observer_statefeedback.png b/MXfastStageDoc/observer_statefeedback.png similarity index 100% rename from python/MXTuningDoc/observer_statefeedback.png rename to MXfastStageDoc/observer_statefeedback.png