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

Saving temporary changes

parent 4da09b0e
No related branches found
No related tags found
1 merge request!1125Restructure MVD code
......@@ -18,6 +18,8 @@
#define CBMMVDSENSORPLUGIN_H 1
#include "CbmMvdPoint.h"
using std::cout;
using std::endl;
class TClonesArray;
class CbmMvdSensor;
......@@ -52,8 +54,8 @@ public:
virtual TClonesArray* GetWriteArray() { return 0; }
virtual void SetInputArray(TClonesArray*) { ; }
virtual void SetInput(CbmMvdPoint*) { ; }
virtual void SetInput(TObject*) {;}
//virtual void SetInput(CbmMvdPoint*) { ; }
virtual void SetInput(TObject*) {cout << "-E- CbmMvdSensorPlugin::SetInput - You are sending input to the base class instead to your plugin!" << endl;}
virtual void SetOutputArray(TClonesArray*) { ; }
virtual void SetNextPlugin(CbmMvdSensorPlugin* plugin) { fNextPlugin = plugin; }
......
......@@ -84,7 +84,7 @@ void CbmMvdClusterfinder::Exec(Option_t* /*opt*/)
{
// --- Start timer
fTimer.Start();
cout << "CbmMvdClusterfinder::Exec : Starting Exec " << endl;
fCluster->Delete();
if (fDigiMan->GetNofDigis(ECbmModuleId::kMvd)) {
if (fVerbose) cout << "//----------------------------------------//";
......@@ -95,6 +95,8 @@ void CbmMvdClusterfinder::Exec(Option_t* /*opt*/)
Int_t nDigis = fDigiMan->GetNofDigis(ECbmModuleId::kMvd);
cout << "CbmMvdClusterfinder::Exec - nDigis= " << nDigis << endl;
for (Int_t i = 0; i < nDigis; i++) {
digi = new CbmMvdDigi(*(fDigiMan->Get<CbmMvdDigi>(i)));
digi->SetRefId(i);
......@@ -103,6 +105,7 @@ void CbmMvdClusterfinder::Exec(Option_t* /*opt*/)
}
cout << "CbmMvdClusterfinder::Exec : Communicating with Plugin: " << nTargetPlugin << endl;
//fDetector->SendInputDigis(fDigiMan);
......
......@@ -94,7 +94,7 @@ void CbmMvdSensorClusterfinderTask::InitTask(CbmMvdSensor* mysensor)
fSensor = mysensor;
//cout << "-Start- " << GetName() << ": Initialisation of sensor " << fSensor->GetName() << endl;
cout << "-Start- " << GetName() << ": Initialisation of sensor " << fSensor->GetName() << endl;
fInputBuffer = new TClonesArray("CbmMvdDigi", 100);
fOutputBuffer = new TClonesArray("CbmMvdCluster", 100);
......@@ -188,6 +188,10 @@ void CbmMvdSensorClusterfinderTask::ExecChain() { Exec(); }
// ----- Public method Exec --------------
void CbmMvdSensorClusterfinderTask::Exec()
{
cout << "CbmMvdSensorClusterfinderTask::Exec - Running Sensor " << fSensor->GetName() << endl;
cout << "CbmMvdSensorClusterfinderTask::Exec - InputBufferSize " << fInputBuffer->GetEntriesFast() << endl;
if (fInputBuffer->GetEntriesFast() > 0) {
fOutputBuffer->Delete();
inputSet = kFALSE;
......@@ -206,6 +210,7 @@ void CbmMvdSensorClusterfinderTask::Exec()
}
Int_t nDigis = fInputBuffer->GetEntriesFast();
cout << " -I- CbmMvdClusterTrask::Exec(): Received following number of digis: " << nDigis << endl;
nDigis = fInputBuffer->GetEntriesFast();
......
......@@ -68,6 +68,11 @@ public:
inputSet = kTRUE;
}
virtual void SetInput(TObject* digi)
{
new ((*fInputBuffer)[fInputBuffer->GetEntriesFast()]) CbmMvdDigi(*((CbmMvdDigi*) digi));
inputSet = kTRUE;
}
/** Modifiers **/
void SetSigmaNoise(Double_t sigmaNoise, Bool_t addNoise)
......
......@@ -128,7 +128,7 @@ CbmMvdSensorFindHitTask::CbmMvdSensorFindHitTask(Int_t iMode)
, fAdcStepSize(-1.)
, fDigis(NULL)
, fHits(NULL)
, fClusters(new TClonesArray("CbmMvdCluster", 10000))
, fClusters(new TClonesArray("CbmMvdCluster", 100))
, fPixelChargeHistos(NULL)
, fTotalChargeInNpixelsArray(NULL)
, fResolutionHistoX(NULL)
......
......@@ -64,6 +64,12 @@ public:
/** Intialisation **/
void InitTask(CbmMvdSensor* mySensor);
virtual void SetInput(TObject* digi)
{
new ((*fInputBuffer)[fInputBuffer->GetEntriesFast()]) CbmMvdDigi(*((CbmMvdDigi*) digi));
inputSet = kTRUE;
}
virtual void SetInputDigi(CbmMvdDigi* digi)
{
new ((*fInputBuffer)[fInputBuffer->GetEntriesFast()]) CbmMvdDigi(*((CbmMvdDigi*) digi));
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment