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

Jump to bottom

Develop #34

Merged
merged 3 commits into from
Dec 18, 2020
Merged

Develop #34

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
afba95e
MAINT: remove unused kwarg
aburrell Dec 15, 2020
e601817
BUG: default->preprocess per pysat v3.0
rstoneback Dec 17, 2020
991c73e
Merge pull request #32 from pysat/update_list_files
aburrell Dec 18, 2020
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
17 changes: 4 additions & 13 deletions pysatMadrigal/instruments/dmsp_ivm.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,9 +189,7 @@ def clean(self):


def list_files(tag=None, inst_id=None, data_path=None, format_str=None,
supported_tags=supported_tags,
fake_daily_files_from_monthly=False, delimiter=None,
file_type='hdf5'):
supported_tags=supported_tags, delimiter=None, file_type='hdf5'):
"""Return a Pandas Series of every data file for this Instrument

Parameters
Expand All @@ -211,11 +209,6 @@ def list_files(tag=None, inst_id=None, data_path=None, format_str=None,
supported_tags : dict or NoneType
keys are inst_id, each containing a dict keyed by tag
where the values file format template strings. (default=None)
fake_daily_files_from_monthly : bool
Some CDAWeb instrument data files are stored by month, interfering
with pysat's functionality of loading by day. This flag, when true,
appends daily dates to monthly files internally. These dates are
used by load routine in this module to provide data by day.
delimiter : string
Delimiter string upon which files will be split (e.g., '.')
file_type : string
Expand All @@ -233,11 +226,9 @@ def list_files(tag=None, inst_id=None, data_path=None, format_str=None,
supported_tags[inst_id][tag] = supported_tags[inst_id][tag].format(
file_type=file_type)

out = ps_gen.list_files(
tag=tag, inst_id=inst_id, data_path=data_path, format_str=format_str,
supported_tags=supported_tags,
fake_daily_files_from_monthly=fake_daily_files_from_monthly,
delimiter=delimiter)
out = ps_gen.list_files(tag=tag, inst_id=inst_id, data_path=data_path,
format_str=format_str, delimiter=delimiter,
supported_tags=supported_tags)

return out

Expand Down
17 changes: 5 additions & 12 deletions pysatMadrigal/instruments/gnss_tec.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,8 +143,7 @@ def clean(self):


def list_files(tag=None, inst_id=None, data_path=None, format_str=None,
supported_tags=supported_tags,
fake_daily_files_from_monthly=False, two_digit_year_break=99,
supported_tags=supported_tags, two_digit_year_break=99,
delimiter=None, file_type='netCDF4'):
"""Return a Pandas Series of every data file for this Instrument

Expand All @@ -165,11 +164,6 @@ def list_files(tag=None, inst_id=None, data_path=None, format_str=None,
supported_tags : dict or NoneType
keys are inst_id, each containing a dict keyed by tag
where the values file format template strings. (default=None)
fake_daily_files_from_monthly : bool
Some CDAWeb instrument data files are stored by month, interfering
with pysat's functionality of loading by day. This flag, when true,
appends daily dates to monthly files internally. These dates are
used by load routine in this module to provide data by day.
two_digit_year_break : int
If filenames only store two digits for the year, then
'1900' will be added for years >= two_digit_year_break
Expand All @@ -191,11 +185,10 @@ def list_files(tag=None, inst_id=None, data_path=None, format_str=None,
supported_tags[inst_id][tag] = supported_tags[inst_id][tag].format(
file_type=file_type)

out = ps_gen.list_files(
tag=tag, inst_id=inst_id, data_path=data_path, format_str=format_str,
supported_tags=supported_tags,
fake_daily_files_from_monthly=fake_daily_files_from_monthly,
two_digit_year_break=two_digit_year_break, delimiter=delimiter)
out = ps_gen.list_files(tag=tag, inst_id=inst_id, data_path=data_path,
format_str=format_str, delimiter=delimiter,
supported_tags=supported_tags,
two_digit_year_break=two_digit_year_break)

return out

Expand Down
19 changes: 5 additions & 14 deletions pysatMadrigal/instruments/jro_isr.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@
# To ensure this function is always applied first, we set the filter
# function as the default function for (JRO).
# Default function is run first by the nanokernel on every load call.
default = mad_meth.filter_data_single_date
preprocess = mad_meth.filter_data_single_date


def init(self):
Expand Down Expand Up @@ -170,9 +170,7 @@ def clean(self):


def list_files(tag='', inst_id='', data_path=None, format_str=None,
supported_tags=supported_tags,
fake_daily_files_from_monthly=False,
delimiter=None, file_type='hdf5'):
supported_tags=supported_tags, delimiter=None, file_type='hdf5'):
"""Return a Pandas Series of every data file for this Instrument

Parameters
Expand All @@ -192,11 +190,6 @@ def list_files(tag='', inst_id='', data_path=None, format_str=None,
supported_tags : dict or NoneType
keys are inst_id, each containing a dict keyed by tag
where the values file format template strings. (default=None)
fake_daily_files_from_monthly : bool
Some CDAWeb instrument data files are stored by month, interfering
with pysat's functionality of loading by day. This flag, when true,
appends daily dates to monthly files internally. These dates are
used by load routine in this module to provide data by day.
delimiter : string
Delimiter string upon which files will be split (e.g., '.')
file_type : string
Expand All @@ -214,11 +207,9 @@ def list_files(tag='', inst_id='', data_path=None, format_str=None,
supported_tags[inst_id][tag] = supported_tags[inst_id][tag].format(
file_type=file_type)

out = ps_gen.list_files(
tag=tag, inst_id=inst_id, data_path=data_path, format_str=format_str,
supported_tags=supported_tags,
fake_daily_files_from_monthly=fake_daily_files_from_monthly,
delimiter=delimiter)
out = ps_gen.list_files(tag=tag, inst_id=inst_id, data_path=data_path,
format_str=format_str,
supported_tags=supported_tags, delimiter=delimiter)

return out

Expand Down