merging

AdvancedPhotonSource · Jun 16, 2021 · e4a74ff · e4a74ff
2 parents 45aa7cb + abf152c
commit e4a74ff
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/cohere/src_cpp/worker.cpp b/cohere/src_cpp/worker.cpp
@@ -279,10 +279,10 @@ void Reconstruction::Twin()
     dim4 dims = data.dims();
     std::vector<int> twin_halves = params->GetTwinHalves();
     af::array temp = constant(0, dims, u32);
-    int x_start = (twin_halves[0] == 0) ? 0 : dims[0]/2;
-    int x_end = (twin_halves[0] == 0) ? dims[0]/2 -1 : dims[0]-1;
-    int y_start = (twin_halves[1] == 0) ? 0 : dims[1]/2;
-    int y_end = (twin_halves[1] == 0) ? dims[1]/2 -1 : dims[1]-1;
+    int x_start = (twin_halves[0] == 0) ? 0 : int(dims[0]/2);
+    int x_end = (twin_halves[0] == 0) ? int(dims[0]/2 -1) : dims[0]-1;
+    int y_start = (twin_halves[1] == 0) ? 0 : int(dims[1]/2);
+    int y_end = (twin_halves[1] == 0) ? int(dims[1]/2 -1) : dims[1]-1;
     temp( af::seq(x_start, x_end), af::seq(y_start, y_end), span, span) = 1;
     ds_image = ds_image * temp;
 //     printf("Twin\n");