Age | Commit message (Collapse) | Author |
|
|
|
This (re-)adds the ability to get data via a request/reply socket.
See afcb7b568947c for when it was removed.
|
|
This fixes --threshold when --zmq-subscribe is used.
|
|
Closes: https://gitlab.desy.de/thomas.white/crystfel/-/issues/12
|
|
|
|
A silly cut+paste error.
|
|
The logic behind forcing the results selector (to "Calculations within
GUI") was that anything calculated in the GUI should appear under that
selection only.
Unfortunately, when loading a stream without images, there is nothing at
all to be seen under this selection, not even an image. Forcing the
selector resulted in proj->cur_image = NULL and therefore a crash when
trying to index based on that.
Similarly, the call to update_peaks expected image data, but there is
none. In reality, we have a perfectly good image structure with peaks
from the stream already.
This allows a non-image stream to be "re-indexed" based on the peaks.
Fixes: https://gitlab.desy.de/thomas.white/crystfel/-/issues/33
|
|
|
|
|
|
|
|
|
|
If this happens once, it'll probably happen every frame. This makes
things very noisy.
|
|
|
|
This will help to avoid mistakes when people put statements at the end
of the geometry file, rather than the top.
Closes https://gitlab.desy.de/thomas.white/crystfel/-/issues/20.
|
|
|
|
This removes the big potential for confusion, which has happened several
times (see e.g. 095cbebaf6). It also fixes in-tree builds with CMake
(but seriously, always use out-of-tree builds).
Fixes #2.
|
|
|
|
This code hasn't been looked at for a very long time, and can be made a
bit faster by iterating in a more cache-friendly way.
|
|
|
|
The unique filename is needed by the GUI for looking up results in a
stream. Otherwise, the filename is "(null)" for everything and the
lookup just returns the first chunk in the stream.
The filename is generated based on the unique serial number for each
chunk, and is therefore unique across one run of indexamajig regardless
of the number of worker processes (-j). This might have to change in future
to accommodate jobs run across multiple nodes, if there is any demand
for looking at results in one big concatenated stream.
This also changes the condition for deciding when to look for a 'real'
file, to take into account that there is always a non-NULL filename.
|
|
|
|
|
|
This is a hack to filter out what seems like "keepalive" messages. It's
nasty, but better than contaminating the stream with spurious chunks.
|
|
The changes in b22f6f524 were incorrect. config.h should never be
included from libcrystfel headers, because that will include the main
CrystFEL program config.h instead.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
This removes some unnecessary work (getting the address from the file)
and seems cleaner.
|
|
|
|
It's not used anywhere.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
This moves the entry point for loading MsgPack data to a new function,
image_read_data_block. Inside image.c, the image structure can be
created using exactly the same functions as for data files.
|
|
|
|
For data formats other than HDF5, the location can be anything.
|
|
|
|
Indexamajig uses only ZMQ, to receive streaming data, while libcrystfel
uses only msgpack to implement another type of image format.
The two of these are eventually tied together in process_image, which
does this: if ( have_zmq_data ) interpret_zmq_data_as_msgpack;
- however, they would be easy to split up if we wanted to do something
else (CBF data over ZMQ, anyone?).
This commit also switches the ZMQ connector to use a pub/sub socket
instead of a request/reply one. This matches changes in OnDA.
At the moment, the MessagePack image reader simply dumps the object to
disk.
|
|
|
|
|
|
|
|
|