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

modify RawDataProcess

Browse Source
This commit is contained in:
hinger_v 2023-10-06 12:18:33 +02:00
parent 51d34063ac
commit 95b7be6842
2 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
slsDetectorCalibration/jungfrauExecutables/CMakeLists.txt
View File

@ -14,6 +14,11 @@ add_executable(jungfrauRawDataProcess jungfrauRawDataProcess.cpp)
target_compile_definitions(jungfrauRawDataProcess PRIVATE MODULE) target_compile_definitions(jungfrauRawDataProcess PRIVATE MODULE)
list(APPEND JUNGFRAU_EXECUTABLES jungfrauRawDataProcess) list(APPEND JUNGFRAU_EXECUTABLES jungfrauRawDataProcess)
# jungfrauRawDataProcessChipAldo
add_executable(jungfrauRawDataProcessChip jungfrauRawDataProcess.cpp)
target_compile_definitions(jungfrauRawDataProcessChip PRIVATE CHIP ALDO)
list(APPEND JUNGFRAU_EXECUTABLES jungfrauRawDataProcessChipAldo)
# jungfrauRawDataProcessStrx # jungfrauRawDataProcessStrx
add_executable(jungfrauRawDataProcessStrx jungfrauRawDataProcess_filetxt.cpp) add_executable(jungfrauRawDataProcessStrx jungfrauRawDataProcess_filetxt.cpp)
target_compile_definitions(jungfrauRawDataProcessStrx PRIVATE JFSTRX) target_compile_definitions(jungfrauRawDataProcessStrx PRIVATE JFSTRX)

16
slsDetectorCalibration/jungfrauExecutables/jungfrauRawDataProcess.cpp
View File

@ -11,7 +11,7 @@
#define RAWDATA #define RAWDATA
#if !defined JFSTRX && !defined JFSTRXOLD && !defined JFSTRXCHIP1 && \ #if !defined JFSTRX && !defined JFSTRXOLD && !defined JFSTRXCHIP1 && \
!defined JFSTRXCHIP6 !defined JFSTRXCHIP6 && !defined CHIP
#ifndef MODULE #ifndef MODULE
#include "jungfrauHighZSingleChipData.h" #include "jungfrauHighZSingleChipData.h"
#endif #endif
@ -20,6 +20,10 @@
#endif #endif
#endif #endif
#ifdef CHIP
#include "jungfrauSingleChipData.h"
#endif
#ifdef JFSTRX #ifdef JFSTRX
#include "jungfrauLGADStrixelsData_new.h" #include "jungfrauLGADStrixelsData_new.h"
#endif #endif
@ -180,7 +184,7 @@ int main(int argc, char *argv[]) {
// Define decoders... // Define decoders...
#if !defined JFSTRX && !defined JFSTRXOLD && !defined JFSTRXCHIP1 && \ #if !defined JFSTRX && !defined JFSTRXOLD && !defined JFSTRXCHIP1 && \
!defined JFSTRXCHIP6 !defined JFSTRXCHIP6 && !defined CHIP
#ifndef MODULE #ifndef MODULE
jungfrauHighZSingleChipData *decoder = new jungfrauHighZSingleChipData(); jungfrauHighZSingleChipData *decoder = new jungfrauHighZSingleChipData();
int nx = 256, ny = 256; int nx = 256, ny = 256;
@ -191,8 +195,14 @@ int main(int argc, char *argv[]) {
#endif #endif
#endif #endif
#ifdef CHIP
std::cout << "Jungfrau pixel module single chip readout" << std::endl;
jungfrauSingleChipData *decoder = new jungfrauSingleChipData();
int nx = 256, ny = 256;
#endif
#ifdef JFSTRX #ifdef JFSTRX
cout << "Jungfrau strixel full module readout" << endl; std::cout << "Jungfrau strixel full module readout" << std::endl;
#ifndef ALDO #ifndef ALDO
if (readrxroifromdatafile) if (readrxroifromdatafile)