Commit 8f4b003 1 parent 4207377 commit 8f4b003 Copy full SHA for 8f4b003
File tree 1 file changed +6
-6
lines changed
1 file changed +6
-6
lines changed Original file line number Diff line number Diff line change @@ -35,21 +35,21 @@ def read_rFCS(file_path):
35
35
''' )
36
36
fcs_columns = globalenv ["marker_names" ](raw_FCS )
37
37
df_file = globalenv ["FF2dframe" ](raw_FCS )
38
- if not isinstance (fcs_columns ,np .ndarray ):
38
+ if not isinstance (fcs_columns ,np .ndarray ): #Error checking for StrVector output from rpy2
39
39
print ("CALLUM'S ERROR. CONTACT @FerranC96" )
40
40
print (type (fcs_columns ),": " , fcs_columns )
41
+ columns_list = []
41
42
for i in fcs_columns :
42
43
print (i )
43
- bad_flag = 1
44
+ columns_list .append (i )
45
+ fcs_columns = columns_list
46
+ else :
47
+ fcs_columns = fcs_columns .tolist ()
44
48
if not isinstance (df_file ,pd .core .frame .DataFrame ):
45
49
print ("CALLUM'S ERROR. CONTACT @FerranC96" )
46
50
print (type (df_file ),": " , df_file )
47
51
for i in df_file :
48
52
print (i )
49
- bad_flag = 1
50
- if bad_flag == 1 :
51
- sys .exit ("Bye!" )
52
- fcs_columns = fcs_columns .tolist ()
53
53
original_columns = df_file .columns .values .tolist ()
54
54
filtered_columns = []
55
55
try :
You can’t perform that action at this time.
0 commit comments