Skip to content
Snippets Groups Projects
Commit af13d405 authored by Michael Deveaux's avatar Michael Deveaux Committed by Florian Uhlig
Browse files

Comment out obsolete code in CbmMvdDetector and CbmMvdSensor

parent a2fd07cd
Branches
Tags
1 merge request!1125Restructure MVD code
...@@ -374,16 +374,11 @@ void CbmMvdDetector::SendInputToSensorPlugin(Int_t nSensor, Int_t nPlugin, TObje ...@@ -374,16 +374,11 @@ void CbmMvdDetector::SendInputToSensorPlugin(Int_t nSensor, Int_t nPlugin, TObje
} }
*/ */
//----------------------------------------------------------------------- //-----------------------------------------------------------------------
/*
void CbmMvdDetector::SendInput(TClonesArray* input) void CbmMvdDetector::SendInput(TClonesArray* input)
{ {
/**
*
* Sending event to sensors,
* each sensor gets only his own points
*
*
*
* **/
CbmMvdPoint* point; CbmMvdPoint* point;
Int_t nEntries = input->GetEntriesFast(); Int_t nEntries = input->GetEntriesFast();
...@@ -404,6 +399,7 @@ void CbmMvdDetector::SendInput(TClonesArray* input) ...@@ -404,6 +399,7 @@ void CbmMvdDetector::SendInput(TClonesArray* input)
if (!send) LOG(warn) << "Point not send to any sensor: " << point->GetDetectorID(); if (!send) LOG(warn) << "Point not send to any sensor: " << point->GetDetectorID();
} }
} }
*/
//----------------------------------------------------------------------- //-----------------------------------------------------------------------
//----------------------------------------------------------------------- //-----------------------------------------------------------------------
... ...
......
...@@ -57,7 +57,7 @@ public: ...@@ -57,7 +57,7 @@ public:
virtual ~CbmMvdDetector(); virtual ~CbmMvdDetector();
/** Data interface */ /** Data interface */
void SendInput(TClonesArray* input); //void SendInput(TClonesArray* input);
void SendInputNeutral(TClonesArray* input); void SendInputNeutral(TClonesArray* input);
// void SendInputToSensorPlugin(Int_t nSensor, Int_t nPlugin, TObject* input); // void SendInputToSensorPlugin(Int_t nSensor, Int_t nPlugin, TObject* input);
void SendInputToSensorPlugin(Int_t detectorid, Int_t nPlugin, TObject* input); void SendInputToSensorPlugin(Int_t detectorid, Int_t nPlugin, TObject* input);
... ...
......
...@@ -126,56 +126,19 @@ void CbmMvdDigitizer::Exec(Option_t* /*opt*/) ...@@ -126,56 +126,19 @@ void CbmMvdDigitizer::Exec(Option_t* /*opt*/)
Int_t nDigis = 0; Int_t nDigis = 0;
CbmMvdPoint* point=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) { if (fInputPoints->GetEntriesFast() > 0) {
LOG(debug) << "//----------------------------------------//"; LOG(debug) << "//----------------------------------------//";
LOG(debug) << fName << ": Send Input"; 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); Int_t nTargetPlugin=DetectPlugin(100);
for (Int_t i=0; i< nPoints; i++) { //loop over all points for (Int_t i=0; i< nPoints; i++) { //loop over all points
point=(CbmMvdPoint*) fInputPoints->At(i); point=(CbmMvdPoint*) fInputPoints->At(i);
fDetector->SendInputToSensorPlugin(point->GetDetectorID(), nTargetPlugin, static_cast<TObject*>(point)); 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;
}
}
*/
} }
... ...
......
...@@ -300,6 +300,8 @@ void CbmMvdSensor::SetProduceNoise() ...@@ -300,6 +300,8 @@ void CbmMvdSensor::SetProduceNoise()
// ------------------------------------------------------------------------- // -------------------------------------------------------------------------
// ------------------------------------------------------------------------- // -------------------------------------------------------------------------
/*
void CbmMvdSensor::SendInput(CbmMvdPoint* point) void CbmMvdSensor::SendInput(CbmMvdPoint* point)
{ {
...@@ -326,6 +328,7 @@ void CbmMvdSensor::SendInput(CbmMvdPoint* point) ...@@ -326,6 +328,7 @@ void CbmMvdSensor::SendInput(CbmMvdPoint* point)
cout << endl << "ERROR!! undefind plugin!" << endl; cout << endl << "ERROR!! undefind plugin!" << endl;
} }
} }
*/
// ------------------------------------------------------------------------- // -------------------------------------------------------------------------
void CbmMvdSensor::SendInputToPlugin(Int_t nPlugin, TObject* input) void CbmMvdSensor::SendInputToPlugin(Int_t nPlugin, TObject* input)
... ...
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment