MRC.BZ2 support: more friendly message and file chooser in the GUI

M-Hakmi · Feb 15, 2023 · e390968 · e390968
1 parent f376d85
commit e390968
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/src/image.h b/src/image.h
@@ -1664,7 +1664,8 @@ class MRCBZ2Reader
 		std::string commandline = "pbzip2 -cdkp" + integerToString(n_threads) + " " + filename + " 2>/dev/null";
 		pipe = popen(commandline.c_str(), "r");
 		if (pipe == NULL)
-			REPORT_ERROR("MRCBZ2Reader: error in opening decompression pipe for " + filename);
+			REPORT_ERROR("MRCBZ2Reader: error in opening decompression pipe for " + filename +\
+				     ". Do you have pbzip2 in the PATH? Is the movie accessible and intact?");
 
 		Image<float>::MRChead *header = new Image<float>::MRChead();
 		if (fread(header, MRCSIZE, 1, pipe) < 1)

diff --git a/src/pipeline_jobs.cpp b/src/pipeline_jobs.cpp
@@ -1142,7 +1142,7 @@ 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})", ".", "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})", ".", "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["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.");