detectors/slsDetectorPackage
24
1
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2026-08-09 18:10:29 +02:00
Code Issues Actions Packages Releases Activity

Revert previous datatype change to int

Browse Source
This commit is contained in:
hinger_v
2024-11-08 12:01:08 +01:00
parent 0583a0703c
commit d2dead070c
3 changed files with 12 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
slsDetectorCalibration/multiThreadedInterpolatingDetector.h
+4 -5
View File
@@ -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;
};