Skip to content

Commit

Permalink
Merge branch 'devel' into fixmonotomo
Browse files Browse the repository at this point in the history
  • Loading branch information
Vilax authored Nov 24, 2023
2 parents 838e68c + ef69a5f commit 7353dc6
Show file tree
Hide file tree
Showing 9 changed files with 813 additions and 138 deletions.
4 changes: 4 additions & 0 deletions CHANGES.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
## V3.23.11
- New protocols
- Protocols updated

## V3.23.07
- New protocols
- project_subtomograms (for obtaining sobtomogram projections)
Expand Down
2 changes: 1 addition & 1 deletion xmipptomo/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ class Plugin(xmipp3.Plugin):
@classmethod
def getTensorFlowEnviron(cls):
""" Create the needed environment for XmippTomo programs. """
environ = pwutils.Environ(os.environ)
environ = xmipp3.Plugin.getEnviron()
environ.update({
"TF_FORCE_GPU_ALLOW_GROWTH": "'true'"
}, position=pwutils.Environ.BEGIN)
Expand Down
27 changes: 27 additions & 0 deletions xmipptomo/convert/__init__.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
# **************************************************************************
# *
# * Authors: Estrella Fernandez Gimenez (me.fernandez@cnb.csic.es)
# *
# * Unidad de Bioinformatica of Centro Nacional de Biotecnologia , CSIC
# *
# * This program is free software; you can redistribute it and/or modify
# * it under the terms of the GNU General Public License as published by
# * the Free Software Foundation; either version 2 of the License, or
# * (at your option) any later version.
# *
# * This program is distributed in the hope that it will be useful,
# * but WITHOUT ANY WARRANTY; without even the implied warranty of
# * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# * GNU General Public License for more details.
# *
# * You should have received a copy of the GNU General Public License
# * along with this program; if not, write to the Free Software
# * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
# * 02111-1307 USA
# *
# * All comments concerning this program package may be sent to the
# * e-mail address 'scipion@cnb.csic.es'
# *
# **************************************************************************

from .convert import *
Loading

0 comments on commit 7353dc6

Please sign in to comment.