Skip to content

Commit 96695cf

Browse files
author
SarahOuologuem
committed
check if columns exist
1 parent 5cb183b commit 96695cf

File tree

1 file changed

+21
-14
lines changed

1 file changed

+21
-14
lines changed

panpipes/funcs/io.py

Lines changed: 21 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -171,16 +171,19 @@ def gen_load_spatial_jobs(caf, mode_dictionary = {}, load_raw=True):
171171
visium_tissue_positions_file = None
172172
visium_scalefactors_file = None
173173
spatial_filetype = caf['spatial_filetype'][nn]
174-
if pd.notna(caf['vpt_cell_by_gene'][nn]):
175-
vpt_cell_by_gene = caf['vpt_cell_by_gene'][nn]
174+
if "vpt_cell_by_gene" in caf[nn].columns:
175+
if pd.notna(caf['vpt_cell_by_gene'][nn]):
176+
vpt_cell_by_gene = caf['vpt_cell_by_gene'][nn]
176177
else:
177178
vpt_cell_by_gene = None
178-
if pd.notna(caf['vpt_cell_metadata'][nn]):
179-
vpt_cell_metadata = caf['vpt_cell_metadata'][nn]
179+
if "vpt_cell_metadata" in caf[nn].columns:
180+
if pd.notna(caf['vpt_cell_metadata'][nn]):
181+
vpt_cell_metadata = caf['vpt_cell_metadata'][nn]
180182
else:
181183
vpt_cell_metadata = None
182-
if pd.notna(caf['vpt_cell_boundaries'][nn]):
183-
vpt_cell_boundaries = caf['vpt_cell_boundaries'][nn]
184+
if "vpt_cell_boundaries" in caf[nn].columns:
185+
if pd.notna(caf['vpt_cell_boundaries'][nn]):
186+
vpt_cell_boundaries = caf['vpt_cell_boundaries'][nn]
184187
else:
185188
vpt_cell_boundaries = None
186189
elif caf['spatial_filetype'][nn]=="visium":
@@ -189,23 +192,27 @@ def gen_load_spatial_jobs(caf, mode_dictionary = {}, load_raw=True):
189192
vpt_cell_boundaries = None
190193
spatial_filetype = caf['spatial_filetype'][nn]
191194
#counts file
192-
if pd.notna(caf["visium_feature_bc_matrix"][nn]):
193-
visium_feature_bc_matrix= caf["visium_feature_bc_matrix"][nn]
195+
if "visium_feature_bc_matrix" in caf[nn].columns:
196+
if pd.notna(caf["visium_feature_bc_matrix"][nn]):
197+
visium_feature_bc_matrix= caf["visium_feature_bc_matrix"][nn]
194198
else:
195199
visium_feature_bc_matrix = None
196200
# fullres image
197-
if pd.notna(caf["visium_fullres_image_file"][nn]):
198-
visium_fullres_image_file= caf["visium_fullres_image_file"][nn]
201+
if "visium_fullres_image_file" in caf[nn].columns:
202+
if pd.notna(caf["visium_fullres_image_file"][nn]):
203+
visium_fullres_image_file= caf["visium_fullres_image_file"][nn]
199204
else:
200205
visium_fullres_image_file = None
201206
# tissue position
202-
if pd.notna(caf["visium_tissue_positions_file"][nn]):
203-
visium_tissue_positions_file= caf["visium_tissue_positions_file"][nn]
207+
if "visium_tissue_positions_file" in caf[nn].columns:
208+
if pd.notna(caf["visium_tissue_positions_file"][nn]):
209+
visium_tissue_positions_file= caf["visium_tissue_positions_file"][nn]
204210
else:
205211
visium_tissue_positions_file = None
206212
# scalefactor
207-
if pd.notna(caf["visium_scalefactors_file"][nn]):
208-
visium_scalefactors_file= caf["visium_scalefactors_file"][nn]
213+
if "visium_scalefactors_file" in caf[nn].columns:
214+
if pd.notna(caf["visium_scalefactors_file"][nn]):
215+
visium_scalefactors_file= caf["visium_scalefactors_file"][nn]
209216
else:
210217
visium_scalefactors_file = None
211218
else:

0 commit comments

Comments
 (0)