Merge branch 'devel' into master

xmipp3/protocols/protocol_subtract_projection.py

@@ -80,6 +80,11 @@ def _defineParams(cls, form):
                       allowsNull=True,
                       help='Specify a 3D mask for the region of the input volume that must be considered in the analysis.',
                       condition='maskOption==1')
+        form.addParam('ignoreCTF',
+                      BooleanParam,
+                      label="Ignore CTF",
+                      default=False,
+                      help='Do not consider CTF in the subtraction. Use if particles have been CTF corrected.')
         form.addParam('resol', 
                       FloatParam, 
                       label="Maximum resolution (A)", 
@@ -195,6 +200,9 @@ def subtractionStep(self):
 
         if self.realSpaceProjection.get() == 1:
             args += ' --realSpaceProjection'
+
+        if self.ignoreCTF.get():
+            args += ' --ignoreCTF'
 
         self.runJob("xmipp_subtract_projection", args)
 
@@ -271,6 +279,10 @@ def boostingStep(self):
 
         if self.nonNegative.get():
             args += ' --nonNegative'
+
+        if self.ignoreCTF.get():
+            args += ' --ignoreCTF'
+
         self.runJob("xmipp_subtract_projection", args)
 
     # --------------------------- INFO functions --------------------------------------------

xmipp3/viewers/__init__.py

@@ -27,7 +27,6 @@
 from .viewer import XmippViewer
 from .plotter import XmippPlotter
 
-#from .viewer_angular_resolution_alignment import XmippProtAngResAlignViewer
 from .viewer_apply_tilt_to_ctf import XmippApplyTiltToCTFViewer
 from .viewer_cl2d import XmippCL2DViewer
 from .viewer_ctf_consensus import XmippCTFConsensusViewer