jfjoch_viewer: a dataset opened over HTTP keeps its source and instrument
Build Packages / Unit tests (push) Successful in 1h8m44s
Build Packages / build:windows:nocuda (push) Successful in 16m57s
Build Packages / build:windows:cuda (push) Successful in 20m12s
Build Packages / build:viewer-tgz:cpu (push) Successful in 16m28s
Build Packages / build:viewer-tgz:cuda (push) Successful in 17m5s
Build Packages / build:rugnux-tgz (x86_64) (push) Successful in 14m54s
Build Packages / build:rugnux:windows (push) Successful in 11m7s
Build Packages / build:rugnux:aarch64 (cross) (push) Successful in 8m31s
Build Packages / build:rpm (rocky8_nocuda) (push) Successful in 19m32s
Build Packages / build:rpm (ubuntu2404_nocuda) (push) Successful in 14m0s
Build Packages / build:rpm (rocky8_sls9) (push) Successful in 15m23s
Build Packages / build:rpm (rocky8) (push) Successful in 14m28s
Build Packages / build:rpm (ubuntu2404) (push) Successful in 9m2s
Build Packages / XDS test (JFJoch plugin) (push) Successful in 6m23s
Build Packages / XDS test (neggia plugin) (push) Successful in 5m44s
Build Packages / Generate python client (push) Successful in 10s
Build Packages / Build documentation (push) Successful in 34s
Build Packages / Create release (push) Skipped
Build Packages / XDS test (durin plugin) (push) Failing after 3h12m36s
Build Packages / DIALS test (push) Failing after 3h12m38s
Build Packages / build:rpm (ubuntu2204) (push) Failing after 3h12m40s
Build Packages / build:rpm (rocky9) (push) Failing after 3h12m43s
Build Packages / build:rpm (rocky9_sls9) (push) Failing after 3h12m45s
Build Packages / build:rpm (ubuntu2204_nocuda) (push) Failing after 3h12m47s
Build Packages / build:rpm (rocky9_nocuda) (push) Failing after 3h12m49s

The start message carries source_name, source_type and instrument_name, and the
broker fills all three from its config, but the HTTP reader never imported them
into the dataset's experiment - so the Inspector showed "-" for
Source / Instrument on a live connection while the same file opened from disk
showed it. Total flux and attenuator transmission, which the tooltip on that
line reports, were dropped the same way; ring current already came through.

Sample name was never affected and is unchanged.

Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01PogHY7bWXV4bpctDPdyuDN
This commit is contained in:
leonarski_fandClaude Opus 5 committed 2026-09-11 19:23:49 +02:00
1 parent a59be89192
commit 75eb6ce59c
1 file changed
+10
+10
View File
@@ -11,6 +11,7 @@
#include "../broker/gen/model/Plots.h"
#include "../broker/gen/model/Broker_status.h"
#include "../broker/gen/model/Roi_definitions.h"
#include "../common/InstrumentMetadata.h"
#include "../common/JFJochMath.h"
#include "../image_analysis/bragg_integration/CalcISigma.h"
@@ -259,9 +260,18 @@ std::shared_ptr<JFJochReaderDataset> JFJochHttpReader::UpdateDataset_i() {
dataset->experiment.NumTriggers(1);
dataset->experiment.ImagesPerTrigger(msg->start_message->number_of_images);
InstrumentMetadata instrument;
instrument.SourceName(msg->start_message->source_name);
instrument.SourceType(msg->start_message->source_type);
instrument.InstrumentName(msg->start_message->instrument_name);
dataset->experiment.ImportInstrumentMetadata(instrument);
dataset->experiment.SampleName(msg->start_message->sample_name);
dataset->experiment.SampleTemperature_K(msg->start_message->sample_temperature_K);
dataset->experiment.RingCurrent_mA(msg->start_message->ring_current_mA);
dataset->experiment.TotalFlux(msg->start_message->total_flux);
dataset->experiment.AttenuatorTransmission(msg->start_message->attenuator_transmission);
dataset->experiment.IncidentEnergy_keV(msg->start_message->incident_energy / 1000.0);
dataset->experiment.FluorescenceSpectrum(msg->start_message->fluorescence_spectrum);