Merge pull request #47 from aglowacki/master

Bug fix for param_overrdie idx, and upped number of detectors to load…
AdvancedPhotonSource · May 9, 2022 · b46f69a · b46f69a
2 parents 9cd00a9 + 787cb01
commit b46f69a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/mvc/MapsWorkspaceFilesWidget.cpp b/src/mvc/MapsWorkspaceFilesWidget.cpp
@@ -209,11 +209,11 @@ void MapsWorkspaceFilesWidget::onOpenModel(const QStringList& names_list, MODEL_
                 if (h5Model != nullptr)
                 {
                     int idx = -1;
-                    for (byte b = '0'; b < '7'; b++)
+                    for (unsigned char b = '0'; b < '7'; b++)
                     {
                         if (name.endsWith(b))
                         {
-                            idx = (int)b;
+                            idx = b - '0';
                             break;
                         }
                     }

diff --git a/src/mvc/MapsWorkspaceModel.cpp b/src/mvc/MapsWorkspaceModel.cpp
@@ -385,7 +385,7 @@ bool MapsWorkspaceModel::_load_fit_params()
 {
 
     std::string dataset_dir = _dir->absolutePath().toStdString() + "/";
-    for(size_t detector_num = 0; detector_num <= 3; detector_num++)
+    for(size_t detector_num = 0; detector_num <= 7; detector_num++)
     {
         data_struct::Params_Override params_override(dataset_dir, detector_num);
         if( io::load_override_params(dataset_dir, detector_num, &params_override) )