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

Fix strixel mapping and interpolation

Browse Source
This commit is contained in:
hinger_v 2023-07-20 11:12:13 +02:00
parent fb25a01db5
commit 6d6b6b98df
3 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
slsDetectorCalibration/dataStructures/jungfrauLGADStrixelsData_new.h
View File

@ -161,9 +161,9 @@ class jungfrauLGADStrixelsData : public slsDetectorData<uint16_t> {
case 1: case 1:
x0 = 9 + chip_x0; // 9 gr sq pixel x0 = 9 + chip_x0; // 9 gr sq pixel
x1 = 246 + chip_x0; x1 = 245 + chip_x0; // was 246
y0 = 192 + chip_y0; y0 = 192 + chip_y0;
y1 = 244 + chip_y0; y1 = 246 + chip_y0;
shifty = g1_nrows + 2 * g2_nrows + 2 * g3_nrows; shifty = g1_nrows + 2 * g2_nrows + 2 * g3_nrows;
break; break;
@ -171,7 +171,7 @@ class jungfrauLGADStrixelsData : public slsDetectorData<uint16_t> {
case 2: case 2:
x0 = 9 + chip_x0; x0 = 9 + chip_x0;
x1 = 244 + chip_x0; x1 = 243 + chip_x0; //was 244
y0 = 128 + chip_y0; y0 = 128 + chip_y0;
y1 = 191 + chip_y0; y1 = 191 + chip_y0;
@ -236,6 +236,9 @@ class jungfrauLGADStrixelsData : public slsDetectorData<uint16_t> {
} else if (ymax <= c6g1_yend - bond_shift_y) { } else if (ymax <= c6g1_yend - bond_shift_y) {
group = 1; group = 1;
mchip = 6; mchip = 6;
} else if (ymax <= 511) {
group = 1;
mchip = 6;
} else { //to fix compiler warning } else { //to fix compiler warning
group = -1; group = -1;
mchip = -1; mchip = -1;
@ -243,7 +246,7 @@ class jungfrauLGADStrixelsData : public slsDetectorData<uint16_t> {
int multiplicator = getMultiplicator(group); int multiplicator = getMultiplicator(group);
setMappingShifts(group); setMappingShifts(group);
std::cout << "group: " << group << ", m: " << multiplicator std::cout << "chip: " << mchip << ", group: " << group << ", m: " << multiplicator
<< ", x0: " << x0 << ", x1: " << x1 << ", y0: " << y0 << ", x0: " << x0 << ", x1: " << x1 << ", y0: " << y0
<< ", y1: " << y1 << std::endl; << ", y1: " << y1 << std::endl;

2
slsDetectorCalibration/moenchExecutables/moench03Interpolation.cpp
View File

@ -98,7 +98,7 @@ int main(int argc, char *argv[]) {
// int nSubPixels = nsubpix; // int nSubPixels = nsubpix;
#ifndef NOINTERPOLATION #ifndef NOINTERPOLATION
eta2InterpolationPosXY *interp = eta2InterpolationPosXY *interp =
new eta2InterpolationPosXY(NC, NR, nsubpix, etabins, etamin, etamax); new eta2InterpolationPosXY(NC, NR, nsubpix, nsubpix,etabins,etabins, etamin, etamax);
// eta2InterpolationCleverAdaptiveBins *interp=new // eta2InterpolationCleverAdaptiveBins *interp=new
// eta2InterpolationCleverAdaptiveBins(NC, NR, nsubpix, etabins, etamin, // eta2InterpolationCleverAdaptiveBins(NC, NR, nsubpix, etabins, etamin,
// etamax); // etamax);