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: Add `--model model.pdb` - score the merged data against an atomic model and compute initial maps. It reports R-work/R-free (scaling the model to the observed amplitudes with an overall scale, an anisotropic B and a flat bulk solvent - the standard few-parameter model, so a batch of maps stays directly comparable) and writes 2Fo-Fc / Fo-Fc electron-density maps (CCP4) plus a map-coefficient MTZ. The structure itself is not refined; the model is only re-fractionalised into the data cell. * rugnux: The merged reflection output now carries French-Wilson amplitudes (|F| and its sigma) next to the intensities - MTZ `F`/`SIGF`, mmCIF `_refln.F_meas_au`, and the text HKL - computed with the correct centric/acentric Wilson prior and epsilon multiplicity, so a downstream program (e.g. phenix.refine) can refine against amplitudes. The intensity columns are unchanged. * rugnux: R-free test-set flags are now assigned deterministically and consistently across symmetry - a Bijvoet pair I(+)/I(-) is never split between the work and free sets, and the assignment is a reproducible per-hkl hash that depends only on the reflection index, so every dataset of one crystal form gets the same ~5% free set (what a multi-dataset campaign such as PanDDA needs). On small data the fraction is floored so the test set stays large enough for a stable R-free (~500 reflections, capped at 10%); it stays flat at 5% on ordinary data. When a reference MTZ carries a `FreeR_flag` column its test set is imported instead, letting a whole campaign inherit one shared free set. * rugnux: A reference MTZ (`--reference-mtz`) can now fix the space group and cell for rotation data too (previously rejected), without being used to scale - the rotation merge stays self-consistent. When the crystal has an indexing (merohedral) ambiguity - a lattice symmetry higher than its Laue symmetry, e.g. P3/P4/P6/C2 - the reference also resolves it: each candidate reindexing (identity plus the twin-law cosets of the metric symmetry) is scored by its intensity correlation against the reference and the data are re-merged in the best-correlating one. This is a metric-preserving relabelling of hkl (the cell is unchanged) and a no-op for a holohedral crystal such as lysozyme. * rugnux: `--model` validation now aligns the data to the model before scoring - the observed reflections are reindexed into the model's enantiomorph when the two differ only by hand (indistinguishable from merged intensities). A merohedral indexing ambiguity is resolved against the reference MTZ when one is given (so a whole campaign shares one indexing convention); only with a model and no reference does validation fall back to fitting each candidate reindexing and keeping the lowest R-free. * rugnux: De-novo symmetry - recover a genuine high-symmetry group whose data are imperfectly scaled. Such a merge's within-orbit chi² lands just past the self-consistency bound (each real symmetry step adds a little systematic scatter), right where a merohedral twin also lands, so the chi² ratio alone cannot separate them. The candidate is now rescued when the extra intensity-proportional systematic error it invokes stays small relative to the confirmed subgroup - a genuine symmetry step gains multiplicity without inflating the merge error model's b, whereas a twin forces non-equivalent reflections together and b balloons. Fixes cubic insulin (I23 instead of I222) with no change to any other crystal in the test battery, including the twins that must stay in their lower symmetry. * Docs: Document the French-Wilson amplitude estimation, R-free flagging, reference-based space-group/ambiguity resolution, and model-based validation/maps in CPU_DATA_ANALYSIS.md. * Frontend: The status-bar pill now shows a progress bar during detector calibration (previously only during measurement), and the calibration state and its button are labelled "Calibration"/"CALIBRATE" (the internal `Pedestal` state name is unchanged for back-compatibility).Reviewed-on: #70 Co-authored-by: Filip Leonarski <filip.leonarski@psi.ch>
8.4 KiB
jfjoch_writer
jfjoch_writer is NeXus compliant HDF5 file writer.
Acknowledgements
- Zdenek Matej (MAX IV)
- Felix Engelmann (MAX IV) for testing and multiple improvement suggestions.
Running directory
Writer needs to be running in base directory for writing files - file_prefix will be always relative in regard to writer running directory.
Writer detects and protects for basic security issues, like file_prefix starting with a slash, or starting with ../, or containing /../.
Usage
Writer needs to be started as a background service, with the following command:
jfjoch_writer {options} <address to connect via ZeroMQ to DCU>
Options:
-R<int> | --root_dir=<int> Root directory for file writing
-H<int> | --http_port=<int> HTTP port for statistics
-r<int> | --zmq_repub_port=<int> ZeroMQ port for PUSH socket to republish images
-f<int> | --zmq_file_port=<int> ZeroMQ port for PUB socket for notifications on finalized files
-w<int> | --rcv_watermark=<int> Receiving ZeroMQ socket watermark (default = 100)
-W<int> | --repub_watermark=<int> Republish ZeroMQ socket watermark (default = 1000)
for example:
jfjoch_writer -H5234 tcp://dcu-address:5400
HTTP interface
Writer has dedicated status interface via HTTP. It allows for two operations:
- check state of the writer to check if the writer is properly synchronized with DCU (e.g., that
file_prefixagrees with what was set on the DCU) and monitor progress. - cancel writing this will close all the HDF5 files being written and restart writer - the option should be used only if DCU process was terminated or disconnected, it SHOULD NOT be used as standard cancellation procedure (when DCU received cancel command it should properly finish writing as well)
Republish
Republish creates a PULL socket on the writer, where all the messages are republished for further use by data analysis pipeline. Republish is non-blocking, so if there is no receiver on other end or the sending queue is full - images won't be republished. In case of START/END messages republishing will attempt sending for 100 ms, but if send times out it won't be retried.
Republish functionality is optional, if republish port number is omitted this functionality is not enabled.
Overwriting files
When jfjoch_writer creates a HDF5 file, it first adds suffix .<random>.tmp.
Random value depends on current time-stamp and likely will be different from each file of the particular series.
After file is all saved and closed, it is renamed to remove the suffix.
By default, renaming won't happen if this would overwrite existing file.
However, this behavior can be changed by setting overwrite parameter to true in the file writer configuration.
When the overwrite conflict is reported
An existing output file is a fatal condition (unless overwrite is true). When it is detected
depends on whether the transport between the broker and the writer has a back-channel to report the
failure before acquisition starts:
- Direct HDF5 pusher and TCP writer (back-channel available). The conflict is detected at start: the writer that owns the master file checks whether it already exists and refuses to start. The direct pusher raises the error in-process; the TCP writer returns a START-failure acknowledgement. Either way the broker learns immediately and aborts the data collection before the detector is armed — no images are taken and nothing is written. Only the master file is checked up front: in a multi-writer setup the per-image data files are staggered across writers, and checking them at start would make each writer inspect files it never writes (and race the writers that do). Data-file conflicts are instead caught by their owning writer at the final rename, which for the TCP path surfaces as a write-failure acknowledgement to the broker.
- ZeroMQ writer (no back-channel). The ZeroMQ image stream is fire-and-forget: the writer has no
way to tell the broker to stop, and the broker would keep streaming images regardless. The writer
therefore does not fail at start. It writes the whole series to the
.<random>.tmpfiles as usual and only fails at the final rename, leaving the.tmpfiles on disk. This is deliberate: the acquired images are preserved (in.tmpform) rather than being dropped by a writer that aborted mid-stream. Rename the.tmpfiles by hand, or re-run withoverwriteset, to recover them.
Finalized files information
Creates PUB socket to inform about finalized data files. For each closed file, the socket will send a JSON message, with the following structure:
{
"filename": <string>: HDF5 data file name (relative to writer root directory),
"nimages": <int> number of images in the file (counting from 1!),
"file_number": <int> number of file within the acquisition,
"sample_name": <string> name of sample,
"run_name": <string> name of run,
"run_number": <int> number of run,
"experiment_group": <string> number of p-group / proposal (optional),
"user_data": <any json> user_data,
"beam_x_pxl": <float> beam center (X) in pixels,
"beam_y_pxl": <float> beam center (Y) in pixels,
"detector_distance_m": <float> detector distance (X) in m,
"detector_height_pxl": <int> detector size (X) in pixels,
"detector_width_pxl": <int> detector size (Y) in pixels,
"incident_energy_eV": <float> photon energy of the X-ray beam,
"pixel_size_m": <float> pixel size in meter (assuming pixel X == Y),
"saturation": <int> this count and higher mean saturation,
"space_group_number": <int> space group number (optional),
"underload": <int> pixels with this count should be excluded,
"unit_cell": <optinal> unit cell dimensions in Angstrom/degree {
"a": <float>, "b": <float>, "c": <float>,
"alpha": <float>, "beta": <float>, "gamma": <float>
},
}
user_data is defined as header_appendix in the /start operation in the jfjoch_broker.
Other metadata are also carried over from /start operation.
If the header_appendix is a string with valid JSON meaning, it will be embedded as JSON, otherwise it will be escaped as string.
For example header_appendix of {"param1": "test1", "param2": ["test1", "test2"]}, than example message will look as follows:
{
"filename": "dataset_name_data_000001.h5",
"nimages": 1000,
"file_number": 0,
"sample_name": "my_sample",
"run_name": "my_run",
"run_number": 25,
"experiment_group": "p00001",
"beam_x_pxl": 1200,
"beam_y_pxl": 1500,
"detector_distance_m": 0.155,
"detector_height_pxl": 2164,
"detector_width_pxl": 2068,
"image_time_s": 0.001,
"nimages": 2,
"incident_energy_eV": 12400.0,
"pixel_size_m": 7.5e-05,
"saturation": 32766,
"space_group_number": 96,
"underload": -32768,
"unit_cell": {
"a": 78.0,
"alpha": 90.0,
"b": 78.0,
"beta": 90.0,
"c": 39.0,
"gamma": 90.0
},
"user_data": {
"param1": "test1",
"param2": ["test1", "test2"]
}
}
Notifications for finalized files are optional, if notification port number is omitted this functionality is not enabled.
HDF5 file structure
Jungfraujoch writes NXmx-compliant HDF5, with substantial derived metadata (spot finding, indexing,
integration, azimuthal integration, per-image statistics and timing) stored beyond the NXmx
standard. The complete file layout — master vs data files, the three format variants
(NXmxLegacy, NXmxVDS, NXmxIntegrated), every NXmx field that is populated and every
Jungfraujoch extension — is documented in HDF5 / NeXus data format.
If data collection was configured with a header_appendix containing a key hdf5 whose value is a
JSON object of numbers and strings, those entries are written to /entry/user.
Other formats (CBF and TIFF)
Earlier versions could also write Crystallographic Binary File (CBF, miniCBF) and TIFF images. These
writers have been removed: Jungfraujoch now writes only NXmx HDF5. The CBF and TIFF values are
retained in the file-format enum for wire back-compatibility, but a request to write either format
is rejected.
No file option(s)
There are two options to disable writing of files by the writer:
- Setting
file_prefixto empty string - this will disable sending files on ZeroMQ image socket. - Setting file format to
NoFile- files are streamed over ZeroMQ socket, butjfjoch_writerwill not write anything. This can be useful for debugging purposes, or if you only rely on republishing functionality of thejfjoch_writer