code checks, code formats and fix nomenclature

cms-sw · Dec 14, 2020 · 65cdaec · 65cdaec
1 parent 92ddba2
commit 65cdaec
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 17 deletions.
diff --git a/Alignment/APEEstimation/plugins/ApeEstimator.cc b/Alignment/APEEstimation/plugins/ApeEstimator.cc
@@ -2571,14 +2571,14 @@ bool ApeEstimator::isHit2D(const TrackingRecHit& hit) const {
           const ProjectedSiStripRecHit2D* pH = static_cast<const ProjectedSiStripRecHit2D*>(&hit);
           return (this->isHit2D(pH->originalHit()));  // depends on original...
         } else {
-          edm::LogError("UnknownType") << "@SUB=AlignmentTrackSelector::isHit2D"
-                                      << "Tracker hit not in pixel, neither SiStripRecHit[12]D nor "
-                                      << "SiStripMatchedRecHit2D nor ProjectedSiStripRecHit2D.";
+          edm::LogError("UnknownType") << "@SUB=ApeEstimator::isHit2D"
+                                       << "Tracker hit not in pixel, neither SiStripRecHit[12]D nor "
+                                       << "SiStripMatchedRecHit2D nor ProjectedSiStripRecHit2D.";
           return false;
         }
       }
     } else {  // not tracker??
-      edm::LogWarning("DetectorMismatch") << "@SUB=AlignmentTrackSelector::isHit2D"
+      edm::LogWarning("DetectorMismatch") << "@SUB=ApeEstimator::isHit2D"
                                           << "Hit not in tracker with 'official' dimension >=2.";
       return true;  // dimension() >= 2 so accept that...
     }

diff --git a/Alignment/CommonAlignmentProducer/plugins/LSNumberFilter.cc b/Alignment/CommonAlignmentProducer/plugins/LSNumberFilter.cc
@@ -1,11 +1,8 @@
 #include "FWCore/Framework/interface/stream/EDFilter.h"
-
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/Run.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
 #include "FWCore/Framework/interface/EventSetup.h"
-#include "FWCore/Framework/interface/ESHandle.h"
-
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 

diff --git a/Alignment/CommonAlignmentProducer/src/AlignmentTrackSelector.cc b/Alignment/CommonAlignmentProducer/src/AlignmentTrackSelector.cc
@@ -493,8 +493,8 @@ bool AlignmentTrackSelector::isHit2D(const TrackingRecHit& hit) const {
           return (countStereoHitAs2D_ && this->isHit2D(pH->originalHit()));  // depends on original...
         } else {
           edm::LogError("UnknownType") << "@SUB=AlignmentTrackSelector::isHit2D"
-                                      << "Tracker hit not in pixel, neither SiStripRecHit[12]D nor "
-                                      << "SiStripMatchedRecHit2D nor ProjectedSiStripRecHit2D.";
+                                       << "Tracker hit not in pixel, neither SiStripRecHit[12]D nor "
+                                       << "SiStripMatchedRecHit2D nor ProjectedSiStripRecHit2D.";
           return false;
         }
       }

diff --git a/Alignment/OfflineValidation/plugins/DMRChecker.cc b/Alignment/OfflineValidation/plugins/DMRChecker.cc
@@ -1795,8 +1795,8 @@ class DMRChecker : public edm::one::EDAnalyzer<edm::one::SharedResources> {
             return (countStereoHitAs2D_ && this->isHit2D(pH->originalHit()));  // depends on original...
           } else {
             edm::LogError("UnknownType") << "@SUB=DMRChecker::isHit2D"
-                                        << "Tracker hit not in pixel, neither SiStripRecHit[12]D nor "
-                                        << "SiStripMatchedRecHit2D nor ProjectedSiStripRecHit2D.";
+                                         << "Tracker hit not in pixel, neither SiStripRecHit[12]D nor "
+                                         << "SiStripMatchedRecHit2D nor ProjectedSiStripRecHit2D.";
             return false;
           }
         }

diff --git a/Alignment/OfflineValidation/plugins/GeneralPurposeTrackAnalyzer.cc b/Alignment/OfflineValidation/plugins/GeneralPurposeTrackAnalyzer.cc
@@ -1172,8 +1172,8 @@ class GeneralPurposeTrackAnalyzer : public edm::one::EDAnalyzer<edm::one::WatchR
             return (countStereoHitAs2D_ && this->isHit2D(pH->originalHit()));  // depends on original...
           } else {
             edm::LogError("UnknownType") << "@SUB=GeneralPurposeTrackAnalyzer::isHit2D"
-                                        << "Tracker hit not in pixel, neither SiStripRecHit[12]D nor "
-                                        << "SiStripMatchedRecHit2D nor ProjectedSiStripRecHit2D.";
+                                         << "Tracker hit not in pixel, neither SiStripRecHit[12]D nor "
+                                         << "SiStripMatchedRecHit2D nor ProjectedSiStripRecHit2D.";
             return false;
           }
         }

diff --git a/Alignment/OfflineValidation/plugins/PrimaryVertexValidation.cc b/Alignment/OfflineValidation/plugins/PrimaryVertexValidation.cc
@@ -1173,16 +1173,16 @@ bool PrimaryVertexValidation::isHit2D(const TrackingRecHit& hit, const PVValHelp
         else if (dynamic_cast<const ProjectedSiStripRecHit2D*>(&hit))
           return false;  // crazy hit...
         else {
-          edm::LogError("UnknownType") << "@SUB=AlignmentTrackSelector::isHit2D"
-				       << "Tracker hit not in pixel and neither SiStripRecHit2D nor "
-				       << "SiStripMatchedRecHit2D nor ProjectedSiStripRecHit2D.";
+          edm::LogError("UnknownType") << "@SUB=PrimaryVertexValidation::isHit2D"
+                                       << "Tracker hit not in pixel and neither SiStripRecHit2D nor "
+                                       << "SiStripMatchedRecHit2D nor ProjectedSiStripRecHit2D.";
           return false;
         }
       } else {
         return false;
       }
     } else {  // not tracker??
-      edm::LogWarning("DetectorMismatch") << "@SUB=AlignmentTrackSelector::isHit2D"
+      edm::LogWarning("DetectorMismatch") << "@SUB=PrimaryVertexValidation::isHit2D"
                                           << "Hit not in tracker with 'official' dimension >=2.";
       return true;  // dimension() >= 2 so accept that...
     }