Remove start_pulse_id and pulse_id_step from live writer

We do not rely on start_pulse_id and pulse_id_step to
calculate the next image as we don't care which image this
will be - we write whatever we receive. This will allow us
to use an external driver for the pulses we desire to write.
This commit is contained in:
2020-07-20 14:59:00 +02:00
parent 0441758d96
commit 9d9549b868
3 changed files with 4 additions and 14 deletions
+2 -6
View File
@@ -16,10 +16,8 @@ class JFH5LiveWriter {
const std::string detector_name_;
const size_t n_modules_;
const uint64_t start_pulse_id_;
const size_t n_pulses_;
const size_t pulse_id_step_;
size_t write_index_;
H5::H5File file_;
@@ -43,9 +41,7 @@ public:
JFH5LiveWriter(const std::string& output_file,
const std::string& detector_folder,
const size_t n_modules,
const uint64_t start_pulse_id,
const size_t n_pulses,
const size_t pulse_id_step);
const size_t n_pulses);
~JFH5LiveWriter();
void write(const ImageMetadata* metadata, const char* data);
};
+1 -6
View File
@@ -12,14 +12,10 @@ using namespace buffer_config;
JFH5LiveWriter::JFH5LiveWriter(const string& output_file,
const string& detector_folder,
const size_t n_modules,
const uint64_t start_pulse_id,
const size_t n_pulses,
const size_t pulse_id_step) :
const size_t n_pulses) :
detector_name_(get_detector_name(detector_folder)),
n_modules_(n_modules),
start_pulse_id_(start_pulse_id),
n_pulses_(n_pulses),
pulse_id_step_(pulse_id_step),
write_index_(0)
{
b_pulse_id_ = new uint64_t[n_pulses_];
@@ -123,7 +119,6 @@ void JFH5LiveWriter::close_file()
void JFH5LiveWriter::write(const ImageMetadata* metadata, const char* data)
{
hsize_t offset[] = {write_index_, 0, 0};
H5DOwrite_chunk(image_dataset_.getId(), H5P_DEFAULT, 0,
+1 -2
View File
@@ -112,8 +112,7 @@ int main (int argc, char *argv[])
ref(image_assembler));
}
JFH5LiveWriter writer(output_file, detector_folder, n_modules,
start_pulse_id, n_pulses, pulse_id_step);
JFH5LiveWriter writer(output_file, detector_folder, n_modules, n_pulses);
for (uint64_t pulse_id:pulse_ids_to_write) {