Skip to content

Commit 125d1e7

Browse files
committed
clean form
1 parent f761b2c commit 125d1e7

File tree

1 file changed

+13
-11
lines changed

1 file changed

+13
-11
lines changed

content/analyze.py

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -191,11 +191,11 @@
191191

192192
with cols[1]:
193193
scoring = cols[1].radio(
194-
"select the scoring method",
195-
[NuXL_config['scoring']['restrictions'][1], NuXL_config['scoring']['restrictions'][0]],
196-
help=NuXL_config['scoring']['description'] + " default: "+ NuXL_config['scoring']['default'],
197-
key="scoring"
198-
)
194+
"scoring method",
195+
[NuXL_config['scoring']['restrictions'][1], NuXL_config['scoring']['restrictions'][0]],
196+
help=NuXL_config['scoring']['description'] + " default: "+ NuXL_config['scoring']['default'],
197+
key="scoring"
198+
)
199199

200200
with st.expander("**Advanced parameters**"):
201201

@@ -305,7 +305,7 @@ def terminate_subprocess():
305305

306306
args = [OpenNuXL_exec, "-ThermoRaw_executable", thermo_exec_path, "-in", mzML_file_path, "-database", database_file_path, "-out", result_path, "-NuXL:presets", preset,
307307
"-NuXL:length", length, "-NuXL:scoring", scoring, "-precursor:mass_tolerance", Precursor_MT, "-precursor:mass_tolerance_unit", Precursor_MT_unit,
308-
"-fragment:mass_tolerance", Fragment_MT, "-fragment:mass_tolerance_unit", Fragment_MT_unit,
308+
"-fragment:mass_tolerance", Fragment_MT, "-fragment:mass_tolerance_unit", Fragment_MT_unit, "-threads", str(30),
309309
"-peptide:min_size", peptide_min, "-peptide:max_size", peptide_max, "-peptide:missed_cleavages", Missed_cleavages, "-peptide:enzyme", Enzyme,
310310
"-modifications:variable_max_per_peptide", Variable_max_per_peptide,"-report:peptideFDR", peptideFDR
311311
]
@@ -318,7 +318,7 @@ def terminate_subprocess():
318318
thermo_exec_path = "/thirdparty/ThermoRawFileParser/ThermoRawFileParser.exe"
319319
# In docker it executable on path
320320
args = ["OpenNuXL", "-ThermoRaw_executable", thermo_exec_path, "-in", mzML_file_path, "-database", database_file_path, "-out", result_path, "-NuXL:presets", preset,
321-
"-NuXL:length", length, "-NuXL:scoring", scoring, "-precursor:mass_tolerance", Precursor_MT, "-precursor:mass_tolerance_unit", Precursor_MT_unit,
321+
"-NuXL:length", length, "-NuXL:scoring", scoring, "-precursor:mass_tolerance", Precursor_MT, "-precursor:mass_tolerance_unit", Precursor_MT_unit,
322322
"-fragment:mass_tolerance", Fragment_MT, "-fragment:mass_tolerance_unit", Fragment_MT_unit,"-peptide:min_size", peptide_min, "-peptide:max_size",peptide_max, "-peptide:missed_cleavages",Missed_cleavages, "-peptide:enzyme", Enzyme,
323323
"-modifications:variable_max_per_peptide", Variable_max_per_peptide,"-report:peptideFDR", peptideFDR
324324
]
@@ -346,8 +346,8 @@ def terminate_subprocess():
346346
variables = []
347347

348348
# want to see the command values and argues
349-
#message = f"Running '{' '.join(args)}'"
350-
#st.info(message)
349+
message = f"Running '{' '.join(args)}'"
350+
st.info(message)
351351
st.info(f"Analyzing {mzML_file_name}", icon="ℹ️")
352352

353353
# run subprocess command
@@ -360,7 +360,7 @@ def terminate_subprocess():
360360
# terminate_flag = threading.Event()
361361
# thread = threading.Thread(target=run_subprocess, args=(args, variables, result_dict))
362362
# thread.start()
363-
# thread.join()
363+
# thread.join()<
364364

365365
delete_files(directory = Path(st.session_state.workspace, "mzML-files"), remove_files_end_with = '.raw.mzML')
366366

@@ -427,7 +427,9 @@ def terminate_subprocess():
427427

428428
# then download link for identification file of above criteria
429429
download_selected_result_files(identification_files, f":arrow_down: {protocol_name}_XL_identification_files")
430-
430+
431+
st.success("⚡️ **Analyzing with NuXL Completed Successfully!** ⚡️")
432+
431433
else:
432434
# Display error message
433435
st.error(

0 commit comments

Comments
 (0)