Fix bug not avg us_fm properly. Added update weight if greater. Basically for nbs 1832 1833 have an issue with Fe

Author: Arthur Glowacki

src/data_struct/detector.cpp

@@ -112,7 +112,7 @@ void Detector<T_real>::append_element(Fitting_Routines routine, std::string quan
     if (element != nullptr)
     {
         Electron_Shell shell = get_shell_by_name(name);
-        fitting_quant_map.at(routine).update_weight(shell, element->number, weight);
+        fitting_quant_map.at(routine).update_weight_if_greater(shell, element->number, weight);
 
         if (fitting_quant_map.at(routine).quant_scaler_map.count(quant_scaler) > 0)
         {
@@ -274,7 +274,7 @@ void Detector<T_real>::generage_avg_quantification_scalers()
         if (itr.second.US_FM > 0.0)
         {
             avg_US_FM += itr.second.US_FM;
-            us_cnt += 1.0;
+            us_fm_cnt += 1.0;
         }
         if (itr.second.DS_IC > 0.0)
         {

src/data_struct/quantification_standard.h

@@ -124,6 +124,17 @@ struct DLL_EXPORT Fitting_Quantification_Struct
         }
     }
 
+    void update_weight_if_greater(Electron_Shell shell, unsigned int Z, T_real weight)
+    {
+        for (auto& itr : quant_scaler_map)
+        {
+            if(weight > itr.second.curve_quant_map.at(shell).at(Z - 1).weight)
+            {
+                itr.second.curve_quant_map.at(shell).at(Z - 1).weight = weight;
+            }
+        }
+    }
+
     //            Quantifier {SR_Current, US_IC, DS_IC}
     std::unordered_map<std::string, Quantification_Scaler_Struct<T_real>> quant_scaler_map;
     // saved value from optimizer, {SR_Current, US_IC, DS_IC}