Skip to content

Commit d274496

Browse files
committed
tracking with unraw data in option
1 parent 13e1e64 commit d274496

File tree

1 file changed

+10
-6
lines changed

1 file changed

+10
-6
lines changed

src/scripts/EddyTracking

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,9 @@ def usage():
103103
parser.add_argument('--zarr',
104104
action='store_true',
105105
help='Output will be wrote in zarr')
106+
parser.add_argument('--unraw',
107+
action='store_true',
108+
help='Load unraw data')
106109
parser.add_argument('--blank_period',
107110
type=int,
108111
default=0,
@@ -114,12 +117,13 @@ def usage():
114117
config = yaml_load(stream)
115118
if args.correspondance_in is not None and not exists(args.correspondance_in):
116119
args.correspondance_in = None
117-
return config, args.save_correspondance_and_stop, args.correspondance_in, args.correspondance_out, args.blank_period, args.zarr
120+
return config, args.save_correspondance_and_stop, args.correspondance_in, args.correspondance_out,\
121+
args.blank_period, args.zarr, not args.unraw
118122

119123

120124
if __name__ == '__main__':
121-
CONFIG, SAVE_STOP, CORRESPONDANCES_IN, CORRESPONDANCES_OUT, BLANK_PERIOD, ZARR = usage()
122-
125+
CONFIG, SAVE_STOP, CORRESPONDANCES_IN, CORRESPONDANCES_OUT, BLANK_PERIOD, ZARR, RAW = usage()
126+
print(RAW)
123127
# Create output directory
124128
SAVE_DIR = CONFIG['PATHS'].get('SAVE_DIR', None)
125129
if SAVE_DIR is not None and not exists(SAVE_DIR):
@@ -189,15 +193,15 @@ if __name__ == '__main__':
189193
logger.info('Longer track saved have %d obs', CORRESPONDANCES.nb_obs_by_tracks.max())
190194
logger.info('The mean length is %d observations before filtering', CORRESPONDANCES.nb_obs_by_tracks.mean())
191195

192-
CORRESPONDANCES.get_unused_data().write_file(path=SAVE_DIR, filename='%(path)s/%(sign_type)s_untracked.nc', zarr_flag=ZARR)
196+
CORRESPONDANCES.get_unused_data(raw_data=RAW).write_file(path=SAVE_DIR, filename='%(path)s/%(sign_type)s_untracked.nc', zarr_flag=ZARR)
193197

194198
SHORT_CORRESPONDANCES = CORRESPONDANCES._copy()
195199
SHORT_CORRESPONDANCES.shorter_than(size_max=NB_OBS_MIN)
196200

197201
CORRESPONDANCES.longer_than(size_min=NB_OBS_MIN)
198202

199-
FINAL_EDDIES = CORRESPONDANCES.merge()
200-
SHORT_TRACK = SHORT_CORRESPONDANCES.merge()
203+
FINAL_EDDIES = CORRESPONDANCES.merge(raw_data=RAW)
204+
SHORT_TRACK = SHORT_CORRESPONDANCES.merge(raw_data=RAW)
201205

202206
# We flag obs
203207
if CORRESPONDANCES.virtual:

0 commit comments

Comments
 (0)