projects/lcdd/branches/v04-00-00-pre/src/lcdd/detectors
--- projects/lcdd/branches/v04-00-00-pre/src/lcdd/detectors/LegacyCalorimeterHitProcessor.cc 2014-07-02 00:04:22 UTC (rev 3167)
+++ projects/lcdd/branches/v04-00-00-pre/src/lcdd/detectors/LegacyCalorimeterHitProcessor.cc 2014-07-02 00:26:43 UTC (rev 3168)
@@ -34,12 +34,6 @@
return false;
}
- static std::string segTimer = _calorimeter->GetName() + "_seg";
- static std::string segTimerTotal = segTimer + "_total";
- if (!TimerUtil::haveTimer(segTimerTotal))
- TimerUtil::createTimer(segTimerTotal);
- TimerUtil::startTimer(segTimer);
-
// Get the Segmentation from the CalorimeterSD.
Segmentation* segmentation = _calorimeter->getSegmentation();
@@ -50,36 +44,12 @@
//segmentation->resetBins();
segmentation->setBins(step);
- long segTime = TimerUtil::stopTimer(segTimer);
- //TimerUtil::printOut(segTimer, G4cout);
-
- TimerUtil::addTime(segTimerTotal, segTime);
- //TimerUtil::printOut(segTimerTotal, G4cout);
-
- // TODO: time this call
// Create a 64-bit ID from the step information.
Id64bit id = _calorimeter->makeIdentifier(step);
// Check for an existing hit with this identifier.
- static std::string findHitTimer = _calorimeter->GetName() + "_findHit";
- static std::string findHitTimerTotal = findHitTimer + "_total";
- if (!TimerUtil::haveTimer(findHitTimerTotal))
- TimerUtil::createTimer(findHitTimerTotal);
- TimerUtil::startTimer(findHitTimer);
-
CalorimeterHit* hit = _calorimeter->findHit(id);
- long findHitTime = TimerUtil::stopTimer(findHitTimer);
- //TimerUtil::printOut(findHitTimer, G4cout);
- TimerUtil::addTime(findHitTimerTotal, findHitTime);
- //TimerUtil::printOut(findHitTimerTotal, G4cout);
-
- static std::string addHitTimer = _calorimeter->GetName() + "_addHit";
- static std::string addHitTimerTotal = addHitTimer + "_total";
- if (!TimerUtil::haveTimer(addHitTimerTotal))
- TimerUtil::createTimer(addHitTimerTotal);
- TimerUtil::startTimer(addHitTimer);
-
// Was there a hit found with this identifier?
if (hit == NULL) {
@@ -89,40 +59,16 @@
// Add the new hit to the calorimeter.
_calorimeter->addHit(hit);
- // Debug print new hit information.
- //if (_calorimeter->getVerbose() > 0) {
- // std::cout << "made new hit: " << std::hex
- // << hit->getId64bit().getId0() << "|"
- // << hit->getId64bit().getId1() << std::endl;
- // std::resetiosflags(std::ios::showbase);
- //}
-
} else {
// Add energy deposition to an existing hit.
hit->addEdep(edep);
-
- // Debug print existing hit information.
- //if (_calorimeter->getVerbose() > 0) {
- // std::cout << "added " << edep << " GeV to hit: " << std::hex
- // << hit->getId64bit().getId0() << "|"
- // << hit->getId64bit().getId1() << std::endl;
- // std::resetiosflags(std::ios::showbase);
- //}
-
}
// Add hit contribution to the hit.
- //hit->addHitContribution(HitContribution(step));
- //G4cout << "addHitContribution - track ID " << CurrentTrackState::getCurrentTrackID() << G4endl;
// FIXME: This should pass a pointer to a new object. It is copied, which is inefficient.
hit->addHitContribution(HitContribution(CurrentTrackState::getCurrentTrackID(), step));
- long addHitTime = TimerUtil::stopTimer(addHitTimer);
- TimerUtil::addTime(addHitTimerTotal, addHitTime);
- //TimerUtil::printOut(addHitTimer, G4cout);
- //TimerUtil::printOut(addHitTimerTotal, G4cout);
-
// Return true, indicating that a hit was added or modified.
return true;
}