diff --git a/CalibCalorimetry/CaloMiscalibTools/plugins/WriteEcalMiscalibConstants.cc b/CalibCalorimetry/CaloMiscalibTools/plugins/WriteEcalMiscalibConstants.cc index 20dfb9bcaf1e9..9261bdb7ab3fb 100644 --- a/CalibCalorimetry/CaloMiscalibTools/plugins/WriteEcalMiscalibConstants.cc +++ b/CalibCalorimetry/CaloMiscalibTools/plugins/WriteEcalMiscalibConstants.cc @@ -54,12 +54,11 @@ void WriteEcalMiscalibConstants::analyze(const edm::Event& iEvent, const edm::Ev if (poolDbService.isAvailable()) { if (poolDbService->isNewTagRequest(newTagRequest_)) { edm::LogVerbatim("WriteEcalMiscalibConstants") << "Creating a new IOV"; - poolDbService->createNewIOV(*Mcal, poolDbService->beginOfTime(), newTagRequest_); + poolDbService->createOneIOV(*Mcal, poolDbService->beginOfTime(), newTagRequest_); edm::LogVerbatim("WriteEcalMiscalibConstants") << "Done"; } else { edm::LogVerbatim("WriteEcalMiscalibConstants") << "Old IOV"; - poolDbService->appendSinceTime( - *Mcal, poolDbService->currentTime(), newTagRequest_); + poolDbService->appendOneIOV(*Mcal, poolDbService->currentTime(), newTagRequest_); } } } diff --git a/CalibCalorimetry/CaloMiscalibTools/plugins/WriteEcalMiscalibConstantsMC.cc b/CalibCalorimetry/CaloMiscalibTools/plugins/WriteEcalMiscalibConstantsMC.cc index 74896397ca2b7..3e37d5f5ac947 100644 --- a/CalibCalorimetry/CaloMiscalibTools/plugins/WriteEcalMiscalibConstantsMC.cc +++ b/CalibCalorimetry/CaloMiscalibTools/plugins/WriteEcalMiscalibConstantsMC.cc @@ -54,12 +54,11 @@ void WriteEcalMiscalibConstantsMC::analyze(const edm::Event& iEvent, const edm:: if (poolDbService.isAvailable()) { if (poolDbService->isNewTagRequest(newTagRequest_)) { edm::LogVerbatim("WriteEcalMiscalibConstantsMC") << "Creating a new IOV"; - poolDbService->createNewIOV(*Mcal, poolDbService->beginOfTime(), newTagRequest_); + poolDbService->createOneIOV(*Mcal, poolDbService->beginOfTime(), newTagRequest_); edm::LogVerbatim("WriteEcalMiscalibConstantsMC") << "Done"; } else { edm::LogVerbatim("WriteEcalMiscalibConstantsMC") << "Old IOV"; - poolDbService->appendSinceTime( - *Mcal, poolDbService->currentTime(), newTagRequest_); + poolDbService->appendOneIOV(*Mcal, poolDbService->currentTime(), newTagRequest_); } } } diff --git a/CalibTracker/SiPixelQuality/plugins/SiPixelStatusHarvester.cc b/CalibTracker/SiPixelQuality/plugins/SiPixelStatusHarvester.cc index 15c2dd56a7027..b4dc6f87d6684 100644 --- a/CalibTracker/SiPixelQuality/plugins/SiPixelStatusHarvester.cc +++ b/CalibTracker/SiPixelQuality/plugins/SiPixelStatusHarvester.cc @@ -194,7 +194,7 @@ void SiPixelStatusHarvester::dqmEndRun(const edm::Run& iRun, const edm::EventSet } if (debug_ == true) { // only produced for debugging reason cond::Time_t thisIOV = (cond::Time_t)iRun.id().run(); - poolDbService->writeOne(*siPixelQualityPermBad, thisIOV, recordName_ + "_permanentBad"); + poolDbService->writeOneIOV(*siPixelQualityPermBad, thisIOV, recordName_ + "_permanentBad"); } // IOV for final payloads. FEDerror25 and pcl @@ -298,7 +298,7 @@ void SiPixelStatusHarvester::dqmEndRun(const edm::Run& iRun, const edm::EventSet fedError25IOV[it->first] = it->first; if (debug_ == true) // only produced for debugging reason - poolDbService->writeOne(*siPixelQuality_FEDerror25, thisIOV, recordName_ + "_FEDerror25"); + poolDbService->writeOneIOV(*siPixelQuality_FEDerror25, thisIOV, recordName_ + "_FEDerror25"); delete siPixelQuality_FEDerror25; } @@ -556,12 +556,12 @@ void SiPixelStatusHarvester::dqmEndRun(const edm::Run& iRun, const edm::EventSet edm::LuminosityBlockID lu(iRun.id().run(), endLumiBlock_ + 1); cond::Time_t thisIOV = (cond::Time_t)(lu.value()); if (!SiPixelStatusHarvester::equal(lastPrompt, siPixelQualityPermBad)) - poolDbService->writeOne(*siPixelQualityPermBad, thisIOV, recordName_ + "_prompt"); + poolDbService->writeOneIOV(*siPixelQualityPermBad, thisIOV, recordName_ + "_prompt"); // add empty bad components to last lumi+1 IF AND ONLY IF the last payload of other is not equal to empty SiPixelQuality* siPixelQualityDummy = new SiPixelQuality(); if (!SiPixelStatusHarvester::equal(lastOther, siPixelQualityDummy)) - poolDbService->writeOne(*siPixelQualityDummy, thisIOV, recordName_ + "_other"); + poolDbService->writeOneIOV(*siPixelQualityDummy, thisIOV, recordName_ + "_other"); delete siPixelQualityDummy; } @@ -657,12 +657,12 @@ void SiPixelStatusHarvester::constructTag(std::map siPixel SiPixelQuality* thisPayload = qIt->second; if (qIt == siPixelQualityTag.begin()) - poolDbService->writeOne(*thisPayload, thisIOV, recordName_ + "_" + tagName); + poolDbService->writeOneIOV(*thisPayload, thisIOV, recordName_ + "_" + tagName); else { SiPixelQuality* prevPayload = (std::prev(qIt))->second; if (!SiPixelStatusHarvester::equal(thisPayload, prevPayload)) // only append newIOV if this payload differs wrt last - poolDbService->writeOne(*thisPayload, thisIOV, recordName_ + "_" + tagName); + poolDbService->writeOneIOV(*thisPayload, thisIOV, recordName_ + "_" + tagName); } } } diff --git a/CalibTracker/SiStripESProducers/plugins/DBWriter/DummyCondDBWriter.h b/CalibTracker/SiStripESProducers/plugins/DBWriter/DummyCondDBWriter.h index 283b944272447..265538fafcd1b 100644 --- a/CalibTracker/SiStripESProducers/plugins/DBWriter/DummyCondDBWriter.h +++ b/CalibTracker/SiStripESProducers/plugins/DBWriter/DummyCondDBWriter.h @@ -68,7 +68,7 @@ void DummyCondDBWriter::endRun(const edm::Run& run, else Time_ = iConfig_.getUntrackedParameter("OpenIovAtTime", 1); - dbservice->writeOne(*obj, Time_, rcdName); + dbservice->writeOneIOV(*obj, Time_, rcdName); } else { edm::LogError("SiStripFedCablingBuilder") << "Service is unavailable" << std::endl; } diff --git a/CalibTracker/SiStripESProducers/plugins/DBWriter/SiStripFedCablingManipulator.cc b/CalibTracker/SiStripESProducers/plugins/DBWriter/SiStripFedCablingManipulator.cc index 20c230a5c48a3..eb0fd67e5f8e8 100644 --- a/CalibTracker/SiStripESProducers/plugins/DBWriter/SiStripFedCablingManipulator.cc +++ b/CalibTracker/SiStripESProducers/plugins/DBWriter/SiStripFedCablingManipulator.cc @@ -41,12 +41,12 @@ void SiStripFedCablingManipulator::endRun(const edm::Run& run, const edm::EventS edm::LogInfo("SiStripFedCablingManipulator") << "first request for storing objects with Record " << "SiStripFedCablingRcd" << " at time " << Time_ << std::endl; - dbservice->createNewIOV(*obj, Time_, "SiStripFedCablingRcd"); + dbservice->createOneIOV(*obj, Time_, "SiStripFedCablingRcd"); } else { edm::LogInfo("SiStripFedCablingManipulator") << "appending a new object to existing tag " << "SiStripFedCablingRcd" << " in since mode " << std::endl; - dbservice->appendSinceTime(*obj, Time_, "SiStripFedCablingRcd"); + dbservice->appendOneIOV(*obj, Time_, "SiStripFedCablingRcd"); } } else { edm::LogError("SiStripFedCablingManipulator") << "Service is unavailable" << std::endl; diff --git a/CommonTools/ConditionDBWriter/interface/ConditionDBWriter.h b/CommonTools/ConditionDBWriter/interface/ConditionDBWriter.h index 428559fc31460..9cc647a235bc7 100644 --- a/CommonTools/ConditionDBWriter/interface/ConditionDBWriter.h +++ b/CommonTools/ConditionDBWriter/interface/ConditionDBWriter.h @@ -332,7 +332,7 @@ class ConditionDBWriter : public edm::one::EDAnalyzerwriteOne(*objPointer, since, Record_); + mydbservice->writeOneIOV(*objPointer, since, Record_); } void setTime() { diff --git a/CondCore/DBOutputService/interface/OnlineDBOutputService.h b/CondCore/DBOutputService/interface/OnlineDBOutputService.h index 5577699b60755..b184bb99133a0 100644 --- a/CondCore/DBOutputService/interface/OnlineDBOutputService.h +++ b/CondCore/DBOutputService/interface/OnlineDBOutputService.h @@ -37,11 +37,11 @@ namespace cond { // template - bool writeForNextLumisection(const PayloadType& payload, const std::string& recordName) { + bool writeIOVForNextLumisection(const PayloadType& payload, const std::string& recordName) { cond::Time_t targetTime = getLastLumiProcessed() + m_latencyInLumisections; auto t0 = std::chrono::high_resolution_clock::now(); logger().logInfo() << "Updating lumisection " << targetTime; - cond::Hash payloadId = PoolDBOutputService::writeOne(payload, targetTime, recordName); + cond::Hash payloadId = PoolDBOutputService::writeOneIOV(payload, targetTime, recordName); bool ret = true; if (payloadId.empty()) { return false; diff --git a/CondCore/DBOutputService/interface/PoolDBOutputService.h b/CondCore/DBOutputService/interface/PoolDBOutputService.h index b6f56157b29c6..de047207b3381 100644 --- a/CondCore/DBOutputService/interface/PoolDBOutputService.h +++ b/CondCore/DBOutputService/interface/PoolDBOutputService.h @@ -59,7 +59,7 @@ namespace cond { bool isNewTagRequest(const std::string& recordName); template - Hash writeOne(const T& payload, Time_t time, const std::string& recordName) { + Hash writeOneIOV(const T& payload, Time_t time, const std::string& recordName) { std::lock_guard lock(m_mutex); doStartTransaction(); cond::persistency::TransactionScope scope(m_session.transaction()); @@ -85,7 +85,7 @@ namespace cond { } } thePayloadHash = m_session.storePayload(payload); - std::string payloadType = cond::demangledName(typeid(T)); + std::string payloadType = cond::demangledName(typeid(payload)); if (newTag) { createNewIOV(thePayloadHash, payloadType, time, myrecord); } else { @@ -111,8 +111,7 @@ namespace cond { if (!payloadPtr) throwException("Provided payload pointer is invalid.", "PoolDBOutputService::writeOne"); std::unique_ptr payload(payloadPtr); - std::lock_guard lock(m_mutex); - return writeOne(*payload, time, recordName); + return writeOneIOV(*payload, time, recordName); } template @@ -172,9 +171,8 @@ namespace cond { void closeIOV(Time_t lastTill, const std::string& recordName); template - void createNewIOV(const T& payload, cond::Time_t firstSinceTime, const std::string& recordName) { + void createOneIOV(const T& payload, cond::Time_t firstSinceTime, const std::string& recordName) { std::lock_guard lock(m_mutex); - Record& myrecord = this->lookUpRecord(recordName); if (!myrecord.m_isNewTag) { cond::throwException(myrecord.m_tag + " is not a new tag", "PoolDBOutputService::createNewIOV"); @@ -184,7 +182,7 @@ namespace cond { try { this->initDB(); Hash payloadId = m_session.storePayload(payload); - createNewIOV(payloadId, cond::demangledName(typeid(T)), firstSinceTime, myrecord); + createNewIOV(payloadId, cond::demangledName(typeid(payload)), firstSinceTime, myrecord); } catch (const std::exception& er) { cond::throwException(std::string(er.what()), "PoolDBOutputService::createNewIov"); } @@ -197,11 +195,11 @@ namespace cond { if (!payloadPtr) throwException("Provided payload pointer is invalid.", "PoolDBOutputService::createNewIOV"); std::unique_ptr payload(payloadPtr); - this->createNewIOV(*payload, firstSinceTime, recordName); + this->createOneIOV(*payload, firstSinceTime, recordName); } template - void appendSinceTime(const T& payload, cond::Time_t sinceTime, const std::string& recordName) { + void appendOneIOV(const T& payload, cond::Time_t sinceTime, const std::string& recordName) { std::lock_guard lock(m_mutex); Record& myrecord = this->lookUpRecord(recordName); if (myrecord.m_isNewTag) { @@ -224,7 +222,7 @@ namespace cond { if (!payloadPtr) throwException("Provided payload pointer is invalid.", "PoolDBOutputService::appendSinceTime"); std::unique_ptr payload(payloadPtr); - this->appendSinceTime(*payload, sinceTime, recordName); + this->appendOneIOV(*payload, sinceTime, recordName); } void createNewIOV(const std::string& firstPayloadId, cond::Time_t firstSinceTime, const std::string& recordName); diff --git a/CondCore/DBOutputService/test/stubs/LumiBasedUpdateAnalyzer.cc b/CondCore/DBOutputService/test/stubs/LumiBasedUpdateAnalyzer.cc index 903ff5dd17387..61d8188012841 100644 --- a/CondCore/DBOutputService/test/stubs/LumiBasedUpdateAnalyzer.cc +++ b/CondCore/DBOutputService/test/stubs/LumiBasedUpdateAnalyzer.cc @@ -50,7 +50,7 @@ void LumiBasedUpdateAnalyzer::beginLuminosityBlock(const edm::LuminosityBlock& l mydbservice->logger().logDebug() << "BeamType: " << mybeamspot.GetBeamType(); m_ret = 0; try { - mydbservice->writeForNextLumisection(&mybeamspot, m_record); + mydbservice->writeIOVForNextLumisection(mybeamspot, m_record); } catch (const std::exception& e) { std::cout << "Error:" << e.what() << std::endl; mydbservice->logger().logError() << e.what(); diff --git a/CondFormats/MFObjects/test/MagFieldConfigDBWriter.cc b/CondFormats/MFObjects/test/MagFieldConfigDBWriter.cc index 38a0081ae5d5f..29c798c024a43 100644 --- a/CondFormats/MFObjects/test/MagFieldConfigDBWriter.cc +++ b/CondFormats/MFObjects/test/MagFieldConfigDBWriter.cc @@ -45,10 +45,10 @@ void MagFieldConfigDBWriter::endJob() { try { if (dbOutputSvc->isNewTagRequest(record)) { //create mode - dbOutputSvc->writeOne(*conf, dbOutputSvc->beginOfTime(), record); + dbOutputSvc->writeOneIOV(*conf, dbOutputSvc->beginOfTime(), record); } else { //append mode. Note: correct PoolDBESSource must be loaded - dbOutputSvc->writeOne(*conf, dbOutputSvc->currentTime(), record); + dbOutputSvc->writeOneIOV(*conf, dbOutputSvc->currentTime(), record); } } catch (const cond::Exception& er) { std::cout << er.what() << std::endl; diff --git a/CondTools/SiPixel/plugins/SiPixelGainCalibrationReadDQMFile.cc b/CondTools/SiPixel/plugins/SiPixelGainCalibrationReadDQMFile.cc index 16d7ee88e1536..a54533f81bf43 100644 --- a/CondTools/SiPixel/plugins/SiPixelGainCalibrationReadDQMFile.cc +++ b/CondTools/SiPixel/plugins/SiPixelGainCalibrationReadDQMFile.cc @@ -450,20 +450,20 @@ void SiPixelGainCalibrationReadDQMFile::fillDatabase(const edm::EventSetup &iSet edm::LogPrint("SiPixelGainCalibrationReadDQMFile") << "now doing SiPixelGainCalibrationForHLTRcd payload..." << std::endl; if (mydbservice->isNewTagRequest(record_)) { - mydbservice->createNewIOV( + mydbservice->createOneIOV( *theGainCalibrationDbInputHLT, mydbservice->beginOfTime(), "SiPixelGainCalibrationForHLTRcd"); } else { - mydbservice->appendSinceTime( + mydbservice->appendOneIOV( *theGainCalibrationDbInputHLT, mydbservice->currentTime(), "SiPixelGainCalibrationForHLTRcd"); } } else if (record_ == "SiPixelGainCalibrationOfflineRcd") { edm::LogPrint("SiPixelGainCalibrationReadDQMFile") << "now doing SiPixelGainCalibrationOfflineRcd payload..." << std::endl; if (mydbservice->isNewTagRequest(record_)) { - mydbservice->createNewIOV( + mydbservice->createOneIOV( *theGainCalibrationDbInputOffline, mydbservice->beginOfTime(), "SiPixelGainCalibrationOfflineRcd"); } else { - mydbservice->appendSinceTime( + mydbservice->appendOneIOV( *theGainCalibrationDbInputOffline, mydbservice->currentTime(), "SiPixelGainCalibrationOfflineRcd"); } } diff --git a/CondTools/SiPixel/plugins/SiPixelTemplateDBObjectUploader.cc b/CondTools/SiPixel/plugins/SiPixelTemplateDBObjectUploader.cc index 9a2c0892e938e..b7bb9762845b9 100644 --- a/CondTools/SiPixel/plugins/SiPixelTemplateDBObjectUploader.cc +++ b/CondTools/SiPixel/plugins/SiPixelTemplateDBObjectUploader.cc @@ -281,9 +281,9 @@ void SiPixelTemplateDBObjectUploader::analyze(const edm::Event& iEvent, const ed if (!poolDbService.isAvailable()) // Die if not available throw cms::Exception("NotAvailable") << "PoolDBOutputService not available"; if (poolDbService->isNewTagRequest("SiPixelTemplateDBObjectRcd")) - poolDbService->writeOne(&obj, poolDbService->beginOfTime(), "SiPixelTemplateDBObjectRcd"); + poolDbService->writeOneIOV(obj, poolDbService->beginOfTime(), "SiPixelTemplateDBObjectRcd"); else - poolDbService->writeOne(&obj, poolDbService->currentTime(), "SiPixelTemplateDBObjectRcd"); + poolDbService->writeOneIOV(obj, poolDbService->currentTime(), "SiPixelTemplateDBObjectRcd"); } void SiPixelTemplateDBObjectUploader::endJob() {} diff --git a/CondTools/SiStrip/plugins/SiStripApvSimulationParametersBuilder.cc b/CondTools/SiStrip/plugins/SiStripApvSimulationParametersBuilder.cc index b5d7e89ae6e4c..c391b42fb691c 100644 --- a/CondTools/SiStrip/plugins/SiStripApvSimulationParametersBuilder.cc +++ b/CondTools/SiStrip/plugins/SiStripApvSimulationParametersBuilder.cc @@ -22,10 +22,10 @@ void SiStripApvSimulationParametersBuilder::analyze(const edm::Event&, const edm edm::Service mydbservice; if (mydbservice.isAvailable()) { if (mydbservice->isNewTagRequest("SiStripApvSimulationParametersRcd")) { - mydbservice->createNewIOV( + mydbservice->createOneIOV( *obj, mydbservice->beginOfTime(), "SiStripApvSimulationParametersRcd"); } else { - mydbservice->appendSinceTime( + mydbservice->appendOneIOV( *obj, mydbservice->currentTime(), "SiStripApvSimulationParametersRcd"); } } else { diff --git a/CondTools/SiStrip/plugins/SiStripBadChannelBuilder.cc b/CondTools/SiStrip/plugins/SiStripBadChannelBuilder.cc index 4252970489e59..68d1bef917bbe 100644 --- a/CondTools/SiStrip/plugins/SiStripBadChannelBuilder.cc +++ b/CondTools/SiStrip/plugins/SiStripBadChannelBuilder.cc @@ -79,10 +79,9 @@ std::unique_ptr SiStripBadChannelBuilder::getNewObject() { if (mydbservice.isAvailable()) { if (mydbservice->isNewTagRequest("SiStripBadStripRcd")) { - mydbservice->createNewIOV(*obj, mydbservice->beginOfTime(), "SiStripBadStripRcd"); + mydbservice->createOneIOV(*obj, mydbservice->beginOfTime(), "SiStripBadStripRcd"); } else { - //mydbservice->createNewIOV(*obj, mydbservice->currentTime(),"SiStripBadStripRcd"); - mydbservice->appendSinceTime(*obj, mydbservice->currentTime(), "SiStripBadStripRcd"); + mydbservice->appendOneIOV(*obj, mydbservice->currentTime(), "SiStripBadStripRcd"); } } else { edm::LogError("SiStripBadStripBuilder") << "Service is unavailable" << std::endl; diff --git a/DQM/BeamMonitor/plugins/BeamMonitor.cc b/DQM/BeamMonitor/plugins/BeamMonitor.cc index 0078d20e1a649..8728e4907dad7 100644 --- a/DQM/BeamMonitor/plugins/BeamMonitor.cc +++ b/DQM/BeamMonitor/plugins/BeamMonitor.cc @@ -1430,7 +1430,7 @@ void BeamMonitor::FitAndFill(const LuminosityBlock& lumiSeg, int& lastlumi, int& << "BeamMonitor::FitAndFill - [PayloadCreation] SetCreationTime: " << creationTime << " [epoch in microseconds]"; try { - onlineDbService_->writeForNextLumisection(BSOnline, recordName_); + onlineDbService_->writeIOVForNextLumisection(BSOnline, recordName_); onlineDbService_->logger().logInfo() << "BeamMonitor::FitAndFill - [PayloadCreation] writeForNextLumisection executed correctly"; } catch (const std::exception& e) { diff --git a/DQM/BeamMonitor/plugins/FakeBeamMonitor.cc b/DQM/BeamMonitor/plugins/FakeBeamMonitor.cc index f3082eb39f78f..17fe6c8b0859a 100644 --- a/DQM/BeamMonitor/plugins/FakeBeamMonitor.cc +++ b/DQM/BeamMonitor/plugins/FakeBeamMonitor.cc @@ -1459,7 +1459,7 @@ void FakeBeamMonitor::FitAndFill(const LuminosityBlock& lumiSeg, int& lastlumi, onlineDbService_->logger().logInfo() << "FakeBeamMonitor::FitAndFill - [PayloadCreation] SetCreationTime: " << creationTime << " [epoch in microseconds]"; try { - onlineDbService_->writeForNextLumisection(BSOnline, recordName_); + onlineDbService_->writeIOVForNextLumisection(BSOnline, recordName_); onlineDbService_->logger().logInfo() << "FakeBeamMonitor::FitAndFill - [PayloadCreation] writeForNextLumisection executed correctly"; } catch (const std::exception& e) { diff --git a/DQM/EcalMonitorDbModule/plugins/EcalDQMStatusWriter.cc b/DQM/EcalMonitorDbModule/plugins/EcalDQMStatusWriter.cc index 95a9cce444986..c959fd16b8570 100644 --- a/DQM/EcalMonitorDbModule/plugins/EcalDQMStatusWriter.cc +++ b/DQM/EcalMonitorDbModule/plugins/EcalDQMStatusWriter.cc @@ -36,8 +36,8 @@ void EcalDQMStatusWriter::analyze(edm::Event const &, edm::EventSetup const &_es if (firstRun_ == dbOutput.endOfTime()) return; - dbOutput.writeOne(channelStatus_, firstRun_, "EcalDQMChannelStatusRcd"); - dbOutput.writeOne(towerStatus_, firstRun_, "EcalDQMTowerStatusRcd"); + dbOutput.writeOneIOV(channelStatus_, firstRun_, "EcalDQMChannelStatusRcd"); + dbOutput.writeOneIOV(towerStatus_, firstRun_, "EcalDQMTowerStatusRcd"); firstRun_ = dbOutput.endOfTime(); // avoid accidentally re-writing the conditions } diff --git a/IOMC/EventVertexGenerators/src/BeamProfile2DB.cc b/IOMC/EventVertexGenerators/src/BeamProfile2DB.cc index 2bc9415b70d70..6a922283d057a 100644 --- a/IOMC/EventVertexGenerators/src/BeamProfile2DB.cc +++ b/IOMC/EventVertexGenerators/src/BeamProfile2DB.cc @@ -103,7 +103,7 @@ void BeamProfile2DB::beginJob() {} // ------------ method called once each job just after ending the event loop ------------ void BeamProfile2DB::endJob() { edm::Service poolDbService; - poolDbService->createNewIOV(beamSpot_, poolDbService->beginOfTime(), "SimBeamSpotObjectsRcd"); + poolDbService->createOneIOV(beamSpot_, poolDbService->beginOfTime(), "SimBeamSpotObjectsRcd"); } // ------------ method fills 'descriptions' with the allowed parameters for the module ------------ diff --git a/RecoHI/HiJetAlgos/plugins/UETableProducer.cc b/RecoHI/HiJetAlgos/plugins/UETableProducer.cc index cb8747a40906b..d1069ce9bf582 100644 --- a/RecoHI/HiJetAlgos/plugins/UETableProducer.cc +++ b/RecoHI/HiJetAlgos/plugins/UETableProducer.cc @@ -202,18 +202,17 @@ void UETableProducer::endJob() { jme_payload->push_back(JetCorrectorParametersCollection::L1Offset, parameter); if (pool->isNewTagRequest("JetCorrectionsRecord")) { - pool->createNewIOV(*jme_payload, pool->beginOfTime(), "JetCorrectionsRecord"); + pool->createOneIOV(*jme_payload, pool->beginOfTime(), "JetCorrectionsRecord"); } else { - pool->appendSinceTime( - *jme_payload, pool->currentTime(), "JetCorrectionsRecord"); + pool->appendOneIOV(*jme_payload, pool->currentTime(), "JetCorrectionsRecord"); } } else { ue_predictor_pf->values = ue_vec; if (pool->isNewTagRequest("HeavyIonUERcd")) { - pool->createNewIOV(*ue_predictor_pf, pool->beginOfTime(), "HeavyIonUERcd"); + pool->createOneIOV(*ue_predictor_pf, pool->beginOfTime(), "HeavyIonUERcd"); } else { - pool->appendSinceTime(*ue_predictor_pf, pool->currentTime(), "HeavyIonUERcd"); + pool->appendOneIOV(*ue_predictor_pf, pool->currentTime(), "HeavyIonUERcd"); } } }