diff --git a/modules/aeolus/datasource.py b/modules/aeolus/datasource.py index 2e856466ba6f9b3dd81812fcce0fb458adf01d49..9b4f2566b7f58d41df1fcad3cea901d591d38030 100644 --- a/modules/aeolus/datasource.py +++ b/modules/aeolus/datasource.py @@ -133,8 +133,8 @@ class Files: class GOESL1B(Files): - def __init__(self, files_path, band='14'): - super().__init__(files_path, 10, 'OR_ABI-L1b-RadC-M*C'+band+'*.nc') + def __init__(self, files_path, band='14', pattern='OR_ABI-L1b-RadC-M*C14'+'*.nc'): + super().__init__(files_path, 10, pattern) def get_datetime(self, pathname): filename = os.path.split(pathname)[1] @@ -146,8 +146,8 @@ class GOESL1B(Files): # GOES-16, CONUS. TODO: Generalize to G-16 and FD, MESO class CLAVRx(Files): - def __init__(self, files_path): - super().__init__(files_path, 10, 'clavrx_OR_ABI-L1b*.level2.nc') + def __init__(self, files_path, pattern='clavrx_OR_ABI-L1b*.level2.nc'): + super().__init__(files_path, 10, pattern) self.params = get_parameters_clavrx() def get_datetime(self, pathname): @@ -166,8 +166,8 @@ class CLAVRx(Files): # filename must begin with 'clavrx_H08_YYYYMMDD_HHMM' class CLAVRx_H08(Files): - def __init__(self, files_path): - super().__init__(files_path, 10, 'clavrx_H08*.level2.nc') + def __init__(self, files_path, pattern='clavrx_H08*.level2.nc'): + super().__init__(files_path, 10, pattern) self.params = get_parameters_clavrx() def get_datetime(self, pathname): @@ -184,8 +184,8 @@ class CLAVRx_H08(Files): class CLAVRx_CALIPSO(Files): - def __init__(self, files_path): - super().__init__(files_path, 10, '*_06kmCLay.matchup.calipso.h5') + def __init__(self, files_path, pattern='*_06kmCLay.matchup.calipso.h5'): + super().__init__(files_path, 10, pattern) self.params = ['cld_opd_acha', 'cld_reff_acha', 'cld_temp_acha', 'cld_press_acha', 'cld_height_acha'] # self.params = get_parameters_clavrx() @@ -227,8 +227,8 @@ class CLAVRx_VIIRS(Files): class RAOBfiles(Files): - def __init__(self, files_path, file_time_span=10): - super().__init__(files_path, file_time_span, 'raob_soundings*.cdf') + def __init__(self, files_path, file_time_span=10, pattern='raob_soundings*.cdf'): + super().__init__(files_path, file_time_span, pattern) def get_datetime(self, pathname): filename = os.path.split(pathname)[1] @@ -238,8 +238,8 @@ class RAOBfiles(Files): class GFSfiles(Files): - def __init__(self, files_path): - super().__init__(files_path, 10, 'gfs*.h5') + def __init__(self, files_path, pattern='gfs*.h5'): + super().__init__(files_path, 10, pattern) def get_datetime(self, pathname): filename = os.path.split(pathname)[1]