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

Added JF strixels cluster finder and gain bit for Moench04

Browse Source
This commit is contained in:
Bergamaschi Anna
2022-07-14 12:18:34 +02:00
parent 704b67c846
commit 3b9df5868e
5 changed files with 408 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
slsDetectorCalibration/jungfrauExecutables/Makefile.cluster_finder
View File

@ -1,9 +1,9 @@
# SPDX-License-Identifier: LGPL-3.0-or-other
# Copyright (C) 2021 Contributors to the SLS Detector Package
#module add CBFlib/0.9.5
INCDIR=-I. -I../ -I../interpolations -I../interpolations/etaVEL -I../dataStructures -I../../slsSupportLib/include/ -I../../slsReceiverSoftware/include/
INCDIR=-I. -I../ -I../interpolations -I../interpolations/etaVEL -I../dataStructures -I../../slsSupportLib/include/ -I../../slsReceiverSoftware/include/ -I../tiffio/include/
LDFLAG= ../tiffIO.cpp -L/usr/lib64/ -lpthread -lm -lstdc++ -pthread -lrt -ltiff -O3 -std=c++11
LDFLAG= ../tiffio/src/tiffIO.cpp -L/usr/lib64/ -lpthread -lm -lstdc++ -pthread -lrt -ltiff -O3 -std=c++11
MAIN=jungfrauClusterFinder.cpp
@ -20,6 +20,10 @@ jungfrauClusterFinderHighZ: jungfrauClusterFinder.cpp $(INCS) clean
g++ -o jungfrauClusterFinderHighZ jungfrauClusterFinder.cpp $(LDFLAG) $(INCDIR) $(LIBHDF5) $(LIBRARYCBF) -DSAVE_ALL -DHIGHZ
jungfrauClusterFinderStrx: jungfrauClusterFinder.cpp $(INCS) clean
g++ -o jungfrauClusterFinderStrx jungfrauClusterFinder.cpp $(LDFLAG) $(INCDIR) $(LIBHDF5) $(LIBRARYCBF) -DSAVE_ALL -DJFSTRX
jungfrauMakeEta: jungfrauInterpolation.cpp $(INCS) clean

BIN
slsDetectorCalibration/jungfrauExecutables/jungfrauClusterFinder
View File

Binary file not shown.

14
slsDetectorCalibration/jungfrauExecutables/jungfrauClusterFinder.cpp
View File

@ -4,7 +4,12 @@
#include <iostream>
//#include "moench03T1ZmqData.h"
#ifndef JFSTRX
#include "jungfrauHighZSingleChipData.h"
#endif
#ifdef JFSTRX
#include "jungfrauLGADStrixelsData.h"
#endif
#include "multiThreadedAnalogDetector.h"
#include "singlePhotonDetector.h"
@ -38,8 +43,13 @@ int main(int argc, char *argv[]) {
int ndark = 100;
int ok;
int iprog = 0;
#ifndef JFSTRX
jungfrauHighZSingleChipData *decoder = new jungfrauHighZSingleChipData();
#endif
#ifdef JFSTRX
cout << "bbb" << endl;
jungfrauLGADStrixelsData *decoder = new jungfrauLGADStrixelsData();
#endif
decoder->getDetectorSize(nx, ny);
cout << "nx " << nx << " ny " << ny << endl;
@ -97,7 +107,7 @@ int main(int argc, char *argv[]) {
for (int irun = runmin; irun < runmax; irun++) {
sprintf(fn, fformat, irun);
sprintf(fname, "%s/%s.raw", indir, fn);
sprintf(fname, "%s/%s.dat", indir, fn);
sprintf(outfname, "%s/%s.clust", outdir, fn);
sprintf(imgfname, "%s/%s.tiff", outdir, fn);
std::time(&end_time);