Merge pull request #46123 from civanch/fix_totem_transport

[SIM] Fix static analizer warnings to the TOTEM transport code

Author: cmsbuild

SimTransport/TotemRPProtonTransportParametrization/src/LHCOpticsApproximator.cc

@@ -188,18 +188,20 @@ bool LHCOpticsApproximator::Transport_m_GeV(double in_pos[3],
   double in[5];
   double out[5];
   double part_mom = 0.0;
-  for (int i = 0; i < 3; i++)
+  for (int i = 0; i < 3; ++i)
     part_mom += in_momentum[i] * in_momentum[i];
 
-  part_mom = TMath::Sqrt(part_mom);
+  part_mom = std::sqrt(part_mom);
 
   in[0] = in_pos[0];
   in[1] = in_momentum[0] / nominal_beam_momentum_;
   in[2] = in_pos[1];
   in[3] = in_momentum[1] / nominal_beam_momentum_;
   in[4] = (part_mom - nominal_beam_momentum_) / nominal_beam_momentum_;
 
-  bool res = Transport(in, out, check_apertures, true);
+  if (!Transport(in, out, check_apertures, true)) {
+    return false;
+  }
 
   out_pos[0] = out[0];
   out_pos[1] = out[2];
@@ -208,11 +210,11 @@ bool LHCOpticsApproximator::Transport_m_GeV(double in_pos[3],
   out_momentum[0] = out[1] * nominal_beam_momentum_;
   out_momentum[1] = out[3] * nominal_beam_momentum_;
   double part_out_total_mom = (out[4] + 1) * nominal_beam_momentum_;
-  out_momentum[2] = TMath::Sqrt(part_out_total_mom * part_out_total_mom - out_momentum[0] * out_momentum[0] -
-                                out_momentum[1] * out_momentum[1]);
+  out_momentum[2] = std::sqrt(part_out_total_mom * part_out_total_mom - out_momentum[0] * out_momentum[0] -
+                              out_momentum[1] * out_momentum[1]);
   out_momentum[2] = TMath::Sign(out_momentum[2], in_momentum[2]);
 
-  return res;
+  return true;
 }
 
 bool LHCOpticsApproximator::Transport(const MadKinematicDescriptor *in,
@@ -231,15 +233,17 @@ bool LHCOpticsApproximator::Transport(const MadKinematicDescriptor *in,
   input[4] = in->ksi;
 
   //transport inverts the coordinate systems
-  bool res = Transport(input, output, check_apertures, invert_beam_coord_sytems);
+  if (!Transport(input, output, check_apertures, invert_beam_coord_sytems)) {
+    return false;
+  }
 
   out->x = output[0];
   out->theta_x = output[1];
   out->y = output[2];
   out->theta_y = output[3];
   out->ksi = output[4];
 
-  return res;
+  return true;
 }
 
 LHCOpticsApproximator::LHCOpticsApproximator(const LHCOpticsApproximator &org)
@@ -760,7 +764,7 @@ void LHCOpticsApproximator::TestAperture(
   out_tree->SetBranchAddress("par_accept", &(entry[6]));
 
   //  int ind=0;
-  for (Long64_t i = 0; i < entries; i++) {
+  for (Long64_t i = 0; i < entries; ++i) {
     inp_tree->GetEntry(i);
 
     //Don't invert the coordinate systems, appertures are defined in the
@@ -983,7 +987,7 @@ bool LHCApertureApproximator::CheckAperture(const double *in,
   double out[5];
   bool result = Transport(in, out, false, invert_beam_coord_sytems);
 
-  if (ap_type_ == ApertureType::RECTELLIPSE) {
+  if (result && ap_type_ == ApertureType::RECTELLIPSE) {
     result = result && out[0] < rect_x_ && out[0] > -rect_x_ && out[2] < rect_y_ && out[2] > -rect_y_ &&
              (out[0] * out[0] / (r_el_x_ * r_el_x_) + out[2] * out[2] / (r_el_y_ * r_el_y_) < 1);
   }
@@ -1033,13 +1037,17 @@ void LHCOpticsApproximator::PrintCoordinateOpticalFunctions(TMultiDimFet &parame
 void LHCOpticsApproximator::GetLinearApproximation(
     double atPoint[], double &Cx, double &Lx, double &vx, double &Cy, double &Ly, double &vy, double &D, double ep) {
   double out[2];
-  Transport2D(atPoint, out);
+  if (!Transport2D(atPoint, out)) {
+    return;
+  }
   Cx = out[0];
   Cy = out[1];
 
-  for (int i = 0; i < 5; i++) {
+  for (int i = 0; i < 5; ++i) {
     atPoint[i] += ep;
-    Transport2D(atPoint, out);
+    if (!Transport2D(atPoint, out)) {
+      continue;
+    }
     switch (i) {
       case 0:
         vx = (out[0] - Cx) / ep;
@@ -1081,18 +1089,24 @@ void LHCOpticsApproximator::GetLineariasedTransportMatrixX(double mad_init_x,
 
   double out[5];
 
-  Transport(in, out);
+  if (!Transport(in, out)) {
+    return;
+  };
   double x1 = out[0];
   double thx1 = out[1];
 
   in[0] = mad_init_x + d_mad_x;
-  Transport(in, out);
+  if (!Transport(in, out)) {
+    return;
+  }
   double x2_dx = out[0];
   double thx2_dx = out[1];
 
   in[0] = mad_init_x;
   in[1] = mad_init_thx + d_mad_thx;  //?
-  Transport(in, out);
+  if (!Transport(in, out)) {
+    return;
+  }
   double x2_dthx = out[0];
   double thx2_dthx = out[1];
 
@@ -1125,18 +1139,24 @@ void LHCOpticsApproximator::GetLineariasedTransportMatrixY(double mad_init_x,
 
   double out[5];
 
-  Transport(in, out);
+  if (!Transport(in, out)) {
+    return;
+  };
   double y1 = out[2];
   double thy1 = out[3];
 
   in[2] = mad_init_y + d_mad_y;
-  Transport(in, out);
+  if (!Transport(in, out)) {
+    return;
+  }
   double y2_dy = out[2];
   double thy2_dy = out[3];
 
   in[2] = mad_init_y;
   in[3] = mad_init_thy + d_mad_thy;  //?
-  Transport(in, out);
+  if (!Transport(in, out)) {
+    return;
+  }
   double y2_dthy = out[2];
   double thy2_dthy = out[3];
 
@@ -1165,11 +1185,15 @@ double LHCOpticsApproximator::GetDx(double mad_init_x,
 
   double out[5];
 
-  Transport(in, out);
+  if (!Transport(in, out)) {
+    return 0.0;
+  }
   double x1 = out[0];
 
   in[4] = mad_init_xi + d_mad_xi;
-  Transport(in, out);
+  if (!Transport(in, out)) {
+    return 0.0;
+  }
   double x2_dxi = out[0];
   double dispersion = (x2_dxi - x1) / d_mad_xi;
 
@@ -1194,11 +1218,15 @@ double LHCOpticsApproximator::GetDxds(double mad_init_x,
 
   double out[5];
 
-  Transport(in, out);
+  if (!Transport(in, out)) {
+    return 0.0;
+  }
   double thx1 = out[1] / MADX_momentum_correction_factor;
 
   in[4] = mad_init_xi + d_mad_xi;
-  Transport(in, out);
+  if (!Transport(in, out)) {
+    return 0.0;
+  }
   double thx2_dxi = out[1] / MADX_momentum_correction_factor;
   double dispersion = (thx2_dxi - thx1) / d_mad_xi;