From d88db1182169acec839f21a524144d7e8192ecf5 Mon Sep 17 00:00:00 2001 From: Thomas Dehaeze Date: Tue, 15 Feb 2022 14:18:18 +0100 Subject: [PATCH] Update filenames --- ...feedback.html => dcm-feedback-control.html | 182 +++++++++--------- dcm_feedback.org => dcm-feedback-control.org | 2 +- index.html | 2 +- 3 files changed, 93 insertions(+), 93 deletions(-) rename dcm_feedback.html => dcm-feedback-control.html (95%) rename dcm_feedback.org => dcm-feedback-control.org (99%) diff --git a/dcm_feedback.html b/dcm-feedback-control.html similarity index 95% rename from dcm_feedback.html rename to dcm-feedback-control.html index 3fef167..4b1af33 100644 --- a/dcm_feedback.html +++ b/dcm-feedback-control.html @@ -3,7 +3,7 @@ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> - + ESRF Double Crystal Monochromator - Feedback Controller @@ -22,55 +22,55 @@

Table of Contents

-

This report is also available as a pdf.

+

This report is also available as a pdf.

-
-

1. Estimation of Sensitivity Function

+
+

1. Estimation of Sensitivity Function

-
-

1.1. Load Data

+
+

1.1. Load Data

Two scans are performed: @@ -99,7 +99,7 @@ t = linspace(Ts, Ts*length(ol_drx), length(ol_d

-By comparison the frequency content of the crystal orientation errors between mode B and mode C, it is possible to estimate the Sensitivity transfer function (Figure 1). +By comparison the frequency content of the crystal orientation errors between mode B and mode C, it is possible to estimate the Sensitivity transfer function (Figure 1). 

win = hanning(ceil(1/Ts));
@@ -113,7 +113,7 @@ By comparison the frequency content of the crystal orientation errors between mo
-
+

sensitivity_function_drx_est.png

Figure 1: Estimation of the sensitivity transfer function magnitude

@@ -122,8 +122,8 @@ By comparison the frequency content of the crystal orientation errors between mo
-
-

1.2. Controller

+
+

1.2. Controller

load('X_tal_cage_PID.mat', 'K');
@@ -131,7 +131,7 @@ By comparison the frequency content of the crystal orientation errors between mo
-
+

bode_plot_cur_controller.png

Figure 2: Bode Plot of the Controller

@@ -139,8 +139,8 @@ By comparison the frequency content of the crystal orientation errors between mo
-
-

1.3. Test

+
+

1.3. Test

Ts = 5e-3;
@@ -170,12 +170,12 @@ t = linspace(Ts, Ts*length(ol_drx), length(ol_d
-
-

2. System Identification

+
+

2. System Identification

-
-

2.1. Identification

+
+

2.1. Identification

ur = load('FJPUR_step.mat');
@@ -321,7 +321,7 @@ win = hanning(ceil(5*Fs));
-
+

coherence_id_dcm_dyn.png

Figure 3: Coherence

@@ -329,7 +329,7 @@ win = hanning(ceil(5*Fs)); -
+

bode_plot_dcm_dynamics.png

Figure 4: Bode Plot of the DCM dynamics in the frame of the fast jack.

@@ -359,7 +359,7 @@ Kb = eye(3)*(2* -
+

loop_gain_dcm_contr_simple.png

Figure 5: Loop gain

@@ -367,7 +367,7 @@ Kb = eye(3)*(2* +

loop_gain_diag_old_new_contr.png

Figure 6: Loop gain

@@ -377,7 +377,7 @@ Kb = eye(3)*(2* -
+

sensitivity_comp.png

Figure 7: Comparison of sensitivity functions

@@ -396,7 +396,7 @@ Lb = zeros(3, 3, length(f));
-
+

loci_loop_gain_comp_controllers.png

Figure 8: Root Locus

@@ -405,8 +405,8 @@ Lb = zeros(3, 3, length(f));
-
-

2.2. Identification - New

+
+

2.2. Identification - New

ur = load('FJPUR_step_new.mat');
@@ -577,7 +577,7 @@ Kb = eye(3)*(2*
 
-

+

 
sensitivity_comp.png
 

 
Figure 9: Comparison of sensitivity functions

@@ -596,7 +596,7 @@ Lb = zeros(3, 3, length(f));
 

 
 
-

+

 
loci_loop_gain_comp_controllers.png
 

 
Figure 10: Root Locus

@@ -605,8 +605,8 @@ Lb = zeros(3, 3, length(f));
 

 
 
-

-
2.3. Identification - White noise

+

+
2.3. Identification - White noise

 

 

 
ur = load('fjpur_white_noise.mat');
@@ -725,14 +725,14 @@ win = hanning(ceil(0.5*Fs));
 

 
 
-

+

 
coherence_ident_noise.png
 

 
Figure 11: description

 

 
 
-

+

 
bode_plot_ident_noise.png
 

 
Figure 12: Bode Plot of the DCM dynamics in the frame of the fast jack.

@@ -762,14 +762,14 @@ Kb = eye(3)*(2*
 
 
-

+

 
loop_gain_dcm_contr_simple.png
 

 
Figure 13: Loop gain

 

 
 
-

+

 
loop_gain_diag_old_new_contr.png
 

 
Figure 14: Loop gain

@@ -779,7 +779,7 @@ Kb = eye(3)*(2*
 
-

+

 
sensitivity_comp.png
 

 
Figure 15: Comparison of sensitivity functions

@@ -798,7 +798,7 @@ Lb = zeros(3, 3, length(f));
 

 
 
-

+

 
loci_loop_gain_comp_controllers.png
 

 
Figure 16: Root Locus

@@ -807,8 +807,8 @@ Lb = zeros(3, 3, length(f));
 

 
 
-

-
2.4. Test

+

+
2.4. Test

 

 

 
%% Notch
@@ -851,8 +851,8 @@ Kb =  0.8*eye(3)*
 

 

-

-
2.5. New controller - Higher bandwidth

+

+
2.5. New controller - Higher bandwidth

 

 

 
%% Previously used controller
@@ -916,7 +916,7 @@ Kb =  0.9*eye(3)*
 
 
-

+

 
loop_gain_compare.png
 

 
Figure 17: description

@@ -937,14 +937,14 @@ Lb_new = zeros(3, 3, length(f));
 

 
 
-

+

 
nyquist_compare.png
 

 
Figure 18: n

 

 
 
-

+

 
sensitivity_function_compare.png
 

 
Figure 19: description

@@ -954,8 +954,8 @@ Lb_new = zeros(3, 3, length(f));
 
 
 
-

-
2.6. Added gain

+

+
2.6. Added gain

 

 

 
%% Notch
@@ -1017,21 +1017,21 @@ Kb_gain =  0.9*eye(3)
 

 
 
-

+

 
loop_gain_compare_added_gain.png
 

 
Figure 20: description

 

 
 
-

+

 
sensitivity_new_gain_compare.png
 

 
Figure 21: description

 

 
 
-

+

 
nyquist_after_gain_frequency.png
 

 
Figure 22: nyquist plot

@@ -1041,12 +1041,12 @@ Kb_gain =  0.9*eye(3)
 

 
 
-

-
3. Noise Budgeting

+

+
3. Noise Budgeting

 

 

-

-
3.1. No Displacement

+

+
3.1. No Displacement

 

 
 
@@ -1275,8 +1275,8 @@ data_70_deg.drx = data_70_deg.allValues(:,6) 
-
3.2. Scans

+

+
3.2. Scans

 

 

 
@@ -1437,8 +1437,8 @@ CPS_70_10_d  = flip(-cumtrapz(flip(f), flip(pxx
 
 
 
-

-
3.3. Noise budgeting - No rotation

+

+
3.3. Noise budgeting - No rotation

 

 

 First, we look at the position errors when the bragg axis is not moving
@@ -1488,7 +1488,7 @@ win = hanning(ceil(1/Ts));
 

 
 
-

+

 
noise_budget_no_mov_asd.png
 

 
Figure 23: Amplitude Spectral Density

@@ -1511,7 +1511,7 @@ CPS_dz  = cumtrapz(f, pxx_ol_dz);
 

 
 
-

+

 
noise_budget_no_mov_cas.png
 

 
Figure 24: Cumulative Amplitude Spectrum

@@ -1520,17 +1520,17 @@ CPS_dz  = cumtrapz(f, pxx_ol_dz);
 

 
 
-

-
3.4. Noise budgeting - Bragg rotation

+

+
3.4. Noise budgeting - Bragg rotation

 

 

 
-

-
4. Test Mode C

+

+
4. Test Mode C

 

 

-

-
4.1. Mode B and Mode C

+

+
4.1. Mode B and Mode C

 

 

 
data_B = extractDatData(sprintf("/home/thomas/mnt/data_id21/22Jan/blc13491/id21/test_regul_220119/%s","lut_const_fj_vel_19012022_1450.dat"), ...
@@ -1620,12 +1620,12 @@ win = hanning(ceil(1/Ts));
 

 

 
-

-
5. Export numerator and denominator

+

+
5. Export numerator and denominator

 

 

-

-
5.1. Export

+

+
5.1. Export

 

 

 
K_order = 10;
@@ -1673,8 +1673,8 @@ fclose(fileID);
 

 

 
-

-
5.2. Verify

+

+
5.2. Verify

 

 

 
K_data = importdata('X_tal_cage_PID_20Hz.dat');
@@ -1687,7 +1687,7 @@ K = tf(K_data(1,:), K_data(2,
 
Author: Dehaeze Thomas

-
Created: 2022-02-15 mar. 14:15

+
Created: 2022-02-15 mar. 14:18

 

 
 
diff --git a/dcm_feedback.org b/dcm-feedback-control.org
similarity index 99%
rename from dcm_feedback.org
rename to dcm-feedback-control.org
index bfb5ea7..629e5f6 100644
--- a/dcm_feedback.org
+++ b/dcm-feedback-control.org
@@ -44,7 +44,7 @@
 
 #+begin_export html
   

-  
This report is also available as a pdf.

+  
This report is also available as a pdf.

   

 #+end_export
 
diff --git a/index.html b/index.html
index 60e50a8..d936273 120000
--- a/index.html
+++ b/index.html
@@ -1 +1 @@
-dcm_feedback.html
\ No newline at end of file
+dcm-feedback-control.html
\ No newline at end of file