diff --git a/Alignment/OfflineValidation/plugins/BuildFile.xml b/Alignment/OfflineValidation/plugins/BuildFile.xml
index 8e8611256d7b8..ba723ca66815f 100644
--- a/Alignment/OfflineValidation/plugins/BuildFile.xml
+++ b/Alignment/OfflineValidation/plugins/BuildFile.xml
@@ -10,6 +10,7 @@
+
diff --git a/Calibration/IsolatedParticles/src/FindDistCone.cc b/Calibration/IsolatedParticles/src/FindDistCone.cc
index e7774bc0f7b8e..afa6664410a4d 100644
--- a/Calibration/IsolatedParticles/src/FindDistCone.cc
+++ b/Calibration/IsolatedParticles/src/FindDistCone.cc
@@ -78,10 +78,10 @@ namespace spr {
dR = fabs(Rec * ce1 * sqrt(1. / z / z - 1.));
else
dR = 999999.;
- return dR;
if (debug)
edm::LogVerbatim("IsoTrack") << "getDistInCMatHcal: between (" << eta1 << ", " << phi1 << ") and (" << eta2
<< ", " << phi2 << " is " << dR;
+ return dR;
}
void getEtaPhi(HBHERecHitCollection::const_iterator hit,
diff --git a/CommonTools/TrackerMap/src/TrackerMap.cc b/CommonTools/TrackerMap/src/TrackerMap.cc
index eaa8752607f91..1f58256cda982 100644
--- a/CommonTools/TrackerMap/src/TrackerMap.cc
+++ b/CommonTools/TrackerMap/src/TrackerMap.cc
@@ -3360,7 +3360,6 @@ int TrackerMap::module(int fedId, int fedCh) {
return (apvpair->mod->idex);
}
return (0);
- std::cout << "*** error in FedTrackerMap module method ***";
}
void TrackerMap::fill_fed_channel(int fedId, int fedCh, float qty) {
int key = fedId * 1000 + fedCh;
diff --git a/CondCore/RunInfoPlugins/plugins/RunInfo_PayloadInspector.cc b/CondCore/RunInfoPlugins/plugins/RunInfo_PayloadInspector.cc
index a1a1891ae605c..111d859ac2a88 100644
--- a/CondCore/RunInfoPlugins/plugins/RunInfo_PayloadInspector.cc
+++ b/CondCore/RunInfoPlugins/plugins/RunInfo_PayloadInspector.cc
@@ -223,7 +223,6 @@ namespace {
std::pair getFromPayload(RunInfo& payload) override {
bool isRealRun = ((payload.m_run) != -1);
- float fieldIntensity = RunInfoPI::theBField(payload.m_avg_current);
switch (param) {
case RunInfoPI::m_start_current:
@@ -237,12 +236,12 @@ namespace {
case RunInfoPI::m_min_current:
return std::make_pair(isRealRun, payload.m_min_current);
case RunInfoPI::m_BField:
- return std::make_pair(isRealRun, fieldIntensity);
+ return std::make_pair(isRealRun, RunInfoPI::theBField(payload.m_avg_current));
default:
edm::LogWarning("LogicError") << "Unknown parameter: " << param;
break;
}
-
+ return std::make_pair(isRealRun, -1.0);
} // payload
/************************************************/
diff --git a/CondFormats/DQMObjects/src/HDQMSummary.cc b/CondFormats/DQMObjects/src/HDQMSummary.cc
index c4a0b305a90c5..c24ff2fca350c 100644
--- a/CondFormats/DQMObjects/src/HDQMSummary.cc
+++ b/CondFormats/DQMObjects/src/HDQMSummary.cc
@@ -53,10 +53,10 @@ bool HDQMSummary::put(const uint32_t& DetId, InputVector& input, std::vectordetid != DetId) {
+ edm::LogWarning("HDQMSummary") << "not in range";
return HDQMSummary::Range(v_sum_.end(), v_sum_.end());
- std::cout << "not in range " << std::endl;
- } else
- return HDQMSummary::Range(v_sum_.begin() + p->ibegin, v_sum_.begin() + p->ibegin + userDBContent_.size());
+ }
+ return HDQMSummary::Range(v_sum_.begin() + p->ibegin, v_sum_.begin() + p->ibegin + userDBContent_.size());
}
std::vector HDQMSummary::getDetIds() const {
diff --git a/CondFormats/SiStripObjects/src/SiStripSummary.cc b/CondFormats/SiStripObjects/src/SiStripSummary.cc
index c0195d263d152..f38fca7db0099 100644
--- a/CondFormats/SiStripObjects/src/SiStripSummary.cc
+++ b/CondFormats/SiStripObjects/src/SiStripSummary.cc
@@ -61,10 +61,10 @@ bool SiStripSummary::put(sistripsummary::TrackerRegion region,
const SiStripSummary::Range SiStripSummary::getRange(const uint32_t& DetId) const {
RegistryIterator p = std::lower_bound(indexes_.begin(), indexes_.end(), DetId, SiStripSummary::StrictWeakOrdering());
if (p == indexes_.end() || p->detid != DetId) {
+ edm::LogWarning("SiStripSummary") << "not in range";
return SiStripSummary::Range(v_sum_.end(), v_sum_.end());
- std::cout << "not in range " << std::endl;
- } else
- return SiStripSummary::Range(v_sum_.begin() + p->ibegin, v_sum_.begin() + p->ibegin + userDBContent_.size());
+ }
+ return SiStripSummary::Range(v_sum_.begin() + p->ibegin, v_sum_.begin() + p->ibegin + userDBContent_.size());
}
std::vector SiStripSummary::getDetIds() const {
diff --git a/DQM/HcalCommon/src/ElectronicsQuantity.cc b/DQM/HcalCommon/src/ElectronicsQuantity.cc
index 4fe55281a8f34..9ad4a90396e0b 100644
--- a/DQM/HcalCommon/src/ElectronicsQuantity.cc
+++ b/DQM/HcalCommon/src/ElectronicsQuantity.cc
@@ -283,7 +283,7 @@ namespace hcaldqm {
std::vector getLabels_FED() {
std::vector labels;
- char name[10];
+ char name[12];
for (int i = 0; i < FED_TOTAL_NUM; i++) {
HcalElectronicsId eid = getEid_FED(i);
sprintf(name, "%d", eid.isVMEid() ? eid.dccid() + 700 : utilities::crate2fed(eid.crateId(), eid.slot()));
@@ -294,7 +294,7 @@ namespace hcaldqm {
std::vector getLabels_FEDuTCA() {
std::vector labels;
- char name[10];
+ char name[12];
for (int i = 0; i < FED_uTCA_NUM; i++) {
HcalElectronicsId eid = getEid_FEDuTCA(i);
sprintf(name, "%d", utilities::crate2fed(eid.crateId(), eid.slot()));
@@ -305,7 +305,7 @@ namespace hcaldqm {
std::vector getLabels_FEDVME() {
std::vector labels;
- char name[10];
+ char name[12];
for (int i = 0; i < FED_VME_NUM; i++) {
sprintf(name, "%d", getEid_FEDVME(i).dccid() + 700);
labels.push_back(std::string(name));
@@ -423,7 +423,7 @@ namespace hcaldqm {
std::vector getLabels_FEDVMESpigot() {
std::vector labels;
- char name[10];
+ char name[23];
for (int i = 0; i < FED_VME_NUM; i++)
for (int j = 0; j < SPIGOT_NUM; j++) {
if (j > 0) {
@@ -440,7 +440,7 @@ namespace hcaldqm {
std::vector getLabels_FiberuTCAFiberCh() {
std::vector labels;
- char name[10];
+ char name[23];
for (int i = 0; i < FIBER_uTCA_NUM; i++)
for (int j = 0; j < FIBERCH_NUM; j++) {
if (j > 0) {
@@ -457,7 +457,7 @@ namespace hcaldqm {
std::vector getLabels_FiberVMEFiberCh() {
std::vector labels;
- char name[10];
+ char name[23];
for (int i = 0; i < FIBER_VME_NUM; i++)
for (int j = 0; j < FIBERCH_NUM; j++) {
if (j > 0) {
@@ -473,7 +473,7 @@ namespace hcaldqm {
std::vector getLabels_SLB() {
std::vector labels;
- char name[10];
+ char name[23];
for (int i = 0; i < SLB_NUM; i++) {
HcalElectronicsId eid = getEid_SLB(i);
sprintf(name, "%d", eid.slbSiteNumber());
@@ -485,7 +485,7 @@ namespace hcaldqm {
std::vector getLabels_SLBCh() {
std::vector labels;
- char name[10];
+ char name[23];
for (int i = 0; i < SLBCH_NUM; i++) {
HcalElectronicsId eid = getEid_SLBCh(i);
sprintf(name, "%d", eid.slbChannelIndex());
@@ -497,7 +497,7 @@ namespace hcaldqm {
std::vector getLabels_SLBSLBCh() {
std::vector labels;
- char name[10];
+ char name[23];
for (int i = 0; i < SLB_NUM; i++)
for (int j = 0; j < SLBCH_NUM; j++) {
HcalElectronicsId eid = getEid_SLBSLBCh(i * SLBCH_NUM + j);
@@ -510,7 +510,7 @@ namespace hcaldqm {
std::vector getLabels_FiberuTCATP() {
std::vector labels;
- char name[10];
+ char name[23];
for (int i = 0; i < TPFIBER_NUM; i++) {
HcalElectronicsId eid = getEid_FiberuTCATP(i);
sprintf(name, "%d", eid.fiberIndex());
@@ -522,7 +522,7 @@ namespace hcaldqm {
std::vector getLabels_FiberChuTCATP() {
std::vector labels;
- char name[10];
+ char name[23];
for (int i = 0; i < TPFIBERCH_NUM; i++) {
HcalElectronicsId eid = getEid_FiberChuTCATP(i);
sprintf(name, "%d", eid.fiberChanId());
diff --git a/DQM/HcalCommon/src/HashFunctions.cc b/DQM/HcalCommon/src/HashFunctions.cc
index 52a7c834e384e..b41634176c253 100644
--- a/DQM/HcalCommon/src/HashFunctions.cc
+++ b/DQM/HcalCommon/src/HashFunctions.cc
@@ -333,7 +333,7 @@ namespace hcaldqm {
}
std::string name_FED(HcalElectronicsId const &eid) {
- char name[10];
+ char name[15];
sprintf(name, "FED%d", eid.isVMEid() ? eid.dccid() + 700 : utilities::crate2fed(eid.crateId(), eid.slot()));
return std::string(name);
}
diff --git a/RecoVertex/BeamSpotProducer/plugins/OnlineBeamSpotESProducer.cc b/RecoVertex/BeamSpotProducer/plugins/OnlineBeamSpotESProducer.cc
index a637d0b9ba952..0b8c4233c7c7e 100644
--- a/RecoVertex/BeamSpotProducer/plugins/OnlineBeamSpotESProducer.cc
+++ b/RecoVertex/BeamSpotProducer/plugins/OnlineBeamSpotESProducer.cc
@@ -177,11 +177,10 @@ std::shared_ptr OnlineBeamSpotESProducer::produce(const B
}
if (best) {
return std::shared_ptr(best, edm::do_nothing_deleter());
- } else {
- return std::shared_ptr(&fakeBS_, edm::do_nothing_deleter());
- edm::LogWarning("OnlineBeamSpotESProducer")
- << "None of the Online BeamSpots in the ES is suitable, \n returning a fake one(fallback to PCL).";
}
-};
+ edm::LogWarning("OnlineBeamSpotESProducer")
+ << "None of the Online BeamSpots in the ES is suitable, \n returning a fake one(fallback to PCL).";
+ return std::shared_ptr(&fakeBS_, edm::do_nothing_deleter());
+}
DEFINE_FWK_EVENTSETUP_MODULE(OnlineBeamSpotESProducer);