diff --git a/tools/DataAnalysisPerfTest.cpp b/tools/DataAnalysisPerfTest.cpp
index 7987dfd6..3d55ef1b 100644
--- a/tools/DataAnalysisPerfTest.cpp
+++ b/tools/DataAnalysisPerfTest.cpp
@@ -16,7 +16,7 @@
 
 Logger logger{"DataAnalysisPerfTest"};
 
-auto TestAll(const DiffractionExperiment &experiment, const JFJochProtoBuf::DataProcessingSettings &settings,
+auto TestAll(const DiffractionExperiment &experiment, const DataProcessingSettings &settings,
              GPUImageAnalysis &spot_finder, int16_t* image, size_t nimages) {
     IndexerWrapper indexer;
     indexer.Setup(experiment.GetUnitCell());
@@ -86,7 +86,7 @@ void TestIndexing() {
     }
 }
 
-auto TestSpotFinder(const DiffractionExperiment &experiment, const JFJochProtoBuf::DataProcessingSettings &settings,
+auto TestSpotFinder(const DiffractionExperiment &experiment, const DataProcessingSettings &settings,
                     GPUImageAnalysis &spot_finder, int16_t* image, size_t nimages) {
 
     std::vector<DiffractionSpot> spots;
@@ -110,7 +110,7 @@ auto TestSpotFinder(const DiffractionExperiment &experiment, const JFJochProtoBu
     return strstream.str();
 }
 
-auto TestSpotFinderWithoutCopyToDevice(const DiffractionExperiment &experiment, const JFJochProtoBuf::DataProcessingSettings &settings,
+auto TestSpotFinderWithoutCopyToDevice(const DiffractionExperiment &experiment, const DataProcessingSettings &settings,
                     GPUImageAnalysis &spot_finder, int16_t* image, size_t nimages) {
 
     std::vector<DiffractionSpot> spots;
@@ -178,14 +178,14 @@ int main(int argc, char **argv) {
     x.BeamX_pxl(1090).BeamY_pxl(1136).DetectorDistance_mm(75).PhotonEnergy_keV(WVL_1A_IN_KEV);
     x.SetUnitCell(UnitCell{.a = 78.90f, .b = 78.90f, .c = 36.94, .alpha = 90, .beta = 90, .gamma = 90});
 
-    JFJochProtoBuf::DataProcessingSettings settings;
-    settings.set_signal_to_noise_threshold(2.5);
-    settings.set_photon_count_threshold(5);
-    settings.set_min_pix_per_spot(3);
-    settings.set_max_pix_per_spot(200);
-    settings.set_low_resolution_limit(80.0);
-    settings.set_high_resolution_limit(2.0);
-    settings.set_local_bkg_size(5);
+    DataProcessingSettings settings;
+    settings.signal_to_noise_threshold = 2.5;
+    settings.photon_count_threshold = 5;
+    settings.min_pix_per_spot = 3;
+    settings.max_pix_per_spot = 200;
+    settings.low_resolution_limit = 80.0;
+    settings.high_resolution_limit = 2.0;
+    settings.local_bkg_size = 5;
 
     std::vector<uint8_t> one_byte_mask(x.GetPixelsNum(), 1);
 
@@ -200,7 +200,7 @@ int main(int argc, char **argv) {
         TestSpotFinderWithoutCopyToDevice(x, settings, local_peakfinder_gpu,image_conv.data(), nimages);
     }
 
-    settings.set_local_bkg_size(3);
+    settings.local_bkg_size = 3;
     logger.Info("COLSPOT NBX=NBY=3 (GPU)");
     if (GPUImageAnalysis::GPUPresent()) {
         GPUImageAnalysis local_peakfinder_gpu(x.GetXPixelsNum(), x.GetYPixelsNum());