Fix issues spot by the static analyzer, and make some cleanup in the same files

Author: perrotta

CondTools/RunInfo/src/FillInfoPopConSourceHandler.cc

@@ -11,7 +11,6 @@
 #include "CoralBase/Attribute.h"
 #include "CoralBase/AttributeSpecification.h"
 #include "CoralBase/TimeStamp.h"
-#include <iostream>
 #include <memory>
 #include <sstream>
 #include <utility>
@@ -146,7 +145,6 @@ void FillInfoPopConSourceHandler::getNewObjects() {
   coral::ICursor &fillDataCursor = fillDataQuery->execute();
   //initialize loop variables
   unsigned short previousFillNumber = 1;
-  unsigned short currentFill = m_firstFill;
   cond::Time_t previousFillEndTime = 0ULL, afterPreviousFillEndTime = 0ULL, beforeStableBeamStartTime = 0ULL;
   if (tagInfo().size > 0) {
     previousFillNumber = previousFill->fillNumber();
@@ -167,7 +165,7 @@ void FillInfoPopConSourceHandler::getNewObjects() {
       fillDataCursor.currentRow().toOutputStream(qs);
       edm::LogInfo(m_name) << qs.str() << "\nfrom " << m_name << "::getNewObjects";
     }
-    currentFill = fillDataCursor.currentRow()[std::string("LHCFILL")].data<unsigned short>();
+    unsigned short currentFill = fillDataCursor.currentRow()[std::string("LHCFILL")].data<unsigned short>();
     coral::Attribute const &bunches1Attribute = fillDataCursor.currentRow()[std::string("NBUNCHESBEAM1")];
     if (bunches1Attribute.isNull()) {
       bunches1 = 0;

CondTools/RunInfo/src/LHCInfoPopConSourceHandler.cc

@@ -9,11 +9,11 @@
 #include "CoralBase/TimeStamp.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
+#include "FWCore/Utilities/interface/isFinite.h"
 #include "RelationalAccess/ICursor.h"
 #include "RelationalAccess/IQuery.h"
 #include "RelationalAccess/ISchema.h"
 #include "RelationalAccess/ISessionProxy.h"
-#include <iostream>
 #include <memory>
 #include <sstream>
 #include <utility>
@@ -454,7 +454,7 @@ bool LHCInfoPopConSourceHandler::getEcalData(cond::persistency::Session& session
         dipVal = dipValAttribute.data<std::string>();
         elementNr = elementNrAttribute.data<unsigned int>();
         value = valueNumberAttribute.data<float>();
-        if (std::isnan(value))
+        if (edm::isNotFinite(value))
           value = 0.;
         if (filter.process(iovTime)) {
           iovMap.insert(std::make_pair(changeTime, filter.current()->first));