Remove obsolete data transfer classes from CbmMvdDetector

mvd/CbmMvdClusterfinder.cxx

@@ -100,20 +100,20 @@ void CbmMvdClusterfinder::Exec(Option_t* /*opt*/)
       digi->SetRefId(i);
 
       fDetector->SendInputToSensorPlugin(digi->GetDetectorId(), nTargetPlugin, static_cast<TObject*>(digi));
-      }
+    }
 
 
 
 
-      //fDetector->SendInputDigis(fDigiMan);
-      if (fVerbose) cout << "Execute ClusterPlugin Nr. " << fClusterPluginNr << endl;
-      fDetector->Exec(fClusterPluginNr);
-      if (fVerbose) cout << "End Chain" << endl;
-      if (fVerbose) cout << "Start writing Cluster" << endl;
-      fCluster->AbsorbObjects(fDetector->GetOutputCluster(), 0, fDetector->GetOutputCluster()->GetEntriesFast() - 1);
-      if (fVerbose) cout << "Total of " << fCluster->GetEntriesFast() << " Cluster in this Event" << endl;
-      if (fVerbose) cout << "//----------------------------------------//" << endl;
-      LOG(info) << "+ " << setw(20) << GetName() << ": Created: " << fCluster->GetEntriesFast() << " cluster in " << fixed
+    //fDetector->SendInputDigis(fDigiMan);
+    if (fVerbose) cout << "Execute ClusterPlugin Nr. " << fClusterPluginNr << endl;
+    fDetector->Exec(fClusterPluginNr);
+    if (fVerbose) cout << "End Chain" << endl;
+    if (fVerbose) cout << "Start writing Cluster" << endl;
+    fCluster->AbsorbObjects(fDetector->GetOutputCluster(), 0, fDetector->GetOutputCluster()->GetEntriesFast() - 1);
+    if (fVerbose) cout << "Total of " << fCluster->GetEntriesFast() << " Cluster in this Event" << endl;
+    if (fVerbose) cout << "//----------------------------------------//" << endl;
+    LOG(info) << "+ " << setw(20) << GetName() << ": Created: " << fCluster->GetEntriesFast() << " cluster in " << fixed
               << setprecision(6) << fTimer.RealTime() << " s";
   }
 

mvd/CbmMvdDetector.cxx

@@ -19,16 +19,6 @@
 #include "tools/CbmMvdGeoHandler.h"
 
 
-// #include "plugins/buffers/CbmMvdSensorBuffer.h"
-// #include "plugins/buffers/CbmMvdSensorFrameBuffer.h"
-// #include "plugins/buffers/CbmMvdSensorTrackingBuffer.h"
-
-//   #include "plugins/tasks/CbmMvdSensorClusterfinderTask.h"  //khun
-//   #include "plugins/tasks/CbmMvdSensorDigiToHitTask.h"
-//   #include "plugins/tasks/CbmMvdSensorDigitizerTBTask.h"
-//   #include "plugins/tasks/CbmMvdSensorDigitizerTask.h"
-//   #include "plugins/tasks/CbmMvdSensorFindHitTask.h"
-//   #include "plugins/tasks/CbmMvdSensorHitfinderTask.h"  //khun
 
 
 
@@ -255,7 +245,7 @@ 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
 
-  Int_t nDigitizerPlugin=-1;
+
 
   if (!fSensorArrayFilled) {cout << "-W - CbmMvdDetector::DetectPlugin: You tried to access sensor plugins while the detector is not initialized yet." << endl;  return -1;}
   CbmMvdSensor* sensor=GetSensor(0);
@@ -338,202 +328,6 @@ void CbmMvdDetector::SendInputToSensorPlugin(Int_t detectorid, Int_t nPlugin, TO
   fSensorMap[detectorid]->SendInputToPlugin(nPlugin,input);
 }
 //-----------------------------------------------------------------------
-//-----------------------------------------------------------------------
-/*
-void CbmMvdDetector::SendInputToSensorPlugin(Int_t nSensor, Int_t nPlugin, TObject* input)
-{
-  CbmMvdSensor* sensor=(CbmMvdSensor*)fSensorArray->At(nSensor);
-  sensor->SendInputToPlugin(nPlugin,input);
-}
-*/
-//-----------------------------------------------------------------------
-
-/*
-void CbmMvdDetector::SendInput(TClonesArray* input)
-{
-
-
-  CbmMvdPoint* point;
-  Int_t nEntries = input->GetEntriesFast();
-  Int_t nSensors = fSensorArray->GetEntriesFast();
-  CbmMvdSensor* sensor;
-  Bool_t send = kFALSE;
-  for (Int_t i = 0; i < nEntries; i++) {
-    point = (CbmMvdPoint*) input->At(i);
-    point->SetPointId(i);
-    for (Int_t k = 0; k < nSensors; k++) {
-      sensor = (CbmMvdSensor*) fSensorArray->At(k);
-
-      if (point->GetDetectorID() == sensor->GetDetectorID()) {
-        sensor->SendInputToPlugin(sensor->GetDigiPlugin(),(TObject*) point);
-        send = true;
-      }
-    }
-    if (!send) LOG(warn) << "Point not send to any sensor: " << point->GetDetectorID();
-  }
-}
-*/
-//-----------------------------------------------------------------------
-
-//-----------------------------------------------------------------------
-void CbmMvdDetector::SendInputNeutral(TClonesArray* input)
-{
-  /**
-   *
-   * Sending event to sensors,
-   * each sensor gets only his own points
-   *
-   *
-   *
-   * **/
-/*
-
-  TObject* point;
-  Int_t nEntries = input->GetEntriesFast();
-  Int_t nSensors = fSensorArray->GetEntriesFast();
-  CbmMvdSensor* sensor;
-  Bool_t send = kFALSE;
-  for (Int_t i = 0; i < nEntries; i++) {
-    point = (CbmMvdPoint*) input->At(i);
-    point->SetPointId(i);
-    for (Int_t k = 0; k < nSensors; k++) {
-      sensor = (CbmMvdSensor*) fSensorArray->At(k);
-
-      if (point->GetDetectorID() == sensor->GetDetectorID()) {
-        sensor->SendInput(point);
-        send = true;
-      }
-    }
-    if (!send) LOG(warn) << "Point not send to any sensor: " << point->GetDetectorID();
-  }
-
-*/
-}
-//-----------------------------------------------------------------------
-
-//-----------------------------------------------------------------------
-void CbmMvdDetector::SendInputDigis(CbmDigiManager* digiMan)
-{
-  /**
-   *
-   * Sending event to sensors,
-   * each sensor gets only his own points
-   *
-   *
-   *
-   * **/
-  assert(digiMan);
-  assert(digiMan->IsPresent(ECbmModuleId::kMvd));
-
-
-  CbmMvdDigi* digi;
-
-  Int_t nSensors = fSensorArray->GetEntriesFast();
-  Int_t nEntries = digiMan->GetNofDigis(ECbmModuleId::kMvd);
-  CbmMvdSensor* sensor;
-  for (Int_t i = 0; i < nEntries; i++) {
-    digi = new CbmMvdDigi(*(digiMan->Get<CbmMvdDigi>(i)));
-    digi->SetRefId(i);
-    for (Int_t k = 0; k < nSensors; k++) {
-      sensor = (CbmMvdSensor*) fSensorArray->At(k);
-
-      if (digi->GetDetectorId() == sensor->GetDetectorID()) { sensor->SendInputDigi(digi); }
-    }
-  }
-}
-//-----------------------------------------------------------------------
-
-
-//-----------------------------------------------------------------------
-void CbmMvdDetector::SendInputDigis(TClonesArray* digis)
-{
-  /**
-   *
-   * Sending event to sensors,
-   * each sensor gets only his own points
-   *
-   *
-   *
-   * **/
-
-
-  CbmMvdDigi* digi;
-
-  Int_t nSensors = fSensorArray->GetEntriesFast();
-  Int_t nEntries = digis->GetEntriesFast();
-  CbmMvdSensor* sensor;
-  for (Int_t i = 0; i < nEntries; i++) {
-    digi = (CbmMvdDigi*) digis->At(i);
-    digi->SetRefId(i);
-    for (Int_t k = 0; k < nSensors; k++) {
-      sensor = (CbmMvdSensor*) fSensorArray->At(k);
-
-      if (digi->GetDetectorId() == sensor->GetDetectorID()) { sensor->SendInputDigi(digi); }
-    }
-  }
-}
-//-----------------------------------------------------------------------
-
-//-----------------------------------------------------------------------
-void CbmMvdDetector::SendInputDigisToHits(TClonesArray* digis)
-{
-  /**
-   *
-   * Sending event to sensors,
-   * each sensor gets only his own points
-   *
-   * Version for DigiToHit
-   *
-   * **/
-
-
-  CbmMvdDigi* digi;
-  Int_t nEntries = digis->GetEntriesFast();
-  Int_t nSensors = fSensorArray->GetEntriesFast();
-  CbmMvdSensor* sensor;
-  for (Int_t i = 0; i < nEntries; i++) {
-    digi = (CbmMvdDigi*) digis->At(i);
-    digi->SetRefId(i);
-    for (Int_t k = 0; k < nSensors; k++) {
-      sensor = (CbmMvdSensor*) fSensorArray->At(k);
-
-      if (digi->GetDetectorId() == sensor->GetDetectorID()) { sensor->SendInputDigiToHit(digi); }
-    }
-  }
-}
-//-----------------------------------------------------------------------
-
-
-//-----------------------------------------------------------------------
-void CbmMvdDetector::SendInputCluster(TClonesArray* clusters)
-{
-
-  /**
-   *
-   * Sending event to sensors,
-   * each sensor gets only his own points
-   *
-   *
-   *
-   * **/
-  CbmMvdCluster* cluster;
-  Int_t nEntries = clusters->GetEntriesFast();
-  Int_t nSensors = fSensorArray->GetEntriesFast();
-  CbmMvdSensor* sensor;
-  for (Int_t i = 0; i < nEntries; i++) {
-    cluster = (CbmMvdCluster*) clusters->At(i);
-    cluster->SetRefId(i);
-    for (Int_t k = 0; k < nSensors; k++) {
-      sensor = (CbmMvdSensor*) fSensorArray->At(k);
-
-      if (cluster->GetSensorNr() == sensor->GetSensorNr()) {
-        LOG(debug2) << "Sending cluster to sensor: " << sensor->GetSensorNr();
-        sensor->SendInputCluster(cluster);
-      }
-    }
-  }
-}
-//-----------------------------------------------------------------------
 
 //-----------------------------------------------------------------------
 void CbmMvdDetector::ExecChain()

mvd/CbmMvdDetector.h

@@ -57,15 +57,9 @@ public:
   virtual ~CbmMvdDetector();
 
   /** Data interface */
-  //void SendInput(TClonesArray* input);
-  void SendInputNeutral(TClonesArray* input);
-//  void SendInputToSensorPlugin(Int_t nSensor, Int_t nPlugin, TObject* input);
+
   void SendInputToSensorPlugin(Int_t detectorid, Int_t nPlugin, TObject* input);
-  void SendInputDigis(CbmDigiManager* digiMan);
-  void SendInputDigis(TClonesArray* digis);
-  void SendInputDigisToHits(TClonesArray* digis);
-  void SendInputCluster(TClonesArray* cluster);
-  // void SendClonesArray(TClonesArray* addedStructures, Int_t dataLevel=0){;}
+
 
   TClonesArray* GetOuput() { return 0; }
   TClonesArray* GetOutputHits();

mvd/CbmMvdDigitizer.cxx

@@ -368,7 +368,7 @@ void CbmMvdDigitizer::GetMvdGeometry() {}
 // -------------------------------------------------------------------------
 
 Int_t CbmMvdDigitizer::DetectPlugin(Int_t pluginID)
-{ Int_t nDigitizerPlugin=-1;
+{
 
   CbmMvdDetector* detector= CbmMvdDetector::Instance();
   return detector->DetectPlugin(pluginID);

mvd/CbmMvdHitfinder.cxx

@@ -105,7 +105,7 @@ void CbmMvdHitfinder::Exec(Option_t* /*opt*/)
   fHits->Clear();
   fTimer.Start();
   Int_t nTargetPlugin= fDetector->DetectPlugin(300);
-  Int_t nDigis;
+  Int_t nDigis=0;
   CbmMvdDigi* digi=0;
   CbmMvdCluster* cluster=0;
 

mvd/CbmMvdReadout.cxx

@@ -57,7 +57,17 @@ void CbmMvdReadout::Exec(Option_t* /*opt*/)
   if (fDigiMan->GetNofDigis(ECbmModuleId::kMvd) > 0) {
     if (fVerbose) cout << "//----------------------------------------//";
     if (fVerbose) cout << endl << "Send Input" << endl;
-    fDetector->SendInputDigis(fDigiMan);
+    Int_t nTargetPlugin=fDetector->DetectPlugin(200);
+    CbmMvdDigi* digi=0;
+
+    Int_t nDigis = fDigiMan->GetNofDigis(ECbmModuleId::kMvd);
+
+    for (Int_t i = 0; i < nDigis; i++) {
+      digi = new CbmMvdDigi(*(fDigiMan->Get<CbmMvdDigi>(i)));
+      digi->SetRefId(i);
+
+      fDetector->SendInputToSensorPlugin(digi->GetDetectorId(), nTargetPlugin, static_cast<TObject*>(digi));
+    }
     if (fVerbose) cout << "Execute ReadoutPlugin Nr. " << fPluginNr << endl;
     fDetector->Exec(fPluginNr);
     if (fVerbose) cout << "End Chain" << endl;