Skip to content

Commit 39d3c57

Browse files
author
SarahOuologuem
committed
fix bug
1 parent 4d873f2 commit 39d3c57

File tree

1 file changed

+8
-15
lines changed

1 file changed

+8
-15
lines changed

panpipes/funcs/io.py

Lines changed: 8 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -171,22 +171,23 @@ 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+
vpt_cell_by_gene = None
175+
vpt_cell_metadata = None
176+
vpt_cell_boundaries = None
174177
if "vpt_cell_by_gene" in caf.columns:
175178
if pd.notna(caf['vpt_cell_by_gene'][nn]):
176179
vpt_cell_by_gene = caf['vpt_cell_by_gene'][nn]
177-
else:
178-
vpt_cell_by_gene = None
179180
if "vpt_cell_metadata" in caf.columns:
180181
if pd.notna(caf['vpt_cell_metadata'][nn]):
181182
vpt_cell_metadata = caf['vpt_cell_metadata'][nn]
182-
else:
183-
vpt_cell_metadata = None
184183
if "vpt_cell_boundaries" in caf.columns:
185184
if pd.notna(caf['vpt_cell_boundaries'][nn]):
186185
vpt_cell_boundaries = caf['vpt_cell_boundaries'][nn]
187-
else:
188-
vpt_cell_boundaries = None
189186
elif caf['spatial_filetype'][nn]=="visium":
187+
visium_feature_bc_matrix = None
188+
visium_fullres_image_file = None
189+
visium_tissue_positions_file = None
190+
visium_scalefactors_file = None
190191
vpt_cell_by_gene = None
191192
vpt_cell_metadata = None
192193
vpt_cell_boundaries = None
@@ -195,26 +196,18 @@ def gen_load_spatial_jobs(caf, mode_dictionary = {}, load_raw=True):
195196
if "visium_feature_bc_matrix" in caf.columns:
196197
if pd.notna(caf["visium_feature_bc_matrix"][nn]):
197198
visium_feature_bc_matrix= caf["visium_feature_bc_matrix"][nn]
198-
else:
199-
visium_feature_bc_matrix = None
200199
# fullres image
201200
if "visium_fullres_image_file" in caf.columns:
202201
if pd.notna(caf["visium_fullres_image_file"][nn]):
203202
visium_fullres_image_file= caf["visium_fullres_image_file"][nn]
204-
else:
205-
visium_fullres_image_file = None
206203
# tissue position
207204
if "visium_tissue_positions_file" in caf.columns:
208205
if pd.notna(caf["visium_tissue_positions_file"][nn]):
209206
visium_tissue_positions_file= caf["visium_tissue_positions_file"][nn]
210-
else:
211-
visium_tissue_positions_file = None
212207
# scalefactor
213208
if "visium_scalefactors_file" in caf.columns:
214209
if pd.notna(caf["visium_scalefactors_file"][nn]):
215-
visium_scalefactors_file= caf["visium_scalefactors_file"][nn]
216-
else:
217-
visium_scalefactors_file = None
210+
visium_scalefactors_file= caf["visium_scalefactors_file"][nn]
218211
else:
219212
spatial_path= None
220213
spatial_filetype = None

0 commit comments

Comments
 (0)