Changed STR_SCAN_TYPE to STR_XRF_SCAN_TYPE

Author: Arthur Glowacki

src/core/defines.h

@@ -292,7 +292,7 @@ const std::string STR_REQUESTED_ROWS = "requested_rows";
 const std::string STR_REQUESTED_COLS = "requested_cols";
 const std::string STR_THETA = "theta";
 const std::string STR_SCAN_TIME_STAMP = "scan_time_stamp";
-const std::string STR_SCAN_TYPE = "scan_type";
+const std::string STR_XRF_SCAN_TYPE = "scan_type";
 const std::string STR_NAME = "name";
 const std::string STR_SCAN_METADATA = "scan_metadata";
 

src/io/file/hdf5_io.h

@@ -8308,14 +8308,14 @@ class DLL_EXPORT HDF5_IO
             }
 
             //Save scan type  
-            if ( _open_h5_dataset(STR_SCAN_TYPE, filetype, scan_grp_id, 1, count, count, dset_id, dataspace_id))
+            if ( _open_h5_dataset(STR_XRF_SCAN_TYPE, filetype, scan_grp_id, 1, count, count, dset_id, dataspace_id))
             {   
                 char tmp_char[255] = { 0 };
                 meta_info->scan_type.copy(tmp_char, 254);
                 status = H5Dwrite(dset_id, memtype, memoryspace_id, dataspace_id, H5P_DEFAULT, (void*)tmp_char);
                 if (status < 0)
                 {
-                    logE << "failed to write " << STR_SCAN_TYPE << "\n";
+                    logE << "failed to write " << STR_XRF_SCAN_TYPE << "\n";
                 }
             }