diff --git a/Analysis/ground_motion_experiment.m b/Analysis/ground_motion_experiment.m index ae34883..59e84a2 100644 --- a/Analysis/ground_motion_experiment.m +++ b/Analysis/ground_motion_experiment.m @@ -52,7 +52,7 @@ hold off; exportFig('tomo_psd_translations', 'normal-normal') -%% PSD X-Y-Z +%% PSD han_windows = hanning(ceil(length(Dsample.Time)/10)); [psd_x, freqs_x] = pwelch(Dsample.Data(:, 4), han_windows, 0, [], 1/Ts); diff --git a/Assemblage.slx b/Assemblage.slx index 9691ad2..b886624 100644 Binary files a/Assemblage.slx and b/Assemblage.slx differ diff --git a/Identification/identification_NASS.m b/Identification/identification_NASS.m index d244c5f..7bafb42 100644 --- a/Identification/identification_NASS.m +++ b/Identification/identification_NASS.m @@ -6,12 +6,12 @@ clear; close all; clc; %% -initializeSample(struct('mass', 0)); +initializeSample(struct('mass', 1)); G_nass_1 = identifyNass(); %% -initializeSample(struct('mass', 10)); +initializeSample(struct('mass', 20)); G_nass_20 = identifyNass(); diff --git a/init_data.m b/init_data.m index 8bdfb8d..3b20bcb 100644 --- a/init_data.m +++ b/init_data.m @@ -3,7 +3,7 @@ clear; close all; clc; %% Initialize Inputs opts_inputs = struct(... - 'ground_motion', false... + 'ground_motion', true ... ); initializeInputs(opts_inputs); diff --git a/mat/G_f_to_d.mat b/mat/G_f_to_d.mat index 023f56a..4e6dc7d 100644 Binary files a/mat/G_f_to_d.mat and b/mat/G_f_to_d.mat differ diff --git a/mat/axisc.mat b/mat/axisc.mat index 13d9bc2..cda8ebd 100644 Binary files a/mat/axisc.mat and b/mat/axisc.mat differ diff --git a/mat/control_K_tx.mat b/mat/control_K_tx.mat index acb80d5..0f9f84d 100644 Binary files a/mat/control_K_tx.mat and b/mat/control_K_tx.mat differ diff --git a/mat/control_K_ty.mat b/mat/control_K_ty.mat index d1eee7b..c145adc 100644 Binary files a/mat/control_K_ty.mat and b/mat/control_K_ty.mat differ diff --git a/mat/controller.mat b/mat/controller.mat index 993d3d2..7d3c03c 100644 Binary files a/mat/controller.mat and b/mat/controller.mat differ diff --git a/mat/granite.mat b/mat/granite.mat index 5af607c..f764449 100644 Binary files a/mat/granite.mat and b/mat/granite.mat differ diff --git a/mat/ground.mat b/mat/ground.mat index 6532160..7943cef 100644 Binary files a/mat/ground.mat and b/mat/ground.mat differ diff --git a/mat/inputs.mat b/mat/inputs.mat index d511979..a62a3cd 100644 Binary files a/mat/inputs.mat and b/mat/inputs.mat differ diff --git a/mat/micro_hexapod.mat b/mat/micro_hexapod.mat index ca23dc3..e96e7ee 100644 Binary files a/mat/micro_hexapod.mat and b/mat/micro_hexapod.mat differ diff --git a/mat/nano_hexapod.mat b/mat/nano_hexapod.mat index dffe5db..53f35f9 100644 Binary files a/mat/nano_hexapod.mat and b/mat/nano_hexapod.mat differ diff --git a/mat/ry.mat b/mat/ry.mat index a342639..de8472d 100644 Binary files a/mat/ry.mat and b/mat/ry.mat differ diff --git a/mat/rz.mat b/mat/rz.mat index 673329e..38f3058 100644 Binary files a/mat/rz.mat and b/mat/rz.mat differ diff --git a/mat/sample.mat b/mat/sample.mat index c50ee19..5b47ad6 100644 Binary files a/mat/sample.mat and b/mat/sample.mat differ diff --git a/mat/smiData.mat b/mat/smiData.mat index 6b4cd14..b95ef7d 100644 Binary files a/mat/smiData.mat and b/mat/smiData.mat differ diff --git a/mat/ty.mat b/mat/ty.mat index eb64c4d..07f1317 100644 Binary files a/mat/ty.mat and b/mat/ty.mat differ