Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/RELEASE_next_patch' into RELEA…
Browse files Browse the repository at this point in the history
…SE_v1.5.2
  • Loading branch information
francisco-dlp committed Sep 6, 2019
2 parents 08d2951 + 00a7c1a commit 05aa811
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions hyperspy/io_plugins/bruker.py
Original file line number Diff line number Diff line change
Expand Up @@ -821,12 +821,12 @@ def calc_real_time(self):
"""calculate and return real time for whole hypermap
in seconds
"""
line_cnt_sum = np.sum(self.line_counter)
line_cnt_sum = np.sum(self.line_counter, dtype=np.float64)
line_avg = self.dsp_metadata['LineAverage']
pix_avg = self.dsp_metadata['PixelAverage']
pix_time = self.dsp_metadata['PixelTime']
width = self.image.width
real_time = line_cnt_sum * line_avg * pix_avg * pix_time * width / 1000000.0
real_time = line_cnt_sum * line_avg * pix_avg * pix_time * width * 1E-6
return float(real_time)

def gen_hspy_item_dict_basic(self):
Expand Down

0 comments on commit 05aa811

Please sign in to comment.