ImagePreprocessorBuffer: Dedicated class to handle buffer used by spot finding.

image_analysis/image_preprocessing/ImagePreprocessorGPU.cu

@@ -94,7 +94,6 @@ ImagePreprocessorGPU::ImagePreprocessorGPU(const DiffractionExperiment &experime
       stream(stream),
       gpu_mask(npixels),
       gpu_decompressed_image(npixels * sizeof(uint32_t)),  // Overshoot - if input image is 1- or 2-byte, then it is still fine, while memory loss is minimal
-      gpu_image(npixels),
       gpu_stats(1),
       cpu_stats(1),
       cpu_stats_reg(cpu_stats) {
@@ -113,7 +112,7 @@ ImagePreprocessorGPU::ImagePreprocessorGPU(const DiffractionExperiment &experime
     blocks = 4 * prop.multiProcessorCount;
 }
 
-ImageStatistics ImagePreprocessorGPU::Analyze(std::vector<int32_t> &processed_image, const uint8_t *image_ptr,
+ImageStatistics ImagePreprocessorGPU::Analyze(ImagePreprocessorBuffer &processed_image, const uint8_t *image_ptr,
                                               CompressedImageMode image_mode) {
     switch (image_mode) {
         case CompressedImageMode::Int8:
@@ -134,7 +133,7 @@ ImageStatistics ImagePreprocessorGPU::Analyze(std::vector<int32_t> &processed_im
 }
 
 template<class T>
-ImageStatistics ImagePreprocessorGPU::Analyze(std::vector<int32_t> &processed_image,
+ImageStatistics ImagePreprocessorGPU::Analyze(ImagePreprocessorBuffer &processed_image,
                                               const uint8_t *input,
                                               T err_value,
                                               T sat_value) {
@@ -148,23 +147,15 @@ ImageStatistics ImagePreprocessorGPU::Analyze(std::vector<int32_t> &processed_im
     preprocess_kernel<T> <<< blocks, threads, 0, *stream >>>(
         reinterpret_cast<const T *>(gpu_decompressed_image.get()),
         gpu_mask,
-        gpu_image,
+        processed_image.getGPUBuffer(),
         gpu_stats,
         sat_value,
         err_value,
         npixels);
-    cudaMemcpyAsync(processed_image.data(), gpu_image, npixels * sizeof(int32_t), cudaMemcpyDeviceToHost, *stream);
+    cudaMemcpyAsync(processed_image.data(), processed_image.getGPUBuffer(), npixels * sizeof(int32_t), cudaMemcpyDeviceToHost, *stream);
     cudaMemcpyAsync(cpu_stats.data(), gpu_stats, sizeof(ImageStatistics), cudaMemcpyDeviceToHost, *stream);
 
     cudaStreamSynchronize(*stream);
 
     return cpu_stats[0];
 }
-
-const int32_t *ImagePreprocessorGPU::GetImageDevicePtr() const {
-    return gpu_image;
-}
-
-std::shared_ptr<CudaStream> ImagePreprocessorGPU::GetStream() const {
-    return stream;
-}