Skip to content

Corrections in Collection class #11

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

Open
DancingQuanta wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Corrections in Collection class #11

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
32 changes: 15 additions & 17 deletions specdal/containers/collection.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ def separator_keyfun(spectrum, separator, indices):
def separator_with_filler_keyfun(spectrum, separator, indices, filler='.'):
elements = spectrum.name.split(separator)
return separator.join([elements[i] if i in indices else
fill for i in range(len(elements))])
filler for i in range(len(elements))])

def df_to_collection(df, name, measure_type='pct_reflect'):
'''
Expand Down Expand Up @@ -162,7 +162,7 @@ def data(self):

def _unflagged_data(self):
try:
spectra = [s for s in self.spectra if not s.name in self.flags]
spectra = [s for s in self.spectra if s.name not in self.flags]
return pd.concat(objs=[s.measurement for s in spectra],
axis=1, keys=[s.name for s in spectra])
except ValueError as err:
Expand Down Expand Up @@ -259,17 +259,17 @@ def read(self, directory, measure_type='pct_reflect',
# wrapper around spectral operations
def interpolate(self, spacing=1, method='slinear'):
'''
'''
'''
for spectrum in self.spectra:
spectrum.interpolate(spacing, method)
def stitch(self, method='max'):
'''
'''
'''
for spectrum in self.spectra:
spectrum.stitch(method)
def jump_correct(self, splices, reference, method='additive'):
'''
'''
'''
for spectrum in self.spectra:
spectrum.jump_correct(splices, reference, method)
##################################################
Expand All @@ -291,7 +291,7 @@ def groupby(self, separator, indices, filler=None):
args.append(filler)
key_fun = separator_with_filler_keyfun
spectra_sorted = sorted(self.spectra,
key=lambda x: key_fun(x, *args))
key=lambda x: key_fun(x, *args))
groups = groupby(spectra_sorted,
lambda x: key_fun(x, *args))
result = OrderedDict()
Expand All @@ -305,7 +305,6 @@ def plot(self, *args, **kwargs):
'''
'''
self.data.plot(*args, **kwargs)
pass
def to_csv(self, *args, **kwargs):
'''
'''
Expand All @@ -315,7 +314,7 @@ def to_csv(self, *args, **kwargs):
def mean(self, append=False, ignore_flagged=True):
'''
'''
data = self._unflagged_data() if ignore_flagged else data
data = self._unflagged_data() if ignore_flagged else self.data
spectrum = Spectrum(name=self.name + '_mean',
measurement=data.mean(axis=1),
measure_type=self.measure_type)
Expand All @@ -324,8 +323,8 @@ def mean(self, append=False, ignore_flagged=True):
return spectrum
def median(self, append=False, ignore_flagged=True):
'''
'''
data = self._unflagged_data() if ignore_flagged else data
'''
data = self._unflagged_data() if ignore_flagged else self.data
spectrum = Spectrum(name=self.name + '_median',
measurement=data.median(axis=1),
measure_type=self.measure_type)
Expand All @@ -334,8 +333,8 @@ def median(self, append=False, ignore_flagged=True):
return spectrum
def min(self, append=False, ignore_flagged=True):
'''
'''
data = self._unflagged_data() if ignore_flagged else data
'''
data = self._unflagged_data() if ignore_flagged else self.data
spectrum = Spectrum(name=self.name + '_min',
measurement=data.min(axis=1),
measure_type=self.measure_type)
Expand All @@ -344,8 +343,8 @@ def min(self, append=False, ignore_flagged=True):
return spectrum
def max(self, append=False, ignore_flagged=True):
'''
'''
data = self._unflagged_data() if ignore_flagged else data
'''
data = self._unflagged_data() if ignore_flagged else self.data
spectrum = Spectrum(name=self.name + '_max',
measurement=data.max(axis=1),
measure_type=self.measure_type)
Expand All @@ -354,12 +353,11 @@ def max(self, append=False, ignore_flagged=True):
return spectrum
def std(self, append=False, ignore_flagged=True):
'''
'''
data = self._unflagged_data() if ignore_flagged else data
'''
data = self._unflagged_data() if ignore_flagged else self.data
spectrum = Spectrum(name=self.name + '_std',
measurement=data.std(axis=1),
measure_type=self.measure_type)
if append:
self.append(spectrum)
return spectrum