Skip to content

Commit

Permalink
fix comparePayloads in LHInfo PopCons
Browse files Browse the repository at this point in the history
  • Loading branch information
@JanChyczynski
JanChyczynski committed Jul 28, 2023
1 parent a8b2114 commit 644e779
Show file tree
Hide file tree
Showing 4 changed files with 41 additions and 167 deletions.
6 changes: 6 additions & 0 deletions ...Tools/RunInfo/plugins/LumiSectionFilter.h → ...ols/RunInfo/interface/LumiSectionFilter.h
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
#ifndef CondTools_RunInfo_LumiSectionFilter_h
#define CondTools_RunInfo_LumiSectionFilter_h

#include "CondFormats/Common/interface/TimeConversions.h"
#include "CondCore/CondDB/interface/Time.h"
#include <vector>
#include <memory>

Expand Down Expand Up @@ -57,3 +61,5 @@ struct LumiSectionFilter {
typename std::vector<std::pair<cond::Time_t, std::shared_ptr<T>>>::const_iterator end;
cond::Time_t currentDipTime = 0;
};

#endif
6 changes: 3 additions & 3 deletions CondTools/RunInfo/plugins/LHCInfoPerFillPopConAnalyzer.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
#include "CondCore/PopCon/interface/PopConSourceHandler.h"
#include "CondFormats/Common/interface/TimeConversions.h"
#include "CondFormats/RunInfo/interface/LHCInfoPerFill.h"
#include "CondTools/RunInfo/interface/LumiSectionFilter.h"
#include "CondTools/RunInfo/interface/OMSAccess.h"
#include "CoralBase/Attribute.h"
#include "CoralBase/AttributeList.h"
Expand All @@ -12,7 +13,6 @@
#include "FWCore/MessageLogger/interface/MessageLogger.h"
#include "FWCore/ParameterSet/interface/ParameterSet.h"
#include "FWCore/ParameterSet/interface/ParameterSetfwd.h"
#include "LumiSectionFilter.h"
#include "RelationalAccess/ICursor.h"
#include "RelationalAccess/IQuery.h"
#include "RelationalAccess/ISchema.h"
Expand Down Expand Up @@ -164,8 +164,8 @@ namespace theLHCInfoPerFillImpl {
bool comparePayloads(const LHCInfoPerFill& rhs, const LHCInfoPerFill& lhs) {
if (rhs.fillNumber() != lhs.fillNumber() || rhs.delivLumi() != lhs.delivLumi() || rhs.recLumi() != lhs.recLumi() ||
rhs.instLumi() != lhs.instLumi() || rhs.instLumiError() != lhs.instLumiError() ||
rhs.lhcState() != rhs.lhcState() || rhs.lhcComment() != rhs.lhcComment() ||
rhs.ctppsStatus() != rhs.ctppsStatus()) {
rhs.lhcState() != lhs.lhcState() || rhs.lhcComment() != lhs.lhcComment() ||
rhs.ctppsStatus() != lhs.ctppsStatus()) {
return false;
}
return true;
Expand Down
75 changes: 6 additions & 69 deletions CondTools/RunInfo/plugins/LHCInfoPerLSPopConAnalyzer.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#include "CondCore/PopCon/interface/PopConSourceHandler.h"
#include "CondFormats/Common/interface/TimeConversions.h"
#include "CondFormats/RunInfo/interface/LHCInfoPerLS.h"
#include "CondTools/RunInfo/interface/OMSAccess.h"
#include "CondTools/RunInfo/interface/LumiSectionFilter.h"
#include "CondTools/RunInfo/interface/OMSAccess.h"
#include "CoralBase/Attribute.h"
#include "CoralBase/AttributeList.h"
Expand Down Expand Up @@ -34,75 +34,12 @@ typedef popcon::PopConAnalyzer<LHCInfoPerLSPopConSourceHandler> LHCInfoPerLSPopC
DEFINE_FWK_MODULE(LHCInfoPerLSPopConAnalyzer);

namespace theLHCInfoPerLSImpl {

struct LumiSectionFilter {
LumiSectionFilter(const std::vector<std::pair<cond::Time_t, std::shared_ptr<LHCInfoPerLS>>>& samples)
: currLow(samples.begin()), currUp(samples.begin()), end(samples.end()) {
currUp++;
}

void reset(const std::vector<std::pair<cond::Time_t, std::shared_ptr<LHCInfoPerLS>>>& samples) {
currLow = samples.begin();
currUp = samples.begin();
currUp++;
end = samples.end();
currentDipTime = 0;
}

bool process(cond::Time_t dipTime) {
if (currLow == end)
return false;
bool search = false;
if (currentDipTime == 0) {
search = true;
} else {
if (dipTime == currentDipTime)
return true;
else {
cond::Time_t upper = cond::time::MAX_VAL;
if (currUp != end)
upper = currUp->first;
if (dipTime < upper && currentDipTime >= currLow->first)
return false;
else {
search = true;
}
}
}
if (search) {
while (currUp != end and currUp->first < dipTime) {
currLow++;
currUp++;
}
currentDipTime = dipTime;
return currLow != end;
}
return false;
}

cond::Time_t currentSince() { return currLow->first; }
LHCInfoPerLS& currentPayload() { return *currLow->second; }

std::vector<std::pair<cond::Time_t, std::shared_ptr<LHCInfoPerLS>>>::const_iterator current() { return currLow; }
std::vector<std::pair<cond::Time_t, std::shared_ptr<LHCInfoPerLS>>>::const_iterator currLow;
std::vector<std::pair<cond::Time_t, std::shared_ptr<LHCInfoPerLS>>>::const_iterator currUp;
std::vector<std::pair<cond::Time_t, std::shared_ptr<LHCInfoPerLS>>>::const_iterator end;
cond::Time_t currentDipTime = 0;
};

bool comparePayloads(const LHCInfoPerLS& rhs, const LHCInfoPerLS& lhs) {
if (rhs.fillNumber() != lhs.fillNumber())
return false;
if (rhs.runNumber() != lhs.runNumber())
return false;
if (rhs.crossingAngleX() != lhs.crossingAngleX())
return false;
if (rhs.crossingAngleY() != lhs.crossingAngleY())
return false;
if (rhs.betaStarX() != lhs.betaStarX())
return false;
if (rhs.betaStarY() != lhs.betaStarY())
if (rhs.fillNumber() != lhs.fillNumber() || rhs.runNumber() != lhs.runNumber() ||
rhs.crossingAngleX() != lhs.crossingAngleX() || rhs.crossingAngleY() != lhs.crossingAngleY() ||
rhs.betaStarX() != lhs.betaStarX() || rhs.betaStarY() != lhs.betaStarY()) {
return false;
}
return true;
}

Expand Down Expand Up @@ -479,7 +416,7 @@ class LHCInfoPerLSPopConSourceHandler : public popcon::PopConSourceHandler<LHCIn
float crossingAngleY = 0., betaStarY = 0.;

bool ret = false;
theLHCInfoPerLSImpl::LumiSectionFilter filter(m_tmpBuffer);
LumiSectionFilter<LHCInfoPerLS> filter(m_tmpBuffer);
while (CTPPSDataCursor.next()) {
if (m_debug) {
std::ostringstream CTPPS;
Expand Down
121 changes: 26 additions & 95 deletions CondTools/RunInfo/src/LHCInfoPopConSourceHandler.cc
View file
Original file line number Diff line number Diff line change
@@ -1,17 +1,18 @@
#include "FWCore/MessageLogger/interface/MessageLogger.h"
#include "FWCore/ParameterSet/interface/ParameterSet.h"
#include "CondCore/CondDB/interface/ConnectionPool.h"
#include "CondFormats/Common/interface/TimeConversions.h"
#include "CondTools/RunInfo/interface/LHCInfoPopConSourceHandler.h"
#include "CondTools/RunInfo/interface/LumiSectionFilter.h"
#include "CondTools/RunInfo/interface/OMSAccess.h"
#include "RelationalAccess/ISessionProxy.h"
#include "RelationalAccess/ISchema.h"
#include "RelationalAccess/IQuery.h"
#include "RelationalAccess/ICursor.h"
#include "CoralBase/AttributeList.h"
#include "CoralBase/Attribute.h"
#include "CoralBase/AttributeList.h"
#include "CoralBase/AttributeSpecification.h"
#include "CoralBase/TimeStamp.h"
#include "FWCore/MessageLogger/interface/MessageLogger.h"
#include "FWCore/ParameterSet/interface/ParameterSet.h"
#include "RelationalAccess/ICursor.h"
#include "RelationalAccess/IQuery.h"
#include "RelationalAccess/ISchema.h"
#include "RelationalAccess/ISessionProxy.h"
#include <iostream>
#include <memory>
#include <sstream>
Expand Down Expand Up @@ -91,7 +92,7 @@ LHCInfoPopConSourceHandler::LHCInfoPopConSourceHandler(edm::ParameterSet const&
//L2: try with different m_name
LHCInfoPopConSourceHandler::~LHCInfoPopConSourceHandler() {}

namespace LHCInfoImpl {
namespace theLHCInfoImpl {

struct IOVComp {
bool operator()(const cond::Time_t& x, const std::pair<cond::Time_t, std::shared_ptr<LHCInfo>>& y) {
Expand Down Expand Up @@ -148,7 +149,7 @@ namespace LHCInfoImpl {
return ret;
}

} // namespace LHCInfoImpl
} // namespace theLHCInfoImpl

size_t LHCInfoPopConSourceHandler::getLumiData(const cond::OMSService& oms,
unsigned short fillId,
Expand Down Expand Up @@ -177,63 +178,6 @@ size_t LHCInfoPopConSourceHandler::getLumiData(const cond::OMSService& oms,
return nlumi;
}

namespace LHCInfoImpl {
struct LumiSectionFilter {
LumiSectionFilter(const std::vector<std::pair<cond::Time_t, std::shared_ptr<LHCInfo>>>& samples)
: currLow(samples.begin()), currUp(samples.begin()), end(samples.end()) {
currUp++;
}

void reset(const std::vector<std::pair<cond::Time_t, std::shared_ptr<LHCInfo>>>& samples) {
currLow = samples.begin();
currUp = samples.begin();
currUp++;
end = samples.end();
currentDipTime = 0;
}

bool process(cond::Time_t dipTime) {
if (currLow == end)
return false;
bool search = false;
if (currentDipTime == 0) {
search = true;
} else {
if (dipTime == currentDipTime)
return true;
else {
cond::Time_t upper = cond::time::MAX_VAL;
if (currUp != end)
upper = currUp->first;
if (dipTime < upper)
return false;
else {
search = true;
}
}
}
if (search) {
while (currUp != end and currUp->first < dipTime) {
currLow++;
currUp++;
}
currentDipTime = dipTime;
return currLow != end;
}
return false;
}

cond::Time_t currentSince() { return currLow->first; }
LHCInfo& currentPayload() { return *currLow->second; }

std::vector<std::pair<cond::Time_t, std::shared_ptr<LHCInfo>>>::const_iterator current() { return currLow; }
std::vector<std::pair<cond::Time_t, std::shared_ptr<LHCInfo>>>::const_iterator currLow;
std::vector<std::pair<cond::Time_t, std::shared_ptr<LHCInfo>>>::const_iterator currUp;
std::vector<std::pair<cond::Time_t, std::shared_ptr<LHCInfo>>>::const_iterator end;
cond::Time_t currentDipTime = 0;
};
} // namespace LHCInfoImpl

void LHCInfoPopConSourceHandler::getDipData(const cond::OMSService& oms,
const boost::posix_time::ptime& beginFillTime,
const boost::posix_time::ptime& endFillTime) {
Expand Down Expand Up @@ -340,7 +284,7 @@ bool LHCInfoPopConSourceHandler::getCTTPSData(cond::persistency::Session& sessio
float crossingAngle = 0., betastar = 0.;

bool ret = false;
LHCInfoImpl::LumiSectionFilter filter(m_tmpBuffer);
LumiSectionFilter<LHCInfo> filter(m_tmpBuffer);
while (CTPPSDataCursor.next()) {
if (m_debug) {
std::ostringstream CTPPS;
Expand Down Expand Up @@ -388,7 +332,7 @@ bool LHCInfoPopConSourceHandler::getCTTPSData(cond::persistency::Session& sessio
return ret;
}

namespace LHCInfoImpl {
namespace theLHCInfoImpl {
static const std::map<std::string, int> vecMap = {
{"Beam1/beamPhaseMean", 1}, {"Beam2/beamPhaseMean", 2}, {"Beam1/cavPhaseMean", 3}, {"Beam2/cavPhaseMean", 4}};
void setElementData(cond::Time_t since,
Expand Down Expand Up @@ -424,7 +368,7 @@ namespace LHCInfoImpl {
}
}
}
} // namespace LHCInfoImpl
} // namespace theLHCInfoImpl

bool LHCInfoPopConSourceHandler::getEcalData(cond::persistency::Session& session,
const boost::posix_time::ptime& lowerTime,
Expand Down Expand Up @@ -474,7 +418,7 @@ bool LHCInfoPopConSourceHandler::getEcalData(cond::persistency::Session& session
unsigned int elementNr = 0;
float value = 0.;
std::set<cond::Time_t> initializedVectors;
LHCInfoImpl::LumiSectionFilter filter(m_tmpBuffer);
LumiSectionFilter<LHCInfo> filter(m_tmpBuffer);
bool ret = false;
if (m_prevPayload.get()) {
for (auto& lumiSlot : m_tmpBuffer) {
Expand Down Expand Up @@ -516,7 +460,7 @@ bool LHCInfoPopConSourceHandler::getEcalData(cond::persistency::Session& session
iovMap.insert(std::make_pair(changeTime, filter.current()->first));
for (auto it = filter.current(); it != m_tmpBuffer.end(); it++) {
LHCInfo& payload = *(it->second);
LHCInfoImpl::setElementData(it->first, dipVal, elementNr, value, payload, initializedVectors);
theLHCInfoImpl::setElementData(it->first, dipVal, elementNr, value, payload, initializedVectors);
}
}
//}
Expand Down Expand Up @@ -550,28 +494,15 @@ void LHCInfoPopConSourceHandler::addEmptyPayload(cond::Time_t iov) {
}
}

namespace LHCInfoImpl {
namespace theLHCInfoImpl {
bool comparePayloads(const LHCInfo& rhs, const LHCInfo& lhs) {
if (rhs.fillNumber() != lhs.fillNumber())
return false;
if (rhs.delivLumi() != lhs.delivLumi())
return false;
if (rhs.recLumi() != lhs.recLumi())
return false;
if (rhs.instLumi() != lhs.instLumi())
return false;
if (rhs.instLumiError() != lhs.instLumiError())
return false;
if (rhs.crossingAngle() != rhs.crossingAngle())
return false;
if (rhs.betaStar() != rhs.betaStar())
return false;
if (rhs.lhcState() != rhs.lhcState())
return false;
if (rhs.lhcComment() != rhs.lhcComment())
return false;
if (rhs.ctppsStatus() != rhs.ctppsStatus())
if (rhs.fillNumber() != lhs.fillNumber() || rhs.delivLumi() != lhs.delivLumi() || rhs.recLumi() != lhs.recLumi() ||
rhs.instLumi() != lhs.instLumi() || rhs.instLumiError() != lhs.instLumiError() ||
rhs.crossingAngle() != lhs.crossingAngle() || rhs.betaStar() != lhs.betaStar() ||
rhs.lhcState() != lhs.lhcState() || rhs.lhcComment() != lhs.lhcComment() ||
rhs.ctppsStatus() != lhs.ctppsStatus()) {
return false;
}
return true;
}

Expand Down Expand Up @@ -600,7 +531,7 @@ namespace LHCInfoImpl {
return niovs;
}

} // namespace LHCInfoImpl
} // namespace theLHCInfoImpl

void LHCInfoPopConSourceHandler::getNewObjects() {
//reference to the last payload in the tag
Expand Down Expand Up @@ -683,7 +614,7 @@ void LHCInfoPopConSourceHandler::getNewObjects() {
query->filterEQ("fill_number", m_prevPayload->fillNumber());
bool foundFill = query->execute();
if (foundFill)
foundFill = LHCInfoImpl::makeFillPayload(m_fillPayload, query->result());
foundFill = theLHCInfoImpl::makeFillPayload(m_fillPayload, query->result());
if (!foundFill) {
edm::LogError(m_name) << "Could not find fill #" << m_prevPayload->fillNumber();
break;
Expand All @@ -704,7 +635,7 @@ void LHCInfoPopConSourceHandler::getNewObjects() {
query->filterNotNull("end_time");
bool foundFill = query->execute();
if (foundFill)
foundFill = LHCInfoImpl::makeFillPayload(m_fillPayload, query->result());
foundFill = theLHCInfoImpl::makeFillPayload(m_fillPayload, query->result());
if (!foundFill) {
edm::LogInfo(m_name) << "No fill found - END of job.";
if (iovAdded)
Expand Down Expand Up @@ -740,7 +671,7 @@ void LHCInfoPopConSourceHandler::getNewObjects() {
getEcalData(session2, startSampleTime, endSampleTime, updateEcal);
session2.transaction().commit();
//
size_t niovs = LHCInfoImpl::transferPayloads(m_tmpBuffer, m_iovs, m_prevPayload);
size_t niovs = theLHCInfoImpl::transferPayloads(m_tmpBuffer, m_iovs, m_prevPayload);
edm::LogInfo(m_name) << "Added " << niovs << " iovs within the Fill time";
m_tmpBuffer.clear();
iovAdded = true;
Expand Down

0 comments on commit 644e779

Please sign in to comment.