Build Packages / Unit tests (push) Successful in 1h32m35s
Build Packages / build:windows:cuda (push) Successful in 18m0s
Build Packages / build:viewer-tgz:cpu (push) Successful in 7m37s
Build Packages / build:viewer-tgz:cuda (push) Successful in 8m55s
Build Packages / build:rpm (rocky8_nocuda) (push) Successful in 14m13s
Build Packages / build:rpm (rocky9_nocuda) (push) Successful in 14m11s
Build Packages / build:rpm (ubuntu2204_nocuda) (push) Successful in 14m35s
Build Packages / build:rpm (ubuntu2404_nocuda) (push) Successful in 13m57s
Build Packages / build:rpm (rocky8_sls9) (push) Successful in 14m23s
Build Packages / build:rpm (rocky9_sls9) (push) Successful in 12m45s
Build Packages / build:rpm (rocky8) (push) Successful in 11m39s
Build Packages / build:rpm (rocky9) (push) Successful in 14m0s
Build Packages / build:rpm (ubuntu2204) (push) Successful in 13m42s
Build Packages / build:rpm (ubuntu2404) (push) Successful in 12m38s
Build Packages / DIALS test (push) Successful in 14m55s
Build Packages / XDS test (durin plugin) (push) Successful in 7m11s
Build Packages / XDS test (JFJoch plugin) (push) Successful in 9m7s
Build Packages / XDS test (neggia plugin) (push) Successful in 8m34s
Build Packages / Generate python client (push) Successful in 28s
Build Packages / Build documentation (push) Successful in 1m3s
Build Packages / Create release (push) Skipped
Build Packages / build:windows:nocuda (push) Successful in 9m55s
This is an UNSTABLE release. It includes many experimental features, as well as many AI generated fixes. We recommend using rc.152 for production use. * Analysis: The azimuthal-integration solid-angle correction now follows the incidence angle to the detector normal (`cos^3` of that angle) instead of `cos^3(2*theta)`, so it is correct for a tilted detector and matches PyFAI `solidAngleArray` and MAX IV azint (unchanged for an untilted detector). Crystal geometry refinement (`XtalOptimizer`) no longer silently ignores an imported PONI `rot3` (rotation about the beam): it is applied as a fixed rotation in the residual so refinement stays consistent with the rest of the pipeline. Polarization and azimuthal binning already honoured `rot3` through the full PONI rotation. * jfjoch_viewer: Open datasets on the WSL2/UNC filesystem (paths starting `\\`); write processing outputs next to the input file, with a Browse button and independent `_process.h5` / merged `.mtz`/`.cif` toggles; and show the determined space group in the merge-statistics window. * rugnux: Accept an absolute `-o` output prefix in offline processing. * Packaging: The self-contained Linux viewer `.tgz` now bundles cuFFT, so it runs without a system CUDA toolkit (`.deb`/`.rpm` are unchanged, distro-managed). * Docs: Bring the analysis references up to date with the code. `docs/CPU_DATA_ANALYSIS.md` now reflects the unified profile-fit Bragg integration engine, multi-lattice indexing, azimuthal phi binning, the radial parallax/bandwidth profile with sub-pixel centring, the rot3d capture-fraction handling and the automatic CC1/2 resolution cutoff, and drops the descriptions of features that were never implemented (French-Wilson amplitudes, the still excitation-error partiality model); `docs/RUGNUX.md` documents the new `--resolution-cutoff`/`--resolution-cc-target`/`--resolution-shells`, `--min-captured-fraction`, `--mosaicity`, `--reference-column`, the azimuthal correction toggles and the geometry-override options, and corrects the `-N` default. The outdated in-source design notes (ICE_RING_DETECTION, BRAGG_INTEGRATION_ENGINE, NEXTGEN_INTEGRATOR) are removed.Reviewed-on: #68 Co-authored-by: Filip Leonarski <filip.leonarski@psi.ch>
173 lines
7.2 KiB
C++
173 lines
7.2 KiB
C++
// SPDX-FileCopyrightText: 2024 Filip Leonarski, Paul Scherrer Institute <filip.leonarski@psi.ch>
|
|
// SPDX-License-Identifier: GPL-3.0-only
|
|
|
|
#include <tiffio.h>
|
|
#include <tiffio.hxx>
|
|
#include <cstdint>
|
|
#include <cstring>
|
|
#include <sstream>
|
|
|
|
#include "JFJochTIFF.h"
|
|
#include "../common/JFJochException.h"
|
|
|
|
|
|
void WriteTIFF(TIFF *tiff, const CompressedImage& image) {
|
|
|
|
if (tiff == nullptr)
|
|
throw JFJochException(JFJochExceptionCategory::TIFFGeneratorError, "TIFFStreamOpen error");
|
|
|
|
std::vector<uint8_t> buffer;
|
|
image.GetUncompressed(buffer);
|
|
|
|
TIFFSetField(tiff, TIFFTAG_IMAGEWIDTH, image.GetWidth()); // set the width of the image
|
|
TIFFSetField(tiff, TIFFTAG_IMAGELENGTH, image.GetHeight()); // set the height of the image
|
|
|
|
switch (image.GetMode()) {
|
|
case CompressedImageMode::RGB:
|
|
TIFFSetField(tiff, TIFFTAG_BITSPERSAMPLE, 8);
|
|
TIFFSetField(tiff, TIFFTAG_SAMPLESPERPIXEL, 3);
|
|
TIFFSetField(tiff, TIFFTAG_PHOTOMETRIC, PHOTOMETRIC_RGB);
|
|
TIFFSetField(tiff, TIFFTAG_SAMPLEFORMAT, SAMPLEFORMAT_UINT);
|
|
break;
|
|
case CompressedImageMode::Int8:
|
|
TIFFSetField(tiff, TIFFTAG_BITSPERSAMPLE, 8);
|
|
TIFFSetField(tiff, TIFFTAG_SAMPLESPERPIXEL, 1);
|
|
TIFFSetField(tiff, TIFFTAG_SAMPLEFORMAT, SAMPLEFORMAT_INT);
|
|
break;
|
|
case CompressedImageMode::Int16:
|
|
TIFFSetField(tiff, TIFFTAG_BITSPERSAMPLE, 16);
|
|
TIFFSetField(tiff, TIFFTAG_SAMPLESPERPIXEL, 1);
|
|
TIFFSetField(tiff, TIFFTAG_SAMPLEFORMAT, SAMPLEFORMAT_INT);
|
|
break;
|
|
case CompressedImageMode::Int32:
|
|
TIFFSetField(tiff, TIFFTAG_BITSPERSAMPLE, 32);
|
|
TIFFSetField(tiff, TIFFTAG_SAMPLESPERPIXEL, 1);
|
|
TIFFSetField(tiff, TIFFTAG_SAMPLEFORMAT, SAMPLEFORMAT_INT);
|
|
break;
|
|
case CompressedImageMode::Uint8:
|
|
TIFFSetField(tiff, TIFFTAG_BITSPERSAMPLE, 8);
|
|
TIFFSetField(tiff, TIFFTAG_SAMPLESPERPIXEL, 1);
|
|
TIFFSetField(tiff, TIFFTAG_SAMPLEFORMAT, SAMPLEFORMAT_UINT);
|
|
break;
|
|
case CompressedImageMode::Uint16:
|
|
TIFFSetField(tiff, TIFFTAG_BITSPERSAMPLE, 16);
|
|
TIFFSetField(tiff, TIFFTAG_SAMPLESPERPIXEL, 1);
|
|
TIFFSetField(tiff, TIFFTAG_SAMPLEFORMAT, SAMPLEFORMAT_UINT);
|
|
break;
|
|
case CompressedImageMode::Uint32:
|
|
TIFFSetField(tiff, TIFFTAG_BITSPERSAMPLE, 32);
|
|
TIFFSetField(tiff, TIFFTAG_SAMPLESPERPIXEL, 1);
|
|
TIFFSetField(tiff, TIFFTAG_SAMPLEFORMAT, SAMPLEFORMAT_UINT);
|
|
break;
|
|
case CompressedImageMode::Float16:
|
|
TIFFSetField(tiff, TIFFTAG_BITSPERSAMPLE, 16);
|
|
TIFFSetField(tiff, TIFFTAG_SAMPLEFORMAT, SAMPLEFORMAT_IEEEFP); // Float format
|
|
TIFFSetField(tiff, TIFFTAG_SAMPLESPERPIXEL, 1);
|
|
break;
|
|
case CompressedImageMode::Float32:
|
|
TIFFSetField(tiff, TIFFTAG_BITSPERSAMPLE, 32);
|
|
TIFFSetField(tiff, TIFFTAG_SAMPLEFORMAT, SAMPLEFORMAT_IEEEFP); // Float format
|
|
TIFFSetField(tiff, TIFFTAG_SAMPLESPERPIXEL, 1);
|
|
break;
|
|
case CompressedImageMode::Float64:
|
|
TIFFSetField(tiff, TIFFTAG_BITSPERSAMPLE, 64);
|
|
TIFFSetField(tiff, TIFFTAG_SAMPLEFORMAT, SAMPLEFORMAT_IEEEFP); // Float format
|
|
TIFFSetField(tiff, TIFFTAG_SAMPLESPERPIXEL, 1);
|
|
break;
|
|
}
|
|
TIFFSetField(tiff, TIFFTAG_PLANARCONFIG, PLANARCONFIG_CONTIG);
|
|
TIFFSetField(tiff, TIFFTAG_ORIENTATION, ORIENTATION_TOPLEFT);
|
|
TIFFSetField(tiff, TIFFTAG_COMPRESSION, COMPRESSION_NONE); // set compression to LZW
|
|
TIFFSetField(tiff, TIFFTAG_ROWSPERSTRIP, image.GetHeight());
|
|
|
|
if (TIFFWriteEncodedStrip(tiff, 0, buffer.data(), image.GetUncompressedSize()) < 0)
|
|
throw JFJochException(JFJochExceptionCategory::TIFFGeneratorError, "TIFFWriteEncodedStrip error");
|
|
}
|
|
|
|
std::string WriteTIFFToString(const CompressedImage& image) {
|
|
std::stringstream os;
|
|
|
|
TIFF *tiff = TIFFStreamOpen("x", (std::ostream *) &os);
|
|
WriteTIFF(tiff, image);
|
|
TIFFClose(tiff);
|
|
|
|
return os.str();
|
|
}
|
|
|
|
void WriteTIFFToFile(const std::string &filename, const CompressedImage& image) {
|
|
TIFF *tiff = TIFFOpen(filename.c_str(), "w");
|
|
|
|
WriteTIFF(tiff, image);
|
|
|
|
TIFFClose(tiff);
|
|
}
|
|
|
|
CompressedImage ReadTIFF(const std::string &s, std::vector<uint8_t> &buffer) {
|
|
if (s.empty())
|
|
throw JFJochException(JFJochExceptionCategory::TIFFGeneratorError, "No TIFF file provided");
|
|
uint32_t rows_per_string = 0;
|
|
|
|
uint16_t elem_size = 0;
|
|
uint16_t format = 0;
|
|
uint32_t cols = 0;
|
|
uint32_t lines = 0;
|
|
|
|
std::istringstream input_TIFF_stream(s);
|
|
TIFF* tiff = TIFFStreamOpen("MemTIFF", &input_TIFF_stream);
|
|
if (tiff == nullptr)
|
|
throw JFJochException(JFJochExceptionCategory::TIFFGeneratorError,"Not a proper TIFF file");
|
|
|
|
TIFFGetField(tiff, TIFFTAG_IMAGEWIDTH, &cols); // get the width of the image
|
|
TIFFGetField(tiff, TIFFTAG_IMAGELENGTH, &lines); // get the height of the image
|
|
TIFFGetField(tiff, TIFFTAG_BITSPERSAMPLE, &elem_size); // get the size of the channels
|
|
TIFFGetField(tiff, TIFFTAG_ROWSPERSTRIP, &rows_per_string);
|
|
TIFFGetField(tiff, TIFFTAG_SAMPLEFORMAT, &format);
|
|
|
|
if (elem_size % 8 != 0)
|
|
throw JFJochException(JFJochExceptionCategory::TIFFGeneratorError, "Only byte-aligned TIFF samples are supported");
|
|
|
|
const size_t elem_size_bytes = elem_size / 8;
|
|
if (cols == 0 || lines == 0 || elem_size_bytes == 0)
|
|
throw JFJochException(JFJochExceptionCategory::TIFFGeneratorError,"Size wrong");
|
|
|
|
const size_t scanline_bytes = static_cast<size_t>(cols) * elem_size_bytes;
|
|
if (scanline_bytes != TIFFScanlineSize(tiff))
|
|
throw JFJochException(JFJochExceptionCategory::TIFFGeneratorError, "TIFFScanlineSize mismatch");
|
|
|
|
// Guard the buffer size against overflow: a huge IMAGELENGTH could otherwise wrap
|
|
// scanline_bytes * lines to a small value, undersizing the buffer that TIFFReadScanline writes into.
|
|
if (lines > SIZE_MAX / scanline_bytes)
|
|
throw JFJochException(JFJochExceptionCategory::TIFFGeneratorError, "TIFF image too large");
|
|
|
|
buffer.resize(scanline_bytes * lines);
|
|
|
|
for (uint32_t i = 0; i < lines; i++) {
|
|
if (TIFFReadScanline(tiff, buffer.data() + static_cast<size_t>(i) * scanline_bytes, i, 0) < 0)
|
|
throw JFJochException(JFJochExceptionCategory::TIFFGeneratorError, "TIFFReadScanline error");
|
|
}
|
|
|
|
TIFFClose(tiff);
|
|
|
|
CompressedImageMode mode = CalcImageMode(elem_size_bytes, (format == SAMPLEFORMAT_IEEEFP), (format == SAMPLEFORMAT_INT));
|
|
return CompressedImage(buffer, cols, lines, mode);
|
|
}
|
|
|
|
std::vector<uint16_t> ReadTIFFFromString16(const std::string &s, uint32_t &cols, uint32_t &lines) {
|
|
std::vector<uint8_t> buffer;
|
|
CompressedImage image = ReadTIFF(s, buffer);
|
|
|
|
if (image.GetByteDepth() != sizeof(uint16_t) || image.GetNumChannels() != 1)
|
|
throw JFJochException(JFJochExceptionCategory::TIFFGeneratorError, "Only 16-bit format supported");
|
|
|
|
cols = image.GetWidth();
|
|
lines = image.GetHeight();
|
|
|
|
std::vector<uint16_t> ret(static_cast<size_t>(cols) * lines);
|
|
memcpy(ret.data(), buffer.data(), buffer.size());
|
|
return ret;
|
|
}
|
|
|
|
void SuppressTIFFErrors() {
|
|
TIFFSetErrorHandler(nullptr);
|
|
}
|