Skip to content

Commit

Permalink
RelionIt: fixed crash when "images_are_movies = False" (reported by Y…
Browse files Browse the repository at this point in the history
…ongchan Lee)
  • Loading branch information
biochem-fan committed Jan 15, 2019
1 parent 46d525d commit 943a876
Showing 1 changed file with 10 additions and 4 deletions.
14 changes: 10 additions & 4 deletions scripts/relion_it.py
Original file line number Diff line number Diff line change
Expand Up @@ -1570,9 +1570,7 @@ def run_pipeline(opts):


#### Set up the CtfFind job
star_name = 'corrected_micrographs.star' if opts.images_are_movies else 'micrographs.star'
ctffind_options = ['Input micrographs STAR file: == {}{}'.format(motioncorr_job, star_name),
'Voltage (kV): == {}'.format(opts.voltage),
ctffind_options = ['Voltage (kV): == {}'.format(opts.voltage),
'Spherical aberration (mm): == {}'.format(opts.Cs),
'Amplitude contrast: == {}'.format(opts.ampl_contrast),
'Amount of astigmatism (A): == {}'.format(opts.ctffind_astigmatism),
Expand All @@ -1588,6 +1586,11 @@ def run_pipeline(opts):
'CTFFIND-4.1 executable: == {}'.format(opts.ctffind4_exe),
'Number of MPI procs: == {}'.format(opts.ctffind_mpi)]

if opts.images_are_movies:
ctffind_options.append('Input micrographs STAR file: == {}{}'.format(motioncorr_job, 'corrected_micrographs.star'))
else:
ctffind_options.append('Input micrographs STAR file: == {}{}'.format(import_job, 'micrographs.star'))

if opts.use_ctffind_instead:
ctffind_options.append('Use CTFFIND-4.1? == Yes')
ctffind_options.append('Use Gctf instead? == No')
Expand All @@ -1613,7 +1616,10 @@ def run_pipeline(opts):

ctffind_job, already_had_it = addJob('CtfFind', 'ctffind_job', SETUP_CHECK_FILE, ctffind_options)

runjobs = [import_job, motioncorr_job, ctffind_job]
runjobs = [import_job]
if opts.images_are_movies:
runjobs.append(motioncorr_job)
runjobs.append(ctffind_job)

# There is an option to stop on-the-fly processing after CTF estimation
if not opts.stop_after_ctf_estimation:
Expand Down

0 comments on commit 943a876

Please sign in to comment.