diff --git a/receiver/JFJochReceiver.cpp b/receiver/JFJochReceiver.cpp index de29e59a..8af4c97f 100644 --- a/receiver/JFJochReceiver.cpp +++ b/receiver/JFJochReceiver.cpp @@ -562,16 +562,16 @@ void JFJochReceiver::Cancel(const JFJochException &e) { acquisition_device[d]->ActionAbort(); } -double JFJochReceiver::GetIndexingRate() const { +float JFJochReceiver::GetIndexingRate() const { return indexing_solution.Mean(); } -double JFJochReceiver::GetProgress() const { +float JFJochReceiver::GetProgress() const { if (experiment.GetImageNum() > 0) - return static_cast(max_image_number_sent) / static_cast(experiment.GetImageNum()) * 100.0; + return static_cast(max_image_number_sent) / static_cast(experiment.GetImageNum()) * 100.0; else if (experiment.GetFrameNum() > 0) // Pedestal - return static_cast(max_image_number_sent) / static_cast(experiment.GetFrameNum()) * 100.0; + return static_cast(max_image_number_sent) / static_cast(experiment.GetFrameNum()) * 100.0; else return 100.0; } diff --git a/receiver/JFJochReceiver.h b/receiver/JFJochReceiver.h index 9c9c2e47..138eb994 100644 --- a/receiver/JFJochReceiver.h +++ b/receiver/JFJochReceiver.h @@ -124,8 +124,8 @@ public: void GetStatistics(JFJochProtoBuf::ReceiverOutput &out) const; void Cancel(); - double GetProgress() const; - double GetIndexingRate() const; + float GetProgress() const; + float GetIndexingRate() const; void SetDataProcessingSettings(const JFJochProtoBuf::DataProcessingSettings &data_processing_settings); float GetAvailableSendBuffers() const;