CTFFIND wrapper: supported (non-movie) TIFF files as suggested by @gr…

…uchalla in GitHub issue 3dem#728.
estrozi · Jan 27, 2021 · 319cd1b · 319cd1b
1 parent 99674d4
commit 319cd1b
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/ctffind_runner.cpp b/src/ctffind_runner.cpp
@@ -252,7 +252,7 @@ void CtffindRunner::initialise()
 
 		if (continue_old)
 		{
-			FileName fn_microot = fn_mic_ctf_given_all[imic].without(".mrc");
+			FileName fn_microot = fn_mic_ctf_given_all[imic].withoutExtension();
 			RFLOAT defU, defV, defAng, CC, HT, CS, AmpCnst, XMAG, DStep, maxres=-1., valscore = -1., phaseshift = 0.;
 			if (getCtffindResults(fn_microot, defU, defV, defAng, CC,
 			     HT, CS, AmpCnst, XMAG, DStep, maxres, valscore, phaseshift, false)) // false: dont warn if not found Final values
@@ -431,7 +431,7 @@ void CtffindRunner::joinCtffindResults()
 	MetaDataTable MDctf;
 	for (long int imic = 0; imic < fn_micrographs_all.size(); imic++)
 	{
-		FileName fn_microot = fn_micrographs_ctf_all[imic].without(".mrc");
+		FileName fn_microot = fn_micrographs_ctf_all[imic].withoutExtension();
 		RFLOAT defU, defV, defAng, CC, HT, CS, AmpCnst, XMAG, DStep;
 		RFLOAT maxres = -999., valscore = -999., phaseshift = -999.;
 		bool has_this_ctf = getCtffindResults(fn_microot, defU, defV, defAng, CC,