mirror of
https://github.com/slsdetectorgroup/slsDetectorPackage.git
synced 2025-06-23 18:17:59 +02:00
modified ZMQonline display for stripsel usage. (#699)
* modified ZMQonline display for stripsel usage. modified dataprocessor to overwrite header.detspec1 with ROI in case of ROI. * Removing changes to the slsReceiver, moved to branch jf_zeromq_display_rxroi
This commit is contained in:
@ -57,21 +57,33 @@ class jungfrauLGADStrixelsData : public slsDetectorData<uint16_t> {
|
||||
1286 large etc.) \param c crosstalk parameter for the output buffer
|
||||
|
||||
*/
|
||||
|
||||
int groupmap[512*5][1024/5];
|
||||
|
||||
|
||||
jungfrauLGADStrixelsData()
|
||||
: slsDetectorData<uint16_t>(1024/5, 512*5,
|
||||
512 * 1024 * 2 + sizeof(header)) {
|
||||
cout << "aaa" << endl;
|
||||
// cout << "aaa" << endl;
|
||||
#ifdef ALDO //VH
|
||||
cout<< "using reduced jf_header" << endl; //VH
|
||||
#endif //VH
|
||||
for (int ix = 0; ix < 1024/5; ix++) {
|
||||
for (int iy = 0; iy < 512*5; iy++) {
|
||||
dataMap[iy][ix] = sizeof(header);//+ ( 1024 * 5 + 300) * 2; //somewhere on the guardring of the LGAD
|
||||
groupmap[iy][ix]=-1;
|
||||
#ifdef HIGHZ
|
||||
dataMask[iy][ix] = 0x3fff;
|
||||
#endif
|
||||
}
|
||||
}
|
||||
|
||||
int x0=256+10, x1=256+246;
|
||||
int y0=10, y1=256-10;
|
||||
int ix,iy;
|
||||
int ox=0, oy=0, ooy=0;
|
||||
ox=2;//0; //original value is 0
|
||||
cout << "G0" << endl;
|
||||
|
||||
//chip1
|
||||
/*
|
||||
@ -90,10 +102,11 @@ class jungfrauLGADStrixelsData : public slsDetectorData<uint16_t> {
|
||||
ox=0;
|
||||
for (int ipx=x0; ipx<x1; ipx++) {
|
||||
for (int ipy=y0; ipy<y0+54; ipy++) { //y0+54 excludes the last row (in chip coordinates), should be y0+55 to include all rows
|
||||
ix=(ipx-x0+ox)/3;
|
||||
iy=(ipx-x0+ox)%3+(ipy-y0+oy)*3+ooy;
|
||||
ix=(ipx-x0+ox)/3;
|
||||
dataMap[iy][ix] = sizeof(header) + (1024 * ipy + ipx) * 2;
|
||||
// cout << ipx << " " << ipy << " " << ix << " " << iy << endl;
|
||||
groupmap[iy][ix]=0;
|
||||
// cout << ipx << " " << ipy << " " << ix << " " << iy << endl;
|
||||
}
|
||||
}
|
||||
|
||||
@ -101,12 +114,13 @@ class jungfrauLGADStrixelsData : public slsDetectorData<uint16_t> {
|
||||
//3 square pixels in x on the left
|
||||
oy=-54;
|
||||
ooy=54*3;
|
||||
ox=3;
|
||||
ox=2;//; //original value is 3
|
||||
for (int ipx=x0; ipx<x1; ipx++) {
|
||||
for (int ipy=y0+54; ipy<y0+64+54; ipy++) { //I think y0+54 catches the last row of group1! Should be y0+55 if we want to include all rows? And y0+55+64
|
||||
ix=(ipx-x0+ox)/5;
|
||||
iy=(ipx-x0+ox)%5+(ipy-y0+oy)*5+ooy;
|
||||
dataMap[iy][ix] = sizeof(header) + (1024 * ipy + ipx) * 2;
|
||||
groupmap[iy][ix]=1;
|
||||
}
|
||||
}
|
||||
|
||||
@ -120,6 +134,7 @@ class jungfrauLGADStrixelsData : public slsDetectorData<uint16_t> {
|
||||
ix=(ipx-x0+ox)/4;
|
||||
iy=(ipx-x0+ox)%4+(ipy-y0+oy)*4+ooy;
|
||||
dataMap[iy][ix] = sizeof(header) + (1024 * ipy + ipx) * 2;
|
||||
groupmap[iy][ix]=2;
|
||||
}
|
||||
}
|
||||
|
||||
@ -143,8 +158,8 @@ class jungfrauLGADStrixelsData : public slsDetectorData<uint16_t> {
|
||||
ix=(ipx-x0+ox)/4;
|
||||
iy=(ipx-x0+ox)%4+(ipy-y0+oy)*4+ooy;
|
||||
dataMap[iy][ix] = sizeof(header) + (1024 * ipy + ipx) * 2;
|
||||
//if (ipx==x0)
|
||||
// cout << ipx << " " << ipy << " " << ix << " " << iy << endl;
|
||||
//if (ipx==x0) cout << ipx << " " << ipy << " " << ix << " " << iy << endl;
|
||||
groupmap[iy][ix]=2;
|
||||
}
|
||||
}
|
||||
|
||||
@ -158,6 +173,7 @@ class jungfrauLGADStrixelsData : public slsDetectorData<uint16_t> {
|
||||
ix=(ipx-x0+ox)/5;
|
||||
iy=(ipx-x0+ox)%5+(ipy-y0+oy)*5+ooy;
|
||||
dataMap[iy][ix] = sizeof(header) + (1024 * ipy + ipx) * 2;
|
||||
groupmap[iy][ix]=1;
|
||||
}
|
||||
}
|
||||
|
||||
@ -171,6 +187,7 @@ class jungfrauLGADStrixelsData : public slsDetectorData<uint16_t> {
|
||||
ix=(ipx-x0+ox)/3;
|
||||
iy=(ipx-x0+ox)%3+(ipy-y0+oy)*3+ooy;
|
||||
dataMap[iy][ix] = sizeof(header) + (1024 * ipy + ipx) * 2;
|
||||
groupmap[iy][ix]=0;
|
||||
}
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user