Skip to content

Commit

Permalink
Merge pull request #35338 from francescobrivio/alca-BeamSpotOnline_up…
Browse files Browse the repository at this point in the history 
…dates_12_1_X

Add new features to BeamSpotOnlineObjects
  • Loading branch information
@cmsbuild
cmsbuild committed Sep 25, 2021
2 parents 8ed2450 + 7c7ac74 commit 8ec82ec
Show file tree
Hide file tree
Showing 6 changed files with 234 additions and 12 deletions.
76 changes: 73 additions & 3 deletions CondFormats/BeamSpotObjects/interface/BeamSpotOnlineObjects.h
View file
Expand Up @@ -30,14 +30,18 @@ class BeamSpotOnlineObjects : public BeamSpotObjects {
lastAnalyzedRun_ = 0;
lastAnalyzedFill_ = 0;
intParams_.resize(ISIZE, std::vector<int>(1, 0));
floatParams_.resize(FSIZE, std::vector<float>(1, 0.0));
stringParams_.resize(SSIZE, std::vector<std::string>(1, ""));
timeParams_.resize(TSIZE, std::vector<unsigned long long>(1, 0ULL));
}

~BeamSpotOnlineObjects() override {}

/// Enums
enum IntParamIndex { NUM_TRACKS = 0, NUM_PVS = 1, ISIZE = 2 };
enum TimeParamIndex { CREATE_TIME = 0, TSIZE = 1 };
enum IntParamIndex { NUM_TRACKS = 0, NUM_PVS = 1, USED_EVENTS = 2, MAX_PVS = 3, ISIZE = 4 };
enum FloatParamIndex { MEAN_PV = 0, ERR_MEAN_PV = 1, RMS_PV = 2, ERR_RMS_PV = 3, FSIZE = 4 };
enum StringParamIndex { START_TIME = 0, END_TIME = 1, LUMI_RANGE = 2, SSIZE = 3 };
enum TimeParamIndex { CREATE_TIME = 0, START_TIMESTAMP = 1, END_TIMESTAMP = 2, TSIZE = 3 };

/// Setters Methods
// set lastAnalyzedLumi_, last analyzed lumisection
Expand All @@ -55,9 +59,42 @@ class BeamSpotOnlineObjects : public BeamSpotObjects {
// set number of Primary Vertices used in the BeamSpot fit
void SetNumPVs(int val);

// set number of Events used in the BeamSpot fit (for DIP)
void SetUsedEvents(int val);

// set max number of Primary Vertices used in the BeamSpot fit (for DIP)
void SetMaxPVs(int val);

// set mean number of PVs (for DIP)
void SetMeanPV(float val);

// set error on mean number of PVs (for DIP)
void SetMeanErrorPV(float val);

// set rms of number of PVs (for DIP)
void SetRmsPV(float val);

// set error on rm of number of PVs (for DIP)
void SetRmsErrorPV(float val);

// set start time of the firs LS as string (for DIP)
void SetStartTime(std::string val);

// set end time of the last LS as string (for DIP)
void SetEndTime(std::string val);

// set lumi range as string (for DIP)
void SetLumiRange(std::string val);

// set creation time of the payload
void SetCreationTime(cond::Time_t val);

// set timestamp of the first LS (for DIP)
void SetStartTimeStamp(cond::Time_t val);

// set timestamp of the last LS (for DIP)
void SetEndTimeStamp(cond::Time_t val);

/// Getters Methods
// get lastAnalyzedLumi_, last analyzed lumisection
int GetLastAnalyzedLumi() const { return lastAnalyzedLumi_; }
Expand All @@ -74,9 +111,42 @@ class BeamSpotOnlineObjects : public BeamSpotObjects {
// get number of Primary Vertices used in the BeamSpot fit
int GetNumPVs() const;

// get number of Events used in the BeamSpot fit (for DIP)
int GetUsedEvents() const;

// get max number of Primary Vertices used in the BeamSpot fit (for DIP)
int GetMaxPVs() const;

// get mean number of PVs (for DIP)
float GetMeanPV() const;

// get error on mean number of PVs (for DIP)
float GetMeanErrorPV() const;

// get rms of number of PVs (for DIP)
float GetRmsPV() const;

// get error on rm of number of PVs (for DIP)
float GetRmsErrorPV() const;

// get start time of the firs LS as string (for DIP)
std::string GetStartTime() const;

// get end time of the last LS as string (for DIP)
std::string GetEndTime() const;

// get lumi range as string (for DIP)
std::string GetLumiRange() const;

// get creation time of the payload
cond::Time_t GetCreationTime() const;

// get timestamp of the first LS (for DIP)
cond::Time_t GetStartTimeStamp() const;

// get timestamp of the last LS (for DIP)
cond::Time_t GetEndTimeStamp() const;

/// Print BeamSpotOnline parameters
void print(std::stringstream& ss) const;

Expand All @@ -87,7 +157,7 @@ class BeamSpotOnlineObjects : public BeamSpotObjects {
std::vector<std::vector<int> > intParams_;
std::vector<std::vector<float> > floatParams_;
std::vector<std::vector<std::string> > stringParams_;
std::vector<std::vector<unsigned long long> > timeParams_;
std::vector<std::vector<unsigned long long> > timeParams_; // unsigned long long is equal to cond::Time_t

COND_SERIALIZABLE;
};
Expand Down
82 changes: 82 additions & 0 deletions CondFormats/BeamSpotObjects/src/BeamSpotOnlineObjects.cc
View file
Expand Up @@ -51,21 +51,103 @@ int BeamSpotOnlineObjects::GetNumTracks() const {

int BeamSpotOnlineObjects::GetNumPVs() const { return BeamSpotOnlineObjectsImpl::getOneParam(intParams_, NUM_PVS); }

int BeamSpotOnlineObjects::GetUsedEvents() const {
return BeamSpotOnlineObjectsImpl::getOneParam(intParams_, USED_EVENTS);
}

int BeamSpotOnlineObjects::GetMaxPVs() const { return BeamSpotOnlineObjectsImpl::getOneParam(intParams_, MAX_PVS); }

float BeamSpotOnlineObjects::GetMeanPV() const { return BeamSpotOnlineObjectsImpl::getOneParam(floatParams_, MEAN_PV); }

float BeamSpotOnlineObjects::GetMeanErrorPV() const {
return BeamSpotOnlineObjectsImpl::getOneParam(floatParams_, ERR_MEAN_PV);
}

float BeamSpotOnlineObjects::GetRmsPV() const { return BeamSpotOnlineObjectsImpl::getOneParam(floatParams_, RMS_PV); }

float BeamSpotOnlineObjects::GetRmsErrorPV() const {
return BeamSpotOnlineObjectsImpl::getOneParam(floatParams_, ERR_RMS_PV);
}

std::string BeamSpotOnlineObjects::GetStartTime() const {
return BeamSpotOnlineObjectsImpl::getOneParam(stringParams_, START_TIME);
}

std::string BeamSpotOnlineObjects::GetEndTime() const {
return BeamSpotOnlineObjectsImpl::getOneParam(stringParams_, END_TIME);
}

std::string BeamSpotOnlineObjects::GetLumiRange() const {
return BeamSpotOnlineObjectsImpl::getOneParam(stringParams_, LUMI_RANGE);
}

cond::Time_t BeamSpotOnlineObjects::GetCreationTime() const {
return BeamSpotOnlineObjectsImpl::getOneParam(timeParams_, CREATE_TIME);
}

cond::Time_t BeamSpotOnlineObjects::GetStartTimeStamp() const {
return BeamSpotOnlineObjectsImpl::getOneParam(timeParams_, START_TIMESTAMP);
}

cond::Time_t BeamSpotOnlineObjects::GetEndTimeStamp() const {
return BeamSpotOnlineObjectsImpl::getOneParam(timeParams_, END_TIMESTAMP);
}

// setters
void BeamSpotOnlineObjects::SetNumTracks(int nTracks) {
BeamSpotOnlineObjectsImpl::setOneParam(intParams_, NUM_TRACKS, nTracks);
}

void BeamSpotOnlineObjects::SetNumPVs(int nPVs) { BeamSpotOnlineObjectsImpl::setOneParam(intParams_, NUM_PVS, nPVs); }

void BeamSpotOnlineObjects::SetUsedEvents(int usedEvents) {
BeamSpotOnlineObjectsImpl::setOneParam(intParams_, USED_EVENTS, usedEvents);
}

void BeamSpotOnlineObjects::SetMaxPVs(int maxPVs) {
BeamSpotOnlineObjectsImpl::setOneParam(intParams_, MAX_PVS, maxPVs);
}

void BeamSpotOnlineObjects::SetMeanPV(float meanPVs) {
BeamSpotOnlineObjectsImpl::setOneParam(floatParams_, MEAN_PV, meanPVs);
}

void BeamSpotOnlineObjects::SetMeanErrorPV(float errMeanPVs) {
BeamSpotOnlineObjectsImpl::setOneParam(floatParams_, ERR_MEAN_PV, errMeanPVs);
}

void BeamSpotOnlineObjects::SetRmsPV(float rmsPVs) {
BeamSpotOnlineObjectsImpl::setOneParam(floatParams_, RMS_PV, rmsPVs);
}

void BeamSpotOnlineObjects::SetRmsErrorPV(float errRmsPVs) {
BeamSpotOnlineObjectsImpl::setOneParam(floatParams_, ERR_RMS_PV, errRmsPVs);
}

void BeamSpotOnlineObjects::SetStartTime(std::string startTime) {
BeamSpotOnlineObjectsImpl::setOneParam(stringParams_, START_TIME, startTime);
}

void BeamSpotOnlineObjects::SetEndTime(std::string endTime) {
BeamSpotOnlineObjectsImpl::setOneParam(stringParams_, END_TIME, endTime);
}

void BeamSpotOnlineObjects::SetLumiRange(std::string lumiRange) {
BeamSpotOnlineObjectsImpl::setOneParam(stringParams_, LUMI_RANGE, lumiRange);
}

void BeamSpotOnlineObjects::SetCreationTime(cond::Time_t createTime) {
BeamSpotOnlineObjectsImpl::setOneParam(timeParams_, CREATE_TIME, createTime);
}

void BeamSpotOnlineObjects::SetStartTimeStamp(cond::Time_t starTimeStamp) {
BeamSpotOnlineObjectsImpl::setOneParam(timeParams_, START_TIMESTAMP, starTimeStamp);
}

void BeamSpotOnlineObjects::SetEndTimeStamp(cond::Time_t endTimeStamp) {
BeamSpotOnlineObjectsImpl::setOneParam(timeParams_, END_TIMESTAMP, endTimeStamp);
}

// printers
void BeamSpotOnlineObjects::print(std::stringstream& ss) const {
ss << "-----------------------------------------------------\n"
Expand Down
38 changes: 34 additions & 4 deletions DQM/BeamMonitor/plugins/BeamMonitor.cc
View file
Expand Up @@ -88,6 +88,13 @@ void BeamMonitor::formatFitTime(char* ts, const time_t& t) {

static constexpr int buffTime = 23;

std::string BeamMonitor::getGMTstring(const time_t& timeToConvert) {
char buff[32];
std::strftime(buff, sizeof(buff), "%Y.%m.%d %H:%M:%S GMT", gmtime(&timeToConvert));
std::string timeStr(buff);
return timeStr;
}

//
// constructors and destructor
//
Expand Down Expand Up @@ -1348,7 +1355,7 @@ void BeamMonitor::FitAndFill(const LuminosityBlock& lumiSeg, int& lastlumi, int&

// Create the BeamSpotOnlineObjects object
BeamSpotOnlineObjects* BSOnline = new BeamSpotOnlineObjects();
BSOnline->SetLastAnalyzedLumi(fitLS.second);
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());
Expand All @@ -1370,11 +1377,23 @@ void BeamMonitor::FitAndFill(const LuminosityBlock& lumiSeg, int& lastlumi, int&
}
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);

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));

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

Expand All @@ -1385,8 +1404,8 @@ void BeamMonitor::FitAndFill(const LuminosityBlock& lumiSeg, int& lastlumi, int&
onlineDbService_->logger().logInfo()
<< "BeamMonitor::FitAndFill - Do PV Fitting for LS = " << beginLumiOfPVFit_ << " to " << endLumiOfPVFit_;
onlineDbService_->logger().logInfo()
<< "BeamMonitor::FitAndFill - [BeamFitter] Do BeamSpot Fit for LS = " << fitLS.first << " to "
<< fitLS.second;
<< "BeamMonitor::FitAndFill - [BeamFitter] Do BeamSpot Fit for LS = " << LSRange.first << " to "
<< LSRange.second;
onlineDbService_->logger().logInfo()
<< "BeamMonitor::FitAndFill - [BeamMonitor] Do BeamSpot Fit for LS = " << beginLumiOfBSFit_ << " to "
<< endLumiOfBSFit_;
Expand All @@ -1395,6 +1414,17 @@ void BeamMonitor::FitAndFill(const LuminosityBlock& lumiSeg, int& lastlumi, int&
onlineDbService_->logger().logInfo()
<< "BeamMonitor::FitAndFill - [PayloadCreation] BeamSpotOnline object created:";
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() << "BeamMonitor::FitAndFill - [PayloadCreation] onlineDbService available";
onlineDbService_->logger().logInfo()
<< "BeamMonitor::FitAndFill - [PayloadCreation] SetCreationTime: " << creationTime
Expand All @@ -1405,7 +1435,7 @@ void BeamMonitor::FitAndFill(const LuminosityBlock& lumiSeg, int& lastlumi, int&
<< "BeamMonitor::FitAndFill - [PayloadCreation] writeForNextLumisection executed correctly";
} catch (const std::exception& e) {
onlineDbService_->logger().logError() << "BeamMonitor - Error writing record: " << recordName_
<< " for Run: " << frun << " - Lumi: " << fitLS.second;
<< " for Run: " << frun << " - Lumi: " << LSRange.second;
onlineDbService_->logger().logError() << "Error is: " << e.what();
onlineDbService_->logger().logError() << "RESULTS OF DEFAULT FIT WAS:";
onlineDbService_->logger().logError() << "\n" << bs;
Expand Down
2 changes: 2 additions & 0 deletions DQM/BeamMonitor/plugins/BeamMonitor.h
View file
Expand Up @@ -55,6 +55,8 @@ class BeamMonitor : public DQMOneEDAnalyzer<edm::one::WatchLuminosityBlocks> {
void scrollTH1(TH1*, std::time_t);
bool testScroll(std::time_t&, std::time_t&);
void formatFitTime(char*, const std::time_t&);
std::string getGMTstring(const std::time_t&);

const int dxBin_;
const double dxMin_;
const double dxMax_;
Expand Down

0 comments on commit 8ec82ec

Please sign in to comment.