v1.0.0-rc.34

common/DiffractionExperiment.cpp

@@ -21,7 +21,7 @@ using namespace std::literals::chrono_literals;
 DiffractionExperiment::DiffractionExperiment() : DiffractionExperiment(DetectorGeometry(8, 2)) {}
 
 DiffractionExperiment::DiffractionExperiment(const DetectorSetup& det_setup)
-        : detector(det_setup), roi_mask(det_setup) {
+        : detector(det_setup) {
 
     ndatastreams = 1;
 
@@ -39,7 +39,6 @@ DiffractionExperiment::DiffractionExperiment(const DetectorSetup& det_setup)
 // setter functions
 DiffractionExperiment &DiffractionExperiment::Detector(const DetectorSetup &input) {
     detector = input;
-    roi_mask = ROIMap(input);
     return *this;
 }
 
@@ -629,10 +628,7 @@ void DiffractionExperiment::FillMessage(StartMessage &message) const {
     message.run_name = GetRunName();
 
     message.gain_file_names = detector.GetGainFileNames();
-
-    for (const auto &[x, y]: roi_mask.GetROINameMap())
-        message.roi_names.emplace_back(x);
-
+    message.rois = roi_mask.ExportMetadata();
     message.data_reduction_factor_serialmx = GetLossyCompressionSerialMX();
     message.experiment_group = dataset.GetExperimentGroup();
     message.jfjoch_release = jfjoch_version();
@@ -985,8 +981,8 @@ const ROIMap &DiffractionExperiment::ROI() const {
     return roi_mask;
 }
 
-void DiffractionExperiment::ExportROIMap(uint16_t *v, size_t module_number) const {
-    ConvertedToRawGeometry(*this, module_number, v, roi_mask.GetROIMap().data());
+std::vector<uint16_t> DiffractionExperiment::ExportROIMap() const {
+    return roi_mask.GetROIMap(detector, GetDiffractionGeometry());
 }
 
 DiffractionExperiment &DiffractionExperiment::ImagesPerFile(int64_t input) {
@@ -1280,12 +1276,12 @@ bool DiffractionExperiment::IsElectronSource() const {
     return instrument.IsElectronSource();
 }
 
-DiffractionExperiment &DiffractionExperiment::HDF5MasterFormatVersion(int input) {
+DiffractionExperiment &DiffractionExperiment::HDF5MasterFormatVersion(FileWriterFileFormat input) {
     file_writer.HDF5MasterFormatVersion(input);
     return *this;
 }
 
-int DiffractionExperiment::GetHDF5MasterFormatVersion() const {
+FileWriterFileFormat DiffractionExperiment::GetHDF5MasterFormatVersion() const {
     return file_writer.GetHDF5MasterFormatVersion();
 }