Commit 53d3f78b authored by Daniel Brown's avatar Daniel Brown

Fixing bug with parsing xaxis introduced in the previous commit

parent b894833c
......@@ -11230,34 +11230,32 @@ int assign_detector_parameter(component_param_t *component_param) {
bug_error("outtype FBACK 1");
}
if(output_data->detector_type == FEEDBACK){
int detector_index = output_data->detector_index;
int detector_index = output_data->detector_index;
light_out_t *detector = &inter.light_out_list[detector_index];
light_out_t *detector = &inter.light_out_list[detector_index];
if (output_data->detector_type == BEAM) {
assign_beam_detector_params(detector, component_param);
} else if (output_data->detector_type == AD) {
int error_num = assign_amplitude_detector_params(detector, component_param);
if (output_data->detector_type == BEAM) {
assign_beam_detector_params(detector, component_param);
} else if (output_data->detector_type == AD) {
int error_num = assign_amplitude_detector_params(detector, component_param);
if (error_num != 0) {
return error_num;
}
} else if (detector->num_demods == 1) {
int error_num = assign_one_demod_detector_params(detector, component_param);
if (error_num != 0) {
return error_num;
}
} else if (detector->num_demods == 1) {
int error_num = assign_one_demod_detector_params(detector, component_param);
if (error_num != 0) {
return error_num;
}
} else if (detector->num_demods > 1) {
int error_num =
assign_multi_demod_detector_params(detector, component_param);
if (error_num != 0) {
return error_num;
return error_num;
}
} else {
bug_error("detector_type(new) xparam");
} else if (detector->num_demods > 1) {
int error_num =
assign_multi_demod_detector_params(detector, component_param);
if (error_num != 0) {
return error_num;
}
} else {
bug_error("detector_type(new) xparam");
}
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment