Fixing bug with parsing xaxis introduced in the previous commit

53d3f78b · Daniel Brown · b894833c · 53d3f78b
Commit 53d3f78b authored Jul 18, 2017 by Daniel Brown
Hide whitespace changes
Inline Side-by-side

Showing with 19 additions and 21 deletions

src/kat_read.c src/kat_read.c +19 -21

No files found.
--- a/src/kat_read.c
+++ b/src/kat_read.c
@@ -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) {
+        if (output_data->detector_type == BEAM) {
-                    assign_beam_detector_params(detector, component_param);
+                assign_beam_detector_params(detector, component_param);
-            } else if (output_data->detector_type == AD) {
+        } else if (output_data->detector_type == AD) {
-                    int error_num = assign_amplitude_detector_params(detector, component_param);
+                int error_num = assign_amplitude_detector_params(detector, component_param);
-                    if (error_num != 0) {
+                if (error_num != 0) {
-                            return error_num;
+                        return error_num;
-                    }
+                }
-            } else if (detector->num_demods == 1) {
+        } else if (detector->num_demods == 1) {
-                    int error_num = assign_one_demod_detector_params(detector, component_param);
+                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 {
+        } else if (detector->num_demods > 1) {
-                bug_error("detector_type(new) xparam");
+            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");
        }
    }