From 6ee257bc1e9fdc7557c8d7bde5f46b2faa69b39e Mon Sep 17 00:00:00 2001 From: Holger Frey Date: Tue, 18 Jan 2022 11:09:52 +0100 Subject: [PATCH] changed name of RAW_DATA_COLUMN_SET to PARSED_DATA_COLUMN_SET --- sensospot_data/columns.py | 2 +- sensospot_data/parser.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/sensospot_data/columns.py b/sensospot_data/columns.py index b41d608..6f3289a 100644 --- a/sensospot_data/columns.py +++ b/sensospot_data/columns.py @@ -40,7 +40,7 @@ META_DATA_EXPOSURE_ID = "Exposure.Id" META_DATA_PARAMETERS_CHANNEL = "Parameters.Channel" META_DATA_PARAMETERS_TIME = "Parameters.Time" -RAW_DATA_COLUMN_SET = { +PARSED_DATA_COLUMN_SET = { RAW_DATA_POS_X, RAW_DATA_POS_Y, RAW_DATA_BKG_MEAN, diff --git a/sensospot_data/parser.py b/sensospot_data/parser.py index d7773d7..edd05c0 100755 --- a/sensospot_data/parser.py +++ b/sensospot_data/parser.py @@ -13,7 +13,7 @@ from .columns import ( RAW_DATA_POS_ID, META_DATA_WELL_ROW, META_DATA_WELL_NAME, - RAW_DATA_COLUMN_SET, + PARSED_DATA_COLUMN_SET, META_DATA_EXPOSURE_ID, META_DATA_WELL_COLUMN, RAW_DATA_NORMALIZATION_MAP, @@ -66,7 +66,7 @@ def _extract_measurement_info(data_file): def _cleanup_data_columns(data_frame): """ renames some data columns for consistency and drops unused columns """ renamed = data_frame.rename(columns=RAW_DATA_COLUMNS_RENAME_MAP) - surplus_columns = set(renamed.columns) - RAW_DATA_COLUMN_SET + surplus_columns = set(renamed.columns) - PARSED_DATA_COLUMN_SET return renamed.drop(columns=surplus_columns)