diff --git a/core/detectors/mvd/CbmMvdDetector.cxx b/core/detectors/mvd/CbmMvdDetector.cxx
index c4cea769a7b8f8488df2dbafab7951a48cabd44b..20799f16df44038e0056448fa1090d855506edeb 100644
--- a/core/detectors/mvd/CbmMvdDetector.cxx
+++ b/core/detectors/mvd/CbmMvdDetector.cxx
@@ -417,116 +417,6 @@ TClonesArray* CbmMvdDetector::GetCurrentEvent()
}
//-----------------------------------------------------------------------
-//-----------------------------------------------------------------------
-
-TClonesArray* CbmMvdDetector::GetOutputHits()
-{
-
- /**
- * method used to write hits to hd
- */
-
- Int_t nSensors = fSensorArray->GetEntriesFast();
- CbmMvdSensor* sensor;
- for (Int_t i = 0; i < nSensors; i++) {
- sensor = (CbmMvdSensor*) fSensorArray->At(i);
- Int_t length = sensor->GetOutputArrayLen(sensor->GetHitPlugin());
- if (length >= 0) {
- foutputHits->AbsorbObjects(sensor->GetOutputBuffer(), 0, sensor->GetOutputBuffer()->GetEntriesFast() - 1);
- }
- }
-
- return (foutputHits);
-}
-//-----------------------------------------------------------------------
-
-//-----------------------------------------------------------------------
-TClonesArray* CbmMvdDetector::GetOutputDigis()
-{
-
- /**
- * method used to write digis to hd
- */
-
- Int_t nSensors = fSensorArray->GetEntriesFast();
- CbmMvdSensor* sensor;
- for (Int_t i = 0; i < nSensors; i++) {
- sensor = (CbmMvdSensor*) fSensorArray->At(i);
- fDigiPlugin = sensor->GetDigiPlugin();
- Int_t length = sensor->GetOutputArrayLen(fDigiPlugin);
- if (length >= 0) { foutputDigis->AbsorbObjects(sensor->GetOutputArray(fDigiPlugin)); }
- }
-
- return (foutputDigis);
-}
-//-----------------------------------------------------------------------
-
-//-----------------------------------------------------------------------
-TClonesArray* CbmMvdDetector::GetOutputDigiMatchs()
-{
-
- /**
- * method used to write digiMatches to hd
- */
- Int_t nSensors = fSensorArray->GetEntriesFast();
- CbmMvdSensor* sensor;
- for (Int_t i = 0; i < nSensors; i++) {
- sensor = (CbmMvdSensor*) fSensorArray->At(i);
- fDigiPlugin = sensor->GetDigiPlugin();
- // Int_t length = sensor->GetOutputArrayLen(fDigiPlugin);
- foutputDigiMatchs->AbsorbObjects(sensor->GetMatchArray(fDigiPlugin));
- }
- cout << " -W- CbmMvdDetector::GetOutputDigiMatchs - Use of methode depreciated" << endl;
- return (foutputDigiMatchs);
-}
-//-----------------------------------------------------------------------
-
-//-----------------------------------------------------------------------
-// khun /*
-TClonesArray* CbmMvdDetector::GetOutputCluster()
-{
- /**
- * method used to write Cluster to hd
- */
- Int_t nSensors = fSensorArray->GetEntriesFast();
- CbmMvdSensor* sensor;
- for (Int_t i = 0; i < nSensors; i++) {
- sensor = (CbmMvdSensor*) fSensorArray->At(i);
- fClusterPlugin = sensor->GetClusterPlugin();
- Int_t length = sensor->GetOutputArrayLen(fClusterPlugin);
- if (length >= 0) foutputCluster->AbsorbObjects(sensor->GetOutputArray(fClusterPlugin), 0, length); //khun
- }
-
- return (foutputCluster);
-};
-// khun */
-
-//-----------------------------------------------------------------------
-
-
-//-----------------------------------------------------------------------
-
-TClonesArray* CbmMvdDetector::GetOutputArray(Int_t nPlugin)
-{
-
- /**
- * method used to write processed events to hd
- */
-
- Int_t nSensors = fSensorArray->GetEntriesFast();
- CbmMvdSensor* sensor;
- for (Int_t i = 0; i < nSensors; i++) {
- sensor = (CbmMvdSensor*) fSensorArray->At(i);
- Int_t length = sensor->GetOutputArrayLen(nPlugin);
- if (length >= 0) {
- foutputDigis->AbsorbObjects(sensor->GetOutputArray(nPlugin), 0, length);
- foutputDigiMatchs->AbsorbObjects(sensor->GetMatchArray(nPlugin), 0, length);
- }
- }
- return (foutputDigis);
-}
-//-----------------------------------------------------------------------
-
void CbmMvdDetector::GetOutputArray(Int_t nPlugin, TClonesArray* outputArray){
Int_t nSensors = fSensorArray->GetEntriesFast();
CbmMvdSensor* sensor;
@@ -543,6 +433,7 @@ void CbmMvdDetector::GetOutputArray(Int_t nPlugin, TClonesArray* outputArray){
}
}
}
+
//-----------------------------------------------------------------------
void CbmMvdDetector::GetMatchArray(Int_t nPlugin, TClonesArray* matchArray){
Int_t nSensors = fSensorArray->GetEntriesFast();
@@ -559,16 +450,6 @@ void CbmMvdDetector::GetMatchArray(Int_t nPlugin, TClonesArray* matchArray){
matchArray->AbsorbObjects(tmpArray);
}
}
-
- /*
- CbmMvdSensor* sensor;
- for (Int_t i = 0; i < nSensors; i++) {
- sensor = (CbmMvdSensor*) fSensorArray->At(i);
- Int_t length = sensor->GetOutputArrayLen(nPlugin);
- if (length >= 0) {
- matchArray->AbsorbObjects(sensor->GetMatchArray(nPlugin), 0, length);
- }
- } */
}
//-----------------------------------------------------------------------
diff --git a/core/detectors/mvd/CbmMvdDetector.h b/core/detectors/mvd/CbmMvdDetector.h
index 89fc571f1667f89c6f80cfcf6d192d5ac3c551e0..3be4d8cf016092a8e170123bb6896bfb5a4df408 100644
--- a/core/detectors/mvd/CbmMvdDetector.h
+++ b/core/detectors/mvd/CbmMvdDetector.h
@@ -61,12 +61,12 @@ public:
void SendInputToSensorPlugin(Int_t detectorid, Int_t nPlugin, TObject* input);
- TClonesArray* GetOuput() { return 0; }
- TClonesArray* GetOutputHits();
- TClonesArray* GetOutputDigis();
- TClonesArray* GetOutputDigiMatchs();
- TClonesArray* GetOutputCluster(); //khun
- TClonesArray* GetOutputArray(Int_t nPlugin);
+ //TClonesArray* GetOuput() { return 0; }
+ //TClonesArray* GetOutputHits();
+ //TClonesArray* GetOutputDigis();
+ //TClonesArray* GetOutputDigiMatchs();
+ //TClonesArray* GetOutputCluster(); //khun
+ //TClonesArray* GetOutputArray(Int_t nPlugin);
void GetOutputArray(Int_t nPlugin,TClonesArray* outputArray);
void GetMatchArray(Int_t nPlugin, TClonesArray* matchArray);
diff --git a/core/detectors/mvd/CbmMvdSensor.cxx b/core/detectors/mvd/CbmMvdSensor.cxx
index bd06febbc9371d17c57b7ad75c1210af95844d7e..4c9fe84f529fe0924c37a30f4cb73b2f185e887f 100644
--- a/core/detectors/mvd/CbmMvdSensor.cxx
+++ b/core/detectors/mvd/CbmMvdSensor.cxx
@@ -200,15 +200,6 @@ void CbmMvdSensor::Init()
ReadSensorGeometry(fNodeName);
-/*
- if (!initialized) {
- foutputDigis = new TClonesArray("CbmMvdDigi", 1000);
- foutputDigiMatch = new TClonesArray("CbmMatch", 1000);
- foutputBuffer = new TClonesArray("CbmMvdHit", 1000);
- foutputCluster = new TClonesArray("CbmMvdCluster", 1); //not needed khun
- }
- */
-
Int_t nPlugin = fPluginArray->GetEntriesFast();
@@ -295,12 +286,7 @@ void CbmMvdSensor::ExecChain()
FairEventHeader* event = ana->GetEventHeader();
fcurrentEventTime = event->GetEventTime();
}
- /*
- foutputDigis->Clear("C");
- foutputDigiMatch->Clear("C");
- foutputCluster->Clear("C"); //not needed khun
- foutputBuffer->Clear("C");
- */
+
CbmMvdSensorPlugin* plugin;
Int_t nPlugin = fPluginArray->GetEntriesFast();
@@ -308,11 +294,11 @@ void CbmMvdSensor::ExecChain()
plugin = (CbmMvdSensorPlugin*) fPluginArray->At(0);
plugin->ExecChain();
- //cout << endl << "is plugin ready? "<< plugin->PluginReady() << " on sensor "<< this->GetName() << endl;
+
if (plugin->PluginReady()) {
- //cout << endl << "exec chain on sensor "<< this->GetName() << endl;
+
for (Int_t i = 1; i < nPlugin; i++) {
- //cout << endl << "exec plugin " << i << " on sensor "<< this->GetName() << endl;
+
plugin = (CbmMvdSensorPlugin*) fPluginArray->At(i);
plugin->ExecChain();
}
@@ -322,11 +308,6 @@ void CbmMvdSensor::ExecChain()
void CbmMvdSensor::Exec(UInt_t nPlugin)
{
- /*foutputDigis->Clear("C");
- foutputDigiMatch->Clear("C");
- foutputCluster->Clear("C"); //not needed khun
- foutputBuffer->Clear("C");
- */
UInt_t nPluginMax = fPluginArray->GetEntriesFast();
if (nPlugin > nPluginMax) { Fatal(GetName(), " Error - Called non-existing plugin"); }
CbmMvdSensorPlugin* plugin = (CbmMvdSensorPlugin*) fPluginArray->At(nPlugin);
@@ -339,13 +320,6 @@ void CbmMvdSensor::ExecTo(UInt_t nPlugin)
FairPrimaryGenerator* gen = run->GetPrimaryGenerator();
FairMCEventHeader* event = gen->GetEvent();
- /*
- foutputDigis->Delete();
- foutputCluster->Delete(); //not needed khun
- foutputDigiMatch->Clear("C");
- foutputBuffer->Clear("C");
- */
-
fcurrentEventTime = event->GetT();
CbmMvdSensorPlugin* plugin;
@@ -354,11 +328,10 @@ void CbmMvdSensor::ExecTo(UInt_t nPlugin)
plugin = (CbmMvdSensorPlugin*) fPluginArray->At(0);
if (nPlugin < maxPlugin) {
plugin->ExecChain();
- //cout << endl << "is plugin ready? "<< plugin->PluginReady() << " on sensor "<< this->GetName() << endl;
+
if (plugin->PluginReady()) {
- //cout << endl << "exec chain on sensor "<< this->GetName() << endl;
+
for (UInt_t i = 1; i <= nPlugin; i++) {
- //cout << endl << "exec plugin " << i << " on sensor "<< this->GetName() << endl;
plugin = (CbmMvdSensorPlugin*) fPluginArray->At(i);
plugin->ExecChain();
}
@@ -402,35 +375,6 @@ void CbmMvdSensor::ExecFrom(UInt_t nPlugin)
// -------------------------------------------------------------------------
-/*
-TClonesArray* CbmMvdSensor::GetOutputArray(Int_t nPlugin) const
-{
-
- if (nPlugin == fHitPlugin) GetOutputBuffer();
- else if (nPlugin == fDigiPlugin) {
- CbmMvdSensorTask* plugin = static_cast<CbmMvdSensorTask*>(fPluginArray->At(nPlugin));
- Int_t ArrayLength = plugin->GetOutputArray()->GetEntriesFast() - 1;
- if (ArrayLength >= 0) {
- foutputDigis->AbsorbObjects(plugin->GetOutputArray());
- foutputDigiMatch->AbsorbObjects(plugin->GetMatchArray());
- //cout << endl << "got digis " << foutputDigis->GetEntriesFast() << " and matches " << foutputDigiMatch->GetEntriesFast() << endl;
- }
- return (foutputDigis);
- }
- else if (nPlugin == fClusterPlugin) //khun not needed
- {
- CbmMvdSensorTask* plugin = static_cast<CbmMvdSensorTask*>(fPluginArray->At(nPlugin));
- Int_t ArrayLength = plugin->GetOutputArray()->GetEntriesFast() - 1;
- if (ArrayLength >= 0) foutputCluster->AbsorbObjects(plugin->GetOutputArray(), 0, ArrayLength);
- return (foutputCluster);
- }
- else {
- LOG(fatal) << "undefined plugin: " << nPlugin << " called";
- }
- return NULL;
-}
-*/
-
TClonesArray* CbmMvdSensor::GetOutputArray(Int_t nPlugin) const
{
@@ -438,31 +382,6 @@ TClonesArray* CbmMvdSensor::GetOutputArray(Int_t nPlugin) const
return plugin->GetOutputArray();
}
-/*
- if (nPlugin == fHitPlugin) GetOutputBuffer();
- else if (nPlugin == fDigiPlugin) {
- CbmMvdSensorDigitizerTask* digiplugin = (CbmMvdSensorDigitizerTask*) fPluginArray->At(nPlugin);
- Int_t ArrayLength = digiplugin->GetOutputArray()->GetEntriesFast() - 1;
- if (ArrayLength >= 0) {
- foutputDigis->AbsorbObjects(digiplugin->GetOutputArray());
- foutputDigiMatch->AbsorbObjects(digiplugin->GetMatchArray());
- //cout << endl << "got digis " << foutputDigis->GetEntriesFast() << " and matches " << foutputDigiMatch->GetEntriesFast() << endl;
- }
- return (foutputDigis);
- }
- else if (nPlugin == fClusterPlugin) //khun not needed
- {
- CbmMvdSensorClusterfinderTask* clusterplugin = (CbmMvdSensorClusterfinderTask*) fPluginArray->At(nPlugin);
- Int_t ArrayLength = clusterplugin->GetOutputArray()->GetEntriesFast() - 1;
- if (ArrayLength >= 0) foutputCluster->AbsorbObjects(clusterplugin->GetOutputArray(), 0, ArrayLength);
- return (foutputCluster);
- }
- else {
- LOG(fatal) << "undefined plugin: " << nPlugin << " called";
- }
- return NULL;
-}
-*/
// -------------------------------------------------------------------------
TClonesArray* CbmMvdSensor::GetMatchArray(Int_t nPlugin) const
@@ -481,28 +400,10 @@ Int_t CbmMvdSensor::GetOutputArrayLen(Int_t nPlugin) const
return -1;
}
- /*
- //not needed khun
- else if (nPlugin == fClusterPlugin) // && (noCluster==kFALSE))
- {
- return (foutputCluster->GetEntriesFast() - 1);
- }
- else if (nPlugin == fHitPlugin) {
- return (foutputBuffer->GetEntriesFast() - 1);
- }
-
- else {
- LOG(fatal) << "undefined plugin called";
- return -1;
- } */
}
// -------------------------------------------------------------------------
-/*
-// -------------------------------------------------------------------------
-TClonesArray* CbmMvdSensor::GetOutputMatch() const { return (foutputDigiMatch); }
-// -------------------------------------------------------------------------
-*/
+
// -------------------------------------------------------------------------
TClonesArray* CbmMvdSensor::GetOutputBuffer() const
diff --git a/core/detectors/mvd/CbmMvdSensor.h b/core/detectors/mvd/CbmMvdSensor.h
index 244e55788ed6e7a1e9b766773eb90e2a96c48ffd..cdee5bd881862f39897e2dbcaa12c38792d2f7ac 100644
--- a/core/detectors/mvd/CbmMvdSensor.h
+++ b/core/detectors/mvd/CbmMvdSensor.h
@@ -134,12 +134,10 @@ public:
/** Data control */
void ClearInputArray() { ; }
- // void AddInputObject(TObject* dataObject);
TClonesArray* GetOutputBuffer() const;
TClonesArray* GetOutputArray(Int_t nPlugin) const;
TClonesArray* GetMatchArray(Int_t nPlugin) const;
- //TClonesArray* GetOutputMatch() const;
Int_t GetOutputArrayLen(Int_t nPlugin) const;
protected:
@@ -153,12 +151,6 @@ protected:
Int_t fClusterPlugin;
TString fVolName; // Name of the volume attached to this sensor
TString fNodeName; // full name of the volume (including path) of the volume
- /*TClonesArray* foutputDigis;
- TClonesArray* foutputCluster;
- TClonesArray* foutputDigiMatch;
- TClonesArray* foutputBuffer;
- TClonesArray* fcurrentPoints;
- */
Double_t fcurrentEventTime;
Float_t epsilon[3];