diff --git a/analysis/detectors/mvd/CbmMvdReadout.cxx b/analysis/detectors/mvd/CbmMvdReadout.cxx
index 02533f83847f6f518bfa67951c4e5e214e74a711..f64ef8e7c53ea769ce59216deea51cc58fe06079 100644
--- a/analysis/detectors/mvd/CbmMvdReadout.cxx
+++ b/analysis/detectors/mvd/CbmMvdReadout.cxx
@@ -7,17 +7,17 @@
// -------------------------------------------------------------------------
#include "CbmMvdReadout.h"
-#include "CbmDefs.h" // for ECbmModuleId
-#include "CbmDigiManager.h" // for CbmDigiManager
-#include "CbmMvdDetector.h" // for CbmMvdDetector
-#include "CbmMvdDigi.h" // for CbmMvdDigi
-#include "CbmMvdSensor.h" // for CbmMvdSensor
-#include "CbmMvdSensorReadoutTask.h" // for CbmMvdSensorReadoudoutTask
+#include "CbmDefs.h" // for ECbmModuleId
+#include "CbmDigiManager.h" // for CbmDigiManager
+#include "CbmMvdDetector.h" // for CbmMvdDetector
+#include "CbmMvdDigi.h" // for CbmMvdDigi
+#include "CbmMvdSensor.h" // for CbmMvdSensor
+#include "CbmMvdSensorReadoutTask.h" // for CbmMvdSensorReadoudoutTask
-#include <FairRootManager.h> // for FairRootManager
-#include <Logger.h> // for LOG
+#include <FairRootManager.h> // for FairRootManager
+#include <Logger.h> // for LOG
-#include <iostream> // for operator<<, endl
+#include <iostream> // for operator<<, endl
using std::cout;
using std::endl;
@@ -49,8 +49,8 @@ void CbmMvdReadout::Exec(Option_t* /*opt*/)
if (fDigiMan->GetNofDigis(ECbmModuleId::kMvd) > 0) {
if (fVerbose) cout << "//----------------------------------------//";
if (fVerbose) cout << endl << "Send Input" << endl;
- Int_t nTargetPlugin=fDetector->DetectPlugin(200);
- CbmMvdDigi* digi=0;
+ Int_t nTargetPlugin = fDetector->DetectPlugin(200);
+ CbmMvdDigi* digi = 0;
Int_t nDigis = fDigiMan->GetNofDigis(ECbmModuleId::kMvd);
@@ -103,10 +103,9 @@ InitStatus CbmMvdReadout::Init()
// Add the readout plugin to all sensors
std::map<int, CbmMvdSensor*>& sensorMap = fDetector->GetSensorMap();
- UInt_t plugincount=fDetector->GetPluginCount();
+ UInt_t plugincount = fDetector->GetPluginCount();
- for (auto itr = sensorMap.begin();
- itr != sensorMap.end(); itr++) {
+ for (auto itr = sensorMap.begin(); itr != sensorMap.end(); itr++) {
CbmMvdSensorReadoutTask* readerTask = new CbmMvdSensorReadoutTask();
itr->second->AddPlugin(readerTask);
@@ -116,7 +115,7 @@ InitStatus CbmMvdReadout::Init()
itr->second->SetClusterPlugin(plugincount);
}
fDetector->SetSensorArrayFilled(kTRUE);
- fDetector->SetPluginCount(plugincount+1);
+ fDetector->SetPluginCount(plugincount + 1);
fPluginNr = (UInt_t)(fDetector->GetPluginArraySize());
fDetector->Init();
diff --git a/analysis/detectors/mvd/CbmMvdReadout.h b/analysis/detectors/mvd/CbmMvdReadout.h
index 072a15aa32854b539d50b9ca444fce7c2dcfd5f9..2cf0d77e7190f6078a3bf30ead2c6dfc2134674f 100644
--- a/analysis/detectors/mvd/CbmMvdReadout.h
+++ b/analysis/detectors/mvd/CbmMvdReadout.h
@@ -11,7 +11,7 @@
#ifndef CBMMVDREADOUT_H
#define CBMMVDREADOUT_H 1
-#include <FairTask.h> // for InitStatus, FairTask
+#include <FairTask.h> // for InitStatus, FairTask
#include <Rtypes.h> // for ClassDef
#include <RtypesCore.h> // for Int_t, Bool_t, Option_t, kTRUE
diff --git a/analysis/detectors/mvd/CbmMvdReadoutCluster.cxx b/analysis/detectors/mvd/CbmMvdReadoutCluster.cxx
index f6ad8e2999d271db6a1a52e13d85fe2942fd31b9..b39550af07aff640e3be0a02419a2e22a843bb94 100644
--- a/analysis/detectors/mvd/CbmMvdReadoutCluster.cxx
+++ b/analysis/detectors/mvd/CbmMvdReadoutCluster.cxx
@@ -9,19 +9,19 @@
#include "CbmMvdReadoutCluster.h"
-#include "CbmMvdCluster.h" // for CbmMvdCluster
+#include "CbmMvdCluster.h" // for CbmMvdCluster
#include <FairRootManager.h> // for FairRootManager
#include <Logger.h> // for LOG, Logger
-#include <TClonesArray.h> // for TClonesArray
-#include <TFile.h> // for TFile
-#include <TH1.h> // for TH1F
-#include <TString.h> // for Form
+#include <TClonesArray.h> // for TClonesArray
+#include <TFile.h> // for TFile
+#include <TH1.h> // for TH1F
+#include <TString.h> // for Form
-#include <iostream> // for cout, endl
-#include <map> // for allocator, map, operator!=, __map_iterator
-#include <utility> // for pair
+#include <iostream> // for cout, endl
+#include <map> // for allocator, map, operator!=, __map_iterator
+#include <utility> // for pair
using std::cout;
using std::endl;
diff --git a/analysis/detectors/mvd/CbmMvdReadoutCluster.h b/analysis/detectors/mvd/CbmMvdReadoutCluster.h
index f707282a6526216befd2be8520ca65ff3ef57e64..f07896028f651fe15f882afdb69ede53e0006ca7 100644
--- a/analysis/detectors/mvd/CbmMvdReadoutCluster.h
+++ b/analysis/detectors/mvd/CbmMvdReadoutCluster.h
@@ -18,7 +18,7 @@
#ifndef CBMMVDREADOUTCLUSTER_H
#define CBMMVDREADOUTCLUSTER_H 1
-#include <FairTask.h> // for FairTask, InitStatus
+#include <FairTask.h> // for FairTask, InitStatus
#include <Rtypes.h> // for ClassDef
#include <RtypesCore.h> // for Int_t, Bool_t, Option_t, kTRUE
diff --git a/analysis/detectors/mvd/CbmMvdReadoutSimple.cxx b/analysis/detectors/mvd/CbmMvdReadoutSimple.cxx
index ccc923f5ceae712f370da16c23299937fcdc2c7b..b5474d44846897a8ae4b48a6455de08a8e3f0b20 100644
--- a/analysis/detectors/mvd/CbmMvdReadoutSimple.cxx
+++ b/analysis/detectors/mvd/CbmMvdReadoutSimple.cxx
@@ -8,21 +8,21 @@
// -------------------------------------------------------------------------
#include "CbmMvdReadoutSimple.h"
-#include "CbmMvdPoint.h" // for CbmMvdPoint
+#include "CbmMvdPoint.h" // for CbmMvdPoint
#include <FairRootManager.h> // for FairRootManager
#include <Logger.h> // for Logger, LOG
-#include <TAxis.h> // for TAxis
-#include <TCanvas.h> // for TCanvas
-#include <TClonesArray.h> // for TClonesArray
-#include <TF1.h> // for TF1
-#include <TFile.h> // for TFile
-#include <TH1.h> // for TH1F, TH1I
-#include <TH2.h> // for TH2F, TH2I
-#include <TString.h> // for Form
+#include <TAxis.h> // for TAxis
+#include <TCanvas.h> // for TCanvas
+#include <TClonesArray.h> // for TClonesArray
+#include <TF1.h> // for TF1
+#include <TFile.h> // for TFile
+#include <TH1.h> // for TH1F, TH1I
+#include <TH2.h> // for TH2F, TH2I
+#include <TString.h> // for Form
-#include <iostream> // for operator<<, basic_ostream, endl, cout
+#include <iostream> // for operator<<, basic_ostream, endl, cout
using std::cout;
using std::endl;
diff --git a/analysis/detectors/mvd/CbmMvdReadoutSimple.h b/analysis/detectors/mvd/CbmMvdReadoutSimple.h
index 950b1ebaa7c8a3e05eacd6f326c34d56b7fcd77e..40b9b90b6179b362cab540c4d40941cd87e9902f 100644
--- a/analysis/detectors/mvd/CbmMvdReadoutSimple.h
+++ b/analysis/detectors/mvd/CbmMvdReadoutSimple.h
@@ -18,7 +18,7 @@
#ifndef CBMMVDREADOUTSIMPLE_H
#define CBMMVDREADOUTSIMPLE_H 1
-#include <FairTask.h> // for FairTask, InitStatus
+#include <FairTask.h> // for FairTask, InitStatus
#include <Rtypes.h> // for ClassDef
#include <RtypesCore.h> // for Int_t, Bool_t, Option_t, kTRUE
diff --git a/analysis/detectors/mvd/plugins/tasks/CbmMvdSensorReadoutTask.cxx b/analysis/detectors/mvd/plugins/tasks/CbmMvdSensorReadoutTask.cxx
index 7542a16c26ab8f90f02382c07d847084b90eb26f..3c61c97ac39d180f50ec4db9f2745e30a4d2edcd 100644
--- a/analysis/detectors/mvd/plugins/tasks/CbmMvdSensorReadoutTask.cxx
+++ b/analysis/detectors/mvd/plugins/tasks/CbmMvdSensorReadoutTask.cxx
@@ -8,12 +8,12 @@
// -------------------------------------------------------------------------
#include "CbmMvdSensorReadoutTask.h"
-#include "CbmMvdDigi.h" // for CbmMvdDigi
+#include "CbmMvdDigi.h" // for CbmMvdDigi
#include <TClonesArray.h> // for TClonesArray
#include <TH1.h> // for TH1I
-#include <iostream> // for operator<<, basic_ostream, endl, cout, ost...
+#include <iostream> // for operator<<, basic_ostream, endl, cout, ost...
using std::cout;
using std::endl;
@@ -27,7 +27,7 @@ CbmMvdSensorReadoutTask::CbmMvdSensorReadoutTask()
, fSensorBanks()
{
// fSensorBanks[maxBanks] = {0};
- fPluginIDNumber= 600;
+ fPluginIDNumber = 600;
}
// -------------------------------------------------------------------------
// ----- constructor -------------------------------------------
@@ -39,7 +39,7 @@ CbmMvdSensorReadoutTask::CbmMvdSensorReadoutTask(const char* name)
, fSensorBanks()
{
// fSensorBanks[maxBanks] = {0};
- fPluginIDNumber= 600;
+ fPluginIDNumber = 600;
}
// -------------------------------------------------------------------------
diff --git a/analysis/detectors/mvd/plugins/tasks/CbmMvdSensorReadoutTask.h b/analysis/detectors/mvd/plugins/tasks/CbmMvdSensorReadoutTask.h
index 087952be8c090bc2a2bd983b37e484036b0cc96c..3ab9fb8b8e0f75728f9e1efb0fc09d7070b12e1f 100644
--- a/analysis/detectors/mvd/plugins/tasks/CbmMvdSensorReadoutTask.h
+++ b/analysis/detectors/mvd/plugins/tasks/CbmMvdSensorReadoutTask.h
@@ -19,8 +19,8 @@
#include "CbmMvdSensorTask.h" // for CbmMvdSensorTask
-#include <Rtypes.h> // for ClassDef
-#include <RtypesCore.h> // for Int_t
+#include <Rtypes.h> // for ClassDef
+#include <RtypesCore.h> // for Int_t
class CbmMvdDigi;
class CbmMvdSensor;
diff --git a/analysis/detectors/mvd/qa/CbmMvdQa.cxx b/analysis/detectors/mvd/qa/CbmMvdQa.cxx
index 490207aec7b6e8e0be4b41948aef812e7b0e60ac..70ca6495356cfb6351dab2de43a254a9fa254e2c 100644
--- a/analysis/detectors/mvd/qa/CbmMvdQa.cxx
+++ b/analysis/detectors/mvd/qa/CbmMvdQa.cxx
@@ -24,22 +24,23 @@
#include "CbmTrackParam.h" // for CbmTrackParam
#include "CbmVertex.h" // for CbmVertex
-#include <FairRootManager.h> // for FairRootManager
-#include <FairTask.h> // for InitStatus, FairTask
-#include <FairTrackParam.h> // for FairTrackParam
-#include <Logger.h> // for Logger, LOG
-
-#include <TAxis.h> // for TAxis
-#include <TCanvas.h> // for TCanvas
-#include <TClonesArray.h> // for TClonesArray
-#include <TFile.h> // for TFile
-#include <TH1.h> // for TH1F
-#include <TH2.h> // for TH2F
-#include <TObject.h> // for TObject
-#include <TStyle.h> // for TStyle, gStyle
-
-#include <cmath> // for sqrt, fabs
-#include <iostream> // for operator<<, basic_ostream, char_traits
+#include <FairRootManager.h> // for FairRootManager
+#include <FairTask.h> // for InitStatus, FairTask
+#include <FairTrackParam.h> // for FairTrackParam
+#include <Logger.h> // for Logger, LOG
+
+#include <TAxis.h> // for TAxis
+#include <TCanvas.h> // for TCanvas
+#include <TClonesArray.h> // for TClonesArray
+#include <TFile.h> // for TFile
+#include <TH1.h> // for TH1F
+#include <TH2.h> // for TH2F
+#include <TObject.h> // for TObject
+#include <TStyle.h> // for TStyle, gStyle
+
+#include <iostream> // for operator<<, basic_ostream, char_traits
+
+#include <cmath> // for sqrt, fabs
using std::cout;
using std::endl;
diff --git a/analysis/detectors/mvd/qa/CbmMvdQa.h b/analysis/detectors/mvd/qa/CbmMvdQa.h
index cf60db9abf62c641455ceaec4efdf4fcfd304973..81cddf78c2fad274e1a0f839a4befbb0540f5029 100644
--- a/analysis/detectors/mvd/qa/CbmMvdQa.h
+++ b/analysis/detectors/mvd/qa/CbmMvdQa.h
@@ -19,7 +19,7 @@
#ifndef CBMMVDQA_H
#define CBMMVDQA_H 1
-#include "FairTask.h" // for FairTask, InitStatus
+#include "FairTask.h" // for FairTask, InitStatus
#include <Rtypes.h> // for ClassDef
#include <RtypesCore.h> // for Int_t, Bool_t, kTRUE, Float_t, Option_t
diff --git a/core/detectors/mvd/CbmMvdDetector.cxx b/core/detectors/mvd/CbmMvdDetector.cxx
index 3f4a1eb431a5699b5de9c092a1cd93cc528ca5db..8d37ee8e4086184a3d2ba5ed44e172c8ac6014b7 100644
--- a/core/detectors/mvd/CbmMvdDetector.cxx
+++ b/core/detectors/mvd/CbmMvdDetector.cxx
@@ -16,15 +16,14 @@
#include "CbmMvdSensorPlugin.h" // for CbmMvdSensorPlugin, MvdSensorPluginType
#include "CbmMvdSensorTask.h" // for CbmMvdSensorTask
-#include <Logger.h> // for LOG, Logger
+#include <Logger.h> // for LOG, Logger
-#include <Rtypes.h> // for TGenericClassInfo
-
-#include <TClonesArray.h> // for TClonesArray
-#include <TNamed.h> // for TNamed
-#include <TObjArray.h> // for TObjArray
-#include <TRandom.h> // for TRandom, gRandom
-#include <TString.h> // for TString, operator==, operator<<
+#include <Rtypes.h> // for TGenericClassInfo
+#include <TClonesArray.h> // for TClonesArray
+#include <TNamed.h> // for TNamed
+#include <TObjArray.h> // for TObjArray
+#include <TRandom.h> // for TRandom, gRandom
+#include <TString.h> // for TString, operator==, operator<<
//_____________________________________________________________________________
CbmMvdDetector* CbmMvdDetector::fInstance = 0;
@@ -169,20 +168,23 @@ Int_t CbmMvdDetector::DetectPlugin(Int_t pluginID)
// Detects the position of a plugin with a given Plugin-ID (set in the plugin implementation constructor) in the plugin-array of the sensors
+ if (!fSensorArrayFilled) {
+ LOG(warning)
+ << "CbmMvdDetector::DetectPlugin: You tried to access sensor plugins while the detector is not initialized yet.";
+ return -1;
+ }
+ CbmMvdSensor* sensor = GetSensor(0);
+ TObjArray* pluginArray = sensor->GetPluginArray();
- if (!fSensorArrayFilled) {LOG(warning) << "CbmMvdDetector::DetectPlugin: You tried to access sensor plugins while the detector is not initialized yet."; return -1;}
- CbmMvdSensor* sensor=GetSensor(0);
- TObjArray* pluginArray= sensor->GetPluginArray();
-
- Int_t nPlugin=pluginArray->GetEntries();
- for(Int_t i=0; i<nPlugin;i++) {
- CbmMvdSensorPlugin* plugin= (CbmMvdSensorPlugin*) pluginArray->At(i);
+ Int_t nPlugin = pluginArray->GetEntries();
+ 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; }
}
- return -1;
+ return -1;
}
//-----------------------------------------------------------------------
@@ -237,7 +239,7 @@ void CbmMvdDetector::ShowDebugHistos()
//-----------------------------------------------------------------------
void CbmMvdDetector::SendInputToSensorPlugin(Int_t detectorid, Int_t nPlugin, TObject* input)
{
- fSensorMap[detectorid]->SendInputToPlugin(nPlugin,input);
+ fSensorMap[detectorid]->SendInputToPlugin(nPlugin, input);
}
//-----------------------------------------------------------------------
@@ -321,7 +323,8 @@ void CbmMvdDetector::ExecFrom(UInt_t nLevel)
}
//-----------------------------------------------------------------------
-void CbmMvdDetector::GetOutputArray(Int_t nPlugin, TClonesArray* outputArray){
+void CbmMvdDetector::GetOutputArray(Int_t nPlugin, TClonesArray* outputArray)
+{
Int_t nSensors = fSensorArray->GetEntriesFast();
CbmMvdSensor* sensor;
TClonesArray* tmpArray;
@@ -329,17 +332,16 @@ void CbmMvdDetector::GetOutputArray(Int_t nPlugin, TClonesArray* outputArray){
for (Int_t i = 0; i < nSensors; i++) {
sensor = (CbmMvdSensor*) fSensorArray->At(i);
- tmpArray=sensor->GetOutputArray(nPlugin);
+ 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); }
}
}
//-----------------------------------------------------------------------
-void CbmMvdDetector::GetMatchArray(Int_t nPlugin, TClonesArray* matchArray){
+void CbmMvdDetector::GetMatchArray(Int_t nPlugin, TClonesArray* matchArray)
+{
Int_t nSensors = fSensorArray->GetEntriesFast();
CbmMvdSensor* sensor;
TClonesArray* tmpArray;
@@ -347,12 +349,10 @@ void CbmMvdDetector::GetMatchArray(Int_t nPlugin, TClonesArray* matchArray){
for (Int_t i = 0; i < nSensors; i++) {
sensor = (CbmMvdSensor*) fSensorArray->At(i);
- tmpArray=sensor->GetMatchArray(nPlugin);
+ tmpArray = sensor->GetMatchArray(nPlugin);
Int_t length = tmpArray->GetEntriesFast();
- if (length >= 0) {
- matchArray->AbsorbObjects(tmpArray);
- }
+ if (length >= 0) { matchArray->AbsorbObjects(tmpArray); }
}
}
diff --git a/core/detectors/mvd/CbmMvdDetector.h b/core/detectors/mvd/CbmMvdDetector.h
index d914d9c58cfc86c255ae72cd3744cd6d63560a87..59bfaf74a2608ba7637b62d7c8fda28ed24a8236 100644
--- a/core/detectors/mvd/CbmMvdDetector.h
+++ b/core/detectors/mvd/CbmMvdDetector.h
@@ -22,13 +22,13 @@
#include "CbmMvdStationPar.h" // for CbmMvdStationPar
-#include <Rtypes.h> // for ClassDef
-#include <RtypesCore.h> // for Int_t, UInt_t, Bool_t, Float_t, Double_t
-#include <TClonesArray.h> // for TClonesArray
-#include <TNamed.h> // for TNamed
-#include <TString.h> // for TString
+#include <Rtypes.h> // for ClassDef
+#include <RtypesCore.h> // for Int_t, UInt_t, Bool_t, Float_t, Double_t
+#include <TClonesArray.h> // for TClonesArray
+#include <TNamed.h> // for TNamed
+#include <TString.h> // for TString
-#include <map> // for map
+#include <map> // for map
class CbmMvdSensor;
class CbmMvdSensorDataSheet;
@@ -58,23 +58,23 @@ public:
/** Data interface */
void SendInputToSensorPlugin(Int_t detectorid, Int_t nPlugin, TObject* input);
- void GetOutputArray(Int_t nPlugin,TClonesArray* outputArray);
+ void GetOutputArray(Int_t nPlugin, TClonesArray* outputArray);
void GetMatchArray(Int_t nPlugin, TClonesArray* matchArray);
- std::map<int, CbmMvdSensor*>& GetSensorMap() { return fSensorMap;};
- CbmMvdSensor* GetSensor(Int_t nSensor) {return (CbmMvdSensor*) fSensorArray->At(nSensor);}
+ std::map<int, CbmMvdSensor*>& GetSensorMap() { return fSensorMap; };
+ CbmMvdSensor* GetSensor(Int_t nSensor) { return (CbmMvdSensor*) fSensorArray->At(nSensor); }
Int_t GetSensorArraySize() { return (fSensorArray->GetEntriesFast()); }
Int_t GetPluginArraySize() { return fPluginCount - 1; }
UInt_t GetPluginCount() { return fPluginCount; }
- void SetPluginCount(UInt_t count) { fPluginCount=count; }
- Int_t DetectPlugin(Int_t pluginID);
+ void SetPluginCount(UInt_t count) { fPluginCount = count; }
+ Int_t DetectPlugin(Int_t pluginID);
/** Initialisation */
void AddSensor(TString clearName, TString fullName, TString nodeName, CbmMvdSensorDataSheet* sensorData,
Int_t sensorNr, Int_t volumeId, Double_t sensorStartTime, Int_t stationNr);
static void SetSensorTyp(CbmMvdSensorTyp typ) { fSensorTyp = typ; };
- void SetSensorArrayFilled(Bool_t value = kTRUE) {fSensorArrayFilled=value;}
+ void SetSensorArrayFilled(Bool_t value = kTRUE) { fSensorArrayFilled = value; }
void Init();
void SetMisalignment(Float_t misalignment[3])
@@ -87,8 +87,8 @@ public:
void ShowDebugHistos();
/** Data Processing */
- void ExecChain(); //Processes the full execution chain
- void Exec(UInt_t nLevel); //Processes Element nLevel of the chain
+ void ExecChain(); //Processes the full execution chain
+ void Exec(UInt_t nLevel); //Processes Element nLevel of the chain
void ExecFrom(UInt_t nLevel); //Preocesses Elements from a given level till the end
/** Finish */
diff --git a/core/detectors/mvd/CbmMvdPileupManager.cxx b/core/detectors/mvd/CbmMvdPileupManager.cxx
index 39b857c5bb53017b866428248275a314240dbe41..ec086d0924001623dbe8b350ca6dee40f01be4dd 100644
--- a/core/detectors/mvd/CbmMvdPileupManager.cxx
+++ b/core/detectors/mvd/CbmMvdPileupManager.cxx
@@ -8,7 +8,7 @@
// -------------------------------------------------------------------------
#include "CbmMvdPileupManager.h"
-#include <Logger.h> // for Logger, LOG
+#include <Logger.h> // for Logger, LOG
#include <TClonesArray.h> // for TClonesArray
#include <TDirectory.h> // for TDirectoryAtomicAdapter, gDirectory, TDire...
@@ -17,8 +17,8 @@
#include <TObjArray.h> // for TObjArray
#include <TTree.h> // for TTree
-#include <iostream> // for operator<<, endl, basic_ostream, char_traits
-#include <memory> // for allocator
+#include <iostream> // for operator<<, endl, basic_ostream, char_traits
+#include <memory> // for allocator
using std::cout;
using std::endl;
diff --git a/core/detectors/mvd/CbmMvdSensor.cxx b/core/detectors/mvd/CbmMvdSensor.cxx
index cc0f68407f8d08dbebd68fec098342840fe7fc5a..f84b3271cc000749b8ee4677431d2569a85454d0 100644
--- a/core/detectors/mvd/CbmMvdSensor.cxx
+++ b/core/detectors/mvd/CbmMvdSensor.cxx
@@ -9,8 +9,8 @@
#include "CbmMvdSensor.h"
-#include "CbmMvdSensorPlugin.h"
#include "CbmMvdSensorBuffer.h"
+#include "CbmMvdSensorPlugin.h"
#include "CbmMvdSensorTask.h"
#include <FairEventHeader.h>
@@ -45,7 +45,7 @@ CbmMvdSensor::CbmMvdSensor()
, fClusterPlugin(-1)
, fVolName("")
, fNodeName("")
- /*
+ /*
, foutputDigis(nullptr)
, foutputCluster(nullptr)
, //not needed khun
@@ -94,7 +94,7 @@ CbmMvdSensor::CbmMvdSensor(const char* name, CbmMvdSensorDataSheet* dataSheet, T
, fClusterPlugin(-1)
, fVolName(volName)
, fNodeName(nodeName)
- /*
+ /*
, foutputDigis(nullptr)
, foutputCluster(nullptr)
, //not needed khun
@@ -263,7 +263,7 @@ void CbmMvdSensor::ShowDebugHistos()
void CbmMvdSensor::SendInputToPlugin(Int_t nPlugin, TObject* input)
{
CbmMvdSensorPlugin* digitask;
- digitask=(CbmMvdSensorPlugin*) fPluginArray->At(nPlugin);
+ digitask = (CbmMvdSensorPlugin*) fPluginArray->At(nPlugin);
digitask->SetInput(input);
}
@@ -374,7 +374,7 @@ void CbmMvdSensor::ExecFrom(UInt_t nPlugin)
TClonesArray* CbmMvdSensor::GetOutputArray(Int_t nPlugin) const
{
- CbmMvdSensorPlugin* plugin=(CbmMvdSensorPlugin*)fPluginArray->At(nPlugin);
+ CbmMvdSensorPlugin* plugin = (CbmMvdSensorPlugin*) fPluginArray->At(nPlugin);
return plugin->GetOutputArray();
}
@@ -383,24 +383,22 @@ TClonesArray* CbmMvdSensor::GetOutputArray(Int_t nPlugin) const
TClonesArray* CbmMvdSensor::GetMatchArray(Int_t nPlugin) const
{
- CbmMvdSensorPlugin* plugin = (CbmMvdSensorPlugin*)fPluginArray-> At (nPlugin);
+ CbmMvdSensorPlugin* plugin = (CbmMvdSensorPlugin*) fPluginArray->At(nPlugin);
return plugin->GetMatchArray();
}
// -------------------------------------------------------------------------
Int_t CbmMvdSensor::GetOutputArrayLen(Int_t nPlugin) const
{
- TClonesArray* tempArray= GetOutputArray(nPlugin); // make sure that the arrays are filled
- if (tempArray){return tempArray->GetEntriesFast()-1;}
+ TClonesArray* tempArray = GetOutputArray(nPlugin); // make sure that the arrays are filled
+ if (tempArray) { return tempArray->GetEntriesFast() - 1; }
else {
LOG(fatal) << "undefined plugin called";
return -1;
}
-
}
// -------------------------------------------------------------------------
-
// -------------------------------------------------------------------------
TClonesArray* CbmMvdSensor::GetOutputBuffer() const
{
diff --git a/core/detectors/mvd/CbmMvdSensor.h b/core/detectors/mvd/CbmMvdSensor.h
index f9daac23da3ccf4bafc338b7ad3d5fcb3ca421c0..6e0e7d09e454b42471716a2ba295f3204a88ee18 100644
--- a/core/detectors/mvd/CbmMvdSensor.h
+++ b/core/detectors/mvd/CbmMvdSensor.h
@@ -23,13 +23,14 @@
#include "CbmMvdSensorDataSheet.h" // for CbmMvdSensorDataSheet
#include "CbmMvdSensorPlugin.h" // for CbmMvdSensorPlugin
-#include <Rtypes.h> // for ClassDef
-#include <RtypesCore.h> // for Int_t, Double_t, Float_t, UInt_t
-#include <TGeoBBox.h> // for TGeoBBox
-#include <TNamed.h> // for TNamed
-#include <TObjArray.h> // for TObjArray
-#include <TString.h> // for TString
-#include <map> // for map
+#include <Rtypes.h> // for ClassDef
+#include <RtypesCore.h> // for Int_t, Double_t, Float_t, UInt_t
+#include <TGeoBBox.h> // for TGeoBBox
+#include <TNamed.h> // for TNamed
+#include <TObjArray.h> // for TObjArray
+#include <TString.h> // for TString
+
+#include <map> // for map
class TBuffer;
class TClass;
@@ -88,7 +89,7 @@ public:
Int_t GetDigiPlugin() const { return fDigiPlugin; };
Int_t GetHitPlugin() const { return fHitPlugin; };
Int_t GetClusterPlugin() const { return fClusterPlugin; }
- TObjArray* GetPluginArray() {return fPluginArray;}
+ TObjArray* GetPluginArray() { return fPluginArray; }
void SetDigiPlugin(const Int_t& nPlugin) { fDigiPlugin = nPlugin; };
void SetHitPlugin(const Int_t& nPlugin) { fHitPlugin = nPlugin; };
diff --git a/core/detectors/mvd/CbmMvdStationPar.cxx b/core/detectors/mvd/CbmMvdStationPar.cxx
index 3be56060a61a7bf7afc3532314405690f841a9f3..3d3c6e48ce49abf1a0a8f5a028baaf2b9683416e 100644
--- a/core/detectors/mvd/CbmMvdStationPar.cxx
+++ b/core/detectors/mvd/CbmMvdStationPar.cxx
@@ -11,9 +11,10 @@
#include <Logger.h> // for Logger, LOG
+#include <limits> // for numeric_limits
+
#include <assert.h> // for assert
-#include <cmath> // for fabs, isnan
-#include <limits> // for numeric_limits
+#include <cmath> // for fabs, isnan
// ----- Default constructor -------------------------------------------
diff --git a/core/detectors/mvd/CbmMvdStationPar.h b/core/detectors/mvd/CbmMvdStationPar.h
index efd7719f45b070a7a01851450fd2fb9d25f80cd5..4b7aa852d9aa0f26135850810d6d1c21a58028e8 100644
--- a/core/detectors/mvd/CbmMvdStationPar.h
+++ b/core/detectors/mvd/CbmMvdStationPar.h
@@ -23,7 +23,7 @@
#include <RtypesCore.h> // for Double_t, Int_t, Option_t
#include <TNamed.h> // for TNamed
-#include <vector> // for vector
+#include <vector> // for vector
class TBuffer;
class TClass;
diff --git a/core/detectors/mvd/CbmMvdTrackingInterface.h b/core/detectors/mvd/CbmMvdTrackingInterface.h
index 76a09531ce26a5f79519ad6e17c9084093c5ffda..7cdefa87849197361f6f67c8c64fa4ec963cd9d1 100644
--- a/core/detectors/mvd/CbmMvdTrackingInterface.h
+++ b/core/detectors/mvd/CbmMvdTrackingInterface.h
@@ -18,13 +18,13 @@
#include "CbmPixelHit.h" // for CbmPixelHit
#include "CbmTrackingDetectorInterfaceBase.h" // for CbmTrackingDetectorInt...
-#include <FairTask.h> // for InitStatus, FairTask
+#include <FairTask.h> // for InitStatus, FairTask
-#include <Rtypes.h> // for ClassDef
-#include <TMath.h> // for Pi
+#include <Rtypes.h> // for ClassDef
+#include <TMath.h> // for Pi
-#include <algorithm> // for min, max
-#include <string> // for string
+#include <algorithm> // for min, max
+#include <string> // for string
class TBuffer;
class TClass;
diff --git a/core/detectors/mvd/SensorDataSheets/CbmMvdMimosa26AHR.cxx b/core/detectors/mvd/SensorDataSheets/CbmMvdMimosa26AHR.cxx
index 36309748b42b773af635122796520c188dd857a8..dfe97be3c53147af15b4e8bd15044e2bed3805fa 100644
--- a/core/detectors/mvd/SensorDataSheets/CbmMvdMimosa26AHR.cxx
+++ b/core/detectors/mvd/SensorDataSheets/CbmMvdMimosa26AHR.cxx
@@ -10,8 +10,8 @@
#include "CbmMvdMimosa26AHR.h"
#include <RtypesCore.h> // for kTRUE
-#include <TString.h> // for TString
#include <TMath.h> // for Power
+#include <TString.h> // for TString
// ----- Default constructor -------------------------------------------
CbmMvdMimosa26AHR::CbmMvdMimosa26AHR()
diff --git a/core/detectors/mvd/SensorDataSheets/CbmMvdMimosa26AHR.h b/core/detectors/mvd/SensorDataSheets/CbmMvdMimosa26AHR.h
index 868a7c3f01368c38d41d2dc4a388e3b768075754..dde810e3f830d930814e70b790e1b7551708be72 100644
--- a/core/detectors/mvd/SensorDataSheets/CbmMvdMimosa26AHR.h
+++ b/core/detectors/mvd/SensorDataSheets/CbmMvdMimosa26AHR.h
@@ -22,7 +22,7 @@
#include "CbmMvdSensorDataSheet.h" // for CbmMvdSensorDataSheet
-#include <Rtypes.h> // for ClassDef
+#include <Rtypes.h> // for ClassDef
class TBuffer;
class TClass;
diff --git a/core/detectors/mvd/SensorDataSheets/CbmMvdMimosa34.cxx b/core/detectors/mvd/SensorDataSheets/CbmMvdMimosa34.cxx
index 7b061ee1a7533843431973e628a682bfa528f372..5b7fdb329c5db79007683d9108109f2a74a94e22 100644
--- a/core/detectors/mvd/SensorDataSheets/CbmMvdMimosa34.cxx
+++ b/core/detectors/mvd/SensorDataSheets/CbmMvdMimosa34.cxx
@@ -10,10 +10,10 @@
#include "CbmMvdMimosa34.h"
#include <RtypesCore.h> // for kTRUE
-#include <TString.h> // for TString
#include <TMath.h> // for Power
+#include <TString.h> // for TString
-#include <iostream> // for cout, endl
+#include <iostream> // for cout, endl
// ----- Default constructor -------------------------------------------
CbmMvdMimosa34::CbmMvdMimosa34()
diff --git a/core/detectors/mvd/SensorDataSheets/CbmMvdMimosa34.h b/core/detectors/mvd/SensorDataSheets/CbmMvdMimosa34.h
index 44adbef29c46c700f8a40435d7904c35c5b8bc5a..b22991291c68c19f08b619e1cff0353d719ac39e 100644
--- a/core/detectors/mvd/SensorDataSheets/CbmMvdMimosa34.h
+++ b/core/detectors/mvd/SensorDataSheets/CbmMvdMimosa34.h
@@ -20,7 +20,7 @@
#include "CbmMvdSensorDataSheet.h" // for CbmMvdSensorDataSheet
-#include <Rtypes.h> // for ClassDef
+#include <Rtypes.h> // for ClassDef
class TBuffer;
class TClass;
diff --git a/core/detectors/mvd/SensorDataSheets/CbmMvdMimosis.cxx b/core/detectors/mvd/SensorDataSheets/CbmMvdMimosis.cxx
index c7d1acaf32f4557bbe5eafa0b9b2e5176ef3ab8a..5d8a3594ed361caa1ff4038557471dd628bc3945 100644
--- a/core/detectors/mvd/SensorDataSheets/CbmMvdMimosis.cxx
+++ b/core/detectors/mvd/SensorDataSheets/CbmMvdMimosis.cxx
@@ -10,8 +10,8 @@
#include "CbmMvdMimosis.h"
#include <RtypesCore.h> // for kTRUE
-#include <TString.h> // for TString
#include <TMath.h> // for Power
+#include <TString.h> // for TString
// ----- Default constructor -------------------------------------------
CbmMvdMimosis::CbmMvdMimosis()
@@ -32,7 +32,7 @@ CbmMvdMimosis::CbmMvdMimosis()
fEpiTh = 18e-4; // Thickness of the epitaxial layer
fChargeThreshold = 1.;
- fAnalogThreshold =150; //Threshold in electrons
+ fAnalogThreshold = 150; //Threshold in electrons
/** Description of the sensor for the digitizer //mesaured by melisa for Mimosa26AHR**/
fNoise = 13;
diff --git a/core/detectors/mvd/SensorDataSheets/CbmMvdMimosis.h b/core/detectors/mvd/SensorDataSheets/CbmMvdMimosis.h
index 09b6ed4ba739baf36c2b896851c56d4facf951fd..6b04ba5c83404326f246199a3b11b02499e1f526 100644
--- a/core/detectors/mvd/SensorDataSheets/CbmMvdMimosis.h
+++ b/core/detectors/mvd/SensorDataSheets/CbmMvdMimosis.h
@@ -20,7 +20,7 @@
#include "CbmMvdSensorDataSheet.h" // for CbmMvdSensorDataSheet
-#include <Rtypes.h> // for ClassDef
+#include <Rtypes.h> // for ClassDef
class TBuffer;
class TClass;
diff --git a/core/detectors/mvd/SensorDataSheets/CbmMvdSensorDataSheet.h b/core/detectors/mvd/SensorDataSheets/CbmMvdSensorDataSheet.h
index 787fe4c19a3091252f76e7458710fe93dcdb092e..cd584c4c11c568cb38baadc32b267f7b6d5f4f86 100644
--- a/core/detectors/mvd/SensorDataSheets/CbmMvdSensorDataSheet.h
+++ b/core/detectors/mvd/SensorDataSheets/CbmMvdSensorDataSheet.h
@@ -21,8 +21,8 @@
#include <Rtypes.h> // for ClassDef
#include <RtypesCore.h> // for Double_t, Int_t, Float_t, Bool_t, Option_t
-#include <TString.h> // for TString
#include <TNamed.h> // for TNamed
+#include <TString.h> // for TString
class TBuffer;
class TClass;
@@ -62,7 +62,6 @@ protected:
Double_t fSignalFallTime;
-
/** Description of the sensor for the digitizer **/
Double_t fNoise; // Noise of the sensor
Double_t fLandauMPV; // Landau for digitizer
@@ -90,7 +89,6 @@ protected:
Int_t fAnalogThreshold;
-
/** Self-organizsation **/
Bool_t fValidData;
@@ -100,18 +98,17 @@ public:
virtual TString* GetSensorName() { return &fMimosaName; };
virtual Double_t GetPixelPitchX() { return fPixelPitchX; };
virtual Double_t GetPixelPitchY() { return fPixelPitchY; };
- virtual Int_t GetNPixelsX() { return fNPixelsX; };
- virtual Int_t GetNPixelsY() { return fNPixelsY; };
- virtual Int_t GetNPixels() { return fNPixels; };
- virtual Int_t GetPixelSignX() { return fPixelSignX; };
- virtual Int_t GetPixelSignY() { return fPixelSignY; };
- virtual Int_t GetShutterSign() { return fShutterSign; };
+ virtual Int_t GetNPixelsX() { return fNPixelsX; };
+ virtual Int_t GetNPixelsY() { return fNPixelsY; };
+ virtual Int_t GetNPixels() { return fNPixels; };
+ virtual Int_t GetPixelSignX() { return fPixelSignX; };
+ virtual Int_t GetPixelSignY() { return fPixelSignY; };
+ virtual Int_t GetShutterSign() { return fShutterSign; };
virtual Double_t GetIntegrationTime() { return fIntegrationTime; };
virtual Double_t GetEpiThickness() { return fEpiTh; }
virtual Double_t GetNoise() { return fNoise; };
- virtual Double_t GetSignalRiseTime (){ return fSignalRiseTime;};
- virtual Double_t GetSignalFallTime (){ return fSignalFallTime;};
-
+ virtual Double_t GetSignalRiseTime() { return fSignalRiseTime; };
+ virtual Double_t GetSignalFallTime() { return fSignalFallTime; };
/** Description of the sensor for the digitizer **/
@@ -124,8 +121,7 @@ public:
virtual Double_t GetChargeThreshold() { return fChargeThreshold; };
- virtual Int_t GetAnalogThreshold () {return fAnalogThreshold;};
-
+ virtual Int_t GetAnalogThreshold() { return fAnalogThreshold; };
/** ADC description **/
diff --git a/core/detectors/mvd/plugins/CbmMvdSensorPlugin.h b/core/detectors/mvd/plugins/CbmMvdSensorPlugin.h
index 8ab6ba02d3725b1c9d34e9666f630bc98456fa7b..ffe2b2adca8371eebe24b52da89b57f5c2096aaa 100644
--- a/core/detectors/mvd/plugins/CbmMvdSensorPlugin.h
+++ b/core/detectors/mvd/plugins/CbmMvdSensorPlugin.h
@@ -17,12 +17,12 @@
#ifndef CBMMVDSENSORPLUGIN_H
#define CBMMVDSENSORPLUGIN_H 1
+#include <Logger.h> // for LOG
+
#include <Rtypes.h> // for ClassDef
#include <RtypesCore.h> // for Bool_t, Int_t, kTRUE
#include <TObject.h> // for TObject
-#include <Logger.h> // for LOG
-
class TBuffer;
class TClass;
class TClonesArray; // lines 24-24
@@ -45,7 +45,7 @@ public:
virtual ~CbmMvdSensorPlugin();
virtual MvdSensorPluginType GetPluginType() = 0;
- virtual Int_t GetPluginIDNumber (){return fPluginIDNumber;}
+ virtual Int_t GetPluginIDNumber() { return fPluginIDNumber; }
virtual void Init() { ; }
virtual void Exec() { ; }
virtual void ExecChain() { ; }
@@ -57,7 +57,7 @@ public:
virtual TClonesArray* GetWriteArray() { return 0; }
virtual void SetInputArray(TClonesArray*) { ; }
- virtual void SetInput(TObject*) {LOG(error) << "You are sending input to the base class instead to your plugin!";}
+ virtual void SetInput(TObject*) { LOG(error) << "You are sending input to the base class instead to your plugin!"; }
virtual void SetOutputArray(TClonesArray*) { ; }
virtual void SetNextPlugin(CbmMvdSensorPlugin* plugin) { fNextPlugin = plugin; }
@@ -81,7 +81,7 @@ protected:
Bool_t initialized;
Bool_t fShowDebugHistos;
const char* fName;
- Int_t fPluginIDNumber; //Identifier for the Plugin for debugging purposes. Hardcode in implementation please.
+ Int_t fPluginIDNumber; //Identifier for the Plugin for debugging purposes. Hardcode in implementation please.
private:
CbmMvdSensorPlugin& operator=(const CbmMvdSensorPlugin&);
diff --git a/core/detectors/mvd/plugins/buffers/CbmMvdSensorBuffer.cxx b/core/detectors/mvd/plugins/buffers/CbmMvdSensorBuffer.cxx
index c71c83f0ba531b376b0f0b94fdcb3188ba15e8fe..2c1a2909198000d22a1d5b9084f1eec791dcfbed 100644
--- a/core/detectors/mvd/plugins/buffers/CbmMvdSensorBuffer.cxx
+++ b/core/detectors/mvd/plugins/buffers/CbmMvdSensorBuffer.cxx
@@ -11,7 +11,13 @@
#include "TClonesArray.h"
// ----- Default constructor -------------------------------------------
-CbmMvdSensorBuffer::CbmMvdSensorBuffer() : CbmMvdSensorPlugin(), fBuffer(nullptr), fCurrentEvent(nullptr), fSensor(nullptr) {}
+CbmMvdSensorBuffer::CbmMvdSensorBuffer()
+ : CbmMvdSensorPlugin()
+ , fBuffer(nullptr)
+ , fCurrentEvent(nullptr)
+ , fSensor(nullptr)
+{
+}
// -------------------------------------------------------------------------
// ----- Destructor ----------------------------------------------------
diff --git a/core/detectors/mvd/plugins/buffers/CbmMvdSensorBuffer.h b/core/detectors/mvd/plugins/buffers/CbmMvdSensorBuffer.h
index e4d3fca5f50e2043e0794eb39d35197f59981f30..203f5107d4953b758b17548bf8895e3ab209017b 100644
--- a/core/detectors/mvd/plugins/buffers/CbmMvdSensorBuffer.h
+++ b/core/detectors/mvd/plugins/buffers/CbmMvdSensorBuffer.h
@@ -22,8 +22,8 @@
#include "CbmMvdSensorPlugin.h" // for MvdSensorPluginType, CbmMvdSensorPlugin
-#include <Rtypes.h> // for ClassDef
-#include <RtypesCore.h> // for Double_t, Option_t
+#include <Rtypes.h> // for ClassDef
+#include <RtypesCore.h> // for Double_t, Option_t
class CbmMvdSensor;
class TBuffer;
diff --git a/core/detectors/mvd/plugins/buffers/CbmMvdSensorFrameBuffer.cxx b/core/detectors/mvd/plugins/buffers/CbmMvdSensorFrameBuffer.cxx
index 95825d0b4fe277085cdc7a371ea1afcddf0c78e3..93395abab2e44fda8b0855949123271710b6f2b9 100644
--- a/core/detectors/mvd/plugins/buffers/CbmMvdSensorFrameBuffer.cxx
+++ b/core/detectors/mvd/plugins/buffers/CbmMvdSensorFrameBuffer.cxx
@@ -12,11 +12,9 @@
#include "CbmMvdSensor.h" // for CbmMvdSensor
#include "CbmMvdSensorDataSheet.h" // for CbmMvdSensorDataSheet
-#include <Logger.h> // for LOG, Logger
-
-#include "TClonesArray.h" // for TClonesArray
-
+#include <Logger.h> // for LOG, Logger
+#include "TClonesArray.h" // for TClonesArray
// ----- Default constructor -------------------------------------------
diff --git a/core/detectors/mvd/plugins/buffers/CbmMvdSensorFrameBuffer.h b/core/detectors/mvd/plugins/buffers/CbmMvdSensorFrameBuffer.h
index 5c4747078b24dcfbb0f5a34923809b5c26957f8d..12d1f6cff5ef9b62c7a3db8ef71bb9bbf857829b 100644
--- a/core/detectors/mvd/plugins/buffers/CbmMvdSensorFrameBuffer.h
+++ b/core/detectors/mvd/plugins/buffers/CbmMvdSensorFrameBuffer.h
@@ -22,10 +22,10 @@
#include "CbmMvdSensorBuffer.h" // for CbmMvdSensorBuffer
-#include <Logger.h> // for LOG
+#include <Logger.h> // for LOG
-#include <Rtypes.h> // for ClassDef
-#include <RtypesCore.h> // for Double_t, Int_t, Bool_t
+#include <Rtypes.h> // for ClassDef
+#include <RtypesCore.h> // for Double_t, Int_t, Bool_t
class CbmMvdPoint;
class CbmMvdSensor;
diff --git a/core/detectors/mvd/plugins/tasks/CbmMvdSensorTask.cxx b/core/detectors/mvd/plugins/tasks/CbmMvdSensorTask.cxx
index 4441440ff3c85b4bc28a2ef2c15761a52b2f08c6..e8a2a766893fc2dcd811efea4cc61a5a449129ff 100644
--- a/core/detectors/mvd/plugins/tasks/CbmMvdSensorTask.cxx
+++ b/core/detectors/mvd/plugins/tasks/CbmMvdSensorTask.cxx
@@ -12,8 +12,13 @@
#include "TClonesArray.h"
// ----- Default constructor -------------------------------------------
-CbmMvdSensorTask::CbmMvdSensorTask() : CbmMvdSensorPlugin(), fInputBuffer(nullptr), fOutputBuffer(nullptr), fSensor(nullptr) {
-fPluginIDNumber= -1;
+CbmMvdSensorTask::CbmMvdSensorTask()
+ : CbmMvdSensorPlugin()
+ , fInputBuffer(nullptr)
+ , fOutputBuffer(nullptr)
+ , fSensor(nullptr)
+{
+ fPluginIDNumber = -1;
}
// -------------------------------------------------------------------------
// ----- constructor -------------------------------------------
@@ -23,7 +28,7 @@ CbmMvdSensorTask::CbmMvdSensorTask(const char* name)
, fOutputBuffer(nullptr)
, fSensor(nullptr)
{
-fPluginIDNumber= -1;
+ fPluginIDNumber = -1;
}
// -------------------------------------------------------------------------
diff --git a/core/detectors/mvd/plugins/tasks/CbmMvdSensorTask.h b/core/detectors/mvd/plugins/tasks/CbmMvdSensorTask.h
index bec028f0b32e9c08359a24dc9ab51d197617aeab..d3a344fd9c449891c87f0bcdd36c6e47c003447f 100644
--- a/core/detectors/mvd/plugins/tasks/CbmMvdSensorTask.h
+++ b/core/detectors/mvd/plugins/tasks/CbmMvdSensorTask.h
@@ -19,13 +19,13 @@
#include "CbmMvdSensorPlugin.h" // for MvdSensorPluginType, CbmMvdSensorPlugin
-#include <Rtypes.h> // for ClassDef
+#include <Rtypes.h> // for ClassDef
class CbmMvdDigi;
class CbmMvdSensor;
class TBuffer;
class TClass;
-class TClonesArray;
+class TClonesArray;
class TMemberInspector;
class CbmMvdSensorTask : public CbmMvdSensorPlugin {
diff --git a/core/detectors/mvd/tools/CbmMvdGeoHandler.cxx b/core/detectors/mvd/tools/CbmMvdGeoHandler.cxx
index f21e34d419bea06c8655eda531f8a12c78aecb30..fbdb43b3a4b004ff56991b964e4253571003eb4b 100644
--- a/core/detectors/mvd/tools/CbmMvdGeoHandler.cxx
+++ b/core/detectors/mvd/tools/CbmMvdGeoHandler.cxx
@@ -17,17 +17,17 @@
#include "CbmMvdMimosis.h" // for CbmMvdMimosis
#include "CbmMvdStationPar.h" // for CbmMvdStationPar
-#include <Logger.h> // for LOG, Logger
+#include <Logger.h> // for LOG, Logger
-#include <TGeoBBox.h> // for TGeoBBox
-#include <TGeoManager.h> // for TGeoManager, gGeoManager
-#include <TGeoMaterial.h> // for TGeoMaterial
-#include <TGeoNode.h> // for TGeoNode
-#include <TGeoVolume.h> // for TGeoVolume
-#include <TObjArray.h> // for TObjArray
-#include <TString.h> // for TString, operator+, Form, operator<<
+#include <TGeoBBox.h> // for TGeoBBox
+#include <TGeoManager.h> // for TGeoManager, gGeoManager
+#include <TGeoMaterial.h> // for TGeoMaterial
+#include <TGeoNode.h> // for TGeoNode
+#include <TGeoVolume.h> // for TGeoVolume
+#include <TObjArray.h> // for TObjArray
+#include <TString.h> // for TString, operator+, Form, operator<<
-#include <cmath> // for fabs
+#include <cmath> // for fabs
//--------------------------------------------------------------------------
CbmMvdGeoHandler::CbmMvdGeoHandler()
diff --git a/core/detectors/mvd/tools/CbmMvdGeoHandler.h b/core/detectors/mvd/tools/CbmMvdGeoHandler.h
index befb099f823c744008ccb757b3f9fca2c68e097c..e27540f154e6bd8408d115e51ab2c0a9ba089e31 100644
--- a/core/detectors/mvd/tools/CbmMvdGeoHandler.h
+++ b/core/detectors/mvd/tools/CbmMvdGeoHandler.h
@@ -29,7 +29,7 @@ class TMemberInspector;
enum class CbmMvdSensorTyp;
-#include <map> // for map
+#include <map> // for map
enum CbmMvdGeoTyp
{
diff --git a/reco/detectors/mvd/CbmMvdClusterfinder.cxx b/reco/detectors/mvd/CbmMvdClusterfinder.cxx
index 1458673146ee71b1fa9a849e1b941b2720ec471e..04aba54a4e01888c07908035a28a7e33b0f03a9d 100644
--- a/reco/detectors/mvd/CbmMvdClusterfinder.cxx
+++ b/reco/detectors/mvd/CbmMvdClusterfinder.cxx
@@ -7,23 +7,23 @@
// -------------------------------------------------------------------------
#include "CbmMvdClusterfinder.h"
-#include "CbmDefs.h" // for ECbmModuleId
-#include "CbmDigiManager.h" // for CbmDigiManager
-#include "CbmMvdDetector.h" // for CbmMvdDetector
-#include "CbmMvdDigi.h" // for CbmMvdDigi
-#include "CbmMvdSensor.h" // for CbmMvdSensor
-#include "CbmMvdSensorClusterfinderTask.h" // for CbmMvdSensorCluste...
+#include "CbmDefs.h" // for ECbmModuleId
+#include "CbmDigiManager.h" // for CbmDigiManager
+#include "CbmMvdDetector.h" // for CbmMvdDetector
+#include "CbmMvdDigi.h" // for CbmMvdDigi
+#include "CbmMvdSensor.h" // for CbmMvdSensor
+#include "CbmMvdSensorClusterfinderTask.h" // for CbmMvdSensorCluste...
-#include <FairRootManager.h> // for FairRootManager
-#include <FairTask.h> // for InitStatus, FairTask
-#include <Logger.h> // for Logger, LOG
+#include <FairRootManager.h> // for FairRootManager
+#include <FairTask.h> // for InitStatus, FairTask
+#include <Logger.h> // for Logger, LOG
-#include <TClonesArray.h> // for TClonesArray
+#include <TClonesArray.h> // for TClonesArray
-#include <iomanip> // for setprecision, setw
-#include <iostream> // for operator<<, endl
-#include <map> // for allocator, __map_i...
-#include <utility> // for pair
+#include <iomanip> // for setprecision, setw
+#include <iostream> // for operator<<, endl
+#include <map> // for allocator, __map_i...
+#include <utility> // for pair
using std::cout;
@@ -77,19 +77,19 @@ CbmMvdClusterfinder::~CbmMvdClusterfinder()
void CbmMvdClusterfinder::Exec(Option_t* /*opt*/)
{
// --- Start timer
- fTimer.Start();
- if (gDebug>0) {cout << "CbmMvdClusterfinder::Exec : Starting Exec " << endl;}
- fCluster->Delete();
- if (fDigiMan->GetNofDigis(ECbmModuleId::kMvd)) {
+ fTimer.Start();
+ if (gDebug > 0) { cout << "CbmMvdClusterfinder::Exec : Starting Exec " << endl; }
+ fCluster->Delete();
+ if (fDigiMan->GetNofDigis(ECbmModuleId::kMvd)) {
if (fVerbose) cout << "//----------------------------------------//";
if (fVerbose) cout << endl << "Send Input" << endl;
- Int_t nTargetPlugin=fDetector->DetectPlugin(200);
- CbmMvdDigi* digi=0;
+ Int_t nTargetPlugin = fDetector->DetectPlugin(200);
+ CbmMvdDigi* digi = 0;
Int_t nDigis = fDigiMan->GetNofDigis(ECbmModuleId::kMvd);
- if (gDebug>0) {cout << "CbmMvdClusterfinder::Exec - nDigis= " << nDigis << endl;}
+ if (gDebug > 0) { cout << "CbmMvdClusterfinder::Exec - nDigis= " << nDigis << endl; }
for (Int_t i = 0; i < nDigis; i++) {
digi = new CbmMvdDigi(*(fDigiMan->Get<CbmMvdDigi>(i)));
@@ -99,7 +99,7 @@ void CbmMvdClusterfinder::Exec(Option_t* /*opt*/)
}
- if (gDebug>0) {cout << "CbmMvdClusterfinder::Exec : Communicating with Plugin: " << nTargetPlugin << endl;}
+ if (gDebug > 0) { cout << "CbmMvdClusterfinder::Exec : Communicating with Plugin: " << nTargetPlugin << endl; }
//fDetector->SendInputDigis(fDigiMan);
@@ -161,17 +161,16 @@ InitStatus CbmMvdClusterfinder::Init()
// Add the cluster finder plugin to all sensors
std::map<int, CbmMvdSensor*>& sensorMap = fDetector->GetSensorMap();
- UInt_t plugincount=fDetector->GetPluginCount();
+ UInt_t plugincount = fDetector->GetPluginCount();
- for (auto itr = sensorMap.begin();
- itr != sensorMap.end(); itr++) {
+ for (auto itr = sensorMap.begin(); itr != sensorMap.end(); itr++) {
CbmMvdSensorClusterfinderTask* clusterTask = new CbmMvdSensorClusterfinderTask();
itr->second->AddPlugin(clusterTask);
itr->second->SetClusterPlugin(plugincount);
}
fDetector->SetSensorArrayFilled(kTRUE);
- fDetector->SetPluginCount(plugincount+1);
+ fDetector->SetPluginCount(plugincount + 1);
fClusterPluginNr = (UInt_t)(fDetector->GetPluginArraySize());
if (fShowDebugHistos) fDetector->ShowDebugHistos();
diff --git a/reco/detectors/mvd/CbmMvdClusterfinder.h b/reco/detectors/mvd/CbmMvdClusterfinder.h
index e6ab276e6d4b109298cc75662150574b3f18b1e7..c2299108d9d950503e084d1f6ff398502bbd8a15 100644
--- a/reco/detectors/mvd/CbmMvdClusterfinder.h
+++ b/reco/detectors/mvd/CbmMvdClusterfinder.h
@@ -11,12 +11,12 @@
#ifndef CBMMVDCLUSTERFINDER_H
#define CBMMVDCLUSTERFINDER_H 1
-#include "FairTask.h" // for InitStatus, FairTask
+#include "FairTask.h" // for InitStatus, FairTask
#include <Rtypes.h> // for ClassDef
#include <RtypesCore.h> // for Int_t, Bool_t, Option_t, UInt_t, kTRUE
-#include <TString.h> // for TString
#include <TStopwatch.h> // for TStopwatch
+#include <TString.h> // for TString
class CbmDigiManager;
class CbmMvdDetector;
diff --git a/reco/detectors/mvd/CbmMvdClusterfinderTB.cxx b/reco/detectors/mvd/CbmMvdClusterfinderTB.cxx
index fda616bf90893fe53e18cb9039d4b6791270e6e7..1a6d1afcbae9adaec2286da5f8f81484bf0ff1ce 100644
--- a/reco/detectors/mvd/CbmMvdClusterfinderTB.cxx
+++ b/reco/detectors/mvd/CbmMvdClusterfinderTB.cxx
@@ -12,9 +12,9 @@
#include "CbmDigiManager.h"
#include "CbmEvent.h"
#include "CbmMvdDetector.h"
+#include "CbmMvdGeoHandler.h"
#include "CbmMvdPoint.h"
#include "CbmMvdSensorClusterfinderTask.h"
-#include "CbmMvdGeoHandler.h"
// Includes from FAIR
#include "FairModule.h"
@@ -147,17 +147,16 @@ InitStatus CbmMvdClusterfinderTB::Init()
// Add the cluster finder plugin to all sensors
std::map<int, CbmMvdSensor*>& sensorMap = fDetector->GetSensorMap();
- UInt_t plugincount=fDetector->GetPluginCount();
+ UInt_t plugincount = fDetector->GetPluginCount();
- for (auto itr = sensorMap.begin();
- itr != sensorMap.end(); itr++) {
+ for (auto itr = sensorMap.begin(); itr != sensorMap.end(); itr++) {
CbmMvdSensorClusterfinderTask* clusterTask = new CbmMvdSensorClusterfinderTask();
itr->second->AddPlugin(clusterTask);
itr->second->SetClusterPlugin(plugincount);
}
fDetector->SetSensorArrayFilled(kTRUE);
- fDetector->SetPluginCount(plugincount+1);
+ fDetector->SetPluginCount(plugincount + 1);
fClusterPluginNr = (UInt_t)(fDetector->GetPluginArraySize());
if (fShowDebugHistos) fDetector->ShowDebugHistos();
diff --git a/reco/detectors/mvd/CbmMvdDigiToHit.cxx b/reco/detectors/mvd/CbmMvdDigiToHit.cxx
index 8a39dfaf1b20fcfc309a5f87e7e6060661d94944..9a03f9db0532d1f52e005c48610367cefc3b3acb 100644
--- a/reco/detectors/mvd/CbmMvdDigiToHit.cxx
+++ b/reco/detectors/mvd/CbmMvdDigiToHit.cxx
@@ -10,9 +10,9 @@
#include "CbmMvdDigiToHit.h"
#include "CbmMvdDetector.h"
+#include "CbmMvdGeoHandler.h"
#include "CbmMvdPoint.h"
#include "CbmMvdSensorDigiToHitTask.h"
-#include "CbmMvdGeoHandler.h"
// Includes from FAIR
#include "FairModule.h"
@@ -150,17 +150,16 @@ InitStatus CbmMvdDigiToHit::Init()
// Add the digi2hit plugin to all sensors
std::map<int, CbmMvdSensor*>& sensorMap = fDetector->GetSensorMap();
- UInt_t plugincount=fDetector->GetPluginCount();
+ UInt_t plugincount = fDetector->GetPluginCount();
- for (auto itr = sensorMap.begin();
- itr != sensorMap.end(); itr++) {
+ for (auto itr = sensorMap.begin(); itr != sensorMap.end(); itr++) {
CbmMvdSensorDigiToHitTask* hitTask = new CbmMvdSensorDigiToHitTask();
itr->second->AddPlugin(hitTask);
itr->second->SetHitPlugin(plugincount);
}
fDetector->SetSensorArrayFilled(kTRUE);
- fDetector->SetPluginCount(plugincount+1);
+ fDetector->SetPluginCount(plugincount + 1);
fHitPluginNr = (UInt_t)(fDetector->GetPluginArraySize());
if (fShowDebugHistos) fDetector->ShowDebugHistos();
diff --git a/reco/detectors/mvd/CbmMvdDigiToHitTB.cxx b/reco/detectors/mvd/CbmMvdDigiToHitTB.cxx
index 3bf8e71c4dc438c95a2dfa165beeac5ba65f4fbd..a98d082f1d7c5ac4815cee1b67ba6eac88b0144e 100644
--- a/reco/detectors/mvd/CbmMvdDigiToHitTB.cxx
+++ b/reco/detectors/mvd/CbmMvdDigiToHitTB.cxx
@@ -11,9 +11,9 @@
#include "CbmEvent.h"
#include "CbmMvdDetector.h"
+#include "CbmMvdGeoHandler.h"
#include "CbmMvdPoint.h"
#include "CbmMvdSensorDigiToHitTask.h"
-#include "CbmMvdGeoHandler.h"
// Includes from FAIR
#include "FairModule.h"
@@ -143,17 +143,16 @@ InitStatus CbmMvdDigiToHitTB::Init()
// Add the digi2hit plugin to all sensors
std::map<int, CbmMvdSensor*>& sensorMap = fDetector->GetSensorMap();
- UInt_t plugincount=fDetector->GetPluginCount();
+ UInt_t plugincount = fDetector->GetPluginCount();
- for (auto itr = sensorMap.begin();
- itr != sensorMap.end(); itr++) {
+ for (auto itr = sensorMap.begin(); itr != sensorMap.end(); itr++) {
CbmMvdSensorDigiToHitTask* hitTask = new CbmMvdSensorDigiToHitTask();
itr->second->AddPlugin(hitTask);
itr->second->SetHitPlugin(plugincount);
}
fDetector->SetSensorArrayFilled(kTRUE);
- fDetector->SetPluginCount(plugincount+1);
+ fDetector->SetPluginCount(plugincount + 1);
fHitPluginNr = (UInt_t)(fDetector->GetPluginArraySize());
if (fShowDebugHistos) fDetector->ShowDebugHistos();
diff --git a/reco/detectors/mvd/CbmMvdHitfinder.cxx b/reco/detectors/mvd/CbmMvdHitfinder.cxx
index d179490e7c90d5c4a369dd45cdcf22fa250cc9a2..3bc46033538fbfd94b17a1dc6c31ab59538d7098 100644
--- a/reco/detectors/mvd/CbmMvdHitfinder.cxx
+++ b/reco/detectors/mvd/CbmMvdHitfinder.cxx
@@ -7,26 +7,26 @@
// -------------------------------------------------------------------------
#include "CbmMvdHitfinder.h"
-#include "CbmDefs.h" // for ECbmModuleId
-#include "CbmDigiManager.h" // for CbmDigiManager
-#include "CbmMvdCluster.h" // for CbmMvdCluster
-#include "CbmMvdDetector.h" // for CbmMvdDetector
-#include "CbmMvdDetectorId.h" // for CbmMvdDetector
-#include "CbmMvdDigi.h" // for CbmMvdDigi
-#include "CbmMvdSensor.h" // for CbmMvdSensor
-#include "CbmMvdSensorFindHitTask.h" // for CbmMvdSensorFindHi...
-#include "CbmMvdSensorHitfinderTask.h" // for CbmMvdSensorHitfin...
-
-#include <FairTask.h> // for InitStatus, FairTask
-#include <FairRootManager.h> // for FairRootManager
-#include <Logger.h> // for Logger, LOG
-
-#include <TClonesArray.h> // for TClonesArray
-
-#include <iomanip> // for setprecision, setw
-#include <iostream> // for operator<<, endl
-#include <map> // for allocator, __map_i...
-#include <utility> // for pair
+#include "CbmDefs.h" // for ECbmModuleId
+#include "CbmDigiManager.h" // for CbmDigiManager
+#include "CbmMvdCluster.h" // for CbmMvdCluster
+#include "CbmMvdDetector.h" // for CbmMvdDetector
+#include "CbmMvdDetectorId.h" // for CbmMvdDetector
+#include "CbmMvdDigi.h" // for CbmMvdDigi
+#include "CbmMvdSensor.h" // for CbmMvdSensor
+#include "CbmMvdSensorFindHitTask.h" // for CbmMvdSensorFindHi...
+#include "CbmMvdSensorHitfinderTask.h" // for CbmMvdSensorHitfin...
+
+#include <FairRootManager.h> // for FairRootManager
+#include <FairTask.h> // for InitStatus, FairTask
+#include <Logger.h> // for Logger, LOG
+
+#include <TClonesArray.h> // for TClonesArray
+
+#include <iomanip> // for setprecision, setw
+#include <iostream> // for operator<<, endl
+#include <map> // for allocator, __map_i...
+#include <utility> // for pair
using std::cout;
using std::endl;
@@ -103,12 +103,12 @@ void CbmMvdHitfinder::Exec(Option_t* /*opt*/)
fHits->Clear();
fTimer.Start();
- Int_t nTargetPlugin= fDetector->DetectPlugin(fMyPluginID);
+ Int_t nTargetPlugin = fDetector->DetectPlugin(fMyPluginID);
//Int_t nDigis=0;
//CbmMvdDigi* digi=0;
- CbmMvdCluster* cluster=0;
+ CbmMvdCluster* cluster = 0;
- if (fDigiMan->IsPresent(ECbmModuleId::kMvd) || fInputCluster) { //checks if data sources are available
+ if (fDigiMan->IsPresent(ECbmModuleId::kMvd) || fInputCluster) { //checks if data sources are available
if (fVerbose) cout << endl << "//----------------------------------------//" << endl;
if (!fUseClusterfinder) {
/*
@@ -119,16 +119,15 @@ void CbmMvdHitfinder::Exec(Option_t* /*opt*/)
fDetector->SendInputToSensorPlugin(digi->GetDetectorId(), nTargetPlugin, static_cast<TObject*>(digi));
*/
- Fatal("CbmMvdHitFinder - Mode without cluster finder is currently not supported ", "CbmMvdHitFinder - Mode without cluster finder is currently not supported ");
- }
-
-
+ Fatal("CbmMvdHitFinder - Mode without cluster finder is currently not supported ",
+ "CbmMvdHitFinder - Mode without cluster finder is currently not supported ");
+ }
- //fDetector->SendInputDigis(fDigiMan);
+ //fDetector->SendInputDigis(fDigiMan);
- else // of if (!fUseClusterfinder)
+ else // of if (!fUseClusterfinder)
{
@@ -137,12 +136,12 @@ void CbmMvdHitfinder::Exec(Option_t* /*opt*/)
for (Int_t i = 0; i < nEntries; i++) {
cluster = (CbmMvdCluster*) fInputCluster->At(i);
cluster->SetRefId(i);
- fDetector->SendInputToSensorPlugin(tmp.DetectorId(cluster->GetSensorNr()), nTargetPlugin, static_cast<TObject*>(cluster));
-
+ fDetector->SendInputToSensorPlugin(tmp.DetectorId(cluster->GetSensorNr()), nTargetPlugin,
+ static_cast<TObject*>(cluster));
}
}
- //fDetector->SendInputCluster(fInputCluster);
+ //fDetector->SendInputCluster(fInputCluster);
if (fVerbose) cout << "Execute HitfinderPlugin Nr. " << fHitfinderPluginNr << endl;
@@ -186,7 +185,8 @@ InitStatus CbmMvdHitfinder::Init()
// ********** Get input arrays
if (!fUseClusterfinder) {
- Fatal("CbmMvdHitFinder - Mode without cluster finder is currently not supported ", "CbmMvdHitFinder - Mode without cluster finder is currently not supported ");
+ Fatal("CbmMvdHitFinder - Mode without cluster finder is currently not supported ",
+ "CbmMvdHitFinder - Mode without cluster finder is currently not supported ");
fDigiMan = CbmDigiManager::Instance();
fDigiMan->Init();
if (!fDigiMan->IsPresent(ECbmModuleId::kMvd)) {
@@ -214,9 +214,9 @@ InitStatus CbmMvdHitfinder::Init()
// Add the hit finder plugin to all sensors
std::map<int, CbmMvdSensor*>& sensorMap = fDetector->GetSensorMap();
- UInt_t plugincount=fDetector->GetPluginCount();
+ UInt_t plugincount = fDetector->GetPluginCount();
- /*
+ /*
if (!fUseClusterfinder) {
for (auto itr = sensorMap.begin(); itr != sensorMap.end(); itr++) {
@@ -229,17 +229,17 @@ InitStatus CbmMvdHitfinder::Init()
}
else {*/
- for (auto itr = sensorMap.begin(); itr != sensorMap.end(); itr++) {
- CbmMvdSensorHitfinderTask* hitfinderTask = new CbmMvdSensorHitfinderTask();
+ for (auto itr = sensorMap.begin(); itr != sensorMap.end(); itr++) {
+ CbmMvdSensorHitfinderTask* hitfinderTask = new CbmMvdSensorHitfinderTask();
- itr->second->AddPlugin(hitfinderTask);
- itr->second->SetHitPlugin(plugincount);
- fMyPluginID=300;
- }
+ itr->second->AddPlugin(hitfinderTask);
+ itr->second->SetHitPlugin(plugincount);
+ fMyPluginID = 300;
+ }
//}
fDetector->SetSensorArrayFilled(kTRUE);
- fDetector->SetPluginCount(plugincount+1);
+ fDetector->SetPluginCount(plugincount + 1);
fHitfinderPluginNr = (UInt_t)(fDetector->GetPluginArraySize());
if (fShowDebugHistos) fDetector->ShowDebugHistos();
diff --git a/reco/detectors/mvd/CbmMvdHitfinder.h b/reco/detectors/mvd/CbmMvdHitfinder.h
index dd58151bbc4d71938f55c42f4b1426e392e31ba4..d9f1fd820fdc3afe25c1017d1a595b9677fb7cfa 100644
--- a/reco/detectors/mvd/CbmMvdHitfinder.h
+++ b/reco/detectors/mvd/CbmMvdHitfinder.h
@@ -11,7 +11,7 @@
#ifndef CBMMVDHITFINDER_H
#define CBMMVDHITFINDER_H 1
-#include "FairTask.h" // for InitStatus, FairTask
+#include "FairTask.h" // for InitStatus, FairTask
#include <Rtypes.h> // for ClassDef
#include <RtypesCore.h> // for Int_t, Bool_t, Option_t, UInt_t, kTRUE
@@ -46,10 +46,11 @@ public:
{
fUseClusterfinder = clusterfinderFlag;
}; //* enable use of external clusterfinder
- void ShowDebugHistos() { fShowDebugHistos = kTRUE; }
+ void ShowDebugHistos() { fShowDebugHistos = kTRUE; }
protected:
Int_t fMyPluginID;
+
private:
CbmMvdDetector* fDetector;
CbmDigiManager* fDigiMan; //!
diff --git a/reco/detectors/mvd/CbmMvdHitfinderTB.cxx b/reco/detectors/mvd/CbmMvdHitfinderTB.cxx
index cf0b4a3a6978f2d495c8053bbca6619b4827238c..830e0027303a5cb732ad9b1944dd3ff6d0b6ccf1 100644
--- a/reco/detectors/mvd/CbmMvdHitfinderTB.cxx
+++ b/reco/detectors/mvd/CbmMvdHitfinderTB.cxx
@@ -9,10 +9,10 @@
// Includes from MVD
#include "CbmMvdHitfinderTB.h"
+#include "CbmMvdGeoHandler.h"
#include "CbmMvdPoint.h"
#include "CbmMvdSensorFindHitTask.h"
#include "CbmMvdSensorHitfinderTask.h"
-#include "CbmMvdGeoHandler.h"
// Includes from FAIR
@@ -153,20 +153,18 @@ InitStatus CbmMvdHitfinderTB::Init()
fDetector = CbmMvdDetector::Instance();
-
// Add the hit finder plugin to all sensors
std::map<int, CbmMvdSensor*>& sensorMap = fDetector->GetSensorMap();
- UInt_t plugincount=fDetector->GetPluginCount();
+ UInt_t plugincount = fDetector->GetPluginCount();
- for (auto itr = sensorMap.begin();
- itr != sensorMap.end(); itr++) {
+ for (auto itr = sensorMap.begin(); itr != sensorMap.end(); itr++) {
CbmMvdSensorHitfinderTask* hitfinderTask = new CbmMvdSensorHitfinderTask();
itr->second->AddPlugin(hitfinderTask);
itr->second->SetHitPlugin(plugincount);
}
fDetector->SetSensorArrayFilled(kTRUE);
- fDetector->SetPluginCount(plugincount+1);
+ fDetector->SetPluginCount(plugincount + 1);
fHitfinderPluginNr = (UInt_t)(fDetector->GetPluginArraySize());
if (fShowDebugHistos) fDetector->ShowDebugHistos();
diff --git a/reco/detectors/mvd/plugins/tasks/CbmMvdSensorClusterfinderTask.cxx b/reco/detectors/mvd/plugins/tasks/CbmMvdSensorClusterfinderTask.cxx
index f523409bd680052806f387be9ad144f6797a03db..01f5386f08557b360aa1d6214011474e1ca20044 100644
--- a/reco/detectors/mvd/plugins/tasks/CbmMvdSensorClusterfinderTask.cxx
+++ b/reco/detectors/mvd/plugins/tasks/CbmMvdSensorClusterfinderTask.cxx
@@ -20,10 +20,10 @@ using std::pair;
using std::vector;
// ----- Default constructor -------------------------------------------
-CbmMvdSensorClusterfinderTask::CbmMvdSensorClusterfinderTask() : CbmMvdSensorClusterfinderTask(0, 0) {
-
-fPluginIDNumber= 200;
+CbmMvdSensorClusterfinderTask::CbmMvdSensorClusterfinderTask() : CbmMvdSensorClusterfinderTask(0, 0)
+{
+ fPluginIDNumber = 200;
}
// -------------------------------------------------------------------------
@@ -84,7 +84,7 @@ CbmMvdSensorClusterfinderTask::CbmMvdSensorClusterfinderTask(Int_t iMode, Int_t
, fBranchName("MvdHit")
, fAddNoise(kFALSE)
{
-fPluginIDNumber= 200;
+ fPluginIDNumber = 200;
}
// -------------------------------------------------------------------------
@@ -94,7 +94,9 @@ void CbmMvdSensorClusterfinderTask::InitTask(CbmMvdSensor* mysensor)
fSensor = mysensor;
- if(gDebug>0){cout << "-Start- CbmMvdSensorClusterfinderTask : Initialisation of sensor " << fSensor->GetName() << endl;}
+ if (gDebug > 0) {
+ cout << "-Start- CbmMvdSensorClusterfinderTask : Initialisation of sensor " << fSensor->GetName() << endl;
+ }
fInputBuffer = new TClonesArray("CbmMvdDigi", 100);
fOutputBuffer = new TClonesArray("CbmMvdCluster", 100);
@@ -188,9 +190,9 @@ void CbmMvdSensorClusterfinderTask::ExecChain() { Exec(); }
// ----- Public method Exec --------------
void CbmMvdSensorClusterfinderTask::Exec()
{
- if(gDebug>0){
- cout << "CbmMvdSensorClusterfinderTask::Exec - Running Sensor " << fSensor->GetName() << endl;
- cout << "CbmMvdSensorClusterfinderTask::Exec - InputBufferSize " << fInputBuffer->GetEntriesFast() << endl;
+ if (gDebug > 0) {
+ cout << "CbmMvdSensorClusterfinderTask::Exec - Running Sensor " << fSensor->GetName() << endl;
+ cout << "CbmMvdSensorClusterfinderTask::Exec - InputBufferSize " << fInputBuffer->GetEntriesFast() << endl;
}
if (fInputBuffer->GetEntriesFast() > 0) {
fOutputBuffer->Delete();
@@ -269,7 +271,7 @@ void CbmMvdSensorClusterfinderTask::Exec()
pair<Int_t, Int_t> a(digi->GetPixelX(), digi->GetPixelY());
fDigiMapIt = fDigiMap.find(a);
- if(fDigiMapIt!= fDigiMap.end()) {fDigiMap.erase(fDigiMapIt);};
+ if (fDigiMapIt != fDigiMap.end()) { fDigiMap.erase(fDigiMapIt); };
for (ULong64_t iCluster = 0; iCluster < clusterArray->size(); iCluster++) {
diff --git a/reco/detectors/mvd/plugins/tasks/CbmMvdSensorClusterfinderTask.h b/reco/detectors/mvd/plugins/tasks/CbmMvdSensorClusterfinderTask.h
index 2d08f2786b6b14f7a6b879a75e0998ca53ca1d1e..a0c80a560195e9f5b2923d7666c9f32c57a7c888 100644
--- a/reco/detectors/mvd/plugins/tasks/CbmMvdSensorClusterfinderTask.h
+++ b/reco/detectors/mvd/plugins/tasks/CbmMvdSensorClusterfinderTask.h
@@ -19,7 +19,6 @@
#include "TArrayS.h"
#include "TCanvas.h"
-#include <TClonesArray.h>
#include "TH1.h"
#include "TH1F.h"
#include "TH2.h"
@@ -29,6 +28,7 @@
#include "TRefArray.h"
#include "TStopwatch.h"
#include "TString.h"
+#include <TClonesArray.h>
#include <list>
#include <map>
diff --git a/reco/detectors/mvd/plugins/tasks/CbmMvdSensorDigiToHitTask.cxx b/reco/detectors/mvd/plugins/tasks/CbmMvdSensorDigiToHitTask.cxx
index b9c870ebf86814a1bf70997c71aea1d6f546f92e..8b98b55cd2259ffdcb9afdbfd7728e76fab41611 100644
--- a/reco/detectors/mvd/plugins/tasks/CbmMvdSensorDigiToHitTask.cxx
+++ b/reco/detectors/mvd/plugins/tasks/CbmMvdSensorDigiToHitTask.cxx
@@ -72,9 +72,7 @@ UInt_t shape = 0;
// ----- Default constructor -------------------------------------------
-CbmMvdSensorDigiToHitTask::CbmMvdSensorDigiToHitTask() : CbmMvdSensorDigiToHitTask(0, 0) {
-fPluginIDNumber= 500;
-}
+CbmMvdSensorDigiToHitTask::CbmMvdSensorDigiToHitTask() : CbmMvdSensorDigiToHitTask(0, 0) { fPluginIDNumber = 500; }
// -------------------------------------------------------------------------
// -------------------------------------------------------------------------
@@ -108,7 +106,7 @@ CbmMvdSensorDigiToHitTask::CbmMvdSensorDigiToHitTask(Int_t /*iMode*/, Int_t iVer
, fHitPosErrZ(0.0)
{
-fPluginIDNumber= 500;
+ fPluginIDNumber = 500;
}
// -------------------------------------------------------------------------
diff --git a/reco/detectors/mvd/plugins/tasks/CbmMvdSensorFindHitTask.cxx b/reco/detectors/mvd/plugins/tasks/CbmMvdSensorFindHitTask.cxx
index 8b2d24aafba57de0c0eb159373ce69336a26f222..34f274d7800d71150ee4589c1dda0f4a802f7430 100644
--- a/reco/detectors/mvd/plugins/tasks/CbmMvdSensorFindHitTask.cxx
+++ b/reco/detectors/mvd/plugins/tasks/CbmMvdSensorFindHitTask.cxx
@@ -113,7 +113,7 @@ CbmMvdSensorFindHitTask::CbmMvdSensorFindHitTask()
, fDigisInCluster(-1)
, fAddNoise(kFALSE)
{
-fPluginIDNumber= 400;
+ fPluginIDNumber = 400;
}
// -------------------------------------------------------------------------
@@ -172,7 +172,7 @@ CbmMvdSensorFindHitTask::CbmMvdSensorFindHitTask(Int_t iMode)
, fDigisInCluster(-1)
, fAddNoise(kFALSE)
{
-fPluginIDNumber= 400;
+ fPluginIDNumber = 400;
}
// -------------------------------------------------------------------------
@@ -245,7 +245,8 @@ void CbmMvdSensorFindHitTask::ExecChain() { Exec(); }
// ----- Virtual public method Exec --------------
void CbmMvdSensorFindHitTask::Exec()
-{ cout << "Ich lebe auch" << endl;
+{
+ cout << "Ich lebe auch" << endl;
// if(!inputSet)
// {
diff --git a/reco/detectors/mvd/plugins/tasks/CbmMvdSensorFindHitTask.h b/reco/detectors/mvd/plugins/tasks/CbmMvdSensorFindHitTask.h
index d5c63469c5988541a9f7cbecad033c8d1437cb18..af365c9b93454b6927c614060700a4d11c78d042 100644
--- a/reco/detectors/mvd/plugins/tasks/CbmMvdSensorFindHitTask.h
+++ b/reco/detectors/mvd/plugins/tasks/CbmMvdSensorFindHitTask.h
@@ -11,17 +11,16 @@
#ifndef CBMMVDSENSORFINDHITTASK_H
#define CBMMVDSENSORFINDHITTASK_H 1
+#include "CbmMvdCluster.h"
#include "CbmMvdDigi.h"
#include "CbmMvdPoint.h"
#include "CbmMvdSensor.h"
-#include "CbmMvdCluster.h"
#include "CbmMvdSensorTask.h"
#include "FairTask.h"
#include "TArrayS.h"
#include "TCanvas.h"
-#include <TClonesArray.h>
#include "TH1.h"
#include "TH1F.h"
#include "TH2.h"
@@ -31,6 +30,7 @@
#include "TRefArray.h"
#include "TStopwatch.h"
#include "TString.h"
+#include <TClonesArray.h>
#include <list>
#include <map>
diff --git a/reco/detectors/mvd/plugins/tasks/CbmMvdSensorHitfinderTask.cxx b/reco/detectors/mvd/plugins/tasks/CbmMvdSensorHitfinderTask.cxx
index a7e2c1293a52c991b9082714838297d0ea128d65..6a4f864584c1162f837fa3708f64e79e9c8ed66a 100644
--- a/reco/detectors/mvd/plugins/tasks/CbmMvdSensorHitfinderTask.cxx
+++ b/reco/detectors/mvd/plugins/tasks/CbmMvdSensorHitfinderTask.cxx
@@ -13,19 +13,19 @@
#include "CbmMvdHit.h" // for CbmMvdHit
#include "CbmMvdSensor.h" // for CbmMvdSensor
-#include <TClonesArray.h> // for TClonesArray
-#include <TGeoMatrix.h> // for TGeoHMatrix
-#include <TMath.h> // for Power
-#include <TMathBase.h> // for Abs
-#include <TObjArray.h> // for TObjArray
-#include <TRandom.h> // for TRandom
-#include <TRandom3.h> // for gRandom
-#include <TVector3.h> // for TVector3
-
-#include <iomanip> // for setprecision, setw
-#include <iostream> // for operator<<, basic_ostream, char_traits, endl
-#include <map> // for map, __map_iterator, operator!=, operator==
-#include <vector> // for vector
+#include <TClonesArray.h> // for TClonesArray
+#include <TGeoMatrix.h> // for TGeoHMatrix
+#include <TMath.h> // for Power
+#include <TMathBase.h> // for Abs
+#include <TObjArray.h> // for TObjArray
+#include <TRandom.h> // for TRandom
+#include <TRandom3.h> // for gRandom
+#include <TVector3.h> // for TVector3
+
+#include <iomanip> // for setprecision, setw
+#include <iostream> // for operator<<, basic_ostream, char_traits, endl
+#include <map> // for map, __map_iterator, operator!=, operator==
+#include <vector> // for vector
using std::cout;
using std::endl;
@@ -92,7 +92,7 @@ CbmMvdSensorHitfinderTask::CbmMvdSensorHitfinderTask()
, fDigisInCluster(0)
, fAddNoise(kFALSE)
{
-fPluginIDNumber= 300;
+ fPluginIDNumber = 300;
}
// -------------------------------------------------------------------------
@@ -149,7 +149,7 @@ CbmMvdSensorHitfinderTask::CbmMvdSensorHitfinderTask(Int_t iMode)
, fDigisInCluster(0)
, fAddNoise(kFALSE)
{
-fPluginIDNumber= 300;
+ fPluginIDNumber = 300;
}
// -------------------------------------------------------------------------
@@ -180,7 +180,9 @@ void CbmMvdSensorHitfinderTask::InitTask(CbmMvdSensor* mysensor)
fSensor = mysensor;
- if (gDebug>0){cout << "-Start- CbmMvdSensorHitfinderTask: Initialisation of sensor " << fSensor->GetName() << endl;}
+ if (gDebug > 0) {
+ cout << "-Start- CbmMvdSensorHitfinderTask: Initialisation of sensor " << fSensor->GetName() << endl;
+ }
fInputBuffer = new TClonesArray("CbmMvdCluster", 100);
fOutputBuffer = new TClonesArray("CbmMvdHit", 100);
diff --git a/reco/detectors/mvd/plugins/tasks/CbmMvdSensorHitfinderTask.h b/reco/detectors/mvd/plugins/tasks/CbmMvdSensorHitfinderTask.h
index 5aede833fea441a66d795ede849ad3aba7a3031e..331b6c6a7d7bf6840d1bec7925f4a5944010ef36 100644
--- a/reco/detectors/mvd/plugins/tasks/CbmMvdSensorHitfinderTask.h
+++ b/reco/detectors/mvd/plugins/tasks/CbmMvdSensorHitfinderTask.h
@@ -14,15 +14,15 @@
#include "CbmMvdCluster.h" // for CbmMvdCluster
#include "CbmMvdSensorTask.h" // for CbmMvdSensorTask
-#include <FairTask.h> // for InitStatus
+#include <FairTask.h> // for InitStatus
-#include <Rtypes.h> // for ClassDef
-#include <RtypesCore.h> // for Int_t, Double_t, Bool_t, Float_t, kTRUE
-#include <TClonesArray.h> // for TClonesArray
-#include <TString.h> // for TString
+#include <Rtypes.h> // for ClassDef
+#include <RtypesCore.h> // for Int_t, Double_t, Bool_t, Float_t, kTRUE
+#include <TClonesArray.h> // for TClonesArray
+#include <TString.h> // for TString
-#include <map> // for map
-#include <utility> // for pair
+#include <map> // for map
+#include <utility> // for pair
class CbmMvdSensor;
class TBuffer;
diff --git a/sim/detectors/mvd/CbmMvd.cxx b/sim/detectors/mvd/CbmMvd.cxx
index d419017b65ee1f3e9a6c2a91501e263af0c92d9d..6cfe3b925ed58c7c89e1a4ed609529900ef7f6fc 100644
--- a/sim/detectors/mvd/CbmMvd.cxx
+++ b/sim/detectors/mvd/CbmMvd.cxx
@@ -8,23 +8,22 @@
// -------------------------------------------------------------------------
#include "CbmMvd.h"
-#include <Logger.h> // for Logger, LOG
-
#include "CbmDefs.h" // for ToIntegralType, ECbmModuleId
#include "CbmMvdGeoHandler.h" // for CbmMvdGeoHandler
#include "CbmMvdPoint.h" // for CbmMvdPoint
#include "CbmStack.h" // for CbmStack
-#include <FairRootManager.h> // for FairRootManager
-#include <FairVolume.h> // for FairVolume
+#include <FairRootManager.h> // for FairRootManager
+#include <FairVolume.h> // for FairVolume
+#include <Logger.h> // for Logger, LOG
-#include <TClonesArray.h> // for TClonesArray
-#include <TList.h> // for TList
-#include <TString.h> // for TString, operator<<
-#include <TVirtualMC.h> // for TVirtualMC, gMC
-#include <TVirtualMCStack.h> // for TVirtualMCStack
+#include <TClonesArray.h> // for TClonesArray
+#include <TList.h> // for TList
+#include <TString.h> // for TString, operator<<
+#include <TVirtualMC.h> // for TVirtualMC, gMC
+#include <TVirtualMCStack.h> // for TVirtualMCStack
-#include <string> // for allocator
+#include <string> // for allocator
// ----- Default constructor -------------------------------------------
CbmMvd::CbmMvd()
diff --git a/sim/detectors/mvd/CbmMvd.h b/sim/detectors/mvd/CbmMvd.h
index b69b4fcd1dc2f243ce8d292b7291c39ea7b4934c..3df2ab04598f94a4892141458637029ffe0d3aab 100644
--- a/sim/detectors/mvd/CbmMvd.h
+++ b/sim/detectors/mvd/CbmMvd.h
@@ -18,15 +18,15 @@
#ifndef CBMMVD_H
#define CBMMVD_H 1
-#include <FairDetector.h> // for FairDetector
+#include <FairDetector.h> // for FairDetector
#include <Rtypes.h> // for ClassDef
#include <RtypesCore.h> // for Int_t, Bool_t, Double32_t, Double_t, Opt...
#include <TLorentzVector.h> // for TLorentzVector
#include <TVector3.h> // for TVector3
-#include <string> // for string
-#include <map> // for map
+#include <map> // for map
+#include <string> // for string
class CbmMvdGeoHandler;
class CbmMvdPoint;
@@ -140,10 +140,10 @@ private:
Double32_t fLength; //! length
Double32_t fELoss; //! energy loss
- Int_t fPosIndex; //!
- TClonesArray* fCollection; //! The hit collection
- Bool_t kGeoSaved; //!
- TList* fGeoPar; //! List of geometry parameters
+ Int_t fPosIndex; //!
+ TClonesArray* fCollection; //! The hit collection
+ Bool_t kGeoSaved; //!
+ TList* fGeoPar; //! List of geometry parameters
std::map<Int_t, Int_t> fStationMap; //! Map from MC volume ID to station number
CbmMvdGeoHandler* fmvdHandler;
diff --git a/sim/detectors/mvd/CbmMvdDigitizer.cxx b/sim/detectors/mvd/CbmMvdDigitizer.cxx
index 2bd28467c74ce0d5edde341f361faa3e3972db97..0f605737048821c31ac8fa4d79c245d000806607 100644
--- a/sim/detectors/mvd/CbmMvdDigitizer.cxx
+++ b/sim/detectors/mvd/CbmMvdDigitizer.cxx
@@ -15,21 +15,21 @@
#include "CbmMvdSensor.h" // for CbmMvdSensor
#include "CbmMvdSensorDigitizerTask.h" // for CbmMvdSensorDigitizerTask
-#include <FairRootManager.h> // for FairRootManager
-#include <Logger.h> // for Logger, LOG
-
-#include <TClonesArray.h> // for TClonesArray
-#include <TObject.h> // for TObject
-#include <TRandom.h> // for TRandom
-#include <TRandom3.h> // for gRandom
-#include <TStopwatch.h> // for TStopwatch
-
-#include <cassert> // for assert
-#include <iomanip> // for setprecision, setw, __iom_t5
-#include <iostream> // for operator<<, basic_ostream, endl
-#include <map> // for __map_iterator, map, operator!=
-#include <string> // for allocator, char_traits
-#include <vector> // for vector
+#include <FairRootManager.h> // for FairRootManager
+#include <Logger.h> // for Logger, LOG
+
+#include <TClonesArray.h> // for TClonesArray
+#include <TObject.h> // for TObject
+#include <TRandom.h> // for TRandom
+#include <TRandom3.h> // for gRandom
+#include <TStopwatch.h> // for TStopwatch
+
+#include <cassert> // for assert
+#include <iomanip> // for setprecision, setw, __iom_t5
+#include <iostream> // for operator<<, basic_ostream, endl
+#include <map> // for __map_iterator, map, operator!=
+#include <string> // for allocator, char_traits
+#include <vector> // for vector
using std::cout;
using std::endl;
@@ -63,10 +63,8 @@ CbmMvdDigitizer::CbmMvdDigitizer()
, fPileupManager(nullptr)
, fDeltaManager(nullptr)
{
- fTmpDigi = new TClonesArray("CbmMvdDigi", 1000);
- fTmpMatch = new TClonesArray("CbmMatch", 1000);
-
-
+ fTmpDigi = new TClonesArray("CbmMvdDigi", 1000);
+ fTmpMatch = new TClonesArray("CbmMatch", 1000);
}
// -------------------------------------------------------------------------
@@ -129,9 +127,9 @@ void CbmMvdDigitizer::Exec(Option_t* /*opt*/)
// Add points from BG and Delta files to the array if needed
BuildEvent();
- Int_t nPoints = fInputPoints->GetEntriesFast();
- Int_t nDigis = 0;
- CbmMvdPoint* point=0;
+ Int_t nPoints = fInputPoints->GetEntriesFast();
+ Int_t nDigis = 0;
+ CbmMvdPoint* point = 0;
fTmpDigi->Clear();
fTmpMatch->Clear();
@@ -141,11 +139,11 @@ void CbmMvdDigitizer::Exec(Option_t* /*opt*/)
LOG(debug) << fName << ": Send Input";
- Int_t nTargetPlugin=DetectPlugin(100);
+ Int_t nTargetPlugin = DetectPlugin(100);
// Distribute the points from the input array to the sensors
- for (Int_t i=0; i< nPoints; i++) {
- point=(CbmMvdPoint*) fInputPoints->At(i);
+ for (Int_t i = 0; i < nPoints; i++) {
+ point = (CbmMvdPoint*) fInputPoints->At(i);
fDetector->SendInputToSensorPlugin(point->GetDetectorID(), nTargetPlugin, static_cast<TObject*>(point));
}
@@ -162,7 +160,7 @@ void CbmMvdDigitizer::Exec(Option_t* /*opt*/)
fDetector->GetOutputArray(nTargetPlugin, fTmpDigi);
//cout << "CbmMvdDigitizer::Exec() - GetOutputArray completed" << endl;
- fDetector->GetMatchArray (nTargetPlugin, fTmpMatch);
+ fDetector->GetMatchArray(nTargetPlugin, fTmpMatch);
//cout << "CbmMvdDigitizer::Exec() - GetMatchArray data completed" << endl;
//cout << "Length of Digi Array " << fTmpDigi->GetEntriesFast() << endl;
@@ -175,16 +173,16 @@ void CbmMvdDigitizer::Exec(Option_t* /*opt*/)
CbmMvdDigi* digi1 = new CbmMvdDigi(*digi);
assert(digi1);
fDigiVect.push_back(digi1);
-// // Create new digi in the output digi outputfrom the one in the internal TClonesArray
-// fDigiVect.emplace_back(new CbmMvdDigi(*(static_cast<CbmMvdDigi*>(fTmpDigi->At(index)))));
+ // // Create new digi in the output digi outputfrom the one in the internal TClonesArray
+ // fDigiVect.emplace_back(new CbmMvdDigi(*(static_cast<CbmMvdDigi*>(fTmpDigi->At(index)))));
// CbmMatch match{*(dynamic_cast<CbmMatch*>(fTmpMatch->At(index)))};
// CbmMatch* match1 = new CbmMatch(match);
CbmMatch* match = dynamic_cast<CbmMatch*>(fTmpMatch->At(index));
CbmMatch* match1 = new CbmMatch(*match);
fMatchVect.push_back(match1);
-// // Create new match in the output match vector from the one in the internal TClonesArray
-// fMatchVect.emplace_back(new CbmMatch(*(static_cast<CbmMatch*>(fTmpMatch->At(index)))));
+ // // Create new match in the output match vector from the one in the internal TClonesArray
+ // fMatchVect.emplace_back(new CbmMatch(*(static_cast<CbmMatch*>(fTmpMatch->At(index)))));
//digi1->SetMatch(match1);
SendData(digi1->GetTime(), digi1, match1);
@@ -245,7 +243,7 @@ InitStatus CbmMvdDigitizer::Init()
// ********** RootManager
FairRootManager* ioman = FairRootManager::Instance();
if (!ioman) {
- LOG(fatal) << "No FairRootManager!";
+ LOG(fatal) << "No FairRootManager!";
return kFATAL;
}
@@ -275,8 +273,8 @@ InitStatus CbmMvdDigitizer::Init()
fPileupManager = new CbmMvdPileupManager(fBgFileName, fInputBranchName, fBgBufferSize);
if (fPileupManager->GetNEvents() < 2 * fNPileup) {
LOG(error) << "The size of your BG-File is insufficient to perform the requested pileup";
- LOG(error) << " You need at least events > 2* fNPileup but there are only"
- << fNPileup << ", events in file " << fPileupManager->GetNEvents();
+ LOG(error) << " You need at least events > 2* fNPileup but there are only" << fNPileup << ", events in file "
+ << fPileupManager->GetNEvents();
LOG(fatal) << "The size of your BG-File is insufficient";
return kFATAL;
}
@@ -291,8 +289,8 @@ InitStatus CbmMvdDigitizer::Init()
fDeltaManager = new CbmMvdPileupManager(fDeltaFileName, fInputBranchName, fDeltaBufferSize);
if (fDeltaManager->GetNEvents() < 2 * fNDeltaElect) {
LOG(error) << "The size of your Delta-File is insufficient to perform the requested pileup";
- LOG(error) << " You need at least events > 2* fNDeltaElect but there are only"
- << fNDeltaElect << ", events in file " << fDeltaManager->GetNEvents();
+ LOG(error) << " You need at least events > 2* fNDeltaElect but there are only" << fNDeltaElect
+ << ", events in file " << fDeltaManager->GetNEvents();
LOG(fatal) << "The size of your Delta-File is insufficient";
return kFATAL;
}
@@ -301,17 +299,16 @@ InitStatus CbmMvdDigitizer::Init()
// Add the digitizer plugin to all sensors
std::map<int, CbmMvdSensor*>& sensorMap = fDetector->GetSensorMap();
- UInt_t plugincount=fDetector->GetPluginCount();
+ UInt_t plugincount = fDetector->GetPluginCount();
- for (auto itr = sensorMap.begin();
- itr != sensorMap.end(); itr++) {
+ for (auto itr = sensorMap.begin(); itr != sensorMap.end(); itr++) {
CbmMvdSensorDigitizerTask* digiTask = new CbmMvdSensorDigitizerTask();
if (fNoiseSensors) digiTask->SetProduceNoise();
itr->second->AddPlugin(digiTask);
itr->second->SetDigiPlugin(plugincount);
}
fDetector->SetSensorArrayFilled(kTRUE);
- fDetector->SetPluginCount(plugincount+1);
+ fDetector->SetPluginCount(plugincount + 1);
fDigiPluginNr = (UInt_t)(fDetector->GetPluginArraySize());
if (fShowDebugHistos) fDetector->ShowDebugHistos();
@@ -345,7 +342,7 @@ InitStatus CbmMvdDigitizer::ReInit() { return kSUCCESS; }
// ----- Virtual method Finish -----------------------------------------
void CbmMvdDigitizer::Finish()
-{ //Int_t i = DetectPlugin (100);
+{ //Int_t i = DetectPlugin (100);
//cout << "CbmMvdDigitizer::Finish() Autodetect: " << i <<" Manual Detect " << fDigiPluginNr << endl;
// cout<< endl << "finishing" << endl;
fDetector->Finish();
@@ -378,9 +375,8 @@ void CbmMvdDigitizer::GetMvdGeometry() {}
Int_t CbmMvdDigitizer::DetectPlugin(Int_t pluginID)
{
- CbmMvdDetector* detector= CbmMvdDetector::Instance();
+ CbmMvdDetector* detector = CbmMvdDetector::Instance();
return detector->DetectPlugin(pluginID);
-
}
// ----- Private method PrintParameters --------------------------------
diff --git a/sim/detectors/mvd/CbmMvdDigitizer.h b/sim/detectors/mvd/CbmMvdDigitizer.h
index d817e2c5bfced402cf58fc831fcfff1dd5b1f97e..ce43e7579295922bc532f6c19481b2bc9d3576d5 100644
--- a/sim/detectors/mvd/CbmMvdDigitizer.h
+++ b/sim/detectors/mvd/CbmMvdDigitizer.h
@@ -12,20 +12,20 @@
#ifndef CBMMVDDIGITIZER_H
#define CBMMVDDIGITIZER_H 1
-#include "CbmDefs.h" // for ECbmModuleId
-#include "CbmDigitize.h" // for CbmDigitize
-#include "CbmMvdDigi.h" // for CbmMvdDigi
+#include "CbmDefs.h" // for ECbmModuleId
+#include "CbmDigitize.h" // for CbmDigitize
+#include "CbmMvdDigi.h" // for CbmMvdDigi
-#include <FairTask.h> // for InitStatus
+#include <FairTask.h> // for InitStatus
-#include <Rtypes.h> // for ClassDef
-#include <RtypesCore.h> // for Int_t, Float_t, Bool_t, kTRUE, Double_t
-#include <TStopwatch.h> // for TStopwatch
-#include <TString.h> // for TString
+#include <Rtypes.h> // for ClassDef
+#include <RtypesCore.h> // for Int_t, Float_t, Bool_t, kTRUE, Double_t
+#include <TStopwatch.h> // for TStopwatch
+#include <TString.h> // for TString
-#include <utility> // for pair
-#include <string> // for string
-#include <vector> // for vector
+#include <string> // for string
+#include <utility> // for pair
+#include <vector> // for vector
class CbmMatch;
class CbmMvdDetector;
diff --git a/sim/detectors/mvd/CbmMvdDigitizerTB.cxx b/sim/detectors/mvd/CbmMvdDigitizerTB.cxx
index 119df871c4b9bde850d3d2973bcb33c2370ebd8a..cac9803b6f28fd1a2ee31c08754cfb3c4654c029 100644
--- a/sim/detectors/mvd/CbmMvdDigitizerTB.cxx
+++ b/sim/detectors/mvd/CbmMvdDigitizerTB.cxx
@@ -9,11 +9,11 @@
// Includes from MVD
#include "CbmMvdDigitizerTB.h"
+#include "CbmDaqBuffer.h"
#include "CbmMvdDetector.h"
+#include "CbmMvdGeoHandler.h"
#include "CbmMvdPoint.h"
#include "CbmMvdSensorDigitizerTBTask.h"
-#include "CbmMvdGeoHandler.h"
-#include "CbmDaqBuffer.h"
#include "FairModule.h"
#include "FairRootManager.h"
@@ -23,7 +23,6 @@
#include "TClonesArray.h"
#include "TStopwatch.h"
-
#include <iomanip>
#include <iostream>
#include <vector>
@@ -139,17 +138,16 @@ InitStatus CbmMvdDigitizerTB::Init()
// Add the digitizer plugin to all sensors
std::map<int, CbmMvdSensor*>& sensorMap = fDetector->GetSensorMap();
- UInt_t plugincount=fDetector->GetPluginCount();
+ UInt_t plugincount = fDetector->GetPluginCount();
- for (auto itr = sensorMap.begin();
- itr != sensorMap.end(); itr++) {
+ for (auto itr = sensorMap.begin(); itr != sensorMap.end(); itr++) {
CbmMvdSensorDigitizerTBTask* digiTask = new CbmMvdSensorDigitizerTBTask();
itr->second->AddPlugin(digiTask);
itr->second->SetDigiPlugin(plugincount);
}
fDetector->SetSensorArrayFilled(kTRUE);
- fDetector->SetPluginCount(plugincount+1);
+ fDetector->SetPluginCount(plugincount + 1);
fDigiPluginNr = (UInt_t)(fDetector->GetPluginArraySize());
fDetector->Init();
diff --git a/sim/detectors/mvd/CbmMvdPixelCharge.cxx b/sim/detectors/mvd/CbmMvdPixelCharge.cxx
index 19d7f3c53ca6a1d0eacd364f81dad79062301b63..07bd47ee24a441543936564fec8a379441408089 100644
--- a/sim/detectors/mvd/CbmMvdPixelCharge.cxx
+++ b/sim/detectors/mvd/CbmMvdPixelCharge.cxx
@@ -40,9 +40,8 @@ CbmMvdPixelCharge::CbmMvdPixelCharge(Float_t charge, Int_t channelNrX, Int_t cha
fPointX.push_back(pointPosX);
fPointY.push_back(pointPosY);
fTime.push_back(time);
-// fLink.push_back(); // TODO: pass link
- fDominatorIndex = fPointWeight.size();
-
+ // fLink.push_back(); // TODO: pass link
+ fDominatorIndex = fPointWeight.size();
}
// ------- DigestCharge ----------------------------------------------------#
@@ -69,14 +68,13 @@ void CbmMvdPixelCharge::DigestCharge(Float_t pointX, Float_t pointY, Double_t ti
fPointY.push_back(pointY);
fTime.push_back(time);
-// fTime.push_back(time);
-// fLink.push_back(); // TODO: pass link
+ // fTime.push_back(time);
+ // fLink.push_back(); // TODO: pass link
if (chargeContr > fMaxChargeContribution) {
- fDominatorIndex = fPointWeight.size();
+ fDominatorIndex = fPointWeight.size();
fMaxChargeContribution = chargeContr;
}
-
}
}
diff --git a/sim/detectors/mvd/CbmMvdPixelCharge.h b/sim/detectors/mvd/CbmMvdPixelCharge.h
index 60482a289b2ca858fd7148c765dbc34fc584fbf1..cb74164c0f309fca4230732a458f0ad0d6d7da96 100644
--- a/sim/detectors/mvd/CbmMvdPixelCharge.h
+++ b/sim/detectors/mvd/CbmMvdPixelCharge.h
@@ -31,7 +31,8 @@ public:
Bool_t TestXY(Int_t channelNrX, Int_t channelNrY);
- void DigestCharge(Float_t pointX, Float_t pointY, Double_t time, Int_t PointId, Int_t trackId); // TODO: add time here
+ void DigestCharge(Float_t pointX, Float_t pointY, Double_t time, Int_t PointId,
+ Int_t trackId); // TODO: add time here
void AddCharge(Float_t charge) { fTrackCharge = fTrackCharge + charge; };
@@ -46,7 +47,7 @@ public:
std::vector<Float_t>& GetPointX() { return fPointX; }
std::vector<Float_t>& GetPointY() { return fPointY; }
std::vector<Float_t>& GetPointWeight() { return fPointWeight; }
- std::vector<Double_t>& GetTime() {return fTime;}
+ std::vector<Double_t>& GetTime() { return fTime; }
Float_t GetPixelTime() { return fPixelTime; }
Int_t GetFrame() { return fFrame; }
@@ -56,25 +57,25 @@ public:
private:
Int_t fFrame = {-1};
- Float_t fCharge = {-1.};
- Float_t fMaxChargeContribution = {0.};
- Float_t fDominatingPointX = {-1.};
- Float_t fDominatingPointY = {-1.};
- Short_t fContributors = {0};
- Int_t fChannelNrX = {0};
- Int_t fChannelNrY = {0};
- Float_t fTrackCharge = {0.};
- Int_t fDominatorTrackId = {-1};
- Int_t fDominatorPointId = {-1};
- Short_t fDominatorIndex = {0};
- Float_t fPixelTime = {-1.};
- std::vector<Int_t> fTrackId = {};
- std::vector<Int_t> fPointId = {};
- std::vector<Float_t> fPointWeight = {};
- std::vector<Float_t> fPointX = {};
- std::vector<Float_t> fPointY = {};
- std::vector<Double_t> fTime = {};
- std::vector<CbmLink> fLink = {};
+ Float_t fCharge = {-1.};
+ Float_t fMaxChargeContribution = {0.};
+ Float_t fDominatingPointX = {-1.};
+ Float_t fDominatingPointY = {-1.};
+ Short_t fContributors = {0};
+ Int_t fChannelNrX = {0};
+ Int_t fChannelNrY = {0};
+ Float_t fTrackCharge = {0.};
+ Int_t fDominatorTrackId = {-1};
+ Int_t fDominatorPointId = {-1};
+ Short_t fDominatorIndex = {0};
+ Float_t fPixelTime = {-1.};
+ std::vector<Int_t> fTrackId = {};
+ std::vector<Int_t> fPointId = {};
+ std::vector<Float_t> fPointWeight = {};
+ std::vector<Float_t> fPointX = {};
+ std::vector<Float_t> fPointY = {};
+ std::vector<Double_t> fTime = {};
+ std::vector<CbmLink> fLink = {};
ClassDef(CbmMvdPixelCharge, 1);
};
diff --git a/sim/detectors/mvd/plugins/tasks/CbmMvdSensorDigitizerTBTask.cxx b/sim/detectors/mvd/plugins/tasks/CbmMvdSensorDigitizerTBTask.cxx
index bc9cab4d4fd3ddbe644294f05174d5cb186f16eb..96c312137e06aebc734c1b379dd17f4764e9256c 100644
--- a/sim/detectors/mvd/plugins/tasks/CbmMvdSensorDigitizerTBTask.cxx
+++ b/sim/detectors/mvd/plugins/tasks/CbmMvdSensorDigitizerTBTask.cxx
@@ -171,7 +171,7 @@ CbmMvdSensorDigitizerTBTask::CbmMvdSensorDigitizerTBTask()
fReadoutLast = -1.;
fReadoutCurrent = 0.;
- fPluginIDNumber= 1100;
+ fPluginIDNumber = 1100;
}
// -------------------------------------------------------------------------
diff --git a/sim/detectors/mvd/plugins/tasks/CbmMvdSensorDigitizerTask.cxx b/sim/detectors/mvd/plugins/tasks/CbmMvdSensorDigitizerTask.cxx
index 3953c53441b0e83e8f09f1835b31f09c8737b63f..bfc9edf7b819da3bef1e814a794e88b2577c60c5 100644
--- a/sim/detectors/mvd/plugins/tasks/CbmMvdSensorDigitizerTask.cxx
+++ b/sim/detectors/mvd/plugins/tasks/CbmMvdSensorDigitizerTask.cxx
@@ -29,27 +29,28 @@
#include "CbmMvdSensorDataSheet.h" // for CbmMvdSensorDataSheet
#include "CbmMvdSensorPlugin.h" // for CbmMvdSensorPlugin
-#include <FairEventHeader.h> // for FairEventHeader
-#include <FairRunAna.h> // for FairRunAna
-#include <FairRootManager.h> // for FairRootManager
-#include <FairRunSim.h> // for FairRunSim
-#include <Logger.h> // for LOG, Logger
-
-#include <TCanvas.h> // for TCanvas
-#include <TClonesArray.h> // for TClonesArray
-#include <TH1.h> // for TH1F
-#include <TH2.h> // for TH2F
-#include <TMath.h> // for Pi, ATan
-#include <TMathBase.h> // for Abs, Max
-#include <TRandom.h> // for TRandom
-#include <TRefArray.h> // for TRefArray
-#include <TVector3.h> // for TVector3, operator*, operator+
-
-#include <cmath> // for sqrt
-#include <iomanip> // for operator<<, setprecision, setw
-#include <iostream> // for operator<<, basic_ostream, endl
-#include <map> // for map, operator==, __map_iterator
-#include <vector> // for allocator, vector
+#include <FairEventHeader.h> // for FairEventHeader
+#include <FairRootManager.h> // for FairRootManager
+#include <FairRunAna.h> // for FairRunAna
+#include <FairRunSim.h> // for FairRunSim
+#include <Logger.h> // for LOG, Logger
+
+#include <TCanvas.h> // for TCanvas
+#include <TClonesArray.h> // for TClonesArray
+#include <TH1.h> // for TH1F
+#include <TH2.h> // for TH2F
+#include <TMath.h> // for Pi, ATan
+#include <TMathBase.h> // for Abs, Max
+#include <TRandom.h> // for TRandom
+#include <TRefArray.h> // for TRefArray
+#include <TVector3.h> // for TVector3, operator*, operator+
+
+#include <iomanip> // for operator<<, setprecision, setw
+#include <iostream> // for operator<<, basic_ostream, endl
+#include <map> // for map, operator==, __map_iterator
+#include <vector> // for allocator, vector
+
+#include <cmath> // for sqrt
using std::cout;
@@ -157,8 +158,8 @@ CbmMvdSensorDigitizerTask::CbmMvdSensorDigitizerTask()
, h_ElossVsMomIn(nullptr)
{
fRandGen.SetSeed(2736);
- fproduceNoise = kFALSE;
- fPluginIDNumber= 100;
+ fproduceNoise = kFALSE;
+ fPluginIDNumber = 100;
}
// -------------------------------------------------------------------------
@@ -259,8 +260,9 @@ CbmMvdSensorDigitizerTask::CbmMvdSensorDigitizerTask(Int_t iMode)
, h_LengthVsEloss(nullptr)
, h_ElossVsMomIn(nullptr)
-{ fPluginIDNumber= 100;
- if(gDebug>0){cout << "Starting CbmMvdSensorDigitizerTask::CbmMvdSensorDigitizerTask() " << endl;}
+{
+ fPluginIDNumber = 100;
+ if (gDebug > 0) { cout << "Starting CbmMvdSensorDigitizerTask::CbmMvdSensorDigitizerTask() " << endl; }
fRandGen.SetSeed(2736);
fEvent = 0;
@@ -443,7 +445,7 @@ void CbmMvdSensorDigitizerTask::Exec()
ProducePixelCharge(point);
} //loop on MCpoints
- Int_t nDigis = 0;
+ Int_t nDigis = 0;
GetEventInfo(fInputNr, fEventNr, fEventTime);
if (fproduceNoise) ProduceNoise();
@@ -454,13 +456,14 @@ void CbmMvdSensorDigitizerTask::Exec()
if (pixel->GetCharge() > fChargeThreshold) {
nDigis = fDigis->GetEntriesFast();
- new ((*fDigis)[nDigis]) CbmMvdDigi(fSensor->GetSensorNr(), pixel->GetX(), pixel->GetY(), pixel->GetCharge(),
- fPixelSizeX, fPixelSizeY, fEventTime+pixel->GetPixelTime(), pixel->GetFrame());
+ new ((*fDigis)[nDigis])
+ CbmMvdDigi(fSensor->GetSensorNr(), pixel->GetX(), pixel->GetY(), pixel->GetCharge(), fPixelSizeX, fPixelSizeY,
+ fEventTime + pixel->GetPixelTime(), pixel->GetFrame());
new ((*fOutputBuffer)[nDigis])
CbmMvdDigi(fSensor->GetSensorNr(), pixel->GetX(), pixel->GetY(), pixel->GetCharge(), fPixelSizeX, fPixelSizeY,
- fEventTime+pixel->GetPixelTime(), pixel->GetFrame());
+ fEventTime + pixel->GetPixelTime(), pixel->GetFrame());
new ((*fDigiMatch)[nDigis]) CbmMatch();
CbmMatch* match = (CbmMatch*) fDigiMatch->At(nDigis);
@@ -492,34 +495,42 @@ void CbmMvdSensorDigitizerTask::Exec()
// -------------------------------------------------------------------------
+Int_t CbmMvdSensorDigitizerTask::GetPixelCharge(CbmMvdPixelCharge* myPixel, Double_t readoutTime)
+{
-Int_t CbmMvdSensorDigitizerTask::GetPixelCharge(CbmMvdPixelCharge* myPixel, Double_t readoutTime) {
-
-/**
+ /**
* Get the analog signal created by each signal. Assumption: Signal rise and signal fall follows exponential. Contributions of the individual hits add up.
**/
- Int_t pixelCharge=0;
- Double_t pixelSignalRiseTime=fsensorDataSheet->GetSignalRiseTime();
- Double_t pixelSignalFallTime=fsensorDataSheet->GetSignalFallTime();
- Int_t nHits=0; //=myPixel->GetNHits();
-
- for(Int_t hitNr=0; hitNr<nHits; hitNr++){
- Int_t hitCharge=0; //=pixel->GetHitCharge(hitNr);
- Int_t hitTime=0; //=pixel->GetHitTime(hitNr);
-
- pixelCharge=pixelCharge + hitCharge * (1- TMath::Exp(-(readoutTime-hitTime)/pixelSignalRiseTime)); //exponential signal rise of the analog charge
- pixelCharge=pixelCharge - hitCharge * (1- TMath::Exp(-(readoutTime-hitTime)/pixelSignalFallTime)); //exponential signal fall of the analog charge
+ Int_t pixelCharge = 0;
+ Double_t pixelSignalRiseTime = fsensorDataSheet->GetSignalRiseTime();
+ Double_t pixelSignalFallTime = fsensorDataSheet->GetSignalFallTime();
+ Int_t nHits = 0; //=myPixel->GetNHits();
+
+ for (Int_t hitNr = 0; hitNr < nHits; hitNr++) {
+ Int_t hitCharge = 0; //=pixel->GetHitCharge(hitNr);
+ Int_t hitTime = 0; //=pixel->GetHitTime(hitNr);
+
+ pixelCharge = pixelCharge
+ + hitCharge
+ * (1
+ - TMath::Exp(-(readoutTime - hitTime)
+ / pixelSignalRiseTime)); //exponential signal rise of the analog charge
+ pixelCharge = pixelCharge
+ - hitCharge
+ * (1
+ - TMath::Exp(-(readoutTime - hitTime)
+ / pixelSignalFallTime)); //exponential signal fall of the analog charge
}
return pixelCharge;
-
}
// ------------------------------------------------------------------------------
-Bool_t CbmMvdSensorDigitizerTask::GetSignalAboveThreshold (CbmMvdPixelCharge* myPixel, Double_t readoutTime) {
+Bool_t CbmMvdSensorDigitizerTask::GetSignalAboveThreshold(CbmMvdPixelCharge* myPixel, Double_t readoutTime)
+{
/**
* Checks if pixel is above threshold.
**/
@@ -527,9 +538,7 @@ Bool_t CbmMvdSensorDigitizerTask::GetSignalAboveThreshold (CbmMvdPixelCharge* my
CbmMvdSensor* mySensor;
-
- return (GetPixelCharge(myPixel, readoutTime)>fsensorDataSheet->GetAnalogThreshold ());
-
+ return (GetPixelCharge(myPixel, readoutTime) > fsensorDataSheet->GetAnalogThreshold());
}
// ------------------------------------------------------------------------------
@@ -785,9 +794,7 @@ void CbmMvdSensorDigitizerTask::ProducePixelCharge(CbmMvdPoint* point)
yLo = sPoint->y - fWidthOfCluster * sigmaY;
yUp = sPoint->y + fWidthOfCluster * sigmaY;
- if (fNumberOfSegments < 2) {
- LOG(fatal) << "fNumberOfSegments < 2, this makes no sense, check parameters.";
- }
+ if (fNumberOfSegments < 2) { LOG(fatal) << "fNumberOfSegments < 2, this makes no sense, check parameters."; }
Int_t* lowerXArray = new Int_t[fNumberOfSegments];
Int_t* upperXArray = new Int_t[fNumberOfSegments];
@@ -860,7 +867,7 @@ void CbmMvdSensorDigitizerTask::ProducePixelCharge(CbmMvdPoint* point)
Double_t Current[3];
fSensor->PixelToLocal(ix, iy, Current);
pixel = nullptr; //decouple pixel-pointer from previous pixel
-
+
//loop over segments, check if the pad received some charge
for (Int_t i = 0; i < fNumberOfSegments; ++i) {
// cout << endl << "check segment nr. " << i << " from " << fNumberOfSegments << endl;
@@ -889,7 +896,6 @@ void CbmMvdSensorDigitizerTask::ProducePixelCharge(CbmMvdPoint* point)
+ fPar2);
-
if (totCharge < 1) {
// cout << endl << "charge is " << totCharge << " < 1 electron thus charge is negligible" << endl;
@@ -948,8 +954,8 @@ void CbmMvdSensorDigitizerTask::ProducePixelCharge(CbmMvdPoint* point)
CbmMvdPixelCharge* pixelCharge = fPixelChargeShort.at(f);
if (pixelCharge) {
pixelCharge->DigestCharge(((float) (point->GetX() + point->GetXOut()) / 2),
- ((float) (point->GetY() + point->GetYOut()) / 2), fEventTime + point->GetTime(),point->GetPointId(),
- point->GetTrackID());
+ ((float) (point->GetY() + point->GetYOut()) / 2), fEventTime + point->GetTime(),
+ point->GetPointId(), point->GetTrackID());
}
else {
cout << endl << "Warning working on broken pixel " << endl;
@@ -1000,13 +1006,13 @@ void CbmMvdSensorDigitizerTask::ProduceNoise()
if (fChargeMapIt == fChargeMap.end()) {
pixel = new ((*fPixelCharge)[fPixelCharge->GetEntriesFast()])
- CbmMvdPixelCharge(1000, xPix, yPix, 0, -4, Current[0], Current[1]); // TODO: Add time
- pixel->DigestCharge(Current[0], Current[1],fEventTime, 0, -4);
+ CbmMvdPixelCharge(1000, xPix, yPix, 0, -4, Current[0], Current[1]); // TODO: Add time
+ pixel->DigestCharge(Current[0], Current[1], fEventTime, 0, -4);
fChargeMap[thispoint] = pixel;
}
else {
pixel = fChargeMapIt->second;
- pixel->AddCharge(1000); // TODO: Add time
+ pixel->AddCharge(1000); // TODO: Add time
pixel->DigestCharge(Current[0], Current[1], fEventTime, 0, -4);
}
}
@@ -1040,9 +1046,7 @@ void CbmMvdSensorDigitizerTask::InitTask(CbmMvdSensor* mySensor)
fOutputBuffer = new TClonesArray("CbmMvdDigi", 100);
fInputPoints = new TClonesArray("CbmMvdPoint", 100);
- if (!fSensor) {
- LOG(fatal) << "Init(CbmMvdSensor*) called without valid pointer, don't know how to proceed.";
- };
+ if (!fSensor) { LOG(fatal) << "Init(CbmMvdSensor*) called without valid pointer, don't know how to proceed."; };
ReadSensorInformation();
diff --git a/sim/detectors/mvd/plugins/tasks/CbmMvdSensorDigitizerTask.h b/sim/detectors/mvd/plugins/tasks/CbmMvdSensorDigitizerTask.h
index 074a4bd00d58434ceea64cfdf2751b200b19c8b7..edeecb689e0c121142f5fe87388ed6fc70c4ffb7 100644
--- a/sim/detectors/mvd/plugins/tasks/CbmMvdSensorDigitizerTask.h
+++ b/sim/detectors/mvd/plugins/tasks/CbmMvdSensorDigitizerTask.h
@@ -19,17 +19,17 @@
#include "CbmMvdSensorTask.h" // for CbmMvdSensorTask
-#include <FairTask.h> // for InitStatus
+#include <FairTask.h> // for InitStatus
-#include <Rtypes.h> // for ClassDef
-#include <RtypesCore.h> // for Double_t, Int_t, Float_t, Bool_t, kTRUE
-#include <TRandom3.h> // for TRandom3
-#include <TStopwatch.h> // for TStopwatch
-#include <TString.h> // for TString
+#include <Rtypes.h> // for ClassDef
+#include <RtypesCore.h> // for Double_t, Int_t, Float_t, Bool_t, kTRUE
+#include <TRandom3.h> // for TRandom3
+#include <TStopwatch.h> // for TStopwatch
+#include <TString.h> // for TString
-#include <map> // for map
-#include <utility> // for pair
-#include <vector> // for vector
+#include <map> // for map
+#include <utility> // for pair
+#include <vector> // for vector
class CbmMvdPileupManager;
class CbmMvdPixelCharge;
@@ -61,7 +61,7 @@ public:
/** fill buffer **/
void SetInputArray(TClonesArray* inputStream);
- void SetInput(TObject*); //overwrite
+ void SetInput(TObject*); //overwrite
/** Execute **/
void Exec();
@@ -75,8 +75,8 @@ public:
void ProduceIonisationPoints(CbmMvdPoint* point);
void ProducePixelCharge(CbmMvdPoint* point);
void ProduceNoise();
- Bool_t GetSignalAboveThreshold (CbmMvdPixelCharge* myPixel, Double_t readoutTime);
- Int_t GetPixelCharge(CbmMvdPixelCharge* myPixel, Double_t readoutTime);
+ Bool_t GetSignalAboveThreshold(CbmMvdPixelCharge* myPixel, Double_t readoutTime);
+ Int_t GetPixelCharge(CbmMvdPixelCharge* myPixel, Double_t readoutTime);
void SetProduceNoise() { fproduceNoise = kTRUE; };
@@ -96,10 +96,10 @@ public:
// ---------- Protected data members ------------------------------------
// Information about event and sensor status
- Int_t fcurrentFrameNumber;
- Int_t fEventNr;
- Int_t fInputNr;
- Double_t fEventTime;
+ Int_t fcurrentFrameNumber;
+ Int_t fEventNr;
+ Int_t fInputNr;
+ Double_t fEventTime;
// Information about sensor
Double_t fEpiTh;