From 2072e85961cc87cdd55b4bd9b8b5f419212476f9 Mon Sep 17 00:00:00 2001 From: Andrej Babic Date: Wed, 26 Sep 2018 14:55:40 +0200 Subject: [PATCH] Remove unused features --- csaxs/CsaxsFormat.cpp | 14 ++++---------- csaxs/csaxs_h5_writer.cpp | 2 +- 2 files changed, 5 insertions(+), 11 deletions(-) diff --git a/csaxs/CsaxsFormat.cpp b/csaxs/CsaxsFormat.cpp index 75b386c..7cfaf3e 100644 --- a/csaxs/CsaxsFormat.cpp +++ b/csaxs/CsaxsFormat.cpp @@ -17,22 +17,16 @@ class CsaxsFormat : public H5Format public: ~CsaxsFormat(){}; - CsaxsFormat(const string& dataset_name) + CsaxsFormat() { // After format has been writen, where to move the raw datasets. - dataset_move_mapping.reset(new std::unordered_map( - { - {config::raw_image_dataset_name, "data/" + dataset_name + "/data"}, - })); + dataset_move_mapping.reset(new std::unordered_map()); + input_value_type.reset(new unordered_map()); // Definition of the file format. file_format.reset( - new h5_parent("", EMPTY_ROOT, { - s_ptr(new h5_group("data", { - s_ptr(new h5_group(dataset_name, {})) - })) - })); + new h5_parent("", EMPTY_ROOT, {})); } const h5_parent& get_format_definition() const override diff --git a/csaxs/csaxs_h5_writer.cpp b/csaxs/csaxs_h5_writer.cpp index 4af0bc1..ecf3300 100644 --- a/csaxs/csaxs_h5_writer.cpp +++ b/csaxs/csaxs_h5_writer.cpp @@ -40,7 +40,7 @@ int main (int argc, char *argv[]) auto header_values = shared_ptr>(); - CsaxsFormat format(detector_name, n_bad_modules); + CsaxsFormat format(); WriterManager writer_manager(format.get_input_value_type(), output_file, n_frames); ZmqReceiver receiver(connect_address, config::zmq_n_io_threads, config::zmq_receive_timeout, header_values);