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

Introduced changes apply common mode correction - temporarily commented out along with other earlier changes to try an understand segmentation fault after one file processed.

Browse Source
This commit is contained in:
paton_k 2024-01-22 14:20:25 +01:00
parent 457cc0f70c
commit 5caf1966fb
2 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
slsDetectorCalibration/jungfrauExecutables/jungfrauRawDataProcess.cpp
View File

@ -2,8 +2,12 @@
// Copyright (C) 2021 Contributors to the SLS Detector Package // Copyright (C) 2021 Contributors to the SLS Detector Package
//#include "sls/ansi.h" //#include "sls/ansi.h"
#include <iostream> #include <iostream>
#undef CORR //enable common mode subtraction
//#define CMS
//disable common mode subtraction
//#undef CMS
#undef CORR
#define C_GHOST 0.0004 #define C_GHOST 0.0004
#define CM_ROWS 50 #define CM_ROWS 50
@ -36,6 +40,7 @@
#include <map> #include <map>
#include <stdio.h> #include <stdio.h>
#include <sys/stat.h> #include <sys/stat.h>
//#include "jungfrauCommonMode.h"
#include <ctime> #include <ctime>
using namespace std; using namespace std;
@ -44,7 +49,7 @@ int main(int argc, char *argv[]) {
if (argc < 6) { if (argc < 6) {
cout << "Usage is " << argv[0] cout << "Usage is " << argv[0]
<< "indir outdir fname(no extension) fextension csize [runmin] [runmax] [pedfile (raw or tiff)] [threshold]" << " indir outdir fname(no extension) fextension csize [runmin] [runmax] [pedfile (raw or tiff)] [threshold]"
"[nframes] [xmin xmax ymin ymax] [gainmap]" "[nframes] [xmin xmax ymin ymax] [gainmap]"
<< endl; << endl;
cout << "threshold <0 means analog; threshold=0 means cluster finder; " cout << "threshold <0 means analog; threshold=0 means cluster finder; "
@ -179,7 +184,11 @@ int main(int argc, char *argv[]) {
cout << "Nframes is " << nframes << endl; cout << "Nframes is " << nframes << endl;
uint32_t nnx, nny; uint32_t nnx, nny;
// commonModeSubtraction *cm = NULL;
//#ifdef CMS
// cm = new commonModeSubtractionSuperColumnJF();
// std::cout << "Enabled common mode subtraction" << std::endl;
//#endif
singlePhotonDetector *filter = new singlePhotonDetector( singlePhotonDetector *filter = new singlePhotonDetector(
decoder, 3, nsigma, 1, NULL, nped, 200, -1, -1, gainmap, NULL); decoder, 3, nsigma, 1, NULL, nped, 200, -1, -1, gainmap, NULL);

3
slsDetectorCalibration/tiffio/src/tiffIO.cpp
View File

@ -3,7 +3,8 @@
#include "sls/tiffIO.h" #include "sls/tiffIO.h"
#include <iostream> #include <iostream>
#include <tiffio.h> #include "/usr/include/tiffio.h"
//#include <tiffio.h>
void *WriteToTiff(float *imgData, const char *imgname, int ncol, int nrow) { void *WriteToTiff(float *imgData, const char *imgname, int ncol, int nrow) {
constexpr uint32_t sampleperpixel = 1; constexpr uint32_t sampleperpixel = 1;