From 86b0b80001adc3785452c3c8a48318f32496f1b3 Mon Sep 17 00:00:00 2001 From: AmandaBirmingham Date: Wed, 10 Jul 2024 10:45:08 -0700 Subject: [PATCH] cast surface area & vol cols to float if exist, make more key names public --- pysyndna/__init__.py | 4 ++++ pysyndna/src/calc_cell_counts.py | 1 + 2 files changed, 5 insertions(+) diff --git a/pysyndna/__init__.py b/pysyndna/__init__.py index 16b949b..972219e 100644 --- a/pysyndna/__init__.py +++ b/pysyndna/__init__.py @@ -5,6 +5,8 @@ calc_ogu_cell_counts_per_g_of_sample_for_qiita, \ calc_ogu_cell_counts_per_cm2_of_sample_for_qiita, \ calc_ogu_cell_counts_per_ul_of_sample_for_qiita, \ + SAMPLE_IN_ALIQUOT_MASS_G_KEY, SAMPLE_SURFACE_AREA_CM2_KEY, \ + SAMPLE_VOLUME_UL_KEY, OGU_ID_KEY, OGU_PERCENT_COVERAGE_KEY, \ OGU_CELLS_PER_G_OF_GDNA_KEY, OGU_CELLS_PER_G_OF_SAMPLE_KEY, \ OGU_CELLS_PER_UL_OF_SAMPLE_KEY, OGU_CELLS_PER_CM2_OF_SAMPLE_KEY, \ OGU_ID_KEY, OGU_LEN_IN_BP_KEY, OGU_PERCENT_COVERAGE_KEY, \ @@ -27,6 +29,8 @@ 'calc_copies_of_ogu_orf_ssrna_per_g_sample_from_dfs', 'calc_copies_of_ogu_orf_ssrna_per_g_sample', 'calc_copies_of_ogu_orf_ssrna_per_g_sample_for_qiita', + 'SAMPLE_IN_ALIQUOT_MASS_G_KEY', 'SAMPLE_SURFACE_AREA_CM2_KEY', + 'SAMPLE_VOLUME_UL_KEY', 'OGU_ID_KEY', 'OGU_PERCENT_COVERAGE_KEY', 'OGU_CELLS_PER_G_OF_GDNA_KEY', 'OGU_CELLS_PER_G_OF_SAMPLE_KEY', 'OGU_CELLS_PER_UL_OF_SAMPLE_KEY', diff --git a/pysyndna/src/calc_cell_counts.py b/pysyndna/src/calc_cell_counts.py index 0253df0..d65edfa 100644 --- a/pysyndna/src/calc_cell_counts.py +++ b/pysyndna/src/calc_cell_counts.py @@ -710,6 +710,7 @@ def calc_ogu_cell_counts_biom( # params df to float if they aren't already float_col_names = [ GDNA_CONCENTRATION_NG_UL_KEY, SAMPLE_IN_ALIQUOT_MASS_G_KEY, + SAMPLE_SURFACE_AREA_CM2_KEY, SAMPLE_VOLUME_UL_KEY, ELUTE_VOL_UL_KEY, SEQUENCED_SAMPLE_GDNA_MASS_NG_KEY] working_params_df = cast_cols(working_params_df, float_col_names, True)