Age | Commit message (Collapse) | Author |
|
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.
|
|
|
|
|
|
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.
|
|
|
|
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.
|
|
|
|
|
|
|
|
|
|
Infinity isn't allowed in JSON. 'Null' should serve equally well to
indicate "the relevant feature has been switched off".
|
|
|
|
|
|
This makes it work when the filenames contain spaces.
|
|
|
|
|
|
With the new header cache, it's possible to operate completely from the
stream.
|
|
This simultaneously implements --copy-header/--copy-hdf5-field and gives
access to metadata (e.g. detector position or wavelength) when loading
from a stream with header-specified values.
|
|
This will avoid multiple indexamajig processes from overwriting the
others' files when running a batch job.
|
|
|
|
|
|
Whoops.
|
|
|
|
|
|
"cmfilter" and "integrate_saturated" were unused.
|
|
Unfortunately, PinkIndexer needs the real camera length for its centre
refinement. Giving a fake value and scaling the resulting shift does
not work - the indexing rate drops with even a small error.
Ideally, this would work in the same way as --wavelength-estimate, by
using a static value from the geometry file if it's given. However,
this is rather complicated to implement because of the way all the units
stuff is implemented. Therefore, this is left as an improvement for the
future.
|
|
The FIXMEs have both already been fixed.
|
|
|
|
This give FromFile its own private command-lien option processing, like
the other indexers. It removes the ability to auto-generate the
solution filename, but I don't think there's a way to do that without
breaking abstractions.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
If the geometry file contains a literal wavelength, then let's use it.
That's better than nagging the user for a --wavelength-estimate.
|
|
This is a more general replacement for --pinkIndexer-thread-count.
|
|
Spectrum file is currently not supported at all. Maybe later.
|
|
These conflict badly with CrystFEL's own checks, creating a horrible
user and developer experience.
Later, if we want to handle wide bandwidth beams, we will improve the
central CrystFEL checks to support it.
|