@@ -40,25 +40,20 @@ def preprocess_data(adata, params):
40
40
raise ValueError (f'Invalid data layer: { params .data_layer } , please check the input data.' )
41
41
42
42
if params .data_layer in ['count' , 'counts' ]:
43
-
43
+
44
+ adata .X = adata .layers [params .data_layer ].copy ()
45
+ logger .warning ()
46
+ # HVGs based on count
47
+ sc .pp .highly_variable_genes (adata ,flavor = "seurat_v3" ,n_top_genes = params .feat_cell )
48
+ # Normalize the data
44
49
sc .pp .normalize_total (adata , target_sum = 1e4 )
45
50
sc .pp .log1p (adata )
46
51
47
- # Identify highly variable genes
48
- sc .pp .highly_variable_genes (
49
- adata ,
50
- flavor = "seurat_v3" ,
51
- n_top_genes = params .feat_cell ,
52
- layer = params .data_layer ,
53
- )
54
-
55
52
elif params .data_layer in adata .layers .keys ():
56
53
logger .info (f'Using { params .data_layer } data...' )
57
- sc .pp .highly_variable_genes (
58
- adata ,
59
- flavor = "seurat" ,
60
- n_top_genes = params .feat_cell ,
61
- )
54
+ adata .X = adata .layers [params .data_layer ].copy ()
55
+ # HVGs based on normalzied data
56
+ sc .pp .highly_variable_genes (adata ,flavor = "seurat" ,n_top_genes = params .feat_cell )
62
57
63
58
return adata
64
59
@@ -68,9 +63,7 @@ def __init__(self, adata, args: FindLatentRepresentationsConfig):
68
63
self .params = args
69
64
70
65
self .expression_array = adata [:, adata .var .highly_variable ].X .copy ()
71
-
72
- if self .params .data_layer in ['count' , 'counts' ]:
73
- self .expression_array = sc .pp .scale (self .expression_array , max_value = 10 )
66
+ self .expression_array = sc .pp .scale (self .expression_array , max_value = 10 )
74
67
75
68
# Construct the neighboring graph
76
69
self .graph_dict = construct_adjacency_matrix (adata , self .params )
0 commit comments