diff --git a/mvd/CbmMvdDetector.cxx b/mvd/CbmMvdDetector.cxx index a00cc45f985ffa13f7edaa946a9d1904711efb9e..21c151ed8246eec312f92f8cbffa27a0015bbe64 100644 --- a/mvd/CbmMvdDetector.cxx +++ b/mvd/CbmMvdDetector.cxx @@ -374,16 +374,11 @@ void CbmMvdDetector::SendInputToSensorPlugin(Int_t nSensor, Int_t nPlugin, TObje } */ //----------------------------------------------------------------------- + +/* void CbmMvdDetector::SendInput(TClonesArray* input) { - /** - * - * Sending event to sensors, - * each sensor gets only his own points - * - * - * - * **/ + CbmMvdPoint* point; Int_t nEntries = input->GetEntriesFast(); @@ -404,6 +399,7 @@ void CbmMvdDetector::SendInput(TClonesArray* input) if (!send) LOG(warn) << "Point not send to any sensor: " << point->GetDetectorID(); } } +*/ //----------------------------------------------------------------------- //----------------------------------------------------------------------- diff --git a/mvd/CbmMvdDetector.h b/mvd/CbmMvdDetector.h index 6ad02200d9c99321a9f4a541e609ab105151e92b..12d78061fdb3786e513b73edf9049e1815463fcc 100644 --- a/mvd/CbmMvdDetector.h +++ b/mvd/CbmMvdDetector.h @@ -57,7 +57,7 @@ public: virtual ~CbmMvdDetector(); /** Data interface */ - void SendInput(TClonesArray* input); + //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); diff --git a/mvd/CbmMvdDigitizer.cxx b/mvd/CbmMvdDigitizer.cxx index 1f7cd053730a64728dbe0f79c74f09daeb47bb80..cbb8e4668b0b60f6c80777289a0c927a7e8e595b 100644 --- a/mvd/CbmMvdDigitizer.cxx +++ b/mvd/CbmMvdDigitizer.cxx @@ -126,56 +126,19 @@ void CbmMvdDigitizer::Exec(Option_t* /*opt*/) Int_t nDigis = 0; CbmMvdPoint* point=0; - /* - - 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(); - } -} - */ if (fInputPoints->GetEntriesFast() > 0) { LOG(debug) << "//----------------------------------------//"; LOG(debug) << fName << ": Send Input"; - // Get the sensor array from the Detector -/* - TObjArray* sensorArray=fDetector->GetSensorArray(); - CbmMvdSensor* sensor=0; - Int_t nSensors= sensorArray->GetEntriesFast(); -*/ Int_t nTargetPlugin=DetectPlugin(100); for (Int_t i=0; i< nPoints; i++) { //loop over all points point=(CbmMvdPoint*) fInputPoints->At(i); fDetector->SendInputToSensorPlugin(point->GetDetectorID(), nTargetPlugin, static_cast<TObject*>(point)); -/* - for (Int_t k=0; k< nSensors; k++) { //lool over all sensors - point=(CbmMvdPoint*) fInputPoints->At(i); - sensor=(CbmMvdSensor*) sensorArray->At(k); - if (point->GetDetectorID() == sensor-> GetDetectorID()) {fDetector->SendInputToSensorPlugin(k, nTargetPlugin, (TObject*) point); - break; - } - } -*/ } diff --git a/mvd/CbmMvdSensor.cxx b/mvd/CbmMvdSensor.cxx index 84f5bbcf903797c124b00974232c6ac9e7b22a2f..894f703b220b70bc6ffa451d1e1ee89681bae061 100644 --- a/mvd/CbmMvdSensor.cxx +++ b/mvd/CbmMvdSensor.cxx @@ -300,6 +300,8 @@ void CbmMvdSensor::SetProduceNoise() // ------------------------------------------------------------------------- // ------------------------------------------------------------------------- + +/* void CbmMvdSensor::SendInput(CbmMvdPoint* point) { @@ -326,6 +328,7 @@ void CbmMvdSensor::SendInput(CbmMvdPoint* point) cout << endl << "ERROR!! undefind plugin!" << endl; } } +*/ // ------------------------------------------------------------------------- void CbmMvdSensor::SendInputToPlugin(Int_t nPlugin, TObject* input)