Added scaler override in override file laoding to replace all predefined scalers

Author: Arthur Glowacki

src/data_struct/scaler_lookup.cpp

@@ -113,6 +113,28 @@ void Scaler_Lookup::add_beamline_scaler(const std::string& beamline, const std::
 
 // ----------------------------------------------------------------------------
 
+void Scaler_Lookup::add_override_beamline_scaler(const std::string& beamline, const std::string& scaler_label, const std::string& scaler_pv, bool is_time_normalized)
+{
+    if (is_time_normalized)
+    {
+		for(auto itr: _beamline_map[beamline].time_normalized_scaler_pv_label_map)
+		{
+			_beamline_map[beamline].time_normalized_scaler_pv_label_map.erase(scaler_label);
+		}
+		_beamline_map[beamline].time_normalized_scaler_pv_label_map[scaler_pv] = scaler_label;
+    }
+    else
+    {
+		for(auto itr: _beamline_map[beamline].time_normalized_scaler_pv_label_map)
+		{
+			_beamline_map[beamline].scaler_pv_label_map.erase(scaler_label);
+		}
+		_beamline_map[beamline].scaler_pv_label_map[scaler_pv] = scaler_label;	
+    }
+}
+
+// ----------------------------------------------------------------------------
+
 void Scaler_Lookup::add_timing_info(const std::string& beamline, const std::string& time_pv, double clock)
 {
 	_beamline_map[beamline].timing_info[time_pv] = clock;

src/data_struct/scaler_lookup.h

@@ -81,6 +81,8 @@ class DLL_EXPORT Scaler_Lookup
 
     void add_summed_scaler(const std::string& beamline, const std::string& scaler_label, const std::vector<std::string>& scaler_list);
 
+    void add_override_beamline_scaler(const std::string& beamline, const std::string& scaler_label, const std::string& scaler_pv, bool is_time_normalized);
+                                    
     bool search_for_timing_info(const std::vector<std::string>& pv_list, std::string& out_pv, double& out_clock, std::string& out_beamline);
 
     bool search_for_timing_info(const std::unordered_map<std::string, double>& pv_map, std::string& out_pv, double& out_clock, std::string& out_beamline);

src/io/file/aps/aps_fit_params_import.h

@@ -52,6 +52,7 @@ POSSIBILITY OF SUCH DAMAGE.
 #include "core/defines.h"
 #include "data_struct/params_override.h"
 #include "data_struct/element_info.h"
+#include "data_struct/scaler_lookup.h"
 #include <string>
 #include <iostream>
 #include <fstream>
@@ -829,6 +830,36 @@ DLL_EXPORT bool load_parameters_override(std::string path, Params_Override<T_rea
                         value.erase(std::remove(value.begin(), value.end(), ' '), value.end());
                         params_override->polarity_pattern = value;
                     }
+                    else if(tag == STR_SCALER_OVERRIDE)
+                    {
+                        std::string scaler_beamline;
+                        std::string scaler_name;
+                        std::string str_value;
+                        std::getline(strstream, scaler_beamline, ',');
+                        scaler_beamline.erase(std::remove_if(scaler_beamline.begin(), scaler_beamline.end(), ::isspace), scaler_beamline.end());
+                        std::getline(strstream, scaler_name, ',');
+                        scaler_name.erase(std::remove_if(scaler_name.begin(), scaler_name.end(), ::isspace), scaler_name.end());
+                        std::getline(strstream, str_value, ',');
+                        str_value.erase(std::remove(str_value.begin(), str_value.end(), '\n'), str_value.end());
+                        str_value.erase(std::remove(str_value.begin(), str_value.end(), '\r'), str_value.end());
+                        str_value.erase(std::remove(str_value.begin(), str_value.end(), ' '), str_value.end());                        
+                        data_struct::Scaler_Lookup::inst()->add_beamline_scaler(scaler_beamline, scaler_name, str_value, false);
+                    }
+                    else if(tag == STR_TIME_NORM_SCALER_OVERRIDE)
+                    {
+                        std::string scaler_beamline;
+                        std::string scaler_name;
+                        std::string str_value;
+                        std::getline(strstream, scaler_beamline, ',');
+                        scaler_beamline.erase(std::remove_if(scaler_beamline.begin(), scaler_beamline.end(), ::isspace), scaler_beamline.end());
+                        std::getline(strstream, scaler_name, ',');
+                        scaler_name.erase(std::remove_if(scaler_name.begin(), scaler_name.end(), ::isspace), scaler_name.end());
+                        std::getline(strstream, str_value, ',');
+                        str_value.erase(std::remove(str_value.begin(), str_value.end(), '\n'), str_value.end());
+                        str_value.erase(std::remove(str_value.begin(), str_value.end(), '\r'), str_value.end());
+                        str_value.erase(std::remove(str_value.begin(), str_value.end(), ' '), str_value.end());                        
+                        data_struct::Scaler_Lookup::inst()->add_beamline_scaler(scaler_beamline, scaler_name, str_value, true);
+                    }
 
                 }
                 catch (std::exception& e)