Skip to content
Snippets Groups Projects

CALO_DD4HEP

Merged Daniele Manuzzi requested to merge dmanuzzi_CALO_DD4HEP into master
Compare and
13 files
+ 3907
632
Compare changes
  • Side-by-side
  • Inline
Files
13
@@ -576,9 +576,9 @@ namespace LHCb::Detector::Calo {
}
// ============================================================================
/** return parameters of cell, which contains the global point.
* the function shodul be a bit more fast and efficent,
* the function should be a bit more fast and efficient,
* @param globalPoint point to be checked
* @return cell parameters (null if point is not in Calorimter
* @return cell parameters (null if point is not in Calorimeter)
*/
// ============================================================================
const CellParam* Cell_( const ROOT::Math::XYZPoint& globalPoint ) const {
@@ -603,7 +603,7 @@ namespace LHCb::Detector::Calo {
int side = ( sub.id() == 1 ) ? -1 : +1; // ID, Left:0 , Right: 1
// find sub subcalorimeter - assumes they are sorted from the beamline outwards (Inner, Middle, Outer)
const dd4hep::DetElement::Children& subSubCalos = ( *i ).second.children();
const dd4hep::DetElement::Children& subSubCalos = sub.children();
for ( dd4hep::DetElement::Children::const_iterator j = subSubCalos.begin(); j != subSubCalos.end(); ++j ) {
dd4hep::DetElement subSub = ( *j ).second;
@@ -612,8 +612,7 @@ namespace LHCb::Detector::Calo {
auto subSubLocalPoint = LHCb::Detector::detail::toLHCbLengthUnits(
subSubGeo.worldToLocal( LHCb::Detector::detail::toDD4hepUnits( ROOT::Math::XYZVector( globalPoint ) ) ) );
if ( fabs( subSubLocalPoint.x() ) >
LHCb::Detector::detail::toLHCbLengthUnits( subSubVol.boundingBox().x() ) ||
if ( fabs( subSubLocalPoint.x() ) > LHCb::Detector::detail::toLHCbLengthUnits( subSubVol.boundingBox().x() ) ||
fabs( subSubLocalPoint.y() ) > LHCb::Detector::detail::toLHCbLengthUnits( subSubVol.boundingBox().y() ) )
continue;
Loading