diff --git a/sensospot_data/columns.py b/sensospot_data/columns.py index b35ade8..9c251ee 100644 --- a/sensospot_data/columns.py +++ b/sensospot_data/columns.py @@ -49,7 +49,7 @@ RAW_DATA_COLUMN_SET = { COL_NAME_SPOT_STDDEV, COL_NAME_BKG_SUM, COL_NAME_SPOT_SUM, - COL_NAME_BKG_AREA , + COL_NAME_BKG_AREA, COL_NAME_SPOT_AREA, COL_NAME_SPOT_SAT, COL_NAME_POS_NOM_X, @@ -61,7 +61,7 @@ RAW_DATA_COLUMN_SET = { COL_NAME_WELL_COLUMN, COL_NAME_PARAMETERS_CHANNEL, COL_NAME_PARAMETERS_TIME, - COL_NAME_EXPOSURE_ID + COL_NAME_EXPOSURE_ID, } diff --git a/sensospot_data/parser.py b/sensospot_data/parser.py index b5847c3..6c4ed61 100755 --- a/sensospot_data/parser.py +++ b/sensospot_data/parser.py @@ -13,10 +13,10 @@ from .columns import ( COL_NAME_POS_ID, COL_NAME_WELL_ROW, COL_NAME_SPOT_FOUND, + RAW_DATA_COLUMN_SET, COL_NAME_EXPOSURE_ID, COL_NAME_WELL_COLUMN, COL_NAME_SPOT_DIAMETER, - RAW_DATA_COLUMN_SET ) from .parameters import add_optional_measurement_parameters @@ -80,7 +80,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=COLUMNS_RENAME_MAP) + renamed = data_frame.rename(columns=COLUMNS_RENAME_MAP) surplus_columns = set(renamed.columns) - RAW_DATA_COLUMN_SET return renamed.drop(columns=surplus_columns)