Commit 8df5a467 authored by Martin Schorb's avatar Martin Schorb
Browse files

Merge branch 'master' into 'icy'

Master

See merge request schorb/pyem!3
parents bb2df4b1 fbae18ec
......@@ -514,9 +514,10 @@ def mergemap(mapitem,crop=False,black=False,blendmont=True):
m['frames'] = list(map(int,mapitem['MapFramesXY']))
montage_tiles = numpy.prod(m['frames'])
tileidx_offset = 0
if mapfile.find('.st')<0 and mapfile.find('.map')<0 and mapfile.find('.mrc')<0:
#not an mrc file
tileidx_offset = 0
mergeheader = {}
mergeheader['stacksize'] = 1
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment