DataFormats/GeometrySurface/src/DiskSectorBounds.cc - master - githubmirror/cmssw

DataFormats/GeometrySurface/src/DiskSectorBounds.cc

38 строк1 KB

Shahzad Malik Muzaffar

[SIMULATION] [LLVM 14] bitwise-instead-of-logical warnings fixed

06 дек 2022, 10:00

06 дек 2022, 10:00adf08d7

#include "DataFormats/GeometrySurface/interface/DiskSectorBounds.h"

using namespace std;

bool DiskSectorBounds::inside(const Local3DPoint& p) const {
  // transform to system with local frame situated at disk center
  // and rotated  x/y axis
  Local3DPoint tmp(p.y() + theOffset, -p.x(), p.z());

  return ((tmp.z() >= theZmin) && (tmp.z() <= theZmax) && (tmp.perp2() >= theRmin * theRmin) &&
          (tmp.perp2() <= theRmax * theRmax)) &&
         (std::abs(tmp.barePhi()) <= thePhiExtH);
}

bool DiskSectorBounds::inside(const Local3DPoint& p, const LocalError& err, float scale) const {
  if ((p.z() < theZmin) || (p.z() > theZmax))
    return false;

  Local2DPoint tmp(p.x(), p.y() + theOffset);
  auto perp2 = tmp.mag2();
  auto perp = std::sqrt(perp2);

  // this is not really correct, should consider also the angle of the error ellipse
  if (perp2 == 0)
    return scale * scale * err.yy() > theRmin * theRmin;

  LocalError tmpErr(err.xx(), err.xy(), err.yy());
  LocalError rotatedErr = tmpErr.rotate(tmp.x(), tmp.y());
  // x direction in this system is now r, phi is y

  float deltaR = scale * std::sqrt(rotatedErr.xx());
  float deltaPhi = std::atan(scale * std::sqrt(rotatedErr.yy() / perp2));

  float tmpPhi = std::acos(tmp.y() / perp);

  // the previous code (tmpPhi <= thePhiExt + deltaPhi) was wrong
  return ((perp >= std::max(theRmin - deltaR, 0.f)) & (perp <= theRmax + deltaR)) && (tmpPhi <= thePhiExtH + deltaPhi);
}