From aea110f1539554cbe2a476479ab9b08a2b8f04e0 Mon Sep 17 00:00:00 2001
From: Filip Leonarski <filip.leonarski@psi.ch>
Date: Tue, 19 Sep 2023 17:41:04 +0200
Subject: [PATCH] DetectorWrapper: Change threshold temperature to 60

(cherry picked from commit 3b8bbd46684198b7eb19a74b9e5ab15d61fba23a)
---
 detector_control/DetectorWrapper.cpp | 2 +-
 detector_control/DetectorWrapper.h   | 1 +
 detector_control/JFJochDetector.h    | 3 ---
 3 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/detector_control/DetectorWrapper.cpp b/detector_control/DetectorWrapper.cpp
index b434f059..0adfcd4b 100644
--- a/detector_control/DetectorWrapper.cpp
+++ b/detector_control/DetectorWrapper.cpp
@@ -59,7 +59,7 @@ void DetectorWrapper::Configure(const JFJochProtoBuf::DetectorConfig &request) {
         }
 
         det.setTemperatureControl(true);
-        det.setThresholdTemperature(55);
+        det.setThresholdTemperature(THRESHOLD_TEMPERATURE_DEGC);
 
         det.setSynchronization(false);
 
diff --git a/detector_control/DetectorWrapper.h b/detector_control/DetectorWrapper.h
index 2bc09426..759c904c 100644
--- a/detector_control/DetectorWrapper.h
+++ b/detector_control/DetectorWrapper.h
@@ -9,6 +9,7 @@
 
 #define BASE_DETECTOR_MAC 0xAABBCCDDEE10 // little-endian!
 #define HIGH_VOLTAGE      120
+#define THRESHOLD_TEMPERATURE_DEGC 60
 
 class DetectorWrapper {
     Logger logger{"DetectorWrapper"};
diff --git a/detector_control/JFJochDetector.h b/detector_control/JFJochDetector.h
index 4c88e4a6..73613726 100644
--- a/detector_control/JFJochDetector.h
+++ b/detector_control/JFJochDetector.h
@@ -9,9 +9,6 @@
 
 #include "../common/Logger.h"
 
-#define BASE_DETECTOR_MAC 0xAABBCCDDEE10 // little-endian!
-#define HIGH_VOLTAGE      120
-
 class JFJochDetector final : public JFJochProtoBuf::gRPC_JFJochDetector::Service {
     std::mutex m;
     DetectorWrapper detector;