Skip to content

Commit

Permalink
code-checks & code-format
Browse files Browse the repository at this point in the history
  • Loading branch information
panoskatsoulis committed Apr 22, 2022
1 parent a03bb13 commit e98a14f
Showing 1 changed file with 27 additions and 29 deletions.
56 changes: 27 additions & 29 deletions CondTools/L1TriggerExt/plugins/L1CondDBPayloadWriterExt.cc
Expand Up @@ -79,7 +79,7 @@ void L1CondDBPayloadWriterExt::analyze(const edm::Event& iEvent, const edm::Even
L1TriggerKeyListExt oldKeyList;
l1t::DataWriterExt& m_writer = *m_rcdToWriterMap.at("L1TriggerKeyExtRcd@L1TriggerKeyExt");

if ( not (m_newL1TriggerKeyListExt or m_writer.fillLastTriggerKeyList(oldKeyList)) )
if (not(m_newL1TriggerKeyListExt or m_writer.fillLastTriggerKeyList(oldKeyList)))
edm::LogError("L1-O2O") << "Problem getting last L1TriggerKeyListExt";

L1TriggerKeyListExt* keyList = nullptr;
Expand All @@ -103,8 +103,8 @@ void L1CondDBPayloadWriterExt::analyze(const edm::Event& iEvent, const edm::Even
}

if (triggerKeyOK and m_writeL1TriggerKeyExt) {
edm::LogVerbatim("L1-O2O") << "Object key for L1TriggerKeyExtRcd@L1TriggerKeyExt: "
<< key.tscKey() << " (about to run writePayload)";
edm::LogVerbatim("L1-O2O") << "Object key for L1TriggerKeyExtRcd@L1TriggerKeyExt: " << key.tscKey()
<< " (about to run writePayload)";
token = m_writer.writePayload(iSetup);
}

Expand All @@ -126,7 +126,8 @@ void L1CondDBPayloadWriterExt::analyze(const edm::Event& iEvent, const edm::Even

if (not m_writeConfigData) {
// Write L1TriggerKeyListExt to ORCON
if (keyList) m_writer.writeKeyList(keyList, 0, m_logTransactions);
if (keyList)
m_writer.writeKeyList(keyList, 0, m_logTransactions);
return;
}

Expand All @@ -139,8 +140,7 @@ void L1CondDBPayloadWriterExt::analyze(const edm::Event& iEvent, const edm::Even
// for (; it != end; ++it) {

bool throwException = false;
for (auto it: key.recordToKeyMap()) {

for (const auto& it : key.recordToKeyMap()) {
// If there isn't any WriterProxyT constructed for this rcd, continue
// (the missing rcds are left out for a reason - those are static that throw exceptions that cannot be handled in 12_3)
if (m_rcdToWriterMap.find(it.first) == m_rcdToWriterMap.end())
Expand All @@ -149,47 +149,45 @@ void L1CondDBPayloadWriterExt::analyze(const edm::Event& iEvent, const edm::Even
// Do nothing if object key is null.
// (Panos) this might not be working as the "empty" keys are L1TriggerKeyExt::kEmptyKey (std::string(""))
if (it.second == L1TriggerKeyExt::kNullKey) {
edm::LogVerbatim("L1-O2O") << "L1CondDBPayloadWriter: null object key for "
<< it.first << "; skipping this record.";
edm::LogVerbatim("L1-O2O") << "L1CondDBPayloadWriter: null object key for " << it.first
<< "; skipping this record.";
continue;
}

// Check key is new before writing
if (oldKeyList.token(it.first, it.second).empty() || m_overwriteKeys) {
// Write data to ORCON with no IOV
if (!oldKeyList.token(it.first, it.second).empty()) {
edm::LogVerbatim("L1-O2O") << "*** Overwriting payload: object key for "
<< it.first << ": " << it.second;
edm::LogVerbatim("L1-O2O") << "*** Overwriting payload: object key for " << it.first << ": " << it.second;
} else {
edm::LogVerbatim("L1-O2O") << "object key for " << it.first << ": " << it.second;
edm::LogVerbatim("L1-O2O") << "object key for " << it.first << ": " << it.second;
}

try {
edm::LogVerbatim("L1-O2O") << "about to run writePayload for " << it.first;
token = m_rcdToWriterMap.at(it.first)->writePayload(iSetup);
edm::LogVerbatim("L1-O2O") << "about to run writePayload for " << it.first;
token = m_rcdToWriterMap.at(it.first)->writePayload(iSetup);
} catch (l1t::DataInvalidException& ex) {
edm::LogVerbatim("L1-O2O") << ex.what() << " Skipping to next record.";
throwException = true;
continue;
edm::LogVerbatim("L1-O2O") << ex.what() << " Skipping to next record.";
throwException = true;
continue;
}

if (!token.empty()) {
// Record token in L1TriggerKeyListExt
if (!keyList)
keyList = new L1TriggerKeyListExt(oldKeyList);
// The following should never happen because of the check
// above, but just in case....
if (!(keyList->addKey(it.first, it.second, token, m_overwriteKeys)))
throw cond::Exception("L1CondDBPayloadWriter") << "subsystem key " << it.second << " for "
<< it.first << " already in L1TriggerKeyListExt";
// Record token in L1TriggerKeyListExt
if (!keyList)
keyList = new L1TriggerKeyListExt(oldKeyList);
// The following should never happen because of the check
// above, but just in case....
if (!(keyList->addKey(it.first, it.second, token, m_overwriteKeys)))
throw cond::Exception("L1CondDBPayloadWriter")
<< "subsystem key " << it.second << " for " << it.first << " already in L1TriggerKeyListExt";
}

}
else
edm::LogVerbatim("L1-O2O") << "L1CondDBPayloadWriter: object key " << it.second
<< " for " << it.first << " already in L1TriggerKeyListExt";
} else
edm::LogVerbatim("L1-O2O") << "L1CondDBPayloadWriter: object key " << it.second << " for " << it.first
<< " already in L1TriggerKeyListExt";

} // for rcds from keys
} // for rcds from keys

if (keyList) // Write L1TriggerKeyListExt to ORCON
m_writer.writeKeyList(keyList, 0, m_logTransactions);
Expand Down

0 comments on commit e98a14f

Please sign in to comment.