diff --git a/core/detectors/mvd/plugins/CbmMvdSensorPlugin.h b/core/detectors/mvd/plugins/CbmMvdSensorPlugin.h index 6067439ec5b9b2a4f03edfb348dd8785f389d883..c659488f425e6d52f5c9313cb97c23c81d55edd4 100644 --- a/core/detectors/mvd/plugins/CbmMvdSensorPlugin.h +++ b/core/detectors/mvd/plugins/CbmMvdSensorPlugin.h @@ -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; } diff --git a/reco/detectors/mvd/CbmMvdClusterfinder.cxx b/reco/detectors/mvd/CbmMvdClusterfinder.cxx index 90c22458bf000965bd4521fd3187b17deaaf63b0..2bb8f0b1966b410cd008ac55ff89733a81f9699a 100644 --- a/reco/detectors/mvd/CbmMvdClusterfinder.cxx +++ b/reco/detectors/mvd/CbmMvdClusterfinder.cxx @@ -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); diff --git a/reco/detectors/mvd/plugins/tasks/CbmMvdSensorClusterfinderTask.cxx b/reco/detectors/mvd/plugins/tasks/CbmMvdSensorClusterfinderTask.cxx index d2e26fae71f6f36e1f07cb0714b8a473d5183ed9..674a656a86666044ab606ca584c3cf43f8d72dfa 100644 --- a/reco/detectors/mvd/plugins/tasks/CbmMvdSensorClusterfinderTask.cxx +++ b/reco/detectors/mvd/plugins/tasks/CbmMvdSensorClusterfinderTask.cxx @@ -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(); diff --git a/reco/detectors/mvd/plugins/tasks/CbmMvdSensorClusterfinderTask.h b/reco/detectors/mvd/plugins/tasks/CbmMvdSensorClusterfinderTask.h index e5f8f2bc284b7a247fdf8de89a6a54518593f65a..169da3f23a3db49d30d49a60bc0e7aaf365dbdac 100644 --- a/reco/detectors/mvd/plugins/tasks/CbmMvdSensorClusterfinderTask.h +++ b/reco/detectors/mvd/plugins/tasks/CbmMvdSensorClusterfinderTask.h @@ -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) diff --git a/reco/detectors/mvd/plugins/tasks/CbmMvdSensorFindHitTask.cxx b/reco/detectors/mvd/plugins/tasks/CbmMvdSensorFindHitTask.cxx index 3525d88406d06a829e8b75ab0103e7e15badc3a3..c1adff8716556a83c9919f0fcb45316e49625798 100644 --- a/reco/detectors/mvd/plugins/tasks/CbmMvdSensorFindHitTask.cxx +++ b/reco/detectors/mvd/plugins/tasks/CbmMvdSensorFindHitTask.cxx @@ -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) diff --git a/reco/detectors/mvd/plugins/tasks/CbmMvdSensorFindHitTask.h b/reco/detectors/mvd/plugins/tasks/CbmMvdSensorFindHitTask.h index ba1a3c7c8e02aace34c3382e7185a4de425c1922..0557a4d65e6607eb89ae2fe7294ebafb5316a376 100644 --- a/reco/detectors/mvd/plugins/tasks/CbmMvdSensorFindHitTask.h +++ b/reco/detectors/mvd/plugins/tasks/CbmMvdSensorFindHitTask.h @@ -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));