JFJochReceiver: Use DiffractionExperiment and JFCalibration, instead of ProtoBuf structure

2023-11-10 12:27:35 +01:00
parent 4efcdaab74
commit 6008fbea35
4 changed files with 23 additions and 16 deletions
@@ -19,7 +19,11 @@ grpc::Status JFJochReceiverService::Start(grpc::ServerContext *context, const JF
        // ensure that everything was rolled back
        // But it is important to do it in correct order - first abort old receiver, close it, than start new one
        receiver.reset();
-        receiver = std::make_unique<JFJochReceiver>(*request, aq_devices, image_pusher,
+        experiment = std::make_unique<DiffractionExperiment>(request->jungfraujoch_settings());
+        calibration = std::make_unique<JFCalibration>(request->calibration());
+
+        receiver = std::make_unique<JFJochReceiver>(*experiment, calibration.get(),
+                                                    aq_devices, image_pusher,
                                                    logger, nthreads, send_buffer_count,
                                                    preview_publisher, numa_policy);
        try {