diff --git a/slsDetectorCalibration/dataStructures/jungfrauLGADStrixelsData_new.h b/slsDetectorCalibration/dataStructures/jungfrauLGADStrixelsData_new.h index 1ef8c11b9..cbc2d5518 100644 --- a/slsDetectorCalibration/dataStructures/jungfrauLGADStrixelsData_new.h +++ b/slsDetectorCalibration/dataStructures/jungfrauLGADStrixelsData_new.h @@ -161,9 +161,9 @@ class jungfrauLGADStrixelsData : public slsDetectorData { case 1: x0 = 9 + chip_x0; // 9 gr sq pixel - x1 = 246 + chip_x0; + x1 = 245 + chip_x0; // was 246 y0 = 192 + chip_y0; - y1 = 244 + chip_y0; + y1 = 246 + chip_y0; shifty = g1_nrows + 2 * g2_nrows + 2 * g3_nrows; break; @@ -171,7 +171,7 @@ class jungfrauLGADStrixelsData : public slsDetectorData { case 2: x0 = 9 + chip_x0; - x1 = 244 + chip_x0; + x1 = 243 + chip_x0; //was 244 y0 = 128 + chip_y0; y1 = 191 + chip_y0; @@ -236,6 +236,9 @@ class jungfrauLGADStrixelsData : public slsDetectorData { } else if (ymax <= c6g1_yend - bond_shift_y) { group = 1; mchip = 6; + } else if (ymax <= 511) { + group = 1; + mchip = 6; } else { //to fix compiler warning group = -1; mchip = -1; @@ -243,7 +246,7 @@ class jungfrauLGADStrixelsData : public slsDetectorData { int multiplicator = getMultiplicator(group); setMappingShifts(group); - std::cout << "group: " << group << ", m: " << multiplicator + std::cout << "chip: " << mchip << ", group: " << group << ", m: " << multiplicator << ", x0: " << x0 << ", x1: " << x1 << ", y0: " << y0 << ", y1: " << y1 << std::endl; diff --git a/slsDetectorCalibration/jungfrauExecutables/jungfrauRawDataProcess_filetxt.cpp b/slsDetectorCalibration/jungfrauExecutables/jungfrauRawDataProcess_filetxt.cpp index 4f6132cc0..48c8a6cb6 100644 --- a/slsDetectorCalibration/jungfrauExecutables/jungfrauRawDataProcess_filetxt.cpp +++ b/slsDetectorCalibration/jungfrauExecutables/jungfrauRawDataProcess_filetxt.cpp @@ -74,7 +74,7 @@ int main(int argc, char *argv[]) { if (argc < 10) { std::cout << "Usage is " << argv[0] - << "filestxt outdir [pedfile (raw or tiff)] [xmin xmax ymin ymax] " + << " filestxt outdir [pedfile (raw or tiff)] [xmin xmax ymin ymax] " "[threshold] [nframes] " "NOTE THAT THE DATA FILES HAVE TO BE IN THE RIGHT ORDER SO THAT PEDESTAL TRACKING WORKS! " << std::endl; diff --git a/slsDetectorCalibration/moenchExecutables/moench03Interpolation.cpp b/slsDetectorCalibration/moenchExecutables/moench03Interpolation.cpp index 36d370896..3b17d3bf0 100644 --- a/slsDetectorCalibration/moenchExecutables/moench03Interpolation.cpp +++ b/slsDetectorCalibration/moenchExecutables/moench03Interpolation.cpp @@ -98,7 +98,7 @@ int main(int argc, char *argv[]) { // int nSubPixels = nsubpix; #ifndef NOINTERPOLATION eta2InterpolationPosXY *interp = - new eta2InterpolationPosXY(NC, NR, nsubpix, etabins, etamin, etamax); + new eta2InterpolationPosXY(NC, NR, nsubpix, nsubpix,etabins,etabins, etamin, etamax); // eta2InterpolationCleverAdaptiveBins *interp=new // eta2InterpolationCleverAdaptiveBins(NC, NR, nsubpix, etabins, etamin, // etamax);