Build Packages / Unit tests (push) Successful in 1h28m28s
Build Packages / build:windows:nocuda (push) Successful in 14m45s
Build Packages / build:windows:cuda (push) Successful in 13m13s
Build Packages / build:viewer-tgz:cpu (push) Successful in 6m47s
Build Packages / build:viewer-tgz:cuda (push) Successful in 7m22s
Build Packages / build:rpm (rocky9_nocuda) (push) Successful in 13m52s
Build Packages / build:rpm (ubuntu2204_nocuda) (push) Successful in 14m16s
Build Packages / build:rpm (ubuntu2404_nocuda) (push) Successful in 13m19s
Build Packages / build:rpm (rocky8_sls9) (push) Successful in 12m50s
Build Packages / build:rpm (rocky9_sls9) (push) Successful in 14m40s
Build Packages / build:rpm (rocky8) (push) Successful in 11m18s
Build Packages / build:rpm (rocky9) (push) Successful in 12m4s
Build Packages / build:rpm (ubuntu2204) (push) Successful in 11m55s
Build Packages / build:rpm (ubuntu2404) (push) Successful in 11m22s
Build Packages / DIALS test (push) Successful in 13m37s
Build Packages / XDS test (durin plugin) (push) Successful in 8m47s
Build Packages / XDS test (JFJoch plugin) (push) Successful in 9m4s
Build Packages / XDS test (neggia plugin) (push) Successful in 7m45s
Build Packages / Generate python client (push) Successful in 34s
Build Packages / Build documentation (push) Successful in 1m4s
Build Packages / Create release (push) Skipped
Build Packages / build:rpm (rocky8_nocuda) (push) Successful in 7m16s
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. * rugnux: Rebrand the offline data-processing subsystem as `rugnux` and consolidate all offline analysis into the single `rugnux` binary - `jfjoch_process` is now `rugnux`, the former `jfjoch_azint` is now `rugnux --azint-only`, and `jfjoch_scale` is now `rugnux --scale` (see the new docs/NAMING.md and docs/RUGNUX.md). Scaling and merging are on by default for rotation and stills (`--no-merge` disables them), replacing the previous opt-in `-M, --scale-merge`. * rugnux: CLI fixes - default `-N` to all hardware threads, parse numeric option arguments strictly (reject non-numeric or trailing input instead of silently yielding 0), require `--wavelength > 0`, and correct the reproduced command line and `--scale` reference-cell handling. * rugnux: De-novo space-group improvements - recover genuine high symmetry and centred Bravais lattices from intensities, add an automatic CC1/2 high-resolution cutoff, and report L-test twinning statistics. * rugnux: Index weakly-diffracting low-resolution rotation data that previously failed (e.g. F-cubic crystals that diffract only to ~4 A on a detector reaching ~1.5 A). The per-frame indexing gate now measures the indexed fraction only within the resolution range the lattice actually diffracts to, so the many sub-diffraction ice/noise spots no longer make the fraction floor unreachable; the two-pass first pass tries several image-sampling schemes (spread across the whole rotation vs a consecutive wedge whose native stride keeps a reflection's rocking curve continuous, letting the FFT resolve a long axis) and keeps the one that indexes the most frames; and the de-novo space-group search no longer discards all reflections (and crashes) when every resolution shell falls below <I/sigma> = 1. * rugnux: Lower the low-resolution R-meas for strongly-diffracting rotation data - drop edge-of-sweep truncated fulls whose rocking curve was captured below `--min-captured-fraction` (default 0.7 for rotation), and report R-meas only over the observations kept by outlier rejection (matching XDS). The 0.7 default also strips the partiality-extrapolated fulls that dominate the intensity second moment on weakly-diffracting crystals, so the de-novo space-group search is no longer starved by the error-model I/sigma floor and recovers the correct symmetry (e.g. the F-cubic Benas crystals: Benas_3 -> F432, Benas_7 -> P6122, instead of P4/P1); on the reference battery every other crystal keeps its space group. * rugnux: Write the refined geometry (beam, tilt, axis) to _process.h5 and place non-standard mmCIF items under a reserved `jfjoch` prefix. * jfjoch_broker: Ordinary acquisition failures (receiver/writer/analysis problems, missed packets, writer disconnect) now return to the Idle state with an Error-severity message, so a run can be retried without an expensive re-initialisation; only failures that leave the detector in an undefined state (new JFJochCriticalException, e.g. PCIe/FPGA faults) go to the Error state and force re-initialisation. * jfjoch_broker: A synchronous /start now reports its failure to the HTTP caller instead of returning HTTP 200, and an incomplete or truncated dataset (missing packets, writer disconnect) is reported as an error rather than a "reduce frame rate" warning. * jfjoch_broker: Drop uncollected placeholder rows (number = -1) from the scan_result REST endpoint. * jfjoch_broker: Fix the inverted per-image compression ratio reported by the Lite receiver (was compressed/uncompressed instead of uncompressed/compressed). * jfjoch_broker: Bragg integration adds a quantization-noise variance floor with a box-sum fallback, and treats the type-maximum marker as an invalid pixel for unsigned image types. * jfjoch_writer: Detect file-overwrite conflicts at start for back-channel transports, and reset the writer when end-of-collection finalisation fails. * jfjoch_viewer: Preview overlays follow the geometry (resolution/ROI arcs, true beam centre, predictions, coral secondary-lattice spots, legend), add save-as-JPEG, and fix an HTTP live-follow memory leak. * Frontend: Improved aesthetics and usability, and added in-browser pixel-mask and JUNGFRAU-pedestal visualisation. * CI: Name the Windows installer jfjoch-viewer-* instead of jfjoch-*.Reviewed-on: #67 Co-authored-by: Filip Leonarski <filip.leonarski@psi.ch>
116 lines
5.0 KiB
TypeScript
116 lines
5.0 KiB
TypeScript
// Minimal decoder for the baseline TIFFs the broker produces (uncompressed,
|
|
// single-channel, contiguous — see preview/JFJochTIFF.cpp). Handles 8/16/32/64-bit
|
|
// samples in unsigned / signed / IEEE-float formats and both byte orders. Kept
|
|
// dependency-free on purpose: the format is fully under our control, so a full
|
|
// TIFF library would be overkill.
|
|
|
|
export type SampleFormat = "uint" | "int" | "float";
|
|
export type SampleArray =
|
|
Uint8Array | Uint16Array | Uint32Array |
|
|
Int8Array | Int16Array | Int32Array |
|
|
Float32Array | Float64Array;
|
|
|
|
export type DecodedImage = {
|
|
width: number;
|
|
height: number;
|
|
bits: number;
|
|
format: SampleFormat;
|
|
data: SampleArray; // length = width * height, row-major, top-left origin
|
|
};
|
|
|
|
// Bytes per TIFF field type (index = type code).
|
|
const TYPE_SIZE: Record<number, number> = {
|
|
1: 1, 2: 1, 3: 2, 4: 4, 5: 8, 6: 1, 7: 1, 8: 2, 9: 4, 10: 8, 11: 4, 12: 8,
|
|
};
|
|
|
|
const platformLittleEndian = new Uint8Array(new Uint32Array([1]).buffer)[0] === 1;
|
|
|
|
function makeSampleArray(buf: ArrayBuffer, bits: number, format: SampleFormat): SampleArray {
|
|
if (format === "float") {
|
|
if (bits === 32) return new Float32Array(buf);
|
|
if (bits === 64) return new Float64Array(buf);
|
|
} else if (format === "int") {
|
|
if (bits === 8) return new Int8Array(buf);
|
|
if (bits === 16) return new Int16Array(buf);
|
|
if (bits === 32) return new Int32Array(buf);
|
|
} else {
|
|
if (bits === 8) return new Uint8Array(buf);
|
|
if (bits === 16) return new Uint16Array(buf);
|
|
if (bits === 32) return new Uint32Array(buf);
|
|
}
|
|
throw new Error(`Unsupported TIFF sample: ${bits}-bit ${format}`);
|
|
}
|
|
|
|
// In-place byte swap so a foreign-endian file can be viewed as a native typed array.
|
|
function byteSwap(bytes: Uint8Array, wordSize: number) {
|
|
if (wordSize < 2) return;
|
|
for (let i = 0; i + wordSize <= bytes.length; i += wordSize)
|
|
for (let a = 0, b = wordSize - 1; a < b; a++, b--) {
|
|
const t = bytes[i + a]; bytes[i + a] = bytes[i + b]; bytes[i + b] = t;
|
|
}
|
|
}
|
|
|
|
export function decodeTiff(buffer: ArrayBuffer): DecodedImage {
|
|
const dv = new DataView(buffer);
|
|
const bo = dv.getUint16(0, false);
|
|
const little = bo === 0x4949; // "II"
|
|
if (!little && bo !== 0x4d4d) throw new Error("Not a TIFF (bad byte-order mark)");
|
|
if (dv.getUint16(2, little) !== 42) throw new Error("Not a TIFF (bad magic)");
|
|
|
|
const readVals = (type: number, count: number, offset: number): number[] => {
|
|
const size = TYPE_SIZE[type] ?? 0;
|
|
const total = size * count;
|
|
const base = total <= 4 ? offset : dv.getUint32(offset, little); // inline vs pointer
|
|
const out: number[] = [];
|
|
for (let i = 0; i < count; i++) {
|
|
const p = base + i * size;
|
|
switch (type) {
|
|
case 3: out.push(dv.getUint16(p, little)); break; // SHORT
|
|
case 4: out.push(dv.getUint32(p, little)); break; // LONG
|
|
case 1: case 6: case 7: out.push(dv.getUint8(p)); break; // BYTE
|
|
case 8: out.push(dv.getInt16(p, little)); break; // SSHORT
|
|
case 9: out.push(dv.getInt32(p, little)); break; // SLONG
|
|
default: out.push(dv.getUint32(p, little)); break;
|
|
}
|
|
}
|
|
return out;
|
|
};
|
|
|
|
const ifd = dv.getUint32(4, little);
|
|
const n = dv.getUint16(ifd, little);
|
|
const tags = new Map<number, number[]>();
|
|
for (let i = 0; i < n; i++) {
|
|
const e = ifd + 2 + i * 12;
|
|
tags.set(dv.getUint16(e, little), readVals(dv.getUint16(e + 2, little), dv.getUint32(e + 4, little), e + 8));
|
|
}
|
|
const tag = (id: number, def?: number) => (tags.get(id) ? tags.get(id)![0] : def);
|
|
|
|
const width = tag(256)!;
|
|
const height = tag(257)!;
|
|
const bits = tag(258, 8)!;
|
|
const samplesPerPixel = tag(277, 1)!;
|
|
const compression = tag(259, 1)!;
|
|
const sf = tag(339, 1)!; // 1=uint 2=int 3=float
|
|
const format: SampleFormat = sf === 3 ? "float" : sf === 2 ? "int" : "uint";
|
|
const stripOffsets = tags.get(273) ?? [];
|
|
const stripCounts = tags.get(279) ?? [];
|
|
|
|
if (compression !== 1) throw new Error("Only uncompressed TIFF is supported");
|
|
if (samplesPerPixel !== 1) throw new Error("Only single-channel TIFF is supported");
|
|
if (!width || !height || !stripOffsets.length) throw new Error("Malformed TIFF (missing size/strips)");
|
|
|
|
// Concatenate strips into one contiguous, word-aligned buffer.
|
|
const bytesPerSample = bits / 8;
|
|
const totalBytes = width * height * bytesPerSample;
|
|
const out = new Uint8Array(totalBytes);
|
|
let pos = 0;
|
|
for (let i = 0; i < stripOffsets.length; i++) {
|
|
const len = stripCounts[i] ?? (totalBytes - pos);
|
|
out.set(new Uint8Array(buffer, stripOffsets[i], len), pos);
|
|
pos += len;
|
|
}
|
|
if (little !== platformLittleEndian) byteSwap(out, bytesPerSample);
|
|
|
|
return { width, height, bits, format, data: makeSampleArray(out.buffer, bits, format) };
|
|
}
|