fixed a bug preventing "-save-progress" from working when used with "…

…-mask".
jewettaij · Jun 29, 2021 · 4565845 · 4565845
1 parent ae4ca2e
commit 4565845
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/bin/filter_mrc/filter_mrc.cpp b/bin/filter_mrc/filter_mrc.cpp
@@ -29,8 +29,8 @@ using namespace std;
 
 
 string g_program_name("filter_mrc");
-string g_version_string("0.26.1");
-string g_date_string("2021-6-21");
+string g_version_string("0.26.2");
+string g_date_string("2021-6-28");
 
 
 

diff --git a/bin/filter_mrc/handlers.cpp b/bin/filter_mrc/handlers.cpp
@@ -1556,7 +1556,8 @@ HandleTV(Settings settings,
         for(int iz=0; iz < image_size[2]; iz++)
           for(int iy=0; iy < image_size[1]; iy++)
             for(int ix=0; ix < image_size[0]; ix++)
-              aaaafVoteTensor[iz][iy][ix][d] = tomo_tmp.aaafI[iz][iy][ix];
+              if (aaaafVoteTensor[iz][iy][ix])
+                aaaafVoteTensor[iz][iy][ix][d] = tomo_tmp.aaafI[iz][iy][ix];
       }
     } // else clause for if (settings.load_intermediate_fname_base == "")
 
@@ -1620,7 +1621,8 @@ HandleTV(Settings settings,
       for(int iz=0; iz < image_size[2]; iz++)
         for(int iy=0; iy < image_size[1]; iy++)
           for(int ix=0; ix < image_size[0]; ix++)
-            tomo_tmp.aaafI[iz][iy][ix] = aaaafVoteTensor[iz][iy][ix][d];
+            if (aaaafVoteTensor[iz][iy][ix])
+              tomo_tmp.aaafI[iz][iy][ix] = aaaafVoteTensor[iz][iy][ix][d];
       cerr << "writing \"" << fname_ss.str() << "\"" << endl;
       tomo_tmp.Write(fname_ss.str());
     }