5505-public/dima
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Rename variable actris_level --> data_level

Browse Source
This commit is contained in:
florez_j
2025-09-19 18:55:31 +02:00
parent d43ead5f6c
commit 11b9e35526
4 changed files with 5 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
input_files/campaignDescriptor1_LI.yaml
View File

@@ -13,7 +13,7 @@ group_id: '5505'
experiment: 'kinetic_flowtube_study' # 'beamtime', 'smog_chamber_study' experiment: 'kinetic_flowtube_study' # 'beamtime', 'smog_chamber_study'
dataset_startdate: dataset_startdate:
dataset_enddate: dataset_enddate:
actris_level: '0' data_level: 0
# Instrument folders containing raw data from the campaign # Instrument folders containing raw data from the campaign
instrument_datafolder: instrument_datafolder:

2
input_files/campaignDescriptor2_TBR.yaml
View File

@@ -13,7 +13,7 @@ group_id: '5505'
experiment: 'beamtime' # beamtime, smog_chamber, lab_experiment experiment: 'beamtime' # beamtime, smog_chamber, lab_experiment
dataset_startdate: '2023-09-22' dataset_startdate: '2023-09-22'
dataset_enddate: '2023-09-25' dataset_enddate: '2023-09-25'
actris_level: '0' data_level: 0
institution : "PSI" institution : "PSI"
filename_format : "institution,experiment,contact" filename_format : "institution,experiment,contact"

2
input_files/campaignDescriptor3_NG.yaml
View File

@@ -13,7 +13,7 @@ group_id: '5505'
experiment: 'smog_chamber_study' # beamtime, smog_chamber, lab_experiment experiment: 'smog_chamber_study' # beamtime, smog_chamber, lab_experiment
dataset_startdate: dataset_startdate:
dataset_enddate: dataset_enddate:
actris_level: '0' data_level: 0
# Instrument folders containing raw data from the campaign # Instrument folders containing raw data from the campaign
instrument_datafolder: instrument_datafolder:

9
pipelines/data_integration.py
View File

@@ -18,15 +18,10 @@ if dimaPath not in sys.path: # Avoid duplicate entries
import yaml import yaml
import logging import logging
from datetime import datetime from datetime import datetime
<<<<<<< HEAD
import shutil import shutil
=======
# Importing chain class from itertools # Importing chain class from itertools
from itertools import chain from itertools import chain
import shutil import shutil
>>>>>>> 978101f9c2d9b210a22749b8191330c6d8a97959
# Import DIMA modules # Import DIMA modules
try: try:
from dima.src import hdf5_writer as hdf5_lib from dima.src import hdf5_writer as hdf5_lib
@@ -63,7 +58,7 @@ def load_config_and_setup_logging(yaml_config_file_path, log_dir):
# Define required keys # Define required keys
required_keys = [ required_keys = [
'experiment', 'contact', 'input_file_directory', 'output_file_directory', 'experiment', 'contact', 'input_file_directory', 'output_file_directory',
'instrument_datafolder', 'project', 'actris_level' 'instrument_datafolder', 'project', 'data_level'
] ]
# Supported integration modes # Supported integration modes
@@ -264,7 +259,7 @@ def run_pipeline(path_to_config_yamlFile, log_dir='logs/'):
select_dir_keywords = config_dict['instrument_datafolder'] select_dir_keywords = config_dict['instrument_datafolder']
# Define root folder metadata dictionary # Define root folder metadata dictionary
root_metadata_dict = {key : config_dict[key] for key in ['project', 'experiment', 'contact', 'actris_level']} root_metadata_dict = {key : config_dict[key] for key in ['project', 'experiment', 'contact', 'data_level']}
# Get dataset start and end dates # Get dataset start and end dates
dataset_startdate = config_dict['dataset_startdate'] dataset_startdate = config_dict['dataset_startdate']