fix merge ?

Arthur Glowacki · Arthur Glowacki · commit c99d09723a03 · 2025-08-08T11:19:50.000-05:00
diff --git a/src/io/file/hl_file_io.h b/src/io/file/hl_file_io.h
@@ -853,7 +853,7 @@ DLL_EXPORT bool load_spectra_volume(std::string dataset_directory,
             if(io::file::HDF5_IO::inst()->start_save_seq(true))
             {
                 data_struct::Params_Override<double>* null_po = nullptr;
-                io::file::HDF5_IO::inst()->save_scan_scalers(detector_num, &scan_info, null_po);
+                io::file::HDF5_IO::inst()->save_scan_scalers(&scan_info, null_po);
                 return true;
             }
             else
diff --git a/src/support/eigen-git-mirror b/src/support/eigen-git-mirror
@@ -1 +1 @@
-Subproject commit 6dbbf0a843ec3c76c8877e420ba0684bb07e6daa
+Subproject commit e98683846410ae75e9ea83f094a27823033741e1
diff --git a/src/support/pybind11 b/src/support/pybind11
@@ -1 +1 @@
-Subproject commit ea3e33e40dd1cbfa9f885e991386337a0e5b4b66
+Subproject commit 7e5edbc947168fa73e25c5b6e58d656f5e2e9863
diff --git a/vcpkg b/vcpkg
@@ -1 +1 @@
-Subproject commit d8ad13c401b30c2836d00b8923c9127f05f591c7
+Subproject commit c7961da7380ecdb92242c9dbc8ee1bca2105e335

Original file line number	Diff line number	Diff line change
`@@ -853,7 +853,7 @@ DLL_EXPORT bool load_spectra_volume(std::string dataset_directory,`
`853`	`853`	`if(io::file::HDF5_IO::inst()->start_save_seq(true))`
`854`	`854`	`{`
`855`	`855`	`data_struct::Params_Override<double>* null_po = nullptr;`
`856`		`- io::file::HDF5_IO::inst()->save_scan_scalers(detector_num, &scan_info, null_po);`
	`856`	`+ io::file::HDF5_IO::inst()->save_scan_scalers(&scan_info, null_po);`
`857`	`857`	`return true;`
`858`	`858`	`}`
`859`	`859`	`else`