Skip to content

Fix build errors when compiled with -O0 #43030

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
cmsbuild merged 1 commit into from
Oct 19, 2023
Merged

Fix build errors when compiled with -O0 #43030

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions Alignment/OfflineValidation/plugins/BuildFile.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
<use name="CondFormats/BeamSpotObjects"/>
<use name="CondFormats/RunInfo"/>
<use name="CondFormats/SiPixelObjects"/>
<use name="CondCore/SiPixelPlugins"/>
<use name="CalibTracker/SiStripCommon"/>
<use name="DQM/TrackerRemapper"/>
<use name="DQM/SiPixelPhase1Common"/>
Expand Down
2 changes: 1 addition & 1 deletion Calibration/IsolatedParticles/src/FindDistCone.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
1 change: 0 additions & 1 deletion CommonTools/TrackerMap/src/TrackerMap.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
5 changes: 2 additions & 3 deletions CondCore/RunInfoPlugins/plugins/RunInfo_PayloadInspector.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -223,7 +223,6 @@ namespace {

std::pair<bool, float> 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:
Expand All @@ -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

/************************************************/
Expand Down
6 changes: 3 additions & 3 deletions CondFormats/DQMObjects/src/HDQMSummary.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,10 +53,10 @@ bool HDQMSummary::put(const uint32_t& DetId, InputVector& input, std::vector<std
const HDQMSummary::Range HDQMSummary::getRange(const uint32_t& DetId) const {
RegistryIterator p = std::lower_bound(indexes_.begin(), indexes_.end(), DetId, HDQMSummary::StrictWeakOrdering());
if (p == indexes_.end() || p->detid != 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<uint32_t> HDQMSummary::getDetIds() const {
Expand Down
6 changes: 3 additions & 3 deletions CondFormats/SiStripObjects/src/SiStripSummary.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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<uint32_t> SiStripSummary::getDetIds() const {
Expand Down
22 changes: 11 additions & 11 deletions DQM/HcalCommon/src/ElectronicsQuantity.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -283,7 +283,7 @@ namespace hcaldqm {

std::vector<std::string> getLabels_FED() {
std::vector<std::string> 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()));
Expand All @@ -294,7 +294,7 @@ namespace hcaldqm {

std::vector<std::string> getLabels_FEDuTCA() {
std::vector<std::string> 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()));
Expand All @@ -305,7 +305,7 @@ namespace hcaldqm {

std::vector<std::string> getLabels_FEDVME() {
std::vector<std::string> 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));
Expand Down Expand Up @@ -423,7 +423,7 @@ namespace hcaldqm {

std::vector<std::string> getLabels_FEDVMESpigot() {
std::vector<std::string> 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) {
Expand All @@ -440,7 +440,7 @@ namespace hcaldqm {

std::vector<std::string> getLabels_FiberuTCAFiberCh() {
std::vector<std::string> 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) {
Expand All @@ -457,7 +457,7 @@ namespace hcaldqm {

std::vector<std::string> getLabels_FiberVMEFiberCh() {
std::vector<std::string> 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) {
Expand All @@ -473,7 +473,7 @@ namespace hcaldqm {

std::vector<std::string> getLabels_SLB() {
std::vector<std::string> 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());
Expand All @@ -485,7 +485,7 @@ namespace hcaldqm {

std::vector<std::string> getLabels_SLBCh() {
std::vector<std::string> 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());
Expand All @@ -497,7 +497,7 @@ namespace hcaldqm {

std::vector<std::string> getLabels_SLBSLBCh() {
std::vector<std::string> 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);
Expand All @@ -510,7 +510,7 @@ namespace hcaldqm {

std::vector<std::string> getLabels_FiberuTCATP() {
std::vector<std::string> 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());
Expand All @@ -522,7 +522,7 @@ namespace hcaldqm {

std::vector<std::string> getLabels_FiberChuTCATP() {
std::vector<std::string> 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());
Expand Down
2 changes: 1 addition & 1 deletion DQM/HcalCommon/src/HashFunctions.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Expand Down
9 changes: 4 additions & 5 deletions RecoVertex/BeamSpotProducer/plugins/OnlineBeamSpotESProducer.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,11 +177,10 @@ std::shared_ptr<const BeamSpotObjects> OnlineBeamSpotESProducer::produce(const B
}
if (best) {
return std::shared_ptr<const BeamSpotObjects>(best, edm::do_nothing_deleter());
} else {
return std::shared_ptr<const BeamSpotObjects>(&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<const BeamSpotObjects>(&fakeBS_, edm::do_nothing_deleter());
}

DEFINE_FWK_EVENTSETUP_MODULE(OnlineBeamSpotESProducer);