Skip to content

Commit c1a0b2d

Browse files
committed
fix argument error
1 parent cf7ee6a commit c1a0b2d

1 file changed

Lines changed: 8 additions & 9 deletions

File tree

enviroMS/diWorkflow.py

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ def to_toml(self):
7171

7272

7373
def run_thermo_reduce_profile(file_location, first_scan, last_scan):
74-
print("run thermo reduce profile")
74+
7575
from corems.mass_spectra.input import rawFileReader
7676

7777
parser = rawFileReader.ImportMassSpectraThermoMSFileReader(file_location)
@@ -82,7 +82,7 @@ def run_thermo_reduce_profile(file_location, first_scan, last_scan):
8282

8383

8484
def run_bruker_transient(file_location, corems_params_path):
85-
print("run bruker transient")
85+
8686
with ReadBrukerSolarix(file_location) as transient:
8787
transient.set_parameter_from_toml(corems_params_path)
8888
mass_spectrum = transient.get_mass_spectrum(
@@ -93,7 +93,7 @@ def run_bruker_transient(file_location, corems_params_path):
9393

9494

9595
def get_masslist(file_location, corems_params_path, polarity, is_centroid):
96-
print("get masslist")
96+
9797
if is_centroid:
9898
reader = ReadMassList(file_location)
9999
else:
@@ -137,7 +137,6 @@ def read_fticr_raw_data(file_location, workflow_params):
137137

138138

139139
def run_assignment(file_location, workflow_params, error_boundaries):
140-
print("run assignment")
141140

142141
# Determine data file type and read in the mass spectrum
143142
mass_spectrum = read_fticr_raw_data(file_location, workflow_params)
@@ -173,7 +172,7 @@ def run_assignment(file_location, workflow_params, error_boundaries):
173172

174173

175174
def generate_database(corems_parameters_file, jobs):
176-
print("generate database")
175+
177176
"""Create molecular formula database.
178177
corems_parameters_file: Path for CoreMS TOML Parameters file
179178
--jobs: Number of processes to run
@@ -197,7 +196,7 @@ def read_workflow_parameter(di_workflow_parameters_toml_file):
197196

198197

199198
def create_plots(mass_spectrum, workflow_params, dirloc):
200-
print("create plots")
199+
201200
# Prevent overflow error when plotting
202201
mpl.rcParams['agg.path.chunksize'] = 10000
203202

@@ -439,7 +438,7 @@ def NOSCcalc(df):
439438

440439

441440
def workflow_worker(args):
442-
print("workflow worker")
441+
443442
file_location, workflow_params_toml_str, error_boundaries, batch_calibrate, srfa_path = args
444443

445444
workflow_params = DiWorkflowParameters(**toml.loads(workflow_params_toml_str))
@@ -567,8 +566,9 @@ def find_calibration_for_batch(workflow_params):
567566

568567

569568
def run_wdl_direct_infusion_workflow(*args, **kwargs):
570-
print("run wdl direct infusion workflow")
571569

570+
cores = kwargs.get("jobs")
571+
del kwargs["jobs"]
572572
kwargs["polarity"] = -1 if kwargs.get("polarity") == "negative" else 1
573573

574574
workflow_params = DiWorkflowParameters(**kwargs)
@@ -598,7 +598,6 @@ def run_wdl_direct_infusion_workflow(*args, **kwargs):
598598

599599

600600
def run_direct_infusion_workflow(workflow_params_file, jobs, replicas):
601-
print("run direct infusion workflow")
602601

603602
click.echo("Loading Searching Settings from %s" % workflow_params_file)
604603
workflow_params = read_workflow_parameter(workflow_params_file)

0 commit comments

Comments
 (0)