From 95b7be684253837e3b71ff85984e36f9ac961a2e Mon Sep 17 00:00:00 2001
From: vhinger182 <viktoria.hinger@psi.ch>
Date: Fri, 6 Oct 2023 12:18:33 +0200
Subject: [PATCH] modify RawDataProcess

---
 .../jungfrauExecutables/CMakeLists.txt           |  5 +++++
 .../jungfrauRawDataProcess.cpp                   | 16 +++++++++++++---
 2 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/slsDetectorCalibration/jungfrauExecutables/CMakeLists.txt b/slsDetectorCalibration/jungfrauExecutables/CMakeLists.txt
index b6f2d2337..d3c4765cd 100644
--- a/slsDetectorCalibration/jungfrauExecutables/CMakeLists.txt
+++ b/slsDetectorCalibration/jungfrauExecutables/CMakeLists.txt
@@ -14,6 +14,11 @@ add_executable(jungfrauRawDataProcess jungfrauRawDataProcess.cpp)
 target_compile_definitions(jungfrauRawDataProcess PRIVATE MODULE)
 list(APPEND JUNGFRAU_EXECUTABLES jungfrauRawDataProcess)
 
+# jungfrauRawDataProcessChipAldo
+add_executable(jungfrauRawDataProcessChip jungfrauRawDataProcess.cpp)
+target_compile_definitions(jungfrauRawDataProcessChip PRIVATE CHIP ALDO)
+list(APPEND JUNGFRAU_EXECUTABLES jungfrauRawDataProcessChipAldo)
+
 # jungfrauRawDataProcessStrx
 add_executable(jungfrauRawDataProcessStrx jungfrauRawDataProcess_filetxt.cpp)
 target_compile_definitions(jungfrauRawDataProcessStrx PRIVATE JFSTRX)
diff --git a/slsDetectorCalibration/jungfrauExecutables/jungfrauRawDataProcess.cpp b/slsDetectorCalibration/jungfrauExecutables/jungfrauRawDataProcess.cpp
index 6320807ed..5394cc9b1 100644
--- a/slsDetectorCalibration/jungfrauExecutables/jungfrauRawDataProcess.cpp
+++ b/slsDetectorCalibration/jungfrauExecutables/jungfrauRawDataProcess.cpp
@@ -11,7 +11,7 @@
 #define RAWDATA
 
 #if !defined JFSTRX && !defined JFSTRXOLD && !defined JFSTRXCHIP1 &&           \
-    !defined JFSTRXCHIP6
+    !defined JFSTRXCHIP6 && !defined CHIP
 #ifndef MODULE
 #include "jungfrauHighZSingleChipData.h"
 #endif
@@ -20,6 +20,10 @@
 #endif
 #endif
 
+#ifdef CHIP
+#include "jungfrauSingleChipData.h"
+#endif
+
 #ifdef JFSTRX
 #include "jungfrauLGADStrixelsData_new.h"
 #endif
@@ -180,7 +184,7 @@ int main(int argc, char *argv[]) {
 
     // Define decoders...
 #if !defined JFSTRX && !defined JFSTRXOLD && !defined JFSTRXCHIP1 &&           \
-    !defined JFSTRXCHIP6
+    !defined JFSTRXCHIP6 && !defined CHIP
 #ifndef MODULE
     jungfrauHighZSingleChipData *decoder = new jungfrauHighZSingleChipData();
     int nx = 256, ny = 256;
@@ -191,8 +195,14 @@ int main(int argc, char *argv[]) {
 #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
-    cout << "Jungfrau strixel full module readout" << endl;
+    std::cout << "Jungfrau strixel full module readout" << std::endl;
 
 #ifndef ALDO
     if (readrxroifromdatafile)