detectors/slsDetectorPackage
24
1
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2026-01-17 09:13:44 +01:00
Code Issues Actions Packages Releases Activity

minor fixes (#708)

Browse Source
This commit is contained in:
Erik Fröjdh
2023-03-31 11:56:09 +02:00
committed by GitHub
parent 3b8c612103
commit 37e7471dc4
5 changed files with 40 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
slsDetectorCalibration/dataStructures/moench04CtbZmq10GbData.h
View File

@@ -54,28 +54,28 @@ class moench04CtbZmq10GbData : public slsDetectorData<uint16_t> {
#endif
#endif
cout << "off is " << off << endl;
cout << "off is " << off << endl;
if (off>0)
if (off>0)
cout << "M04 RAW DATA NEW " << endl;
else
else
cout << "M04 ZMQ DATA NEW " << endl;
int adc_nr[32] = {9, 8, 11, 10, 13, 12, 15, 14, 1, 0, 3,
2, 5, 4, 7, 6, 23, 22, 21, 20, 19, 18,
17, 16, 31, 30, 29, 28, 27, 26, 25, 24};
int adc_nr[32] = {9, 8, 11, 10, 13, 12, 15, 14, 1, 0, 3,
2, 5, 4, 7, 6, 23, 22, 21, 20, 19, 18,
17, 16, 31, 30, 29, 28, 27, 26, 25, 24};
int row, col;
int row, col;
// int isample;
int iadc;
// int ix, iy;
// int isample;
int iadc;
// int ix, iy;
// int npackets=40;
int i;
// int adc4(0);
// int npackets=40;
int i;
// int adc4(0);
for (int is = 0; is < aSamples; is++) {

17
slsDetectorCalibration/dataStructures/slsDetectorData.h
View File

@@ -198,19 +198,18 @@ template <typename dataType> slsDetectorData<dataType>::~slsDetectorData() {
template <typename dataType>
void slsDetectorData<dataType>::setDataMap(int **dMap) {
int ip = 0;
int ix, iy;
// int ip = 0;
if (dMap == NULL) {
for (iy = 0; iy < ny; iy++) {
for (ix = 0; ix < nx; ix++) {
for (int iy = 0; iy < ny; iy++) {
for (int ix = 0; ix < nx; ix++) {
dataMap[iy][ix] = (iy * nx + ix) * sizeof(dataType);
}
}
} else {
// cout << "set dmap "<< dataMap << " " << dMap << endl;
for (iy = 0; iy < ny; iy++) {
for (int iy = 0; iy < ny; iy++) {
// cout << iy << endl;
for (ix = 0; ix < nx; ix++) {
for (int ix = 0; ix < nx; ix++) {
dataMap[iy][ix] = dMap[iy][ix];
// cout << ix << " " << iy << endl;
/*ip=dataMap[ix][iy]/sizeof(dataType);
@@ -220,8 +219,8 @@ void slsDetectorData<dataType>::setDataMap(int **dMap) {
}
}
/* //commented this part because it causes out-of-bound issues if nx or ny are larger than dataMap bounds (single-chip readout of strixel with groups of different pitches) VH 2023-02-24
for (iy = 0; iy < ny; iy++) {
for (ix = 0; ix < nx; ix++) {
for (int iy = 0; iy < ny; iy++) {
for (int ix = 0; ix < nx; ix++) {
ip = dataMap[iy][ix] / sizeof(dataType);
xmap[ip] = ix;
ymap[ip] = iy;
@@ -293,7 +292,6 @@ template <typename dataType>
dataType **slsDetectorData<dataType>::getData(char *ptr, int dsize) {
int el = dsize / sizeof(dataType);
// dataType **data;
int ix, iy;
// data=new dataType*[ny];
// for(int i = 0; i < ny; i++) {
// data[i]=new dataType[nx];
@@ -303,6 +301,7 @@ dataType **slsDetectorData<dataType>::getData(char *ptr, int dsize) {
dsize = dataSize;
for (int ip = 0; ip < (el); ip++) {
int ix, iy;
getPixel(ip, ix, iy);
if (ix >= 0 && ix < nx && iy >= 0 && iy < ny) {
// data[iy][ix]=getChannel(ptr,ix,iy);