From d8e3e38c33c5e6bac3e3d5ee5ecfe5ed4be30a0e Mon Sep 17 00:00:00 2001
From: vhinger182 <viktoria.hinger@psi.ch>
Date: Thu, 1 Feb 2024 16:41:57 +0100
Subject: [PATCH] Compile strixel quad in cluster finder

---
 .../jungfrauExecutables/CMakeLists.txt            |  9 +++++++--
 .../jungfrauRawDataProcess_filetxt.cpp            | 15 ++++++++++++---
 2 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/slsDetectorCalibration/jungfrauExecutables/CMakeLists.txt b/slsDetectorCalibration/jungfrauExecutables/CMakeLists.txt
index d3c4765cd..931ecfa2b 100644
--- a/slsDetectorCalibration/jungfrauExecutables/CMakeLists.txt
+++ b/slsDetectorCalibration/jungfrauExecutables/CMakeLists.txt
@@ -15,8 +15,8 @@ target_compile_definitions(jungfrauRawDataProcess PRIVATE MODULE)
 list(APPEND JUNGFRAU_EXECUTABLES jungfrauRawDataProcess)
 
 # jungfrauRawDataProcessChipAldo
-add_executable(jungfrauRawDataProcessChip jungfrauRawDataProcess.cpp)
-target_compile_definitions(jungfrauRawDataProcessChip PRIVATE CHIP ALDO)
+add_executable(jungfrauRawDataProcessChipAldo jungfrauRawDataProcess_filetxt.cpp)
+target_compile_definitions(jungfrauRawDataProcessChipAldo PRIVATE CHIP ALDO)
 list(APPEND JUNGFRAU_EXECUTABLES jungfrauRawDataProcessChipAldo)
 
 # jungfrauRawDataProcessStrx
@@ -24,6 +24,11 @@ add_executable(jungfrauRawDataProcessStrx jungfrauRawDataProcess_filetxt.cpp)
 target_compile_definitions(jungfrauRawDataProcessStrx PRIVATE JFSTRX)
 list(APPEND JUNGFRAU_EXECUTABLES jungfrauRawDataProcessStrx)
 
+# jungfrauRawDataProcessStrxQuad
+add_executable(jungfrauRawDataProcessStrxQuad jungfrauRawDataProcess_filetxt.cpp)
+target_compile_definitions(jungfrauRawDataProcessStrxQuad PRIVATE JFSTRXQ)
+list(APPEND JUNGFRAU_EXECUTABLES jungfrauRawDataProcessStrxQuad)
+
 
 # jungfrauRawDataProcessStrxChip1
 add_executable(jungfrauRawDataProcessStrxChip1 jungfrauRawDataProcess.cpp)
diff --git a/slsDetectorCalibration/jungfrauExecutables/jungfrauRawDataProcess_filetxt.cpp b/slsDetectorCalibration/jungfrauExecutables/jungfrauRawDataProcess_filetxt.cpp
index 91fdf4708..2fc221529 100644
--- a/slsDetectorCalibration/jungfrauExecutables/jungfrauRawDataProcess_filetxt.cpp
+++ b/slsDetectorCalibration/jungfrauExecutables/jungfrauRawDataProcess_filetxt.cpp
@@ -10,7 +10,7 @@
 
 #define RAWDATA
 
-#if !defined JFSTRX && !defined JFSTRXOLD && !defined JFSTRXCHIP1 &&           \
+#if !defined JFSTRX && !defined JFSTRXQ && !defined JFSTRXOLD && !defined JFSTRXCHIP1 &&           \
     !defined JFSTRXCHIP6 && !defined CHIP
 #ifndef MODULE
 #include "jungfrauHighZSingleChipData.h"
@@ -27,6 +27,9 @@
 #ifdef JFSTRX
 #include "jungfrauLGADStrixelsData_new.h"
 #endif
+#ifdef JFSTRXQ
+#include "jungfrauLGADStrixelsDataQuad.h"
+#endif
 #if defined JFSTRXCHIP1 || defined JFSTRXCHIP6
 #include "jungfrauLGADStrixelsDataSingleChip.h"
 #endif
@@ -179,7 +182,7 @@ int main(int argc, char *argv[]) {
     }
 
     // Define decoders...
-#if !defined JFSTRX && !defined JFSTRXOLD && !defined JFSTRXCHIP1 &&           \
+#if !defined JFSTRX !defined JFSTRXQ && !defined JFSTRXOLD && !defined JFSTRXCHIP1 &&           \
     !defined JFSTRXCHIP6 && !defined CHIP
 #ifndef MODULE
     jungfrauHighZSingleChipData *decoder = new jungfrauHighZSingleChipData();
@@ -198,7 +201,7 @@ int main(int argc, char *argv[]) {
 #endif
 
 #ifdef JFSTRX
-    cout << "Jungfrau strixel full module readout" << endl;
+    std::cout << "Jungfrau strixel full module readout" << std::endl;
 
 #ifndef ALDO
     if (readrxroifromdatafile)
@@ -239,6 +242,12 @@ int main(int argc, char *argv[]) {
         new jungfrauLGADStrixelsData(rxroi_xmin, rxroi_xmax, rxroi_ymin, rxroi_ymax);
     int nx = 1024 / 3, ny = 512 * 5;
 #endif
+#ifdef JFSTRXQ
+    std::cout << "Jungfrau strixel quad" << std::endl;
+    jungfrauLGADStrixelsDataQuad *decoder =
+        new jungfrauLGADStrixelsDataQuad(rxroi_xmin, rxroi_xmax, rxroi_ymin, rxroi_ymax);
+    int nx = 1024 / 3, ny = 512 * 3;
+#endif
 #ifdef JFSTRXCHIP1
     std::cout << "Jungfrau strixel LGAD single chip 1" << std::endl;
     jungfrauLGADStrixelsDataSingleChip *decoder =