Cleanup more analyzer warnings

Author: iarspider

CalibFormats/SiPixelObjects/interface/PixelConfigBase.h

@@ -68,7 +68,7 @@ namespace pos {
     void setAuthor(std::string author) { creator_ = author; }
     void setComment(std::string comment) { comment_ = comment; }
     std::string getAuthor() const { return creator_; }
-    std::string getComment() const { return base64_encode((unsigned char *)comment_.c_str(), comment_.length()); }
+    std::string getComment() const { return base64_encode((unsigned char const *)comment_.c_str(), comment_.length()); }
 
   private:
     std::string description_;

CalibTracker/SiPixelGainCalibration/plugins/SiPixelGainCalibrationAnalysis.cc

@@ -23,6 +23,7 @@ Description: <one line class summary>
 #include <cmath>
 #include "TGraphErrors.h"
 #include "TMath.h"
+#include "FWCore/Utilities/interface/isFinite.h"
 
 using std::cout;
 using std::endl;
@@ -340,7 +341,7 @@ bool SiPixelGainCalibrationAnalysis::doFits(uint32_t detid, std::vector<SiPixelC
   chi2 = func_->GetChisquare() / ((float)npoints - func_->GetNpar());
   prob = TMath::Prob(func_->GetChisquare(), npoints - func_->GetNpar());
   size_t ntimes = 0;
-  while ((std::isnan(slope) || std::isnan(intercept)) && ntimes < 10) {
+  while ((edm::isNotFinite(slope) || edm::isNotFinite(intercept)) && ntimes < 10) {
     ntimes++;
     makehistopersistent = true;
     //    std::cout << slope << " " << intercept << " " << prob << std::endl;
@@ -364,7 +365,7 @@ bool SiPixelGainCalibrationAnalysis::doFits(uint32_t detid, std::vector<SiPixelC
     status = 0;
   if (slope != 0)
     slope = 1. / slope;
-  if (std::isnan(slope) || std::isnan(intercept)) {
+  if (edm::isNotFinite(slope) || edm::isNotFinite(intercept)) {
     status = -6;
     bookkeeper_[detid]["status_2d"]->setBinContent(ipix->col() + 1, ipix->row() + 1, status);
     if (writeSummary_) {

CondCore/Utilities/bin/conddb_copy_iov.cpp

@@ -32,7 +32,6 @@ cond::CopyIovUtilities::CopyIovUtilities() : Utilities("conddb_copy_iov") {
 cond::CopyIovUtilities::~CopyIovUtilities() {}
 
 int cond::CopyIovUtilities::execute() {
-  bool debug = hasDebug();
   std::string connect = getOptionValue<std::string>("connect");
 
   // this is mandatory

CondCore/Utilities/bin/conddb_edit_tag.cpp

@@ -36,7 +36,6 @@ cond::EditTagUtilities::EditTagUtilities() : Utilities("conddb_edit_tag") {
 cond::EditTagUtilities::~EditTagUtilities() {}
 
 int cond::EditTagUtilities::execute() {
-  bool debug = hasDebug();
   std::string connect = getOptionValue<std::string>("connect");
 
   // this is mandatory

CondCore/Utilities/bin/conddb_import.cpp

@@ -39,7 +39,6 @@ cond::ImportUtilities::ImportUtilities() : Utilities("conddb_import") {
 cond::ImportUtilities::~ImportUtilities() {}
 
 int cond::ImportUtilities::execute() {
-  bool debug = hasDebug();
   std::string destConnect = getOptionValue<std::string>("connect");
   std::string sourceConnect = destConnect;
   if (hasOptionValue("fromConnect"))

CondCore/Utilities/bin/conddb_test.cpp

@@ -26,7 +26,6 @@ cond::TestIovUtilities::TestIovUtilities() : Utilities("conddb_copy_iov") {
 cond::TestIovUtilities::~TestIovUtilities() {}
 
 int cond::TestIovUtilities::execute() {
-  bool debug = hasDebug();
   std::string connect = getOptionValue<std::string>("connect");
 
   std::string hash("");

CondCore/Utilities/bin/conddb_test_gt_load.cpp

@@ -250,7 +250,6 @@ cond::TestGTLoad::TestGTLoad() : Utilities("conddb_test_gt_load") {
 
 int cond::TestGTLoad::execute() {
   std::string gtag = getOptionValue<std::string>("globaltag");
-  bool debug = hasDebug();
   std::string connect = getOptionValue<std::string>("connect");
   bool verbose = hasOptionValue("verbose");
   size_t n = 1;

CondCore/Utilities/bin/conddb_test_gt_perf.cpp

@@ -426,7 +426,6 @@ struct invoker {
 
 int cond::TestGTPerf::execute() {
   std::string gtag = getOptionValue<std::string>("globaltag");
-  bool debug = hasDebug();
   std::string connect = getOptionValue<std::string>("connect");
   bool verbose = hasOptionValue("verbose");
 

CondCore/Utilities/bin/conddb_test_read.cpp

@@ -31,7 +31,6 @@ cond::TestReadUtilities::TestReadUtilities() : Utilities("conddb_copy_iov") {
 cond::TestReadUtilities::~TestReadUtilities() {}
 
 int cond::TestReadUtilities::execute() {
-  bool debug = hasDebug();
   std::string connect = getOptionValue<std::string>("connect");
 
   typedef boost::tokenizer<boost::char_separator<char>> tokenizer;