Set proper plugin information in sensors

reco/detectors/mvd/CbmMvdClusterfinder.cxx

@@ -162,8 +162,7 @@ InitStatus CbmMvdClusterfinder::Init()
     LOG(fatal) << "Geometry couldn't be loaded from file. No MVD digitizer available.";
   }
 
-
-  // Add the digitizer plugin to all sensors
+  // Add the cluster finder plugin to all sensors
   std::map<int, CbmMvdSensor*>& sensorMap = fDetector->GetSensorMap();
   UInt_t plugincount=fDetector->GetPluginCount();
 
@@ -172,7 +171,7 @@ InitStatus CbmMvdClusterfinder::Init()
     CbmMvdSensorClusterfinderTask* clusterTask = new CbmMvdSensorClusterfinderTask();
 
     itr->second->AddPlugin(clusterTask);
-    itr->second->SetDigiPlugin(plugincount);
+    itr->second->SetClusterPlugin(plugincount);
   }
   fDetector->SetSensorArrayFilled(kTRUE);
   fDetector->SetPluginCount(plugincount+1);

reco/detectors/mvd/CbmMvdClusterfinderTB.cxx

@@ -145,14 +145,24 @@ InitStatus CbmMvdClusterfinderTB::Init()
     LOG(fatal) << "Geometry couldn't be loaded from file. No MVD digitizer available.";
   }
 
-  CbmMvdSensorClusterfinderTask* clusterTask = new CbmMvdSensorClusterfinderTask();
+  // Add the cluster finder plugin to all sensors
+  std::map<int, CbmMvdSensor*>& sensorMap = fDetector->GetSensorMap();
+  UInt_t plugincount=fDetector->GetPluginCount();
 
-  fDetector->AddPlugin(clusterTask);
+  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);
   fClusterPluginNr = (UInt_t)(fDetector->GetPluginArraySize());
+
   if (fShowDebugHistos) fDetector->ShowDebugHistos();
   fDetector->Init();
 
-
   // Screen output
   LOG(info) << GetName() << " initialised";
 

reco/detectors/mvd/CbmMvdDigiToHit.cxx

@@ -149,7 +149,7 @@ InitStatus CbmMvdDigiToHit::Init()
     LOG(fatal) << "Geometry couldn't be loaded from file. No MVD digitizer available.";
   }
 
-  // Add the digitizer plugin to all sensors
+  // Add the digi2hit plugin to all sensors
   std::map<int, CbmMvdSensor*>& sensorMap = fDetector->GetSensorMap();
   UInt_t plugincount=fDetector->GetPluginCount();
 
@@ -158,7 +158,7 @@ InitStatus CbmMvdDigiToHit::Init()
     CbmMvdSensorDigiToHitTask* hitTask = new CbmMvdSensorDigiToHitTask();
 
     itr->second->AddPlugin(hitTask);
-    itr->second->SetDigiPlugin(plugincount);
+    itr->second->SetHitPlugin(plugincount);
   }
   fDetector->SetSensorArrayFilled(kTRUE);
   fDetector->SetPluginCount(plugincount+1);

reco/detectors/mvd/CbmMvdDigiToHitTB.cxx

@@ -141,10 +141,21 @@ InitStatus CbmMvdDigiToHitTB::Init()
     LOG(fatal) << "Geometry couldn't be loaded from file. No MVD digitizer available.";
   }
 
-  CbmMvdSensorDigiToHitTask* clusterTask = new CbmMvdSensorDigiToHitTask();
+  // Add the digi2hit plugin to all sensors
+  std::map<int, CbmMvdSensor*>& sensorMap = fDetector->GetSensorMap();
+  UInt_t plugincount=fDetector->GetPluginCount();
+
+  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);
+  fHitPluginNr = (UInt_t)(fDetector->GetPluginArraySize());
 
-  fDetector->AddPlugin(clusterTask);
-  fClusterPluginNr = (UInt_t)(fDetector->GetPluginArraySize());
   if (fShowDebugHistos) fDetector->ShowDebugHistos();
   fDetector->Init();
 

reco/detectors/mvd/CbmMvdHitfinder.cxx

@@ -208,7 +208,7 @@ InitStatus CbmMvdHitfinder::Init()
   fDetector = CbmMvdDetector::Instance();
 
 
-  // Add the digitizer plugin to all sensors
+  // Add the hit finder plugin to all sensors
   std::map<int, CbmMvdSensor*>& sensorMap = fDetector->GetSensorMap();
   UInt_t plugincount=fDetector->GetPluginCount();
 
@@ -217,7 +217,7 @@ InitStatus CbmMvdHitfinder::Init()
     CbmMvdSensorHitfinderTask* hitfinderTask = new CbmMvdSensorHitfinderTask();
 
     itr->second->AddPlugin(hitfinderTask);
-    itr->second->SetDigiPlugin(plugincount);
+    itr->second->SetHitPlugin(plugincount);
   }
   fDetector->SetSensorArrayFilled(kTRUE);
   fDetector->SetPluginCount(plugincount+1);

reco/detectors/mvd/CbmMvdHitfinderTB.cxx

@@ -153,10 +153,23 @@ InitStatus CbmMvdHitfinderTB::Init()
 
   fDetector = CbmMvdDetector::Instance();
 
-  CbmMvdSensorHitfinderTask* HitfinderTask = new CbmMvdSensorHitfinderTask();
-  fDetector->AddPlugin(HitfinderTask);
 
+
+  // Add the hit finder plugin to all sensors
+  std::map<int, CbmMvdSensor*>& sensorMap = fDetector->GetSensorMap();
+  UInt_t plugincount=fDetector->GetPluginCount();
+
+  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);
   fHitfinderPluginNr = (UInt_t)(fDetector->GetPluginArraySize());
+
   if (fShowDebugHistos) fDetector->ShowDebugHistos();
   fDetector->Init();