Skip to content

Commit b2f7c08

Browse files
ggoviggovi
committed
Modified new method names to avoid template instantiation ambiguities
1 parent 8e25e38 commit b2f7c08

File tree

18 files changed

+44
-45
lines changed

18 files changed

+44
-45
lines changed

‎CalibCalorimetry/CaloMiscalibTools/plugins/WriteEcalMiscalibConstants.cc‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,11 +54,11 @@ void WriteEcalMiscalibConstants::analyze(const edm::Event& iEvent, const edm::Ev
5454
if (poolDbService.isAvailable()) {
5555
if (poolDbService->isNewTagRequest(newTagRequest_)) {
5656
edm::LogVerbatim("WriteEcalMiscalibConstants") << "Creating a new IOV";
57-
poolDbService->createNewIOV<const EcalIntercalibConstants>(*Mcal, poolDbService->beginOfTime(), newTagRequest_);
57+
poolDbService->createOneIOV<const EcalIntercalibConstants>(*Mcal, poolDbService->beginOfTime(), newTagRequest_);
5858
edm::LogVerbatim("WriteEcalMiscalibConstants") << "Done";
5959
} else {
6060
edm::LogVerbatim("WriteEcalMiscalibConstants") << "Old IOV";
61-
poolDbService->appendSinceTime<const EcalIntercalibConstants>(
61+
poolDbService->appendOneIOV<const EcalIntercalibConstants>(
6262
*Mcal, poolDbService->currentTime(), newTagRequest_);
6363
}
6464
}

‎CalibCalorimetry/CaloMiscalibTools/plugins/WriteEcalMiscalibConstantsMC.cc‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,11 +54,11 @@ void WriteEcalMiscalibConstantsMC::analyze(const edm::Event& iEvent, const edm::
5454
if (poolDbService.isAvailable()) {
5555
if (poolDbService->isNewTagRequest(newTagRequest_)) {
5656
edm::LogVerbatim("WriteEcalMiscalibConstantsMC") << "Creating a new IOV";
57-
poolDbService->createNewIOV<const EcalIntercalibConstantsMC>(*Mcal, poolDbService->beginOfTime(), newTagRequest_);
57+
poolDbService->createOneIOV<const EcalIntercalibConstantsMC>(*Mcal, poolDbService->beginOfTime(), newTagRequest_);
5858
edm::LogVerbatim("WriteEcalMiscalibConstantsMC") << "Done";
5959
} else {
6060
edm::LogVerbatim("WriteEcalMiscalibConstantsMC") << "Old IOV";
61-
poolDbService->appendSinceTime<const EcalIntercalibConstantsMC>(
61+
poolDbService->appendOneIOV<const EcalIntercalibConstantsMC>(
6262
*Mcal, poolDbService->currentTime(), newTagRequest_);
6363
}
6464
}

‎CalibTracker/SiPixelQuality/plugins/SiPixelStatusHarvester.cc‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -194,7 +194,7 @@ void SiPixelStatusHarvester::dqmEndRun(const edm::Run& iRun, const edm::EventSet
194194
}
195195
if (debug_ == true) { // only produced for debugging reason
196196
cond::Time_t thisIOV = (cond::Time_t)iRun.id().run();
197-
poolDbService->writeOne<SiPixelQuality>(*siPixelQualityPermBad, thisIOV, recordName_ + "_permanentBad");
197+
poolDbService->writeOneIOV<SiPixelQuality>(*siPixelQualityPermBad, thisIOV, recordName_ + "_permanentBad");
198198
}
199199

200200
// IOV for final payloads. FEDerror25 and pcl
@@ -298,7 +298,7 @@ void SiPixelStatusHarvester::dqmEndRun(const edm::Run& iRun, const edm::EventSet
298298
fedError25IOV[it->first] = it->first;
299299

300300
if (debug_ == true) // only produced for debugging reason
301-
poolDbService->writeOne<SiPixelQuality>(*siPixelQuality_FEDerror25, thisIOV, recordName_ + "_FEDerror25");
301+
poolDbService->writeOneIOV<SiPixelQuality>(*siPixelQuality_FEDerror25, thisIOV, recordName_ + "_FEDerror25");
302302

303303
delete siPixelQuality_FEDerror25;
304304
}
@@ -556,12 +556,12 @@ void SiPixelStatusHarvester::dqmEndRun(const edm::Run& iRun, const edm::EventSet
556556
edm::LuminosityBlockID lu(iRun.id().run(), endLumiBlock_ + 1);
557557
cond::Time_t thisIOV = (cond::Time_t)(lu.value());
558558
if (!SiPixelStatusHarvester::equal(lastPrompt, siPixelQualityPermBad))
559-
poolDbService->writeOne<SiPixelQuality>(*siPixelQualityPermBad, thisIOV, recordName_ + "_prompt");
559+
poolDbService->writeOneIOV<SiPixelQuality>(*siPixelQualityPermBad, thisIOV, recordName_ + "_prompt");
560560

561561
// add empty bad components to last lumi+1 IF AND ONLY IF the last payload of other is not equal to empty
562562
SiPixelQuality* siPixelQualityDummy = new SiPixelQuality();
563563
if (!SiPixelStatusHarvester::equal(lastOther, siPixelQualityDummy))
564-
poolDbService->writeOne<SiPixelQuality>(*siPixelQualityDummy, thisIOV, recordName_ + "_other");
564+
poolDbService->writeOneIOV<SiPixelQuality>(*siPixelQualityDummy, thisIOV, recordName_ + "_other");
565565

566566
delete siPixelQualityDummy;
567567
}
@@ -657,12 +657,12 @@ void SiPixelStatusHarvester::constructTag(std::map<int, SiPixelQuality*> siPixel
657657

658658
SiPixelQuality* thisPayload = qIt->second;
659659
if (qIt == siPixelQualityTag.begin())
660-
poolDbService->writeOne<SiPixelQuality>(*thisPayload, thisIOV, recordName_ + "_" + tagName);
660+
poolDbService->writeOneIOV<SiPixelQuality>(*thisPayload, thisIOV, recordName_ + "_" + tagName);
661661
else {
662662
SiPixelQuality* prevPayload = (std::prev(qIt))->second;
663663
if (!SiPixelStatusHarvester::equal(thisPayload,
664664
prevPayload)) // only append newIOV if this payload differs wrt last
665-
poolDbService->writeOne<SiPixelQuality>(*thisPayload, thisIOV, recordName_ + "_" + tagName);
665+
poolDbService->writeOneIOV<SiPixelQuality>(*thisPayload, thisIOV, recordName_ + "_" + tagName);
666666
}
667667
}
668668
}

‎CalibTracker/SiStripESProducers/plugins/DBWriter/DummyCondDBWriter.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ void DummyCondDBWriter<TObject, TObjectO, TRecord>::endRun(const edm::Run& run,
6868
else
6969
Time_ = iConfig_.getUntrackedParameter<uint32_t>("OpenIovAtTime", 1);
7070

71-
dbservice->writeOne(*obj, Time_, rcdName);
71+
dbservice->writeOneIOV(*obj, Time_, rcdName);
7272
} else {
7373
edm::LogError("SiStripFedCablingBuilder") << "Service is unavailable" << std::endl;
7474
}

‎CalibTracker/SiStripESProducers/plugins/DBWriter/SiStripFedCablingManipulator.cc‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,12 +41,12 @@ void SiStripFedCablingManipulator::endRun(const edm::Run& run, const edm::EventS
4141
edm::LogInfo("SiStripFedCablingManipulator") << "first request for storing objects with Record "
4242
<< "SiStripFedCablingRcd"
4343
<< " at time " << Time_ << std::endl;
44-
dbservice->createNewIOV<SiStripFedCabling>(*obj, Time_, "SiStripFedCablingRcd");
44+
dbservice->createOneIOV<SiStripFedCabling>(*obj, Time_, "SiStripFedCablingRcd");
4545
} else {
4646
edm::LogInfo("SiStripFedCablingManipulator") << "appending a new object to existing tag "
4747
<< "SiStripFedCablingRcd"
4848
<< " in since mode " << std::endl;
49-
dbservice->appendSinceTime<SiStripFedCabling>(*obj, Time_, "SiStripFedCablingRcd");
49+
dbservice->appendOneIOV<SiStripFedCabling>(*obj, Time_, "SiStripFedCablingRcd");
5050
}
5151
} else {
5252
edm::LogError("SiStripFedCablingManipulator") << "Service is unavailable" << std::endl;

‎CommonTools/ConditionDBWriter/interface/ConditionDBWriter.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -332,7 +332,7 @@ class ConditionDBWriter : public edm::one::EDAnalyzer<edm::one::WatchRuns, edm::
332332

333333
edm::LogInfo("ConditionDBWriter") << "appending a new object to tag " << Record_ << " in since mode " << std::endl;
334334

335-
mydbservice->writeOne<T>(*objPointer, since, Record_);
335+
mydbservice->writeOneIOV<T>(*objPointer, since, Record_);
336336
}
337337

338338
void setTime() {

‎CondCore/DBOutputService/interface/OnlineDBOutputService.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,11 +37,11 @@ namespace cond {
3737

3838
//
3939
template <typename PayloadType>
40-
bool writeForNextLumisection(const PayloadType& payload, const std::string& recordName) {
40+
bool writeIOVForNextLumisection(const PayloadType& payload, const std::string& recordName) {
4141
cond::Time_t targetTime = getLastLumiProcessed() + m_latencyInLumisections;
4242
auto t0 = std::chrono::high_resolution_clock::now();
4343
logger().logInfo() << "Updating lumisection " << targetTime;
44-
cond::Hash payloadId = PoolDBOutputService::writeOne<PayloadType>(payload, targetTime, recordName);
44+
cond::Hash payloadId = PoolDBOutputService::writeOneIOV<PayloadType>(payload, targetTime, recordName);
4545
bool ret = true;
4646
if (payloadId.empty()) {
4747
return false;

‎CondCore/DBOutputService/interface/PoolDBOutputService.h‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ namespace cond {
5959
bool isNewTagRequest(const std::string& recordName);
6060

6161
template <typename T>
62-
Hash writeOne(const T& payload, Time_t time, const std::string& recordName) {
62+
Hash writeOneIOV(const T& payload, Time_t time, const std::string& recordName) {
6363
std::lock_guard<std::recursive_mutex> lock(m_mutex);
6464
doStartTransaction();
6565
cond::persistency::TransactionScope scope(m_session.transaction());
@@ -85,7 +85,7 @@ namespace cond {
8585
}
8686
}
8787
thePayloadHash = m_session.storePayload(payload);
88-
std::string payloadType = cond::demangledName(typeid(T));
88+
std::string payloadType = cond::demangledName(typeid(payload));
8989
if (newTag) {
9090
createNewIOV(thePayloadHash, payloadType, time, myrecord);
9191
} else {
@@ -112,7 +112,7 @@ namespace cond {
112112
throwException("Provided payload pointer is invalid.", "PoolDBOutputService::writeOne");
113113
std::unique_ptr<const T> payload(payloadPtr);
114114
std::lock_guard<std::recursive_mutex> lock(m_mutex);
115-
return writeOne<T>(*payload, time, recordName);
115+
return writeOneIOV<T>(*payload, time, recordName);
116116
}
117117

118118
template <typename T>
@@ -172,7 +172,7 @@ namespace cond {
172172
void closeIOV(Time_t lastTill, const std::string& recordName);
173173

174174
template <typename T>
175-
void createNewIOV(const T& payload, cond::Time_t firstSinceTime, const std::string& recordName) {
175+
void createOneIOV(const T& payload, cond::Time_t firstSinceTime, const std::string& recordName) {
176176
std::lock_guard<std::recursive_mutex> lock(m_mutex);
177177

178178
Record& myrecord = this->lookUpRecord(recordName);
@@ -184,7 +184,7 @@ namespace cond {
184184
try {
185185
this->initDB();
186186
Hash payloadId = m_session.storePayload(payload);
187-
createNewIOV(payloadId, cond::demangledName(typeid(T)), firstSinceTime, myrecord);
187+
createNewIOV(payloadId, cond::demangledName(typeid(payload)), firstSinceTime, myrecord);
188188
} catch (const std::exception& er) {
189189
cond::throwException(std::string(er.what()), "PoolDBOutputService::createNewIov");
190190
}
@@ -197,11 +197,11 @@ namespace cond {
197197
if (!payloadPtr)
198198
throwException("Provided payload pointer is invalid.", "PoolDBOutputService::createNewIOV");
199199
std::unique_ptr<const T> payload(payloadPtr);
200-
this->createNewIOV<T>(*payload, firstSinceTime, recordName);
200+
this->createOneIOV<T>(*payload, firstSinceTime, recordName);
201201
}
202202

203203
template <typename T>
204-
void appendSinceTime(const T& payload, cond::Time_t sinceTime, const std::string& recordName) {
204+
void appendOneIOV(const T& payload, cond::Time_t sinceTime, const std::string& recordName) {
205205
std::lock_guard<std::recursive_mutex> lock(m_mutex);
206206
Record& myrecord = this->lookUpRecord(recordName);
207207
if (myrecord.m_isNewTag) {
@@ -224,7 +224,7 @@ namespace cond {
224224
if (!payloadPtr)
225225
throwException("Provided payload pointer is invalid.", "PoolDBOutputService::appendSinceTime");
226226
std::unique_ptr<const T> payload(payloadPtr);
227-
this->appendSinceTime<T>(*payload, sinceTime, recordName);
227+
this->appendOneIOV<T>(*payload, sinceTime, recordName);
228228
}
229229

230230
void createNewIOV(const std::string& firstPayloadId, cond::Time_t firstSinceTime, const std::string& recordName);

‎CondCore/DBOutputService/test/stubs/LumiBasedUpdateAnalyzer.cc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ void LumiBasedUpdateAnalyzer::beginLuminosityBlock(const edm::LuminosityBlock& l
5050
mydbservice->logger().logDebug() << "BeamType: " << mybeamspot.GetBeamType();
5151
m_ret = 0;
5252
try {
53-
mydbservice->writeForNextLumisection(&mybeamspot, m_record);
53+
mydbservice->writeIOVForNextLumisection(mybeamspot, m_record);
5454
} catch (const std::exception& e) {
5555
std::cout << "Error:" << e.what() << std::endl;
5656
mydbservice->logger().logError() << e.what();

‎CondFormats/MFObjects/test/MagFieldConfigDBWriter.cc‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,10 +45,10 @@ void MagFieldConfigDBWriter::endJob() {
4545
try {
4646
if (dbOutputSvc->isNewTagRequest(record)) {
4747
//create mode
48-
dbOutputSvc->writeOne<MagFieldConfig>(*conf, dbOutputSvc->beginOfTime(), record);
48+
dbOutputSvc->writeOneIOV<MagFieldConfig>(*conf, dbOutputSvc->beginOfTime(), record);
4949
} else {
5050
//append mode. Note: correct PoolDBESSource must be loaded
51-
dbOutputSvc->writeOne<MagFieldConfig>(*conf, dbOutputSvc->currentTime(), record);
51+
dbOutputSvc->writeOneIOV<MagFieldConfig>(*conf, dbOutputSvc->currentTime(), record);
5252
}
5353
} catch (const cond::Exception& er) {
5454
std::cout << er.what() << std::endl;

0 commit comments

Comments
 (0)