Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Futurize for Python 2 & 3 support #38

Closed
wants to merge 1 commit into from
+14 −8
Closed

Futurize for Python 2 & 3 support #38

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 14 additions & 8 deletions storm_analysis/sa_library/datareader.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,13 @@

Hazen 06/13
"""
from __future__ import division
from __future__ import print_function

from builtins import str
from builtins import range
from builtins import object
from past.utils import old_div
import hashlib
import numpy
import os
Expand Down Expand Up @@ -35,7 +41,7 @@ def inferReader(filename, verbose = False):
elif (ext == ".tif") or (ext == ".tiff"):
return TifReader(filename, verbose = verbose)
else:
print(ext, "is not a recognized file type")
print((ext, "is not a recognized file type"))
raise IOError("only .dax, .spe and .tif are supported (case sensitive..)")


Expand Down Expand Up @@ -76,12 +82,12 @@ def averageFrames(self, start = None, end = None):
average = numpy.zeros((self.image_height, self.image_width), numpy.float)
for [i, frame] in self.frameIterator(start, end):
if self.verbose and ((i%10)==0):
print(" processing frame:", i, " of", self.number_frames)
print((" processing frame:", i, " of", self.number_frames))
length += 1
average += frame

if (length > 0):
average = average/float(length)
average = old_div(average,float(length))

return average

Expand Down Expand Up @@ -227,7 +233,7 @@ def __init__(self, filename, verbose = False):
self.fileptr = open(filename, "rb")
else:
if self.verbose:
print("dax data not found", filename)
print(("dax data not found", filename))

def loadAFrame(self, frame_number):
"""
Expand Down Expand Up @@ -334,7 +340,7 @@ def __init__(self, filename, verbose = False):
self.image_size = 2 * self.image_width * self.image_height
self.image_mode = numpy.uint16
else:
print("unrecognized spe image format: ", image_mode)
print(("unrecognized spe image format: ", image_mode))

def loadAFrame(self, frame_number, cast_to_int16 = True):
"""
Expand Down Expand Up @@ -435,7 +441,7 @@ def loadAFrame(self, frame_number, cast_to_int16 = True):

# Multiple frames of data on multiple pages.
elif (self.frames_per_page > 1):
page = int(frame_number/self.frames_per_page)
page = int(old_div(frame_number,self.frames_per_page))
frame = frame_number % self.frames_per_page

# This is an optimization for files with a large number of frames
Expand Down Expand Up @@ -474,10 +480,10 @@ def loadAFrame(self, frame_number, cast_to_int16 = True):
exit()

movie = inferReader(sys.argv[1], verbose = True)
print("Movie size is", movie.filmSize())
print(("Movie size is", movie.filmSize()))

frame = movie.loadAFrame(0)
print(frame.shape, type(frame), frame.dtype)
print((frame.shape, type(frame), frame.dtype))


#
Expand Down