From 88e6b9685ec00ba606308fbef3787a7f7f640a3d Mon Sep 17 00:00:00 2001 From: Kirsty Paton Date: Thu, 1 Feb 2024 15:29:21 +0100 Subject: [PATCH] Reintroduced changes having confirmed segmentation fault unrelated to changes made for CM correction - still confirming CM correction for Jungfrau correct. --- slsDetectorCalibration/jungfrauCommonMode.h | 4 +--- .../jungfrauExecutables/jungfrauRawDataProcess.cpp | 12 +++++++----- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/slsDetectorCalibration/jungfrauCommonMode.h b/slsDetectorCalibration/jungfrauCommonMode.h index 069524797..791aede95 100644 --- a/slsDetectorCalibration/jungfrauCommonMode.h +++ b/slsDetectorCalibration/jungfrauCommonMode.h @@ -19,7 +19,7 @@ class commonModeSubtractionSuperColumnJF : public commonModeSubtraction { mean2[iroi] += val * val; nCm[iroi]++; if (nCm[iroi] > 64*256) - std::cout << "Too many pixels added " << nCm[iroi] << std::endl + std::cout << "Too many pixels added " << nCm[iroi] << std::endl; } }; @@ -27,8 +27,6 @@ class commonModeSubtractionSuperColumnJF : public commonModeSubtraction { virtual commonModeSubtractionSuperColumnJF *Clone() { return new commonModeSubtractionSuperColumnJF(); }; - - }; diff --git a/slsDetectorCalibration/jungfrauExecutables/jungfrauRawDataProcess.cpp b/slsDetectorCalibration/jungfrauExecutables/jungfrauRawDataProcess.cpp index 2cd64be9e..b71076dfb 100644 --- a/slsDetectorCalibration/jungfrauExecutables/jungfrauRawDataProcess.cpp +++ b/slsDetectorCalibration/jungfrauExecutables/jungfrauRawDataProcess.cpp @@ -2,11 +2,11 @@ // Copyright (C) 2021 Contributors to the SLS Detector Package //#include "sls/ansi.h" #include + //enable common mode subtraction //#define CMS - //disable common mode subtraction -//#undef CMS +#undef CMS #undef CORR #define C_GHOST 0.0004 @@ -184,11 +184,13 @@ int main(int argc, char *argv[]) { cout << "Nframes is " << nframes << endl; uint32_t nnx, nny; -// commonModeSubtraction *cm = NULL; + //commonModeSubtraction *cm = NULL; //#ifdef CMS -// cm = new commonModeSubtractionSuperColumnJF(); -// std::cout << "Enabled common mode subtraction" << std::endl; + //cm = new commonModeSubtractionSuperColumnJF(); + //std::cout << "Enabled common mode subtraction" << std::endl; //#endif + //singlePhotonDetector *filter = new singlePhotonDetector( + // decoder, 3, nsigma, 1, cm, nped, 200, -1, -1, gainmap, NULL); singlePhotonDetector *filter = new singlePhotonDetector( decoder, 3, nsigma, 1, NULL, nped, 200, -1, -1, gainmap, NULL);