Skip to content
Snippets Groups Projects
Commit 0143bea4 authored by Administrator's avatar Administrator Committed by Florian Uhlig
Browse files

Default construct and destroy the object

Initialize the data members in the header file and use default constructor and
default destructor.
parent 78da8df8
No related branches found
No related tags found
1 merge request!1155Fix compilation warnings
......@@ -16,52 +16,6 @@
#include <ostream> // for operator<<, stringstream, basic_ostream
using std::endl;
// ----- Default constructor -------------------------------------------
CbmMvdSensorDataSheet::CbmMvdSensorDataSheet()
: TNamed()
, fMimosaName("DefaulSensor")
, fPixelPitchX(18.4e-4)
, fPixelPitchY(18.4e-4)
, fNPixelsX(0)
, fNPixelsY(0)
, fNPixels(0)
, fPixelSignX(1)
, fPixelSignY(1)
, fShutterSign(1)
, fIntegrationTime(50e3)
, fEpiTh(14e-4)
, fChargeThreshold()
, fNoise(0)
, fLandauMPV(8.62131e+02)
, fLandauSigma(2.e+02)
, fLandauGain(1.56)
, fLorentzPar0(4.12073e+02)
, fLorentzPar1(0.8e+00)
, fLorentzPar2(0.)
, fAdcDynamic(150)
, fAdcOffset(0)
, fAdcBits(1)
, fAdcSteps(TMath::Power(2, fAdcBits))
, fStatesPerBank(0)
, fStatesPerLine(0)
, fStatesPerFrame(0)
, fPixelsPerBank(0)
, fAdcStepSize(fAdcDynamic / fAdcSteps)
, fValidData(kFALSE)
, fSignalRiseTime(nan("NotSet"))
, fSignalFallTime(nan("NotSet"))
, fAnalogThreshold(-1)
{
}
// ----- Destructor ----------------------------------------------------
CbmMvdSensorDataSheet::~CbmMvdSensorDataSheet() {}
// -------------------------------------------------------------------------
// ----- Public method Print -------------------------------------------
void CbmMvdSensorDataSheet::Print(Option_t* /*opt*/) const { LOG(info) << ToString(); }
......
......@@ -21,6 +21,7 @@
#include <Rtypes.h> // for ClassDef
#include <RtypesCore.h> // for Double_t, Int_t, Float_t, Bool_t, Option_t
#include <TMath.h> // for TMath::Power
#include <TNamed.h> // for TNamed
#include <TString.h> // for TString
......@@ -33,67 +34,65 @@ class CbmMvdSensorDataSheet : public TNamed {
public:
/** Default constructor **/
CbmMvdSensorDataSheet();
CbmMvdSensorDataSheet() = default;
virtual void Print(Option_t* opt = "") const;
std::string ToString() const;
/** Destructor **/
~CbmMvdSensorDataSheet();
~CbmMvdSensorDataSheet() = default;
protected:
/** Technical data of the sensor */
TString fMimosaName; // Clear name of the simulated sensor
Double_t fPixelPitchX; // Pixel pitch of this sensor
Double_t fPixelPitchY; // Pixel pitch of this sensor
Int_t fNPixelsX; // Number of pixels in row
Int_t fNPixelsY; // Number of pixels in col
Int_t fNPixels; // Number of pixels in sensor
Int_t fPixelSignX; // Direction of the pixel count X.
TString fMimosaName = "DefaulSensor"; // Clear name of the simulated sensor
Double_t fPixelPitchX = 18.4e-4; // Pixel pitch of this sensor
Double_t fPixelPitchY = 18.4e-4; // Pixel pitch of this sensor
Int_t fNPixelsX = 0; // Number of pixels in row
Int_t fNPixelsY = 0; // Number of pixels in col
Int_t fNPixels = 0; // Number of pixels in sensor
Int_t fPixelSignX = 1; // Direction of the pixel count X.
// Defined according to pixelNumberX=fPixelSign * const * x
Int_t fPixelSignY; // Direction of the pixel count Y.
Int_t fPixelSignY = 1; // Direction of the pixel count Y.
// Defined according to pixelNumberY=fPixelSign * const * y
Int_t fShutterSign; // Direction of the rolling shutter.
Int_t fShutterSign = 0; // Direction of the rolling shutter.
// 1 => parallel to y-axis, -1 => anti-parallel
Double_t fIntegrationTime; // Integration time of the pixels
Double_t fEpiTh; // Thickness of the epitaxial layer
Double_t fIntegrationTime = 50e3; // Integration time of the pixels
Double_t fEpiTh = 14e-4; // Thickness of the epitaxial layer
Double_t fChargeThreshold;
Double_t fSignalRiseTime;
Double_t fSignalFallTime;
Double_t fChargeThreshold = 0.;
Double_t fSignalRiseTime = nan("NotSet");
Double_t fSignalFallTime = nan("NotSet");
/** Description of the sensor for the digitizer **/
Double_t fNoise; // Noise of the sensor
Double_t fLandauMPV; // Landau for digitizer
Double_t fLandauSigma; // Landau for digitizer
Double_t fLandauGain; // Landau for digitizer
Double_t fLorentzPar0; // Lorentz for digitizer
Double_t fLorentzPar1; // Lorentz for digitizer
Double_t fLorentzPar2; // Lorentz for digitizer
Double_t fNoise = 0.; // Noise of the sensor
Double_t fLandauMPV = 8.62131e+02; // Landau for digitizer
Double_t fLandauSigma = 2.e+02; // Landau for digitizer
Double_t fLandauGain = 1.56; // Landau for digitizer
Double_t fLorentzPar0 = 4.12073e+02; // Lorentz for digitizer
Double_t fLorentzPar1 = 0.8e+00; // Lorentz for digitizer
Double_t fLorentzPar2 = 0.1; // Lorentz for digitizer
/** ADC description, relevant for sensors with analog readout (not present in the CbmMvd) **/
Int_t fAdcDynamic;
Int_t fAdcOffset;
Int_t fAdcBits;
Int_t fAdcSteps;
Float_t fAdcStepSize;
Int_t fAdcDynamic = 150;
Int_t fAdcOffset = 0;
Int_t fAdcBits = 1;
Int_t fAdcSteps = TMath::Power(2, fAdcBits);
Float_t fAdcStepSize = fAdcDynamic / fAdcSteps;
/** Sensor substructure, relevant for MIMOSA-26 (Prototype of the CbmMvd) **/
Int_t fStatesPerBank;
Int_t fStatesPerLine;
Int_t fStatesPerFrame;
Int_t fPixelsPerBank;
Int_t fStatesPerBank = 0;
Int_t fStatesPerLine = 0;
Int_t fStatesPerFrame = 0;
Int_t fPixelsPerBank = 0;
/** Threshold of the in-pixel discriminator. Relevant for MIMOSIS **/
Int_t fAnalogThreshold;
Int_t fAnalogThreshold = -1;
/** Self-organizsation **/
Bool_t fValidData;
Bool_t fValidData = kFALSE;
public:
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment