Skip to content
Snippets Groups Projects
Commit 15c42cef authored by Maaijke Mevius's avatar Maaijke Mevius
Browse files

small bugfixes

parent 7194fe45
No related branches found
No related tags found
No related merge requests found
Pipeline #97184 passed
...@@ -164,7 +164,7 @@ def main(): ...@@ -164,7 +164,7 @@ def main():
logging.info('creating task for sas_id %s - dataset %s', sas_id, index) logging.info('creating task for sas_id %s - dataset %s', sas_id, index)
payload = create_payload_from_entry(line, args.filter, args.workflow, args.averaging_window, args.stations) payload = create_payload_from_entry(line, args.filter, args.workflow, args.averaging_window, args.stations)
atdb_interface.submit_task(payload) atdb_interface.submit_task(payload)
break #only one dataset
if __name__ == '__main__': if __name__ == '__main__':
main() main()
#!/home/mevius/bin/python3.8 #!/usr/bin/python3
from argparse import ArgumentParser from argparse import ArgumentParser
import os import os
import logging import logging
......
...@@ -109,6 +109,8 @@ class SmartJsonEncoder(json.JSONEncoder): ...@@ -109,6 +109,8 @@ class SmartJsonEncoder(json.JSONEncoder):
try: try:
if isinstance(o, numpy.int32): if isinstance(o, numpy.int32):
return int(o) return int(o)
elif isinstance(o, numpy.int64):
return int(o)
elif isinstance(o, numpy.ndarray): elif isinstance(o, numpy.ndarray):
return o.tolist() return o.tolist()
elif isinstance(o, numpy.uint64): elif isinstance(o, numpy.uint64):
...@@ -174,6 +176,8 @@ def extract_root_metadata(dataset): ...@@ -174,6 +176,8 @@ def extract_root_metadata(dataset):
if not 'TARGET' in list(metadata.keys()): if not 'TARGET' in list(metadata.keys()):
if 'TARGETS' in list(metadata.keys()): if 'TARGETS' in list(metadata.keys()):
metadata['TARGET']=metadata['TARGETS'][-1].split("_")[0] metadata['TARGET']=metadata['TARGETS'][-1].split("_")[0]
if type(metadata['TARGET']) == list:
metadata['TARGET']=metadata['TARGET'][-1].split("_")[0]
return metadata return metadata
...@@ -284,7 +288,6 @@ def extract_metadata(dataset): ...@@ -284,7 +288,6 @@ def extract_metadata(dataset):
else: else:
continue continue
metadata_per_dynspec[dynspec].update(root_metadata) metadata_per_dynspec[dynspec].update(root_metadata)
return metadata_per_dynspec return metadata_per_dynspec
...@@ -698,10 +701,13 @@ def split_samples(dynspec_name, ...@@ -698,10 +701,13 @@ def split_samples(dynspec_name,
:return: :return:
""" """
if 'INCREMENT' in metadata['TIME'].keys():
if isinstance(metadata['TIME']['INCREMENT'], list): if isinstance(metadata['TIME']['INCREMENT'], list):
time_delta, *_ = metadata['TIME']['INCREMENT'] time_delta, *_ = metadata['TIME']['INCREMENT']
else: else:
time_delta = metadata['TIME']['INCREMENT'] time_delta = metadata['TIME']['INCREMENT']
else:
time_delta = metadata['SAMPLING_TIME']
if 'DYNSPEC_START_UTC' in metadata: if 'DYNSPEC_START_UTC' in metadata:
obs_start_time = parse_datetime_str(metadata['DYNSPEC_START_UTC']) obs_start_time = parse_datetime_str(metadata['DYNSPEC_START_UTC'])
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment