Skip to content

Commit

Permalink
RELION 4.0.1
Browse files Browse the repository at this point in the history
  • Loading branch information
biochem-fan committed Mar 6, 2023
1 parent 8b8e443 commit 4a801d6
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 3 deletions.
3 changes: 2 additions & 1 deletion src/image.h
Original file line number Diff line number Diff line change
Expand Up @@ -1616,7 +1616,8 @@ class CompressedMRCReader

static bool isCompressedMRC(FileName filename)
{
return filename.endsWith(".mrc.bz2") || filename.endsWith(".mrc.xz") || filename.endsWith(".mrc.zst");
return filename.endsWith(".mrc.bz2") || filename.endsWith(".mrc.xz") || filename.endsWith(".mrc.zst")
|| filename.endsWith(".mrcs.bz2") || filename.endsWith(".mrcs.xz") || filename.endsWith(".mrcs.zst");
}

void skip(size_t byte)
Expand Down
2 changes: 1 addition & 1 deletion src/macros.h
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
#ifndef MACROS_H
#define MACROS_H

#define RELION_SHORT_VERSION "4.0.0"
#define RELION_SHORT_VERSION "4.0.1"
extern const char *g_RELION_VERSION;

#include <math.h>
Expand Down
4 changes: 3 additions & 1 deletion src/pipeline_jobs.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1142,7 +1142,9 @@ void RelionJob::initialiseImportJob()
hidden_name = ".gui_import";

joboptions["do_raw"] = JobOption("Import raw movies/micrographs?", true, "Set this to Yes if you plan to import raw movies or micrographs");
joboptions["fn_in_raw"] = JobOption("Raw input files:", "Micrographs/*.tif", (std::string)"Movie or Image (*.{mrc,mrcs,tif,tiff,eer,mrc.bz2})", ".", "Provide a Linux wildcard that selects all raw movies or micrographs to be imported. The path must be a relative path from the project directory. To import files outside the project directory, first make a symbolic link by an absolute path and then specify the link by a relative path. See the FAQ page on RELION wiki (https://www3.mrc-lmb.cam.ac.uk/relion/index.php/FAQs#What_is_the_right_way_to_import_files_outside_the_project_directory.3F) for details.");
joboptions["fn_in_raw"] = JobOption("Raw input files:", "Micrographs/*.tif", (std::string)"Movie or Image (*.{mrc,mrcs,tif,tiff,eer,mrc.bz2,mrcs.bz2,mrc.zst,mrcs.zst,mrc.xz,mrcs.xz})", ".", "Provide a Linux wildcard that selects all raw movies or micrographs to be imported. The path must be a relative path from the project directory. To import files outside the project directory, first make a symbolic link by an absolute path and then specify the link by a relative path. See the FAQ page on RELION wiki (https://www3.mrc-lmb.cam.ac.uk/relion/index.php/FAQs#What_is_the_right_way_to_import_files_outside_the_project_directory.3F) for details.\
\
To process compressed MRC movies, you need pbzip2, zstd and xz command in your PATH for bzip2, Zstandard and xzip compression, respectively.");
joboptions["is_multiframe"] = JobOption("Are these multi-frame movies?", true, "Set to Yes for multi-frame movies, set to No for single-frame micrographs.");

joboptions["optics_group_name"] = JobOption("Optics group name:", (std::string)"opticsGroup1", "Name of this optics group. Each group of movies/micrographs with different optics characteristics for CTF refinement should have a unique name.");
Expand Down

0 comments on commit 4a801d6

Please sign in to comment.