diff --git a/pyaerocom/config.py b/pyaerocom/config.py index 23e86a952..e5de58112 100644 --- a/pyaerocom/config.py +++ b/pyaerocom/config.py @@ -1,4 +1,4 @@ -import getpass +reimport getpass import logging import os from configparser import ConfigParser diff --git a/pyaerocom/io/readgridded.py b/pyaerocom/io/readgridded.py index b33c02692..40c2bd1b6 100755 --- a/pyaerocom/io/readgridded.py +++ b/pyaerocom/io/readgridded.py @@ -170,7 +170,6 @@ class specifying details of the file naming convention for the model VERT_ALT = {"Surface": "ModelLevel"} def __init__(self, data_id=None, data_dir=None, file_convention="aerocom3"): - self._data_dir = None #: data_id of gridded dataset @@ -444,7 +443,6 @@ def _check_var_match_pattern(self, var_name): if fnmatch.fnmatch(var_name, pattern): vars_required = self.AUX_REQUIRES[pattern] for addvar in vars_required: - if not "*" in addvar: vars_found.append(addvar) else: @@ -696,6 +694,7 @@ def _update_file_convention(self, files): FileNotFoundError if none of the input files matches a registered convention. """ + breakpoint() for file in files: try: self.file_convention.from_file(os.path.basename(file)) @@ -1663,7 +1662,6 @@ def read_var( ) if constraints is not None: - if isinstance(constraints, dict): constraints = [constraints] for constraint in constraints: diff --git a/pyaerocom/plugins/tropomi/reader.py b/pyaerocom/plugins/tropomi/reader.py index 555253901..973685ac2 100644 --- a/pyaerocom/plugins/tropomi/reader.py +++ b/pyaerocom/plugins/tropomi/reader.py @@ -10,7 +10,7 @@ import xarray as xr from pyaerocom import const -from pyaerocom.io.readgridded import ReadGriddedBase +from pyaerocom.io.readgridded import ReadGridded from pyaerocom.stationdata import StationData from pyaerocom.griddeddata import GriddedData @@ -35,7 +35,7 @@ ) -class ReadTropomiL3(ReadGriddedData): +class ReadTropomiL3(ReadGridded): """ Class to read processed TROPOMI data (homebrewed L3 data) for use in SESAM. e.g., Tropospheric vertical column of nitrogen dioxide @@ -50,4 +50,4 @@ def __init__(self, data_id=None, data_dir=None): if data_dir is None: data_dir = TMP_DATA_DIR # raise Exception("Need a data_dir") - super.__init__() + super().__init__(data_dir=data_dir)