Merge pull request #216 from aglowacki/master

Bug Fixes

Author: aglowacki

src/io/file/file_scan.cpp

@@ -124,7 +124,11 @@ namespace io
             ////_edf_files = find_all_dataset_files(dataset_dir + "edf" + DIR_END_CHAR, "_0000.edf");
             // populate netcdf and hdf5 files for fly scans
             _netcdf_files = find_all_dataset_files(dataset_dir + "flyXRF" + DIR_END_CHAR, "_0.nc");
-            _netcdf_files = find_all_dataset_files(dataset_dir + "XRF" + DIR_END_CHAR, "_0.nc");
+            auto extre_netcdf_files = find_all_dataset_files(dataset_dir + "XRF" + DIR_END_CHAR, "_0.nc");
+            for(auto& itr : extre_netcdf_files)
+            {
+                _netcdf_files.push_back(itr);
+            }
             _bnp_netcdf_files = find_all_dataset_files(dataset_dir + "flyXRF" + DIR_END_CHAR, "_001.nc");
             _hdf_files = find_all_dataset_files(dataset_dir + "flyXRF.h5" + DIR_END_CHAR, "_0.h5");
             //tmp_vec = find_all_dataset_files(dataset_dir + "flyXRF" + DIR_END_CHAR, "_0.h5");

src/io/file/hl_file_io.h

@@ -1131,12 +1131,26 @@ DLL_EXPORT bool load_spectra_volume(std::string dataset_directory,
         if(hasTetraMM)
         {
             // tetramm has 2 files it can save scalers. filename_tetra1_0.nc or filename_tetra2_0.nc
-            std::ifstream file_io(dataset_directory + "tetramm" + DIR_END_CHAR + tmp_dataset_file + "_tetra1_0.nc");
+            std::ifstream file_io(dataset_directory + "tetramm" + DIR_END_CHAR + tmp_dataset_file + "_0.nc");
             if (file_io.is_open())
             {
                 file_io.close();
                 std::string full_filename;
                 for (size_t i = 0; i < spectra_volume->rows(); i++)
+                {
+                    full_filename = dataset_directory + "tetramm" + DIR_END_CHAR + tmp_dataset_file + "_" + std::to_string(i) + ".nc";
+                    //todo: add verbose option
+                    //logI<<"Loading file "<<full_filename<<"\n";
+                    // if tetramm tag is missing in file name, we assume it is tetra1
+                    size_t spec_size = io::file::NetCDF_IO<T_real>::inst()->load_scalers_line(full_filename, "tetra1_", i, mda_io.get_scan_info());
+                }
+            }
+            std::ifstream file_io1(dataset_directory + "tetramm" + DIR_END_CHAR + tmp_dataset_file + "_tetra1_0.nc");
+            if (file_io1.is_open())
+            {
+                file_io1.close();
+                std::string full_filename;
+                for (size_t i = 0; i < spectra_volume->rows(); i++)
                 {
                     full_filename = dataset_directory + "tetramm" + DIR_END_CHAR + tmp_dataset_file + "_tetra1_" + std::to_string(i) + ".nc";
                     //todo: add verbose option