Skip to content
Snippets Groups Projects
Commit a640e4e8 authored by Michael Deveaux's avatar Michael Deveaux Committed by Florian Uhlig
Browse files

Fix code after rebase

parent d8e22cee
No related branches found
No related tags found
1 merge request!1371Add time based digitization and reconstruction for MVD
Hide whitespace changes
Inline Side-by-side
core/detectors/mvd/SensorDataSheets/CbmMvdSensorDataSheet.cxx
+ 1
− 1
View file @ a640e4e8
......@@ -64,7 +64,7 @@ CbmMvdSensorDataSheet::CbmMvdSensorDataSheet()
}
// ----- Destructor ----------------------------------------------------
CbmMvdSensorDataSheet::~CbmMvdSensorDataSheet() {}
//CbmMvdSensorDataSheet::~CbmMvdSensorDataSheet() {}
// -------------------------------------------------------------------------
......
core/detectors/mvd/SensorDataSheets/CbmMvdSensorDataSheet.h
+ 4
− 4
View file @ a640e4e8
......@@ -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)
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment