Skip to content

Commit fead948

Browse files
committed
quick formating
1 parent 8a32c29 commit fead948

File tree

1 file changed

+7
-12
lines changed

1 file changed

+7
-12
lines changed

src/scripts/EddyTracking

Lines changed: 7 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,10 @@ def browse_dataset_in(
3030
sub_sampling_step=1,
3131
files=None,
3232
):
33+
pattern_regexp = re_compile(".*/" + date_regexp)
3334
if files is not None:
34-
pattern_regexp = re_compile(".*/" + date_regexp)
3535
filenames = bytes_(files)
3636
else:
37-
pattern_regexp = re_compile(".*/" + date_regexp)
3837
full_path = join_path(data_dir, files_model)
3938
logger.info("Search files : %s", full_path)
4039
filenames = bytes_(glob(full_path))
@@ -148,24 +147,21 @@ if __name__ == "__main__":
148147
if SAVE_DIR is not None and not exists(SAVE_DIR):
149148
mkdir(SAVE_DIR)
150149

151-
YAML_CORRESPONDANCES_IN = CONFIG["PATHS"].get("CORRESPONDANCES_IN", None)
152150
YAML_CORRESPONDANCES_OUT = CONFIG["PATHS"].get("CORRESPONDANCES_OUT", None)
153151
if CORRESPONDANCES_IN is None:
154-
CORRESPONDANCES_IN = YAML_CORRESPONDANCES_IN
152+
CORRESPONDANCES_IN = CONFIG["PATHS"].get("CORRESPONDANCES_IN", None)
155153
if CORRESPONDANCES_OUT is None:
156154
CORRESPONDANCES_OUT = YAML_CORRESPONDANCES_OUT
157155
if YAML_CORRESPONDANCES_OUT is None and CORRESPONDANCES_OUT is None:
158156
CORRESPONDANCES_OUT = "{path}/{sign_type}_correspondances.nc"
159157

158+
CLASS = None
160159
if "CLASS" in CONFIG:
160+
CLASSNAME = CONFIG["CLASS"]["CLASS"]
161161
CLASS = getattr(
162-
__import__(
163-
CONFIG["CLASS"]["MODULE"], globals(), locals(), CONFIG["CLASS"]["CLASS"]
164-
),
165-
CONFIG["CLASS"]["CLASS"],
162+
__import__(CONFIG["CLASS"]["MODULE"], globals(), locals(), CLASSNAME),
163+
CLASSNAME,
166164
)
167-
else:
168-
CLASS = None
169165

170166
NB_VIRTUAL_OBS_MAX_BY_SEGMENT = int(CONFIG.get("VIRTUAL_LENGTH_MAX", 0))
171167

@@ -205,11 +201,10 @@ if __name__ == "__main__":
205201
class_method=CLASS,
206202
previous_correspondance=CORRESPONDANCES_IN,
207203
)
208-
209204
CORRESPONDANCES.track()
210205
logger.info("Track finish")
211-
logger.info("Start merging")
212206

207+
logger.info("Start merging")
213208
DATE_START, DATE_STOP = CORRESPONDANCES.period
214209
DICT_COMPLETION = dict(
215210
date_start=DATE_START,

0 commit comments

Comments
 (0)