detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-06-23 18:17:59 +02:00
Code Issues Actions Packages Releases Activity

Update data structures and eta functions for JF strixels

Browse Source
This commit is contained in:
hinger_v
2023-03-17 15:33:01 +01:00
parent 339cb925c7
commit 943a85cbd5
7 changed files with 1331 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

91
slsDetectorCalibration/dataStructures/jungfrauLGADStrixelsData.h
View File

@ -2,7 +2,11 @@
// Copyright (C) 2021 Contributors to the SLS Detector Package
#ifndef JUNGFRAULGADSTRIXELDATA_H
#define JUNGFRAULGADSTRIXELDATA_H
#ifdef CINT
#include "sls/sls_detector_defs_CINT.h"
#else
#include "sls/sls_detector_defs.h"
#endif
#include "slsDetectorData.h"
/*
@ -32,7 +36,7 @@ typedef struct {
uint64_t bunchNumber; /**< is the frame number */
uint64_t pre; /**< something */
} jf_header;
} jf_header; //Aldo's header
using namespace std;
@ -41,7 +45,11 @@ class jungfrauLGADStrixelsData : public slsDetectorData<uint16_t> {
private:
int iframe;
#ifdef ALDO //VH
using header = jf_header; //VH
#else //VH
using header = sls::defs::sls_receiver_header;
#endif //VH
public:
/**
Implements the slsReceiverData structure for the moench02 prototype read
@ -53,6 +61,9 @@ class jungfrauLGADStrixelsData : public slsDetectorData<uint16_t> {
: slsDetectorData<uint16_t>(1024/5, 512*5,
512 * 1024 * 2 + sizeof(header)) {
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
@ -61,44 +72,51 @@ class jungfrauLGADStrixelsData : public slsDetectorData<uint16_t> {
#endif
}
}
int x0=256+10, x1=256+246;
int y0=10, y1=256-10;
//chip1
/*
* TL;DR comments: y0 is too high by 1, group 1 and group 2 are by one row too short
* group34 by 2 rows, x is by one column too short
* NOTE: If x0, x1, y0 are changed, likely also ox (and oy and ooy) will be affected!
*/
cout << "G0" << endl; //chip coordinates of chip1 group1: x=255+10 to x=255+246, y=10 to y=64
//9 pixels guard ring, bonding shift by one pixel in y, one square pixel in x on the left
int x0=256+10, x1=256+246; //excludes first column (in chip coordinates)
int y0=10, y1=256-10; //y1 does nothing
int ix,iy;
int ox=0, oy=0, ooy=0;
ox=0;
cout << "G0" << endl;
//chip1
for (int ipx=x0; ipx<x1; ipx++) {
for (int ipy=y0; ipy<y0+54; ipy++) {
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;
dataMap[iy][ix] = sizeof(header) + (1024 * ipy + ipx) * 2;
// cout << ipx << " " << ipy << " " << ix << " " << iy << endl;
// cout << ipx << " " << ipy << " " << ix << " " << iy << endl;
}
}
cout << "G1" << endl;
cout << "G1" << endl; //chip coordinates of chip1 group2: x=255+12 to x=255+246, y=65 to y=128
//3 square pixels in x on the left
oy=-54;
ooy=54*3;
ox=3;
for (int ipx=x0; ipx<x1; ipx++) {
for (int ipy=y0+54; ipy<y0+64+54; ipy++) {
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;
}
}
cout << "G2" << endl;
cout << "G2" << endl; //chip coordinates of chip1 group34: x=255+11 to x=255+246, y=129 to y=247
//2 square pixels on the left
oy=-54-64;
ooy=54*3+64*5;
ox=3;
for (int ipx=x0; ipx<x1; ipx++) {
for (int ipy=y0+64+54; ipy<y0+64*2+54*2; ipy++) {
for (int ipy=y0+64+54; ipy<y0+64*2+54*2; ipy++) { //Same as above, I think it should be y0+55+64 and y0+55*2+64*2 to include all rows
ix=(ipx-x0+ox)/4;
iy=(ipx-x0+ox)%4+(ipy-y0+oy)*4+ooy;
dataMap[iy][ix] = sizeof(header) + (1024 * ipy + ipx) * 2;
@ -106,43 +124,50 @@ class jungfrauLGADStrixelsData : public slsDetectorData<uint16_t> {
}
//chip 6
/*
* TL;DR comments: y0 is too high by 3, group34 and group 1 are by one row too short
* x is by two columns too short
* NOTE: If x0, x1, y0 are changed, likely also ox (and oy and ooy) will be affected!
*/
cout << "G0" << endl; //chip coordinates of chip6 group34: x=255+256+9 to x=255+256+244, y=255+8 to y=255+126
//9 pixels guard ring, bonding shift by one pixel in -y, 2 square pixels in x on the right
x0=256*2+10;
y0=256+10;
x1=256*2+246;
ooy=256*5;
oy=0;
ox=1;
cout << "G0" << endl;
for (int ipx=x0; ipx<x1; ipx++) {
for (int ipy=y0; ipy<y0+54+64; ipy++) {
for (int ipy=y0; ipy<y0+54+64; ipy++) { //shifted by 3 rows because of y0, if y0 is corrected it should be y0+55+64 to include all rows
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;
}
}
cout << "G1" << endl;
cout << "G1" << endl; //chip coordinates of chip6 group2: x=255+256+9 to x=255+256+243, y=255+127 to y=255+190
//3 square pixels in x on the right
oy=-54-64;
ooy+=(54+64)*4;
ox=1;
for (int ipx=x0; ipx<x1; ipx++) {
for (int ipy=y0+54+64; ipy<y0+64*2+54; ipy++) {
for (int ipy=y0+54+64; ipy<y0+64*2+54; ipy++) { //shifted by 3 rows because of y0, if y0 is corrected it should be y0+55+64 and y0+55+64*2 to include all rows
ix=(ipx-x0+ox)/5;
iy=(ipx-x0+ox)%5+(ipy-y0+oy)*5+ooy;
dataMap[iy][ix] = sizeof(header) + (1024 * ipy + ipx) * 2;
}
}
cout << "G2" << endl;
cout << "G2" << endl; //chip coordinates of chip6 group1: x=255+256+9 to x=255+256+245, y=255+191 to y=255+245
//one square pixel in x on the right
oy=-54-64*2;
ooy+=64*5;
ox=1;
for (int ipx=x0; ipx<x1; ipx++) {
for (int ipy=y0+64*2+54; ipy<y0+64*2+54*2; ipy++) {
for (int ipy=y0+64*2+54; ipy<y0+64*2+54*2; ipy++) { //shifted by 3 rows because of y0, if y0 is corrected it should be y0+55+64*2 and y0+55*2+64*2
ix=(ipx-x0+ox)/3;
iy=(ipx-x0+ox)%3+(ipy-y0+oy)*3+ooy;
dataMap[iy][ix] = sizeof(header) + (1024 * ipy + ipx) * 2;
@ -206,7 +231,11 @@ class jungfrauLGADStrixelsData : public slsDetectorData<uint16_t> {
int getFrameNumber(char *buff) {
return ((header *)buff)->detHeader.frameNumber;
#ifdef ALDO //VH
return ((header *)buff)->bunchNumber; //VH
#else //VH
return ((header *)buff)->detHeader.frameNumber;
#endif //VH
};
/**
@ -219,7 +248,11 @@ class jungfrauLGADStrixelsData : public slsDetectorData<uint16_t> {
*/
int getPacketNumber(char *buff) {
return ((header *)buff)->detHeader.packetNumber;
#ifdef ALDO //VH
return -1; //VH //TODO: Keep in mind in case of bugs!
#else //VH
return ((header *)buff)->detHeader.packetNumber;
#endif //VH
};
@ -265,8 +298,6 @@ class jungfrauLGADStrixelsData : public slsDetectorData<uint16_t> {
return NULL;
};
/* /**
/* Loops over a memory slot until a complete frame is found (i.e. all */
/* packets 0 to nPackets, same frame number). purely virtual func \param */
/* data pointer to the memory to be analyzed \param ndata reference to the */