From 49db2fbee70dfb21c7b9af32faabcecad378323b Mon Sep 17 00:00:00 2001 From: vhinger Date: Mon, 10 Mar 2025 16:46:04 +0100 Subject: [PATCH] Fix tiff filename --- .../jungfrauRawDataProcess_filetxtH5.cpp | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/slsDetectorCalibration/jungfrauExecutables/jungfrauRawDataProcess_filetxtH5.cpp b/slsDetectorCalibration/jungfrauExecutables/jungfrauRawDataProcess_filetxtH5.cpp index 9c024d045..e6ebffbd1 100644 --- a/slsDetectorCalibration/jungfrauExecutables/jungfrauRawDataProcess_filetxtH5.cpp +++ b/slsDetectorCalibration/jungfrauExecutables/jungfrauRawDataProcess_filetxtH5.cpp @@ -54,12 +54,18 @@ std::string getRootString( std::string const& filepath ) { // fext: file extension (e.g. "raw") std::string createFileName( std::string const& dir, std::string const& fprefix="run", std::string const& fsuffix="", std::string const& fext="raw", int const outfilecounter=-1 ) { + std::string return_string; if (outfilecounter >= 0) - return fmt::format("{:s}/{:s}_{:s}_f{:05d}.{:s}", dir, fprefix, fsuffix, outfilecounter, fext); + return_string = fmt::format("{:s}/{:s}_{:s}_f{:05d}", dir, fprefix, fsuffix, outfilecounter); else if (fsuffix.length()!=0) - return fmt::format("{:s}/{:s}_{:s}.{:s}", dir, fprefix, fsuffix, fext); + return_string = fmt::format("{:s}/{:s}_{:s}", dir, fprefix, fsuffix); else - return fmt::format("{:s}/{:s}.{:s}", dir, fprefix, fext); + return_string = fmt::format("{:s}/{:s}", dir, fprefix); + + if (fext.length()!=0) + return_string += "." + fext; + + return return_string; }