diff --git a/core/detectors/mvd/CbmMvdDetector.cxx b/core/detectors/mvd/CbmMvdDetector.cxx
index d14ba5978737195900597f1a1dbbe33e8a67995d..1476b499c006558083439a8968ac01cb50bcb818 100644
--- a/core/detectors/mvd/CbmMvdDetector.cxx
+++ b/core/detectors/mvd/CbmMvdDetector.cxx
@@ -34,7 +34,8 @@ CbmMvdSensorTyp CbmMvdDetector::fSensorTyp = CbmMvdSensorTyp::MIMOSIS;
//_____________________________________________________________________________
CbmMvdDetector* CbmMvdDetector::Instance()
{
- if (fInstance) return fInstance;
+ if (fInstance)
+ return fInstance;
else {
fInstance = new CbmMvdDetector("A");
CbmMvdGeoHandler* mvdHandler = new CbmMvdGeoHandler();
@@ -101,7 +102,9 @@ CbmMvdDetector::CbmMvdDetector(const char* name)
, fParameter(nullptr)
{
- if (fInstance) { Fatal(GetName(), " - Error, singleton does already exist."); }
+ if (fInstance) {
+ Fatal(GetName(), " - Error, singleton does already exist.");
+ }
else {
fInstance = this;
};
@@ -128,7 +131,9 @@ void CbmMvdDetector::AddSensor(TString clearName, TString fullName, TString node
TString myname;
- if (fSensorArrayFilled) { Fatal(GetName(), " - Error, must add all sensors before adding plugins."); }
+ if (fSensorArrayFilled) {
+ Fatal(GetName(), " - Error, must add all sensors before adding plugins.");
+ }
Int_t nSensors = fSensorArray->GetEntriesFast();
@@ -181,7 +186,9 @@ Int_t CbmMvdDetector::DetectPlugin(Int_t pluginID)
for (Int_t i = 0; i < nPlugin; i++) {
CbmMvdSensorPlugin* plugin = (CbmMvdSensorPlugin*) pluginArray->At(i);
// LOG(info) <<"CbmMvdDetector::DetectPlugin: PlugInID = " << plugin->GetPluginIDNumber() << " Position: "<< i;
- if (pluginID == plugin->GetPluginIDNumber()) { return i; }
+ if (pluginID == plugin->GetPluginIDNumber()) {
+ return i;
+ }
}
@@ -336,7 +343,9 @@ void CbmMvdDetector::GetOutputArray(Int_t nPlugin, TClonesArray* outputArray)
tmpArray = sensor->GetOutputArray(nPlugin);
Int_t length = tmpArray->GetEntriesFast();
//LOG(info)<< "CbmMvdDetector::GetOutputArray - Length = " << length;
- if (length >= 0) { outputArray->AbsorbObjects(tmpArray); }
+ if (length >= 0) {
+ outputArray->AbsorbObjects(tmpArray);
+ }
}
}
@@ -353,7 +362,9 @@ void CbmMvdDetector::GetMatchArray(Int_t nPlugin, TClonesArray* matchArray)
tmpArray = sensor->GetMatchArray(nPlugin);
Int_t length = tmpArray->GetEntriesFast();
- if (length >= 0) { matchArray->AbsorbObjects(tmpArray); }
+ if (length >= 0) {
+ matchArray->AbsorbObjects(tmpArray);
+ }
}
}
@@ -395,7 +406,7 @@ TH1* CbmMvdDetector::GetHistogram(UInt_t nPlugin, UInt_t nHistogram)
}
//-----------------------------------------------------------------------
-TH1* CbmMvdDetector::GetHistogram(UInt_t nLevel, UInt_t nHistogramNumber, UInt_t sensorInSensorArrayNumber)
+TH1* CbmMvdDetector::GetHistogram(UInt_t /*nLevel*/, UInt_t /*nHistogramNumber*/, UInt_t /*sensorInSensorArrayNumber*/)
{
return 0;
}
diff --git a/core/detectors/mvd/SensorDataSheets/CbmMvdSensorDataSheet.cxx b/core/detectors/mvd/SensorDataSheets/CbmMvdSensorDataSheet.cxx
index 69b918c27e9b62c7f4c3ddc5d955fcb6b44100a3..c5c872bf441d9c9c33d71e2078cf3a6ed5ad361e 100644
--- a/core/detectors/mvd/SensorDataSheets/CbmMvdSensorDataSheet.cxx
+++ b/core/detectors/mvd/SensorDataSheets/CbmMvdSensorDataSheet.cxx
@@ -9,10 +9,10 @@
#include "CbmMvdSensorDataSheet.h"
-#include <Logger.h>
-
#include "TMath.h"
+#include <Logger.h>
+
#include <ostream> // for operator<<, stringstream, basic_ostream
using std::endl;
@@ -31,10 +31,10 @@ CbmMvdSensorDataSheet::CbmMvdSensorDataSheet()
, fShutterSign(1)
, fIntegrationTime(50e3)
, fEpiTh(14e-4)
+ , fShaperNormalisationFactor(1)
, fChargeThreshold(1)
, fSignalRiseTime(nan("NotSet"))
, fSignalFallTime(nan("NotSet"))
- , fShaperNormalisationFactor(1)
, fNoise(0)
, fLandauMPV(8.62131e+02)
, fLandauSigma(2.e+02)
@@ -101,8 +101,8 @@ std::string CbmMvdSensorDataSheet::ToString() const
// ----------- Standard implementation for backward compatibility based on Lorentz-Model.
// ----------- See PhD Christina Dritsa for scientific details on this model.
-Double_t CbmMvdSensorDataSheet::ComputeCCE(Float_t chargePointX, Float_t chargePointY, Float_t chargePointZ,
- Float_t diodeX, Float_t diodeY, Float_t diodeZ)
+Double_t CbmMvdSensorDataSheet::ComputeCCE(Float_t chargePointX, Float_t chargePointY, Float_t /*chargePointZ*/,
+ Float_t diodeX, Float_t diodeY, Float_t /*diodeZ*/)
{
return
@@ -130,10 +130,14 @@ Int_t CbmMvdSensorDataSheet::ComputeAdcCharge(Float_t charge)
Int_t adcCharge;
- if (charge < fAdcOffset) { return 0; };
+ if (charge < fAdcOffset) {
+ return 0;
+ };
adcCharge = int((charge - fAdcOffset) / fAdcStepSize);
- if (adcCharge > fAdcSteps - 1) { adcCharge = fAdcSteps - 1; }
+ if (adcCharge > fAdcSteps - 1) {
+ adcCharge = fAdcSteps - 1;
+ }
return adcCharge;
}
diff --git a/core/detectors/mvd/SensorDataSheets/CbmMvdSensorDataSheet.h b/core/detectors/mvd/SensorDataSheets/CbmMvdSensorDataSheet.h
index 616913fabb47a08afeb4bd536541956b95fc6581..47e33cf76e94bcb71fd28d6bdf56bb84e5504fd9 100644
--- a/core/detectors/mvd/SensorDataSheets/CbmMvdSensorDataSheet.h
+++ b/core/detectors/mvd/SensorDataSheets/CbmMvdSensorDataSheet.h
@@ -32,7 +32,7 @@ class TMemberInspector;
class CbmMvdSensorDataSheet : public TNamed {
-public:
+ public:
/** Default constructor **/
CbmMvdSensorDataSheet();
virtual void Print(Option_t* opt = "") const;
@@ -41,7 +41,7 @@ public:
/** Destructor **/
~CbmMvdSensorDataSheet() = default;
-protected:
+ protected:
/** Technical data of the sensor */
TString fMimosaName = "DefaulSensor"; // Clear name of the simulated sensor
Double_t fPixelPitchX = 18.4e-4; // Pixel pitch of this sensor
@@ -58,7 +58,7 @@ protected:
Double_t fIntegrationTime = 50e3; // Integration time of the pixels
Double_t fEpiTh = 25.e-4; // Thickness of the epitaxial layer
- Double_t fShaperNormalisationFactor;
+ Double_t fShaperNormalisationFactor = 1.;
Double_t fChargeThreshold = 0.;
Double_t fSignalRiseTime = nan("NotSet");
@@ -97,7 +97,7 @@ protected:
Bool_t fValidData = kFALSE;
-public:
+ public:
virtual TString* GetSensorName() { return &fMimosaName; };
virtual Double_t GetPixelPitchX() { return fPixelPitchX; };
virtual Double_t GetPixelPitchY() { return fPixelPitchY; };
diff --git a/reco/detectors/mvd/plugins/tasks/CbmMvdSensorHitfinderTask.cxx b/reco/detectors/mvd/plugins/tasks/CbmMvdSensorHitfinderTask.cxx
index 91784d19c4f74aef14580eb9b2c9f8cee671c918..9bcc55d6f55565df5d6aab9633d8c65017b6d4f5 100644
--- a/reco/detectors/mvd/plugins/tasks/CbmMvdSensorHitfinderTask.cxx
+++ b/reco/detectors/mvd/plugins/tasks/CbmMvdSensorHitfinderTask.cxx
@@ -307,9 +307,9 @@ void CbmMvdSensorHitfinderTask::ComputeCenterOfGravity(CbmMvdCluster* cluster, T
std::map<pair<Int_t, Int_t>, Int_t> PixelMap = cluster->GetPixelMap();
Int_t clusterSize = cluster->GetNofDigis();
- UInt_t shape = 0;
- Int_t xIndex0 = 0;
- Int_t yIndex0 = 0;
+ // UInt_t shape = 0;
+ // Int_t xIndex0 = 0;
+ // Int_t yIndex0 = 0;
Double_t sigmaIn[3] = {0., 0., 0.}, sigmaOut[3] = {0., 0., 0.}, shiftIn[3] = {0., 0., 0.}, shiftOut[3] = {0., 0., 0.};
@@ -359,13 +359,13 @@ void CbmMvdSensorHitfinderTask::ComputeCenterOfGravity(CbmMvdCluster* cluster, T
yIndex = pixel.second;
// Determine Cluster Shape
- if (PixelMap.size() <= 4) {
- if (it == PixelMap.begin()) {
- xIndex0 = xIndex;
- yIndex0 = yIndex;
- }
- shape += TMath::Power(2, (4 * (yIndex - yIndex0 + 3)) + (xIndex - xIndex0));
- }
+ //if (PixelMap.size() <= 4) {
+ // if (it == PixelMap.begin()) {
+ // xIndex0 = xIndex;
+ // yIndex0 = yIndex;
+ // }
+ // shape += TMath::Power(2, (4 * (yIndex - yIndex0 + 3)) + (xIndex - xIndex0));
+ //}
LOG(debug) << "CbmMvdSensorHitfinderTask:: iCluster= " << cluster->GetRefId() << " , clusterSize= " << clusterSize;
LOG(debug) << "CbmMvdSensorHitfinderTask::xIndex " << xIndex << " , yIndex " << yIndex << " , charge = " << charge;
diff --git a/sim/detectors/mvd/CbmMvdDigitizer.cxx b/sim/detectors/mvd/CbmMvdDigitizer.cxx
index 491e8a4d8c5672c0238f60422d56f83bd4e5ad1b..182781151515af2057cbe2099f83d87d42a868b3 100644
--- a/sim/detectors/mvd/CbmMvdDigitizer.cxx
+++ b/sim/detectors/mvd/CbmMvdDigitizer.cxx
@@ -426,9 +426,7 @@ void CbmMvdDigitizer::CollectHistograms()
void CbmMvdDigitizer::DisplayDebugHistos()
{
- TCanvas* c = 0;
- char myChar = 0;
-
+ //TCanvas* c = 0;
//c->Divide(3, 3);
if (!fHistoArray) {
LOG(info) << "CbmMvdDigitizer::DisplayDebugHistos - Error: fHistoArray not initialized. Disabling histograms.";
@@ -439,11 +437,10 @@ void CbmMvdDigitizer::DisplayDebugHistos()
continue;
}
LOG(debug) << "Trying to display histogram" << i;
- myChar = 48 + (char) i;
- TString myCanvasName = "DigiCanvas" + myChar;
+ TString myCanvasName = TString("DigiCanvas") + i;
LOG(debug) << "Trying to generate Canvas with name" << myCanvasName;
- c = new TCanvas(myCanvasName, myCanvasName, 150, 10, 800, 600);
+ new TCanvas(myCanvasName, myCanvasName, 150, 10, 800, 600);
//c-> cd(i);
((TH1*) fHistoArray->At(i))->Draw();
}