Update to translating tetramm scalers to proper names

Author: Arthur Glowacki

reference/Scaler_to_PV_map.yaml

@@ -30,7 +30,9 @@ BeamLines:
       OCR3: 2iddXMAP:dxp3:OutputCountRate
       OCR4: 2iddXMAP:dxp4:OutputCountRate
       XBIC: 2idd:scaler1_cts1.D
-      US_FM: 2iddtmm1:Current3:MeanValue_RBV
+      US_FM: 
+        - 2iddtmm1:Current3:MeanValue_RBV
+        - 2iddtmm1:Current3
     TimeNormalizedScalers:
       Timing: [2idd:3820:mca1.VAL, 50000000.0]
       Scalers:

src/io/file/mda_io.cpp

@@ -1260,7 +1260,14 @@ void MDA_IO<T_real>::_load_extra_pvs_vector()
                     data_struct::Scaler_Map<T_real> s_map;
                     s_map.values.resize(o_map.values.rows(), o_map.values.cols());
                     s_map.values.setZero(o_map.values.rows(), o_map.values.cols());
-                    s_map.name = tokens[1];
+                    if (data_struct::Scaler_Lookup::inst()->search_pv(tokens[0] + ":" + tokens[1], label, is_time_normalized, beamline))
+                    {
+                        s_map.name = label;
+                    }
+                    else
+                    {
+                        s_map.name = e_pv.name;
+                    }
 
                     if(t1idx != std::string::npos)
                     {