Started working on adding ROI per K,L,M lines

Author: Arthur Glowacki

src/fitting/routines/roi_fit_routine.cpp

@@ -90,20 +90,27 @@ optimizers::OPTIMIZER_OUTCOME ROI_Fit_Routine<T_real>::fit_spectra(const models:
         Fit_Element_Map<T_real>* element = e_itr.second;
         if (element != nullptr)
         {
-            left_roi = static_cast<unsigned int>(std::round(((element->center() - element->width()) - energy_offset) / energy_slope));
-            right_roi = static_cast<unsigned int>(std::round(((element->center() + element->width()) - energy_offset) / energy_slope));
-
-            if (right_roi >= n_mca_channels)
+            if(_separate_lines == false)
             {
-                right_roi = n_mca_channels - 2;
+                left_roi = static_cast<unsigned int>(std::round(((element->center() - element->width()) - energy_offset) / energy_slope));
+                right_roi = static_cast<unsigned int>(std::round(((element->center() + element->width()) - energy_offset) / energy_slope));
+
+                if (right_roi >= n_mca_channels)
+                {
+                    right_roi = n_mca_channels - 2;
+                }
+                if (left_roi > right_roi)
+                {
+                    left_roi = right_roi - 1;
+                }
+
+                size_t spec_size = (right_roi - left_roi) + 1;
+                out_counts[e_itr.first] = spectra->segment(left_roi, spec_size).sum();
             }
-            if (left_roi > right_roi)
+            else
             {
-                left_roi = right_roi - 1;
-            }
 
-            size_t spec_size = (right_roi - left_roi) + 1;
-            out_counts[e_itr.first] = spectra->segment(left_roi, spec_size).sum();
+            }
         }
     }
     return optimizers::OPTIMIZER_OUTCOME::CONVERGED;

src/fitting/routines/roi_fit_routine.h

@@ -80,9 +80,10 @@ class DLL_EXPORT ROI_Fit_Routine: public Base_Fit_Routine<T_real>
                             const struct Range energy_range,
                             ArrayTr<T_real>* custom_background);
 
+    void set_fit_separate_lines(bool val) {_separate_lines = val;}
 protected:
 
-
+      bool _separate_lines;
 
 
 private: