Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
JOSSOUD Olivier
CFA Tools
Commits
79de0f9c
Commit
79de0f9c
authored
Feb 22, 2022
by
JOSSOUD Olivier
Browse files
Flow. Add dataset name in iceblocks.csv filename.
parent
c173ca07
Pipeline
#162945
passed with stages
in 52 seconds
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
4 deletions
+4
-4
cfatools/processor/flow.py
cfatools/processor/flow.py
+3
-3
cfatools/requirements_pkg.txt
cfatools/requirements_pkg.txt
+1
-1
No files found.
cfatools/processor/flow.py
View file @
79de0f9c
...
...
@@ -248,8 +248,8 @@ def get_datasets_data(dataset: DatasetReader, retrieve_iceblocks_from_processed_
Dataset whose data should be retrieved.
retrieve_iceblocks_from_processed_csv: bool, optional
If `True`, the information about the iceblock sequence will be read from a processed file
(`processed/iceblocks.csv`; if it exists, otherwise it will be created). If `False`, the information will be
re-processed from `
yyyymmdd_
[dataset_name]_ICBKCTRL_instant.log` file. Default is `True`.
(`processed/
[dataset_name]_
iceblocks.csv`; if it exists, otherwise it will be created). If `False`, the information will be
re-processed from `[dataset_name]_ICBKCTRL_instant.log` file. Default is `True`.
Returns
-------
...
...
@@ -262,7 +262,7 @@ def get_datasets_data(dataset: DatasetReader, retrieve_iceblocks_from_processed_
# Iceblock
processed_dirname
=
os
.
path
.
join
(
dataset
.
dataset_path
,
"processed"
)
iceblock_filename
=
os
.
path
.
join
(
processed_dirname
,
"
iceblocks.csv"
)
iceblock_filename
=
os
.
path
.
join
(
processed_dirname
,
dataset
.
dataset_name
+
"_
iceblocks.csv"
)
if
retrieve_iceblocks_from_processed_csv
and
os
.
path
.
exists
(
iceblock_filename
):
iceblock_df
=
pd
.
read_csv
(
iceblock_filename
,
parse_dates
=
[
"datetime_start"
,
"datetime_end"
,
"datetime_stacked"
])
else
:
...
...
cfatools/requirements_pkg.txt
View file @
79de0f9c
...
...
@@ -2,6 +2,6 @@ configobj~=5.0
csaps~=0.7
matplotlib~=3.3 # Linux package python3-tk must be also installed
numpy~=1.18
pandas~=1.
2
pandas~=1.
3
pandarallel~=1.5
xmltodict~=0.12
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment