TeresiaOlsson · adb-xkc85723 · Jul 15, 2021 · Jul 15, 2021
diff --git a/generate_wake_impedance/examples/analytic_resistive_wall.txt b/generate_wake_impedance/examples/analytic_resistive_wall.txt
@@ -1,5 +1,14 @@
 # Resistive wall data
 # Plane (lon = 0, hor = 1, ver = 2), Length [m], Resistivity [Ohm m], Effective beam pipe radius [m]
-0 560.560644 1.68e-8 10e-3
-1 560.560644 1.68e-8 10e-3 
-2 560.560644 1.68e-8 10e-3
+0 69.3 7.4e-7 11.9e-3
+1 69.3 7.4e-7 11.9e-3 
+2 69.3 7.4e-7 11.9e-3
+0 12.3320 7.4e-7 18.3e-3
+1 12.3320 7.4e-7 18.3e-3 
+2 12.3320 7.4e-7 18.3e-3
+0 69.3 7.4e-7 11.9e-3
+1 69.3 7.4e-7 11.9e-3 
+2 69.3 7.4e-7 11.9e-3
+0 12.3320 7.4e-7 18.3e-3
+1 12.3320 7.4e-7 18.3e-3 
+2 12.3320 7.4e-7 18.3e-3
diff --git a/generate_wake_impedance/examples/beta_100_1nC.txt b/generate_wake_impedance/examples/beta_100_1nC.txt
diff --git a/generate_wake_impedance/examples/generate_wake_impedance.m b/generate_wake_impedance/examples/generate_wake_impedance.m
@@ -11,13 +11,13 @@
 
 geometric_flag = 2;
 %geometric_file = 'analytic_geometric_impedance.txt';
-geometric_file = 'CST_geometric_impedance.txt';
+geometric_file = 'geometric_openIDS_noNEG.txt';
 
 % Beta functions for transverse normalisation
 % Beta flag: 0 = no normalisation, 1 = normalisation
 
 beta_flag = 1;
-beta_file = 'beta.txt';
+beta_file = 'beta_100_1nC.txt';
 
 %% Factors to multiply wakes/impedance
 % Factors for increasing strength of wakes (mostly for testing purposes)
@@ -30,7 +30,7 @@
 % Unit: m
 
 % Flag if wake should be generated or not
-wake_flag = 1;
+wake_flag = 0;
 
 wake_range = 0.1;
 
@@ -53,7 +53,7 @@
 freq_range = 100e9;
 
 % Frequency step to sample impedance for Elegant
-elegant_freq_step = 1e6;
+elegant_freq_step = 1e7;
 
 %% Interpolate beta functions for transverse normalisation 
 

diff --git a/generate_wake_impedance/examples/geometric_openIDS_noNEG.txt b/generate_wake_impedance/examples/geometric_openIDS_noNEG.txt
diff --git a/generate_wake_impedance/examples/impedance_imag_elegant.sdds b/generate_wake_impedance/examples/impedance_imag_elegant.sdds
diff --git a/generate_wake_impedance/examples/impedance_real_elegant.sdds b/generate_wake_impedance/examples/impedance_real_elegant.sdds
diff --git a/generate_wake_impedance/examples/impedance_transverse_elegant.sdds b/generate_wake_impedance/examples/impedance_transverse_elegant.sdds
diff --git a/generate_wake_impedance/examples/resistive_wall_openIDS_noNEG.txt b/generate_wake_impedance/examples/resistive_wall_openIDS_noNEG.txt
diff --git a/generate_wake_impedance/import_CST_impedance.m b/generate_wake_impedance/import_CST_impedance.m
@@ -82,6 +82,7 @@
     for i = 1:size(data_hor{1},1)
 
         filename = char(data_hor{4}(i));
+        fprintf(filename);
 
         if ~isempty(filename)
             fileID = fopen(filename);

diff --git a/impedance_database/examples/geometric_openIDS_noNEG.txt b/impedance_database/examples/geometric_openIDS_noNEG.txt
diff --git a/impedance_database/examples/impedance_BR_11_Booster.m b/impedance_database/examples/impedance_BR_11_Booster.m
diff --git a/impedance_database/examples/process_impedance_database.m b/impedance_database/examples/process_impedance_database.m
@@ -1,6 +1,8 @@
 %% Process impedance database
 
-impedance_lattice_openIDs_noNEG = impedance_M_H6BA_34_1_1(0,0);
+impedance_database_dir = 'E:\\DIAMOND\\Booster\\Booster_Models\\Impedance_Database';
+
+impedance_lattice_openIDs_noNEG = impedance_BR_11_Booster(0,3, impedance_database_dir);
 
 %% Create statistics
 

diff --git a/impedance_database/examples/resistive_wall_openIDS_noNEG.txt b/impedance_database/examples/resistive_wall_openIDS_noNEG.txt