Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Open sidebar
finesse
finesse
Commits
e328b124
Commit
e328b124
authored
Jun 27, 2017
by
Daniel Brown
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Adding pitch and yaw as targets for puts
parent
30624b49
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
5 deletions
+7
-5
src/kat_calc.c
src/kat_calc.c
+3
-3
src/kat_read.c
src/kat_read.c
+4
-2
No files found.
src/kat_calc.c
View file @
e328b124
...
...
@@ -1398,7 +1398,7 @@ void fill_mirror_signal_rhs(signal_t *signal, ifo_matrix_vars_t* M_car, ifo_matr
double
phase_r
=
f_sig
->
order
*
signal
->
phase
;
// amplitude modulated for alignment signals
double
factor_r
=
signal
->
amplitude
*
EPSILON
/
2
;
//Epsilon/2 for fsig
double
factor_t
=
-
signal
->
amplitude
*
EPSILON
/
4
;
double
factor_t
=
signal
->
amplitude
*
EPSILON
/
4
;
// i factor for transmission is provided in the matrix multiplication
// a12f and a21f later
double
phase_t
=
f_sig
->
order
*
signal
->
phase
;
...
...
@@ -1474,7 +1474,7 @@ void fill_mirror_signal_rhs(signal_t *signal, ifo_matrix_vars_t* M_car, ifo_matr
get_tem_modes_from_field_index
(
&
nj
,
&
mj
,
j
);
if
(
!
node1
->
gnd_node
&&
include_mode_coupling
(
&
mirror
->
a_cplng_11
,
ni
,
nj
,
mi
,
mj
))
{
#
// Get the RHS index of port 1 of the node (The incoming port) then
// Get the RHS index of port 1 of the node (The incoming port) then
// add to it the field HOM j at frequency f_sig->carrier->index.
cidx
=
M_car
->
node_rhs_idx_1
[
node1
->
list_index
]
+
get_port_rhs_idx
(
f_sig
->
carrier
->
index
,
j
);
// Apply component coupling matrix to the carrier field vector
...
...
@@ -1482,7 +1482,7 @@ void fill_mirror_signal_rhs(signal_t *signal, ifo_matrix_vars_t* M_car, ifo_matr
}
if
(
!
node2
->
gnd_node
&&
include_mode_coupling
(
&
mirror
->
a_cplng_22
,
ni
,
nj
,
mi
,
mj
))
{
#
// Get the RHS index of port 2 of the node (The incoming port) then
// Get the RHS index of port 2 of the node (The incoming port) then
// add to it the field HOM j at frequency f_sig->carrier->index.
cidx
=
M_car
->
node_rhs_idx_2
[
node2
->
list_index
]
+
get_port_rhs_idx
(
f_sig
->
carrier
->
index
,
j
);
signal
->
ar2
[
i
]
=
z_pl_z
(
signal
->
ar2
[
i
],
z_by_z
(
*
mirror
->
a22f
[
f_sig
->
carrier
->
index
][
f_sig
->
carrier
->
index
][
j
][
i
],
crhs
[
cidx
]));
...
...
src/kat_read.c
View file @
e328b124
...
...
@@ -10468,7 +10468,8 @@ int assign_mirror_parameter(component_param_t *component_param) {
*component_param->max = 1.0;
*component_param->min = 0.0;
} else if (strcasecmp("xbeta", component_param->parameter) == 0 ||
strcasecmp("xBeta", component_param->parameter) == 0) {
strcasecmp("xBeta", component_param->parameter) == 0 ||
strcasecmp("yaw", component_param->parameter) == 0) {
*component_param->xparam = &(mirror->beta_x);
strcpy(component_param->unit, " [rad]");
mirror->rebuild = 1;
...
...
@@ -10476,7 +10477,8 @@ int assign_mirror_parameter(component_param_t *component_param) {
*component_param->lborder = 0;
*component_param->uborder = 0;
} else if (strcasecmp("ybeta", component_param->parameter) == 0 ||
strcasecmp("yBeta", component_param->parameter) == 0) {
strcasecmp("yBeta", component_param->parameter) == 0 ||
strcasecmp("pitch", component_param->parameter) == 0) {
*component_param->xparam = &(mirror->beta_y);
strcpy(component_param->unit, " [rad]");
mirror->rebuild = 1;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment