Skip to content

Commit

Permalink
Loader: fix loading split data as spectral
Browse files Browse the repository at this point in the history
  • Loading branch information
tritemio committed Mar 28, 2018
1 parent ebce3ca commit 0a37558
Showing 1 changed file with 6 additions and 2 deletions.
8 changes: 6 additions & 2 deletions fretbursts/loader.py
Original file line number Diff line number Diff line change
Expand Up @@ -281,8 +281,12 @@ def _photon_hdf5_1ch(h5data, data, ondisk=False, nch=1, ich=0, loadspecs=True):
# Unless 1-color, load donor and acceptor info
det_specs = meas_specs.detectors_specs
if data.spectral:
donor = np.atleast_1d(det_specs.spectral_ch1.read())
accept = np.atleast_1d(det_specs.spectral_ch2.read())
try:
donor = np.atleast_1d(det_specs.spectral_ch1.read())
accept = np.atleast_1d(det_specs.spectral_ch2.read())
except tables.NoSuchNodeError:
donor = np.atleast_1d(det_specs.split_ch1.read())
accept = np.atleast_1d(det_specs.split_ch2.read())
_append_data_ch(data, 'det_donor_accept', (donor, accept))
else:
# Non-FRET or unspecified data, assume all photons are "acceptor"
Expand Down

0 comments on commit 0a37558

Please sign in to comment.