Skip to content

Migrate BeamSpot codes to new PoolDBOutputService methods #36077

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
Nov 13, 2021
Merged

Migrate BeamSpot codes to new PoolDBOutputService methods #36077

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
39 changes: 16 additions & 23 deletions Calibration/TkAlCaRecoProducers/plugins/AlcaBeamSpotHarvester.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,30 +75,30 @@ void AlcaBeamSpotHarvester::endRun(const edm::Run &iRun, const edm::EventSetup &

if (poolDbService.isAvailable()) {
for (AlcaBeamSpotManager::bsMap_iterator it = beamSpotMap.begin(); it != beamSpotMap.end(); it++) {
BeamSpotObjects *aBeamSpot = new BeamSpotObjects();
aBeamSpot->SetType(it->second.second.type());
aBeamSpot->SetPosition(it->second.second.x0(), it->second.second.y0(), it->second.second.z0());
BeamSpotObjects aBeamSpot;
aBeamSpot.SetType(it->second.second.type());
aBeamSpot.SetPosition(it->second.second.x0(), it->second.second.y0(), it->second.second.z0());
if (sigmaZValue_ == -1) {
aBeamSpot->SetSigmaZ(it->second.second.sigmaZ());
aBeamSpot.SetSigmaZ(it->second.second.sigmaZ());
} else {
aBeamSpot->SetSigmaZ(sigmaZValue_);
aBeamSpot.SetSigmaZ(sigmaZValue_);
}
aBeamSpot->Setdxdz(it->second.second.dxdz());
aBeamSpot->Setdydz(it->second.second.dydz());
aBeamSpot->SetBeamWidthX(it->second.second.BeamWidthX());
aBeamSpot->SetBeamWidthY(it->second.second.BeamWidthY());
aBeamSpot->SetEmittanceX(it->second.second.emittanceX());
aBeamSpot->SetEmittanceY(it->second.second.emittanceY());
aBeamSpot->SetBetaStar(it->second.second.betaStar());
aBeamSpot.Setdxdz(it->second.second.dxdz());
aBeamSpot.Setdydz(it->second.second.dydz());
aBeamSpot.SetBeamWidthX(it->second.second.BeamWidthX());
aBeamSpot.SetBeamWidthY(it->second.second.BeamWidthY());
aBeamSpot.SetEmittanceX(it->second.second.emittanceX());
aBeamSpot.SetEmittanceY(it->second.second.emittanceY());
aBeamSpot.SetBetaStar(it->second.second.betaStar());

for (int i = 0; i < 7; ++i) {
for (int j = 0; j < 7; ++j) {
aBeamSpot->SetCovariance(i, j, it->second.second.covariance(i, j));
aBeamSpot.SetCovariance(i, j, it->second.second.covariance(i, j));
}
}

if (sigmaZValue_ > 0) {
aBeamSpot->SetCovariance(3, 3, 0.000025);
aBeamSpot.SetCovariance(3, 3, 0.000025);
}

cond::Time_t thisIOV = 1;
Expand Down Expand Up @@ -130,12 +130,7 @@ void AlcaBeamSpotHarvester::endRun(const edm::Run &iRun, const edm::EventSetup &
}
if (poolDbService->isNewTagRequest(outputrecordName_)) {
edm::LogInfo("AlcaBeamSpotHarvester") << "new tag requested" << std::endl;
// poolDbService->createNewIOV<BeamSpotObjects>(aBeamSpot,
// poolDbService->beginOfTime(),poolDbService->endOfTime(),"BeamSpotObjectsRcd");
// poolDbService->createNewIOV<BeamSpotObjects>(aBeamSpot,
// poolDbService->currentTime(),
// poolDbService->endOfTime(),"BeamSpotObjectsRcd");
poolDbService->writeOne<BeamSpotObjects>(aBeamSpot, thisIOV, outputrecordName_);
poolDbService->writeOneIOV<BeamSpotObjects>(aBeamSpot, thisIOV, outputrecordName_);
if (dumpTxt_ && beamSpotOutputBase_ == "lumibased") {
beamspot::dumpBeamSpotTxt(outFile, currentBS);

Expand All @@ -149,9 +144,7 @@ void AlcaBeamSpotHarvester::endRun(const edm::Run &iRun, const edm::EventSetup &
}
} else {
edm::LogInfo("AlcaBeamSpotHarvester") << "no new tag requested, appending IOV" << std::endl;
// poolDbService->appendSinceTime<BeamSpotObjects>(aBeamSpot,
// poolDbService->currentTime(),"BeamSpotObjectsRcd");
poolDbService->writeOne<BeamSpotObjects>(aBeamSpot, thisIOV, outputrecordName_);
poolDbService->writeOneIOV<BeamSpotObjects>(aBeamSpot, thisIOV, outputrecordName_);
if (dumpTxt_ && beamSpotOutputBase_ == "lumibased") {
beamspot::dumpBeamSpotTxt(outFile, currentBS);
}
Expand Down
86 changes: 43 additions & 43 deletions DQM/BeamMonitor/plugins/BeamMonitor.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1355,48 +1355,48 @@ void BeamMonitor::FitAndFill(const LuminosityBlock& lumiSeg, int& lastlumi, int&
// }

// Create the BeamSpotOnlineObjects object
BeamSpotOnlineObjects* BSOnline = new BeamSpotOnlineObjects();
BSOnline->SetLastAnalyzedLumi(LSRange.second);
BSOnline->SetLastAnalyzedRun(theBeamFitter->getRunNumber());
BSOnline->SetLastAnalyzedFill(0); // To be updated with correct LHC Fill number
BSOnline->SetPosition(bs.x0(), bs.y0(), bs.z0());
BSOnline->SetSigmaZ(bs.sigmaZ());
BSOnline->SetBeamWidthX(bs.BeamWidthX());
BSOnline->SetBeamWidthY(bs.BeamWidthY());
BSOnline->SetBeamWidthXError(bs.BeamWidthXError());
BSOnline->SetBeamWidthYError(bs.BeamWidthYError());
BSOnline->Setdxdz(bs.dxdz());
BSOnline->Setdydz(bs.dydz());
BSOnline->SetType(bs.type());
BSOnline->SetEmittanceX(bs.emittanceX());
BSOnline->SetEmittanceY(bs.emittanceY());
BSOnline->SetBetaStar(bs.betaStar());
BeamSpotOnlineObjects BSOnline;
BSOnline.SetLastAnalyzedLumi(LSRange.second);
BSOnline.SetLastAnalyzedRun(theBeamFitter->getRunNumber());
BSOnline.SetLastAnalyzedFill(0); // To be updated with correct LHC Fill number
BSOnline.SetPosition(bs.x0(), bs.y0(), bs.z0());
BSOnline.SetSigmaZ(bs.sigmaZ());
BSOnline.SetBeamWidthX(bs.BeamWidthX());
BSOnline.SetBeamWidthY(bs.BeamWidthY());
BSOnline.SetBeamWidthXError(bs.BeamWidthXError());
BSOnline.SetBeamWidthYError(bs.BeamWidthYError());
BSOnline.Setdxdz(bs.dxdz());
BSOnline.Setdydz(bs.dydz());
BSOnline.SetType(bs.type());
BSOnline.SetEmittanceX(bs.emittanceX());
BSOnline.SetEmittanceY(bs.emittanceY());
BSOnline.SetBetaStar(bs.betaStar());
for (int i = 0; i < 7; ++i) {
for (int j = 0; j < 7; ++j) {
BSOnline->SetCovariance(i, j, bs.covariance(i, j));
BSOnline.SetCovariance(i, j, bs.covariance(i, j));
}
}
BSOnline->SetNumTracks(theBeamFitter->getNTracks());
BSOnline->SetNumPVs(theBeamFitter->getNPVs());
BSOnline->SetUsedEvents((int)DipPVInfo_[0]);
BSOnline->SetMeanPV(DipPVInfo_[1]);
BSOnline->SetMeanErrorPV(DipPVInfo_[2]);
BSOnline->SetRmsPV(DipPVInfo_[3]);
BSOnline->SetRmsErrorPV(DipPVInfo_[4]);
BSOnline->SetMaxPVs((int)DipPVInfo_[5]);
BSOnline.SetNumTracks(theBeamFitter->getNTracks());
BSOnline.SetNumPVs(theBeamFitter->getNPVs());
BSOnline.SetUsedEvents((int)DipPVInfo_[0]);
BSOnline.SetMeanPV(DipPVInfo_[1]);
BSOnline.SetMeanErrorPV(DipPVInfo_[2]);
BSOnline.SetRmsPV(DipPVInfo_[3]);
BSOnline.SetRmsErrorPV(DipPVInfo_[4]);
BSOnline.SetMaxPVs((int)DipPVInfo_[5]);
auto creationTime =
std::chrono::duration_cast<std::chrono::microseconds>(std::chrono::system_clock::now().time_since_epoch())
.count();
BSOnline->SetCreationTime(creationTime);
BSOnline.SetCreationTime(creationTime);

std::pair<time_t, time_t> timeForDIP = theBeamFitter->getRefTime();
BSOnline->SetStartTimeStamp(timeForDIP.first);
BSOnline->SetStartTime(getGMTstring(timeForDIP.first));
BSOnline->SetEndTimeStamp(timeForDIP.second);
BSOnline->SetEndTime(getGMTstring(timeForDIP.second));
BSOnline.SetStartTimeStamp(timeForDIP.first);
BSOnline.SetStartTime(getGMTstring(timeForDIP.first));
BSOnline.SetEndTimeStamp(timeForDIP.second);
BSOnline.SetEndTime(getGMTstring(timeForDIP.second));

edm::LogInfo("BeamMonitor") << "FitAndFill::[PayloadCreation] BeamSpotOnline object created: \n" << std::endl;
edm::LogInfo("BeamMonitor") << *BSOnline << std::endl;
edm::LogInfo("BeamMonitor") << BSOnline << std::endl;

// Create the payload for BeamSpotOnlineObjects object
if (onlineDbService_.isAvailable()) {
Expand All @@ -1414,26 +1414,26 @@ void BeamMonitor::FitAndFill(const LuminosityBlock& lumiSeg, int& lastlumi, int&
onlineDbService_->logger().logInfo() << "\n" << bs;
onlineDbService_->logger().logInfo()
<< "BeamMonitor::FitAndFill - [PayloadCreation] BeamSpotOnline object created:";
onlineDbService_->logger().logInfo() << "\n" << *BSOnline;
onlineDbService_->logger().logInfo() << "\n" << BSOnline;
onlineDbService_->logger().logInfo() << "BeamMonitor - Additional parameters for DIP:";
onlineDbService_->logger().logInfo() << "Events used in the fit: " << BSOnline->GetUsedEvents();
onlineDbService_->logger().logInfo() << "Mean PV : " << BSOnline->GetMeanPV();
onlineDbService_->logger().logInfo() << "Mean PV Error : " << BSOnline->GetMeanErrorPV();
onlineDbService_->logger().logInfo() << "Rms PV : " << BSOnline->GetRmsPV();
onlineDbService_->logger().logInfo() << "Rms PV Error : " << BSOnline->GetRmsErrorPV();
onlineDbService_->logger().logInfo() << "Max PVs : " << BSOnline->GetMaxPVs();
onlineDbService_->logger().logInfo() << "StartTime : " << BSOnline->GetStartTime();
onlineDbService_->logger().logInfo() << "StartTimeStamp : " << BSOnline->GetStartTimeStamp();
onlineDbService_->logger().logInfo() << "EndTime : " << BSOnline->GetEndTime();
onlineDbService_->logger().logInfo() << "EndTimeStamp : " << BSOnline->GetEndTimeStamp();
onlineDbService_->logger().logInfo() << "Events used in the fit: " << BSOnline.GetUsedEvents();
onlineDbService_->logger().logInfo() << "Mean PV : " << BSOnline.GetMeanPV();
onlineDbService_->logger().logInfo() << "Mean PV Error : " << BSOnline.GetMeanErrorPV();
onlineDbService_->logger().logInfo() << "Rms PV : " << BSOnline.GetRmsPV();
onlineDbService_->logger().logInfo() << "Rms PV Error : " << BSOnline.GetRmsErrorPV();
onlineDbService_->logger().logInfo() << "Max PVs : " << BSOnline.GetMaxPVs();
onlineDbService_->logger().logInfo() << "StartTime : " << BSOnline.GetStartTime();
onlineDbService_->logger().logInfo() << "StartTimeStamp : " << BSOnline.GetStartTimeStamp();
onlineDbService_->logger().logInfo() << "EndTime : " << BSOnline.GetEndTime();
onlineDbService_->logger().logInfo() << "EndTimeStamp : " << BSOnline.GetEndTimeStamp();
onlineDbService_->logger().logInfo() << "BeamMonitor::FitAndFill - [PayloadCreation] onlineDbService available";
onlineDbService_->logger().logInfo()
<< "BeamMonitor::FitAndFill - [PayloadCreation] SetCreationTime: " << creationTime
<< " [epoch in microseconds]";
try {
onlineDbService_->writeIOVForNextLumisection(BSOnline, recordName_);
onlineDbService_->logger().logInfo()
<< "BeamMonitor::FitAndFill - [PayloadCreation] writeForNextLumisection executed correctly";
<< "BeamMonitor::FitAndFill - [PayloadCreation] writeIOVForNextLumisection executed correctly";
} catch (const std::exception& e) {
onlineDbService_->logger().logError() << "BeamMonitor - Error writing record: " << recordName_
<< " for Run: " << frun << " - Lumi: " << LSRange.second;
Expand Down
89 changes: 43 additions & 46 deletions DQM/BeamMonitor/plugins/FakeBeamMonitor.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1384,51 +1384,48 @@ void FakeBeamMonitor::FitAndFill(const LuminosityBlock& lumiSeg, int& lastlumi,
// }

// Create the BeamSpotOnlineObjects object
BeamSpotOnlineObjects* BSOnline = new BeamSpotOnlineObjects();
BSOnline->SetLastAnalyzedLumi(LSRange.second);
BSOnline->SetLastAnalyzedRun(frun);
BSOnline->SetLastAnalyzedFill(0); // To be updated with correct LHC Fill number
BSOnline->SetPosition(bs.x0(), bs.y0(), bs.z0());
BSOnline->SetSigmaZ(bs.sigmaZ());
BSOnline->SetBeamWidthX(bs.BeamWidthX());
BSOnline->SetBeamWidthY(bs.BeamWidthY());
BSOnline->SetBeamWidthXError(bs.BeamWidthXError());
BSOnline->SetBeamWidthYError(bs.BeamWidthYError());
BSOnline->Setdxdz(bs.dxdz());
BSOnline->Setdydz(bs.dydz());
BSOnline->SetType(bs.type());
BSOnline->SetEmittanceX(bs.emittanceX());
BSOnline->SetEmittanceY(bs.emittanceY());
BSOnline->SetBetaStar(bs.betaStar());
BeamSpotOnlineObjects BSOnline;
BSOnline.SetLastAnalyzedLumi(LSRange.second);
BSOnline.SetLastAnalyzedRun(frun);
BSOnline.SetLastAnalyzedFill(0); // To be updated with correct LHC Fill number
BSOnline.SetPosition(bs.x0(), bs.y0(), bs.z0());
BSOnline.SetSigmaZ(bs.sigmaZ());
BSOnline.SetBeamWidthX(bs.BeamWidthX());
BSOnline.SetBeamWidthY(bs.BeamWidthY());
BSOnline.SetBeamWidthXError(bs.BeamWidthXError());
BSOnline.SetBeamWidthYError(bs.BeamWidthYError());
BSOnline.Setdxdz(bs.dxdz());
BSOnline.Setdydz(bs.dydz());
BSOnline.SetType(bs.type());
BSOnline.SetEmittanceX(bs.emittanceX());
BSOnline.SetEmittanceY(bs.emittanceY());
BSOnline.SetBetaStar(bs.betaStar());
for (int i = 0; i < 7; ++i) {
for (int j = 0; j < 7; ++j) {
BSOnline->SetCovariance(i, j, bs.covariance(i, j));
BSOnline.SetCovariance(i, j, bs.covariance(i, j));
}
}
// BSOnline->SetNumTracks(theBeamFitter->getNTracks());
// BSOnline->SetNumPVs(theBeamFitter->getNPVs());
BSOnline->SetNumTracks(50);
BSOnline->SetNumPVs(10);
BSOnline->SetUsedEvents((int)DipPVInfo_[0]);
BSOnline->SetMeanPV(DipPVInfo_[1]);
BSOnline->SetMeanErrorPV(DipPVInfo_[2]);
BSOnline->SetRmsPV(DipPVInfo_[3]);
BSOnline->SetRmsErrorPV(DipPVInfo_[4]);
BSOnline->SetMaxPVs((int)DipPVInfo_[5]);
BSOnline.SetNumTracks(50);
BSOnline.SetNumPVs(10);
BSOnline.SetUsedEvents((int)DipPVInfo_[0]);
BSOnline.SetMeanPV(DipPVInfo_[1]);
BSOnline.SetMeanErrorPV(DipPVInfo_[2]);
BSOnline.SetRmsPV(DipPVInfo_[3]);
BSOnline.SetRmsErrorPV(DipPVInfo_[4]);
BSOnline.SetMaxPVs((int)DipPVInfo_[5]);
auto creationTime =
std::chrono::duration_cast<std::chrono::microseconds>(std::chrono::system_clock::now().time_since_epoch()).count();
BSOnline->SetCreationTime(creationTime);
BSOnline.SetCreationTime(creationTime);

// use fake timestamps from 1970.01.01 00:00:00 to 1970.01.01 00:00:01 GMT
std::pair<time_t, time_t> timeForDIP = std::make_pair(0, 1);
BSOnline->SetStartTimeStamp(timeForDIP.first);
BSOnline->SetStartTime(getGMTstring(timeForDIP.first));
BSOnline->SetEndTimeStamp(timeForDIP.second);
BSOnline->SetEndTime(getGMTstring(timeForDIP.second));
BSOnline.SetStartTimeStamp(timeForDIP.first);
BSOnline.SetStartTime(getGMTstring(timeForDIP.first));
BSOnline.SetEndTimeStamp(timeForDIP.second);
BSOnline.SetEndTime(getGMTstring(timeForDIP.second));

edm::LogInfo("FakeBeamMonitor") << "FitAndFill::[PayloadCreation] BeamSpotOnline object created: \n" << std::endl;
edm::LogInfo("FakeBeamMonitor") << *BSOnline << std::endl;
//std::cout << "------------------> fitted BS: " << *BSOnline << std::endl;
edm::LogInfo("FakeBeamMonitor") << BSOnline << std::endl;

// Create the payload for BeamSpotOnlineObjects object
if (onlineDbService_.isAvailable()) {
Expand All @@ -1444,25 +1441,25 @@ void FakeBeamMonitor::FitAndFill(const LuminosityBlock& lumiSeg, int& lastlumi,
onlineDbService_->logger().logInfo() << "\n" << bs;
onlineDbService_->logger().logInfo()
<< "FakeBeamMonitor::FitAndFill - [PayloadCreation] BeamSpotOnline object created:";
onlineDbService_->logger().logInfo() << "\n" << *BSOnline;
onlineDbService_->logger().logInfo() << "\n" << BSOnline;
onlineDbService_->logger().logInfo() << "FakeBeamMonitor - Additional parameters for DIP:";
onlineDbService_->logger().logInfo() << "Events used in the fit: " << BSOnline->GetUsedEvents();
onlineDbService_->logger().logInfo() << "Mean PV : " << BSOnline->GetMeanPV();
onlineDbService_->logger().logInfo() << "Mean PV Error : " << BSOnline->GetMeanErrorPV();
onlineDbService_->logger().logInfo() << "Rms PV : " << BSOnline->GetRmsPV();
onlineDbService_->logger().logInfo() << "Rms PV Error : " << BSOnline->GetRmsErrorPV();
onlineDbService_->logger().logInfo() << "Max PVs : " << BSOnline->GetMaxPVs();
onlineDbService_->logger().logInfo() << "StartTime : " << BSOnline->GetStartTime();
onlineDbService_->logger().logInfo() << "StartTimeStamp : " << BSOnline->GetStartTimeStamp();
onlineDbService_->logger().logInfo() << "EndTime : " << BSOnline->GetEndTime();
onlineDbService_->logger().logInfo() << "EndTimeStamp : " << BSOnline->GetEndTimeStamp();
onlineDbService_->logger().logInfo() << "Events used in the fit: " << BSOnline.GetUsedEvents();
onlineDbService_->logger().logInfo() << "Mean PV : " << BSOnline.GetMeanPV();
onlineDbService_->logger().logInfo() << "Mean PV Error : " << BSOnline.GetMeanErrorPV();
onlineDbService_->logger().logInfo() << "Rms PV : " << BSOnline.GetRmsPV();
onlineDbService_->logger().logInfo() << "Rms PV Error : " << BSOnline.GetRmsErrorPV();
onlineDbService_->logger().logInfo() << "Max PVs : " << BSOnline.GetMaxPVs();
onlineDbService_->logger().logInfo() << "StartTime : " << BSOnline.GetStartTime();
onlineDbService_->logger().logInfo() << "StartTimeStamp : " << BSOnline.GetStartTimeStamp();
onlineDbService_->logger().logInfo() << "EndTime : " << BSOnline.GetEndTime();
onlineDbService_->logger().logInfo() << "EndTimeStamp : " << BSOnline.GetEndTimeStamp();
onlineDbService_->logger().logInfo() << "FakeBeamMonitor::FitAndFill - [PayloadCreation] onlineDbService available";
onlineDbService_->logger().logInfo() << "FakeBeamMonitor::FitAndFill - [PayloadCreation] SetCreationTime: "
<< creationTime << " [epoch in microseconds]";
try {
onlineDbService_->writeIOVForNextLumisection(BSOnline, recordName_);
onlineDbService_->logger().logInfo()
<< "FakeBeamMonitor::FitAndFill - [PayloadCreation] writeForNextLumisection executed correctly";
<< "FakeBeamMonitor::FitAndFill - [PayloadCreation] writeIOVForNextLumisection executed correctly";
} catch (const std::exception& e) {
onlineDbService_->logger().logError() << "FakeBeamMonitor - Error writing record: " << recordName_
<< " for Run: " << frun << " - Lumi: " << LSRange.second;
Expand Down
Loading