diff --git a/cryosparc2/__init__.py b/cryosparc2/__init__.py index d8c3947..5df25f7 100644 --- a/cryosparc2/__init__.py +++ b/cryosparc2/__init__.py @@ -31,7 +31,7 @@ from .constants import * -__version__ = '4.1.2' +__version__ = '4.1.3' _references = ['Punjani2017', 'Brubaker2017', 'daniel_asarnow_2019_3576630'] _logo = 'cryosparc2_logo.png' diff --git a/cryosparc2/protocols/protocol_cryosparc_3D_flex_reconstruction.py b/cryosparc2/protocols/protocol_cryosparc_3D_flex_reconstruction.py index f891eeb..719326f 100644 --- a/cryosparc2/protocols/protocol_cryosparc_3D_flex_reconstruction.py +++ b/cryosparc2/protocols/protocol_cryosparc_3D_flex_reconstruction.py @@ -160,11 +160,10 @@ def createOutputStep(self): self._defineOutputs(flexVolume=flexVol) self._defineOutputs(noFlexVolume=noFlexVol) - def _defineParamsName(self): """ Define a list with 3D Flex Reconstruction parameters names""" self._paramsName = ['flex_do_noflex_recon', 'flex_bfgs_num_iters', - 'refine_gs_resplit'] + 'refine_gs_resplit', 'compute_use_ssd'] self.lane = str(self.getAttributeValue('compute_lane')) def doRun3DFlexReconstruction(self): diff --git a/cryosparc2/protocols/protocol_cryosparc_3d_variability_display.py b/cryosparc2/protocols/protocol_cryosparc_3d_variability_display.py index e233475..3136ebf 100644 --- a/cryosparc2/protocols/protocol_cryosparc_3d_variability_display.py +++ b/cryosparc2/protocols/protocol_cryosparc_3d_variability_display.py @@ -181,11 +181,10 @@ def _defineParams(self, form): 'a zero-based integer in the range [0, K-1], where K is the number of components that ' 'exist after the (optional) filtering.') - # form.addParam('var_intermediate_width', IntParam, default=0, - # visible=False, - # expertLevel=LEVEL_ADVANCED, - # label="Intermediates: window (frames)", - # help='Intermediates: window (frames)') + form.addParam('var_intermediate_width', IntParam, default=0, + expertLevel=LEVEL_ADVANCED, + label="Intermediates: window (frames)", + help='Intermediates: window (frames)') form.addSection(label="Compute settings") addComputeSectionParams(form, allowMultipleGPUs=False) @@ -473,7 +472,8 @@ def _defineParamsName(self): 'var_intermediate_width', 'var_component_filter', 'var_intermediate_output_frame_particles', - 'var_intermediate_output_component'] + 'var_intermediate_output_component', + 'compute_use_ssd'] self.lane = str(self.getAttributeValue('compute_lane')) def _validate(self): @@ -509,7 +509,11 @@ def doRun3DVariabilityDisplay(self): elif paramName == 'var_highpass_res' and self.var_highpass_res.get() is not None: params[str(paramName)] = str(self.var_highpass_res.get()) elif paramName == 'var_intermediate_width': - params[str(paramName)] = '0' + if self.var_intermediate_width.get() is not None or self.var_intermediate_width.get() > 0: + params[str(paramName)] = str(self.var_intermediate_width.get()) + else: + params[str(paramName)] = '0' + # elif paramName == 'var_component_filter': # params[str(paramName)] = str(self.var_component_filter.get())