Merge branch 'master' of https://github.com/3dem/relion-devel

3dem · Nov 8, 2023 · 0b4d29f · 0b4d29f
2 parents ed64e6f + 4cdaca5
commit 0b4d29f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 10 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -553,9 +553,9 @@ if (FETCH_WEIGHTS)
 		message(STATUS "Successfully downloaded model weights")
 	else()
 		message(WARNING
-				"Failed to download model weights."
-				"You could ignore this."
-				"The downloads will be attempted again when the model weights are required later."
+				"Failed to download model weights. YOU CAN IGNORE THIS. "
+				"The downloads will be attempted again when the model weights are required later. "
+				"\n"
 				"NOTE: You can skip this step by setting -DFETCH_WEIGHTS=OFF"
 		)
 	endif()

diff --git a/src/ml_optimiser.cpp b/src/ml_optimiser.cpp
@@ -2375,13 +2375,6 @@ void MlOptimiser::initialiseGeneral(int rank)
     if (directions_have_changed)
         mymodel.initialisePdfDirection(sampling.NrDirections());
 
-    // Do this before initialising wsum_model!
-    if (do_blush && mymodel.padding_factor > 1)
-    {
-        mymodel.padding_factor = 1;
-        if (rank == 0) std::cerr << " Warning! Blush regularisation can only be done without padding the maps for now; setting --pad to 1 ..." << std::endl;
-    }
-
     // Initialise the wsum_model according to the mymodel
     wsum_model.initialise(mymodel, sampling.symmetryGroup(), asymmetric_padding, skip_gridding, grad_pseudo_halfsets);