diff --git a/slsDetectorCalibration/moenchExecutables/moenchZmqProcess.cpp b/slsDetectorCalibration/moenchExecutables/moenchZmqProcess.cpp
index aa05dd941..fa7baae30 100644
--- a/slsDetectorCalibration/moenchExecutables/moenchZmqProcess.cpp
+++ b/slsDetectorCalibration/moenchExecutables/moenchZmqProcess.cpp
@@ -336,7 +336,7 @@ int main(int argc, char *argv[]) {
 
     string fname;
     //	int length;
-    long long int *detimage = NULL;
+    int *detimage = nullptr;
     int nnx, nny, nnsx, nnsy;
     // uint32_t imageSize = 0, nPixelsX = 0, nPixelsY = 0,
     // uint32_t  dynamicRange = 0;
diff --git a/slsDetectorCalibration/multiThreadedAnalogDetector.h b/slsDetectorCalibration/multiThreadedAnalogDetector.h
index aa420a5b9..d62e19801 100644
--- a/slsDetectorCalibration/multiThreadedAnalogDetector.h
+++ b/slsDetectorCalibration/multiThreadedAnalogDetector.h
@@ -410,7 +410,7 @@ class multiThreadedAnalogDetector {
             dets[i]->newDataSet();
     };
 
-    virtual long long int *getImage(int &nnx, int &nny, int &ns, int &nsy) {
+    virtual int *getImage(int &nnx, int &nny, int &ns, int &nsy) {
         //int *img;
         // int nnx, nny, ns;
         // int nnx, nny, ns;
@@ -419,7 +419,7 @@ class multiThreadedAnalogDetector {
             delete[] image;
             image = nullptr;
         }
-        image = new long long int[nn];
+        image = new int[nn];
         // int nn=dets[0]->getImageSize(nnx, nny, ns);
         // for (i=0; i<nn; i++) image[i]=0;
 
@@ -430,11 +430,11 @@ class multiThreadedAnalogDetector {
             for (int i = 0; i < nn; i++) {
                 if (ii == 0)
                     //	  if (img[i]>0)
-                    image[i] = static_cast<long long int>(tmp_img[i]);
+                    image[i] = tmp_img[i];
                 // else
                 //  image[i]=0;
                 else // if (img[i]>0)
-                    image[i] += static_cast<long long int>(tmp_img[i]);
+                    image[i] += tmp_img[i];
                 // if (img[i])	  cout << "det " << ii << " pix " << i << " val
                 // " <<  img[i] << " " << image[i] << endl;
             }
@@ -697,9 +697,9 @@ class multiThreadedAnalogDetector {
     threadedAnalogDetector *dets[MAXTHREADS];
     analogDetector<uint16_t> *dd[MAXTHREADS];
     int ithread;
-    long long int *image;
-    int *ff;
-    double *ped;
+    int* image;
+    int* ff;
+    double* ped;
     //pthread_mutex_t fmutex; //unused
 };
 
diff --git a/slsDetectorCalibration/multiThreadedInterpolatingDetector.h b/slsDetectorCalibration/multiThreadedInterpolatingDetector.h
index 502400965..37e0208b5 100644
--- a/slsDetectorCalibration/multiThreadedInterpolatingDetector.h
+++ b/slsDetectorCalibration/multiThreadedInterpolatingDetector.h
@@ -66,11 +66,10 @@ class multiThreadedInterpolatingDetector
         return (dets[0])->getInterpolation();
     };
 
-    virtual long long int *getImage(int &nnx, int &nny, int &nsx, int &nsy) {
+    virtual int *getImage(int &nnx, int &nny, int &nsx, int &nsy) {
         if (getInterpolation() == NULL)
             return multiThreadedAnalogDetector::getImage(nnx, nny, nsx, nsy);
         // if one interpolates, the whole image is stored in detector 0;
-        int *img;
         // int nnx, nny, ns;
         // int nnx, nny, ns;
         int nn = dets[0]->getImageSize(nnx, nny, nsx, nsy);
@@ -78,10 +77,10 @@ class multiThreadedInterpolatingDetector
             delete image;
             image = NULL;
         }
-        image = new long long int[nn];
-        img = dets[0]->getImage();
+        image = new int[nn];
+        int* tmp_img = dets[0]->getImage();
         for (int i = 0; i < nn; i++) {
-            image[i] = static_cast<long long int>(img[i]);
+            image[i] = tmp_img[i];
         }
         return image;
     };