Merge pull request #139 from I2PC/monotomofixes

monotomo fixes
I2PC · Oct 23, 2023 · 79a21cc · 79a21cc
2 parents 4f163d4 + 906a10c
commit 79a21cc
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 11 deletions.
diff --git a/xmipptomo/protocols/protocol_resolution_local_monotomo.py b/xmipptomo/protocols/protocol_resolution_local_monotomo.py
@@ -45,7 +45,6 @@
 MONOTOMO_METHOD_URL = 'http://github.com/I2PC/scipion/wiki/XmippProtMonoTomo'
 TOMOGRAM_RESOLUTION_FILE = 'localResolutionTomogram_'
 FULL_TOMOGRAM_FILE = 'fullTomogram_'
-TOMOGRAMFOLDER = 'tomo_'
 HISTOGRAM_RESOLUTION_FILE = 'histogram_resolution_'
 BINARY_MASK = 'binarymask'
 MRCEXT = '.mrc'
@@ -152,7 +151,7 @@ def resolutionMonoTomoStep(self, oddTomos, evenTomos, tomId):
         tsId = ts.getTsId()
 
         #Defining the output folder
-        tomoPath = self._getExtraPath(TOMOGRAMFOLDER + tsId)
+        tomoPath = self._getExtraPath(tsId)
         os.mkdir(tomoPath)
 
         #Defining outfiles
@@ -201,7 +200,7 @@ def createOutputPath(self, filename, tomId, ext):
         the path with an extension. Exmaple: filename = 'tomogram_' id = 5, ext = '.mrc'
         the output will be tomogram_5.mrc
         '''
-        tomoPath = self._getExtraPath(TOMOGRAMFOLDER + str(tomId))
+        tomoPath = self._getExtraPath(str(tomId))
         fnPath = os.path.join(tomoPath, filename+str(tomId)+ext)
         return fnPath
 

diff --git a/xmipptomo/tests/test_protocol_monotomo.py b/xmipptomo/tests/test_protocol_monotomo.py
@@ -65,16 +65,16 @@ def testMonoTomo(self):
                                     maxRes=150,
                                     )
         self.launchProtocol(MonoTomo)
-        self.assertTrue(exists(MonoTomo._getExtraPath('tomo_1/fullTomogram_1.mrc')),
+        self.assertTrue(exists(MonoTomo._getExtraPath('odd_tomogram_rx1/fullTomogram_1.mrc')),
                         "MonoTomo has failed creating the resolution tomogram")
-        self.assertTrue(exists(MonoTomo._getExtraPath('tomo_1/histogram_resolution_1.xmd')),
+        self.assertTrue(exists(MonoTomo._getExtraPath('odd_tomogram_rx1/histogram_resolution_1.xmd')),
                         "MonoTomo has failed creating the resolution histogram")
-        self.assertTrue(exists(MonoTomo._getExtraPath('tomo_1/localResolutionTomogram_1.mrc')),
+        self.assertTrue(exists(MonoTomo._getExtraPath('odd_tomogram_rx1/localResolutionTomogram_1.mrc')),
                         "MonoTomo has failed creating the mean tomogram")
-        self.assertTrue(exists(MonoTomo._getExtraPath('tomo_2/fullTomogram_2.mrc')),
+        self.assertTrue(exists(MonoTomo._getExtraPath('odd_tomogram_rx2/fullTomogram_2.mrc')),
                         "MonoTomo has failed creating the resolution tomogram")
-        self.assertTrue(exists(MonoTomo._getExtraPath('tomo_2/histogram_resolution_2.xmd')),
+        self.assertTrue(exists(MonoTomo._getExtraPath('odd_tomogram_rx2/histogram_resolution_2.xmd')),
                         "MonoTomo has failed creating the resolution histogram")
-        self.assertTrue(exists(MonoTomo._getExtraPath('tomo_2/localResolutionTomogram_2.mrc')),
+        self.assertTrue(exists(MonoTomo._getExtraPath('odd_tomogram_rx2/localResolutionTomogram_2.mrc')),
                         "MonoTomo has failed creating the mean tomogram")
 
diff --git a/xmipptomo/viewers/viewer_resolution_local_monotomo.py b/xmipptomo/viewers/viewer_resolution_local_monotomo.py
@@ -44,8 +44,7 @@
 
 from xmipptomo.protocols.protocol_resolution_local_monotomo import (XmippProtMonoTomo,
                                                            TOMOGRAM_RESOLUTION_FILE, FULL_TOMOGRAM_FILE,
-                                                           HISTOGRAM_RESOLUTION_FILE, TOMOGRAMFOLDER,
-                                                            MRCEXT, XMDEXT)
+                                                           HISTOGRAM_RESOLUTION_FILE, MRCEXT, XMDEXT)
 
 
 class XmippMonoTomoViewer(LocalResolutionViewer):