@@ -30,11 +30,10 @@ def browse_dataset_in(
30
30
sub_sampling_step = 1 ,
31
31
files = None ,
32
32
):
33
+ pattern_regexp = re_compile (".*/" + date_regexp )
33
34
if files is not None :
34
- pattern_regexp = re_compile (".*/" + date_regexp )
35
35
filenames = bytes_ (files )
36
36
else :
37
- pattern_regexp = re_compile (".*/" + date_regexp )
38
37
full_path = join_path (data_dir , files_model )
39
38
logger .info ("Search files : %s" , full_path )
40
39
filenames = bytes_ (glob (full_path ))
@@ -148,24 +147,21 @@ if __name__ == "__main__":
148
147
if SAVE_DIR is not None and not exists (SAVE_DIR ):
149
148
mkdir (SAVE_DIR )
150
149
151
- YAML_CORRESPONDANCES_IN = CONFIG ["PATHS" ].get ("CORRESPONDANCES_IN" , None )
152
150
YAML_CORRESPONDANCES_OUT = CONFIG ["PATHS" ].get ("CORRESPONDANCES_OUT" , None )
153
151
if CORRESPONDANCES_IN is None :
154
- CORRESPONDANCES_IN = YAML_CORRESPONDANCES_IN
152
+ CORRESPONDANCES_IN = CONFIG [ "PATHS" ]. get ( "CORRESPONDANCES_IN" , None )
155
153
if CORRESPONDANCES_OUT is None :
156
154
CORRESPONDANCES_OUT = YAML_CORRESPONDANCES_OUT
157
155
if YAML_CORRESPONDANCES_OUT is None and CORRESPONDANCES_OUT is None :
158
156
CORRESPONDANCES_OUT = "{path}/{sign_type}_correspondances.nc"
159
157
158
+ CLASS = None
160
159
if "CLASS" in CONFIG :
160
+ CLASSNAME = CONFIG ["CLASS" ]["CLASS" ]
161
161
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 ,
166
164
)
167
- else :
168
- CLASS = None
169
165
170
166
NB_VIRTUAL_OBS_MAX_BY_SEGMENT = int (CONFIG .get ("VIRTUAL_LENGTH_MAX" , 0 ))
171
167
@@ -205,11 +201,10 @@ if __name__ == "__main__":
205
201
class_method = CLASS ,
206
202
previous_correspondance = CORRESPONDANCES_IN ,
207
203
)
208
-
209
204
CORRESPONDANCES .track ()
210
205
logger .info ("Track finish" )
211
- logger .info ("Start merging" )
212
206
207
+ logger .info ("Start merging" )
213
208
DATE_START , DATE_STOP = CORRESPONDANCES .period
214
209
DICT_COMPLETION = dict (
215
210
date_start = DATE_START ,
0 commit comments