Fix broken #if condition in scatter device factory

src/core/scatter_devices/scatter_device_factory.cpp

@@ -163,14 +163,18 @@ ScatterDeviceFactory::create(boost::mpi::communicator &scatter_comm, Sample &sam
             p_ScatterDevice = new SelfVectorsCUDAScatterDevice(
                 all_comm, partition_comm, sample, thispartition_QIV, NAF, fileservice_endpoint,
                 monitorservice_endpoint);
-        } else
+        }
 #endif
+        // The condition is slightly redundant but makes it easier because of the #if/#endif block
+        if (Params::Inst()->device != sass::platform::Device::CUDA) {
             if (scatter_comm.rank() == 0) {
-            Info::Inst()->write("Initializing CPU Scatter Device, Vectors (self)");
+                Info::Inst()->write("Initializing CPU Scatter Device, Vectors (self)");
+            }
+            p_ScatterDevice =
+                new SelfVectorsScatterDevice(all_comm, partition_comm, sample, thispartition_QIV,
+                                             NAF, fileservice_endpoint, monitorservice_endpoint);
         }
-        p_ScatterDevice =
-            new SelfVectorsScatterDevice(all_comm, partition_comm, sample, thispartition_QIV, NAF,
-                                         fileservice_endpoint, monitorservice_endpoint);
+
     } else if (Params::Inst()->scattering.type == "all") {
         if (Params::Inst()->scattering.average.orientation.type == "vectors") {
             if (scatter_comm.rank() == 0)