fixing test

I2PC · Nov 24, 2023 · 838e68c · 838e68c
1 parent 30d02ec
commit 838e68c
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/xmipptomo/protocols/protocol_resolution_local_monotomo.py b/xmipptomo/protocols/protocol_resolution_local_monotomo.py
@@ -135,14 +135,13 @@ def _insertAllSteps(self):
                 if tom_odd.getObjId() == tom_even.getObjId():
                     tomId = tom_odd.getObjId()
                     # self._insertFunctionStep('convertInputStep')
-                    self._insertFunctionStep(self.resolutionMonoTomoStep, tomId, oddTomos=self.oddTomograms.get(),
-                                             evenTomos=self.evenTomograms.get())
+                    self._insertFunctionStep(self.resolutionMonoTomoStep, tomId)
                     self._insertFunctionStep(self.createHistrogram, tomId)
         else:
             for tom in self.tomo.get():
                 tomId = tom.getObjId()
                 # self._insertFunctionStep('convertInputStep')
-                self._insertFunctionStep(self.resolutionMonoTomoStep, tomId, inputTomos=self.tomo.get())
+                self._insertFunctionStep(self.resolutionMonoTomoStep, tomId)
                 self._insertFunctionStep(self.createHistrogram, tomId)
         self._insertFunctionStep('createOutputStep')
 
@@ -158,16 +157,16 @@ def convertInputStep(self):
         if (extVol2 == '.mrc') or (extVol2 == '.map'):
             self.vol2Fn = self.vol2Fn + ':mrc'
 
-    def resolutionMonoTomoStep(self, tomId, inputTomos=None, oddTomos=None, evenTomos=None):
+    def resolutionMonoTomoStep(self, tomId):
         '''
         This function estimates the local resolution from the oddTomo and the evenTomo.
         The output is generated in pseudo streaming. It is not a full streaming due to
         the input is not updated during the execution.
         '''
 
         if not self.useAssociatedOddEven.get():
-            self.vol1Fn = oddTomos[tomId].getFileName()
-            self.vol2Fn = evenTomos[tomId].getFileName()
+            self.vol1Fn = self.oddTomograms.get()[tomId].getFileName()
+            self.vol2Fn = self.evenTomograms.get()[tomId].getFileName()
             ts = self.oddTomograms.get()[tomId]
 
         else:

diff --git a/xmipptomo/tests/test_protocol_monotomo.py b/xmipptomo/tests/test_protocol_monotomo.py
@@ -58,6 +58,7 @@ def setUpClass(cls):
     def testMonoTomo(self):
         MonoTomo = self.newProtocol(XmippProtMonoTomo,
                                     objLabel='two halves monotomo',
+                                    useAssociatedOddEven=False,
                                     oddTomograms=self.protImportHalf1.Tomograms,
                                     evenTomograms=self.protImportHalf2.Tomograms,
                                     useMask=False,