From a640e4e864607d9ffbc477f3b085e758db700c1e Mon Sep 17 00:00:00 2001
From: Michael Deveaux <deveaux@physik.uni-frankfurt.de>
Date: Mon, 24 Jul 2023 16:51:35 +0200
Subject: [PATCH] Fix code after rebase
---
.../mvd/SensorDataSheets/CbmMvdSensorDataSheet.cxx | 2 +-
.../mvd/SensorDataSheets/CbmMvdSensorDataSheet.h | 8 ++++----
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/core/detectors/mvd/SensorDataSheets/CbmMvdSensorDataSheet.cxx b/core/detectors/mvd/SensorDataSheets/CbmMvdSensorDataSheet.cxx
index f154b16e45..c1e9df33f9 100644
--- a/core/detectors/mvd/SensorDataSheets/CbmMvdSensorDataSheet.cxx
+++ b/core/detectors/mvd/SensorDataSheets/CbmMvdSensorDataSheet.cxx
@@ -64,7 +64,7 @@ CbmMvdSensorDataSheet::CbmMvdSensorDataSheet()
}
// ----- Destructor ----------------------------------------------------
-CbmMvdSensorDataSheet::~CbmMvdSensorDataSheet() {}
+//CbmMvdSensorDataSheet::~CbmMvdSensorDataSheet() {}
// -------------------------------------------------------------------------
diff --git a/core/detectors/mvd/SensorDataSheets/CbmMvdSensorDataSheet.h b/core/detectors/mvd/SensorDataSheets/CbmMvdSensorDataSheet.h
index bbf9610a6b..261b85ab7c 100644
--- a/core/detectors/mvd/SensorDataSheets/CbmMvdSensorDataSheet.h
+++ b/core/detectors/mvd/SensorDataSheets/CbmMvdSensorDataSheet.h
@@ -34,7 +34,7 @@ class CbmMvdSensorDataSheet : public TNamed {
public:
/** Default constructor **/
- CbmMvdSensorDataSheet() = default;
+ CbmMvdSensorDataSheet();
virtual void Print(Option_t* opt = "") const;
std::string ToString() const;
@@ -66,9 +66,9 @@ protected:
Double_t fIntegrationTime; // Integration time of the pixels
Double_t fEpiTh; // Thickness of the epitaxial layer
- Double_t fChargeThreshold;
- Double_t fSignalRiseTime;
- Double_t fSignalFallTime;
+ //Double_t fChargeThreshold;
+ //Double_t fSignalRiseTime;
+ //Double_t fSignalFallTime;
Double_t fShaperNormalisationFactor;
//>>>>>>> ddd5fbbb (Time response added)
--
GitLab