diff --git a/LumiBlock/LumiBlockComps/Root/LumiBlockMetaDataTool.cxx b/LumiBlock/LumiBlockComps/Root/LumiBlockMetaDataTool.cxx
index b6ffa7dfa2b794224d7a559dc3f6c5c8556533d0..4d5df86d20651069241eeb44f5914d6390d892cb 100644
--- a/LumiBlock/LumiBlockComps/Root/LumiBlockMetaDataTool.cxx
+++ b/LumiBlock/LumiBlockComps/Root/LumiBlockMetaDataTool.cxx
@@ -107,7 +107,7 @@ StatusCode LumiBlockMetaDataTool::beginInputFile(const SG::SourceID&)
if (m_pInputStore->contains<xAOD::LumiBlockRangeContainer>(m_LBColl_name)) {
ATH_MSG_INFO(" Contains xAOD::LumiBlockRangeContainer " << m_LBColl_name);
- const xAOD::LumiBlockRangeContainer* lbrange =0;
+ const xAOD::LumiBlockRangeContainer* lbrange =nullptr;
StatusCode sc = m_pInputStore->retrieve(lbrange,m_LBColl_name);
if (!sc.isSuccess()) {
ATH_MSG_INFO( "Could not find unfinished xAOD::LumiBlockRangeContainer in input metatdata store" );
@@ -121,7 +121,7 @@ StatusCode LumiBlockMetaDataTool::beginInputFile(const SG::SourceID&)
}
if (m_pInputStore->contains<xAOD::LumiBlockRangeContainer>(m_unfinishedLBColl_name)) {
ATH_MSG_INFO(" Contains xAOD::LumiBlockRangeContainer " << m_unfinishedLBColl_name);
- const xAOD::LumiBlockRangeContainer* lbrange =0;
+ const xAOD::LumiBlockRangeContainer* lbrange =nullptr;
StatusCode sc = m_pInputStore->retrieve(lbrange,m_unfinishedLBColl_name);
if (!sc.isSuccess()) {
ATH_MSG_INFO( "Could not find unfinished xAOD::LumiBlockRangeContainer in input metatdata store" );
@@ -135,7 +135,7 @@ StatusCode LumiBlockMetaDataTool::beginInputFile(const SG::SourceID&)
}
if (m_pInputStore->contains<xAOD::LumiBlockRangeContainer>(m_suspectLBColl_name)) {
ATH_MSG_INFO(" Contains xAOD::LumiBlockRangeContainer " << m_suspectLBColl_name);
- const xAOD::LumiBlockRangeContainer* lbrange =0;
+ const xAOD::LumiBlockRangeContainer* lbrange =nullptr;
StatusCode sc = m_pInputStore->retrieve(lbrange,m_suspectLBColl_name);
if (!sc.isSuccess()) {
ATH_MSG_INFO( "Could not find suspect xAOD::LumiBlockRangeContainer in input metatdata store" );
@@ -201,7 +201,7 @@ StatusCode LumiBlockMetaDataTool::finishUp() {
xAOD::LumiBlockRangeAuxContainer* piovSuspectAux = new xAOD::LumiBlockRangeAuxContainer();
piovSuspect->setStore( piovSuspectAux );
- if(m_cacheSuspectOutputRangeContainer->size()>0) {
+ if(!m_cacheSuspectOutputRangeContainer->empty()) {
ATH_MSG_VERBOSE("Suspect OutputRangeCollection with size " << m_cacheSuspectOutputRangeContainer->size());
for (const auto range : *m_cacheSuspectOutputRangeContainer) {
auto iovr = std::make_unique<xAOD::LumiBlockRange>(*range);
@@ -209,7 +209,7 @@ StatusCode LumiBlockMetaDataTool::finishUp() {
}
}
- if(m_cacheOutputRangeContainer->size()>0) {
+ if(!m_cacheOutputRangeContainer->empty()) {
ATH_MSG_VERBOSE("OutputRangeCollection with size " << m_cacheOutputRangeContainer->size());
m_cacheOutputRangeContainer->sort(xAOD::SortLumiBlockRangeByStart());
@@ -276,7 +276,7 @@ StatusCode LumiBlockMetaDataTool::finishUp() {
}
- if(piovComplete->size()>0) {
+ if(!piovComplete->empty()) {
ATH_MSG_DEBUG( "Number of Complete LumiBlocks:" << piovComplete->size() );
for (const auto range : *piovComplete) {
ATH_MSG_INFO("\t [ ("
@@ -289,7 +289,7 @@ StatusCode LumiBlockMetaDataTool::finishUp() {
}
}
- if(piovUnfinished->size()>0) {
+ if(!piovUnfinished->empty()) {
ATH_MSG_DEBUG( "Number of Unfinished LumiBlocks:" << piovUnfinished->size() );
for (const auto range : *piovUnfinished) {
ATH_MSG_INFO("\t [ ("
@@ -301,7 +301,7 @@ StatusCode LumiBlockMetaDataTool::finishUp() {
<< " ]");
}
}
- if(piovSuspect->size()>0) {
+ if(!piovSuspect->empty()) {
ATH_MSG_DEBUG( "Number of Suspect LumiBlocks:" << piovSuspect->size() );
for (const auto range : *piovSuspect) {
ATH_MSG_INFO("\t [ ("
@@ -316,19 +316,19 @@ StatusCode LumiBlockMetaDataTool::finishUp() {
// Store the LumiBlockRangeContainer in the metadata store
// =======================================================
- if(piovComplete->size()>0) {
+ if(!piovComplete->empty()) {
ATH_MSG_INFO( "Write Complete LumiBlocks with size " << piovComplete->size());
ATH_CHECK( m_pMetaDataStore->record( piovComplete, m_LBColl_name ) );
ATH_CHECK( m_pMetaDataStore->record( piovCompleteAux, m_LBColl_name + "Aux." ) );
}
- if(piovUnfinished->size()>0) {
+ if(!piovUnfinished->empty()) {
ATH_MSG_INFO( "Write Unfinished LumiBlocks with size " << piovUnfinished->size());
ATH_CHECK( m_pMetaDataStore->record( piovUnfinished, m_unfinishedLBColl_name ) );
ATH_CHECK( m_pMetaDataStore->record( piovUnfinishedAux, m_unfinishedLBColl_name + "Aux." ) );
}
- if(piovSuspect->size()>0) {
+ if(!piovSuspect->empty()) {
ATH_MSG_INFO( "Write Suspect LumiBlocks with size " << piovSuspect->size());
ATH_CHECK( m_pMetaDataStore->record( piovSuspect, m_suspectLBColl_name ) );
ATH_CHECK( m_pMetaDataStore->record( piovSuspectAux, m_suspectLBColl_name + "Aux." ) );
diff --git a/LumiBlock/LumiBlockComps/src/BunchCrossingCondAlg.cxx b/LumiBlock/LumiBlockComps/src/BunchCrossingCondAlg.cxx
index b4801289cda09e990cf7fd5febec481f27c6c233..6377f22a64c36c7e6708d85837a2c53ab1fb34fc 100644
--- a/LumiBlock/LumiBlockComps/src/BunchCrossingCondAlg.cxx
+++ b/LumiBlock/LumiBlockComps/src/BunchCrossingCondAlg.cxx
@@ -3,12 +3,12 @@
*/
#include "BunchCrossingCondAlg.h"
+#include "CoolKernel/IObject.h"
+#include "CoralBase/Blob.h"
#include "StoreGate/ReadCondHandle.h"
#include "StoreGate/WriteCondHandle.h"
-#include <stdint.h>
#include <charconv>
-#include "CoralBase/Blob.h"
-#include "CoolKernel/IObject.h"
+#include <cstdint>
#include "CoralBase/AttributeListException.h"
@@ -55,7 +55,7 @@ StatusCode BunchCrossingCondAlg::execute (const EventContext& ctx) const {
const float minBunchIntensity=0.001;
std::vector<float> bunches=tokenize(sbunches);
- if (bunches.size()>0) {
+ if (!bunches.empty()) {
// Check if the pattern "fits into" the LHC:
if( BunchCrossingCondData::m_MAX_BCID % bunches.size() ) {
@@ -217,7 +217,7 @@ std::vector<BunchCrossingCondData::bunchTrain_t> BunchCrossingCondAlg::findTrain
}
- if (holes.size()<1) {
+ if (holes.empty()) {
ATH_MSG_ERROR("Looks like we have bunch train spanning the entire ring w/o any gap. Really?");
return result;
}
diff --git a/LumiBlock/LumiBlockComps/src/BunchCrossingCondTest.h b/LumiBlock/LumiBlockComps/src/BunchCrossingCondTest.h
index 4bd599f357f61b446df189273fcce0199626dc54..4eeea64f674fc0ea7a6629b6ce8cb55c71219e96 100644
--- a/LumiBlock/LumiBlockComps/src/BunchCrossingCondTest.h
+++ b/LumiBlock/LumiBlockComps/src/BunchCrossingCondTest.h
@@ -28,9 +28,9 @@ public:
private:
/// Function for printing detailed info about a given bunch crossing
- void printInfo(const BunchCrossingCondData* bccd, unsigned int bcid, std::ostream& out);
+ static void printInfo(const BunchCrossingCondData* bccd, unsigned int bcid, std::ostream& out);
- void printCompactInfo(const BunchCrossingCondData* bccd, unsigned int bcid, std::ostream& out);
+ static void printCompactInfo(const BunchCrossingCondData* bccd, unsigned int bcid, std::ostream& out);
SG::ReadCondHandleKey<BunchCrossingCondData> m_inputKey{this,"InputKey","BunchCrossingData",""};
diff --git a/LumiBlock/LumiBlockComps/src/CreateLumiBlockCollectionFromFile.cxx b/LumiBlock/LumiBlockComps/src/CreateLumiBlockCollectionFromFile.cxx
index 284f0f78477f8f4e5a5788bc2d1f81cede3d8ab2..f7830582996b473ec361102b1b09cae71ce13fd5 100644
--- a/LumiBlock/LumiBlockComps/src/CreateLumiBlockCollectionFromFile.cxx
+++ b/LumiBlock/LumiBlockComps/src/CreateLumiBlockCollectionFromFile.cxx
@@ -149,7 +149,7 @@ StatusCode CreateLumiBlockCollectionFromFile::fillLumiBlockCollection()
iovr->setEventsSeen(p.second.second);
}
- if(piovComplete->size()>0) {
+ if(!piovComplete->empty()) {
ATH_MSG_INFO( "Number of Complete LumiBlocks:" << piovComplete->size() );
for(const xAOD::LumiBlockRange* lbr : *piovComplete) {
ATH_MSG_INFO("\t [ ("
@@ -162,7 +162,7 @@ StatusCode CreateLumiBlockCollectionFromFile::fillLumiBlockCollection()
}
}
- if(piovUnfinished->size()>0) {
+ if(!piovUnfinished->empty()) {
ATH_MSG_INFO( "Number of Unfinished LumiBlocks:" << piovUnfinished->size() );
for(const xAOD::LumiBlockRange* lbr : *piovUnfinished) {
ATH_MSG_INFO("\t [ ("
@@ -175,7 +175,7 @@ StatusCode CreateLumiBlockCollectionFromFile::fillLumiBlockCollection()
}
}
- if(piovSuspect->size()>0) {
+ if(!piovSuspect->empty()) {
ATH_MSG_INFO( "Number of Suspect LumiBlocks:" << piovSuspect->size() );
for(const xAOD::LumiBlockRange* lbr : *piovSuspect) {
ATH_MSG_INFO("\t [ ("
@@ -190,17 +190,17 @@ StatusCode CreateLumiBlockCollectionFromFile::fillLumiBlockCollection()
// Store the LumiBlockCollection in the metadata store
// =======================================================
- if(piovComplete->size()>0) {
+ if(!piovComplete->empty()) {
ATH_CHECK( m_metaStore->record( std::move(piovComplete), m_LBColl_name ) );
ATH_CHECK( m_metaStore->record( std::move(piovCompleteAux), m_LBColl_name + "Aux." ) );
}
- if(piovUnfinished->size()>0) {
+ if(!piovUnfinished->empty()) {
ATH_CHECK( m_metaStore->record( std::move(piovUnfinished), m_unfinishedLBColl_name ) );
ATH_CHECK( m_metaStore->record( std::move(piovUnfinishedAux), m_unfinishedLBColl_name + "Aux." ) );
}
- if(piovSuspect->size()>0) {
+ if(!piovSuspect->empty()) {
ATH_CHECK( m_metaStore->record( std::move(piovSuspect), m_suspectLBColl_name ) );
ATH_CHECK( m_metaStore->record( std::move(piovSuspectAux), m_suspectLBColl_name + "Aux." ) );
}
@@ -217,7 +217,7 @@ void CreateLumiBlockCollectionFromFile::handle(const Incident& inc)
{
if(inc.type() == "MetaDataStop") {
ATH_MSG_INFO( " finishUp: write lumiblocks to meta data store " );
- if(m_LumiBlockInfo.size()>0) {
+ if(!m_LumiBlockInfo.empty()) {
if(fillLumiBlockCollection().isFailure()) {
ATH_MSG_ERROR( "Could not fill lumiblock collections" );
}
diff --git a/LumiBlock/LumiBlockComps/src/LumiBlockMuTool.cxx b/LumiBlock/LumiBlockComps/src/LumiBlockMuTool.cxx
index a0924aaded1adc0d09fd241dcac611d76709c8cd..2a2909efbdc068621032b6e3da75c85586680c2e 100644
--- a/LumiBlock/LumiBlockComps/src/LumiBlockMuTool.cxx
+++ b/LumiBlock/LumiBlockComps/src/LumiBlockMuTool.cxx
@@ -31,8 +31,6 @@ LumiBlockMuTool::actualInteractionsPerCrossing() const {
SG::ReadHandle<xAOD::EventInfo> eventInfo(m_eventInfoKey);
SG::ReadDecorHandle<xAOD::EventInfo,float> actMu(m_rdhkActMu);
float mu = actMu.isPresent() ? actMu(0) : 0.;
-
- if (eventInfo->eventType(xAOD::EventInfo::IS_SIMULATION) && mu < 0) return eventInfo->lumiBlock() % 100;
return mu;
}
@@ -42,7 +40,5 @@ LumiBlockMuTool::averageInteractionsPerCrossing() const{
SG::ReadHandle<xAOD::EventInfo> eventInfo(m_eventInfoKey);
SG::ReadDecorHandle<xAOD::EventInfo,float> aveMu(m_rdhkAveMu);
float mu = aveMu.isPresent() ? aveMu(0) : 0.;
-
- if (eventInfo->eventType(xAOD::EventInfo::IS_SIMULATION) && mu <= 0) return eventInfo->lumiBlock() % 100;
return mu;
}
diff --git a/LumiBlock/LumiBlockComps/src/LumiBlockMuTool.h b/LumiBlock/LumiBlockComps/src/LumiBlockMuTool.h
index 7da01e053c2d55972b9d6325ee1fe816f970f47f..786d6f63472eb64e58be6e7ec79472ad3fb3be71 100644
--- a/LumiBlock/LumiBlockComps/src/LumiBlockMuTool.h
+++ b/LumiBlock/LumiBlockComps/src/LumiBlockMuTool.h
@@ -36,10 +36,10 @@ class LumiBlockMuTool: public extends<AthAlgTool, ILumiBlockMuTool> {
// ---------------- user interface -------------------
// Return interactions per crossing (mu) averaged over all BCIDs in physics bunch group
- virtual float averageInteractionsPerCrossing() const override;
+ virtual float averageInteractionsPerCrossing() const override final;
// Return interactions per crossing (mu) for this specific BCID
- virtual float actualInteractionsPerCrossing() const override;
+ virtual float actualInteractionsPerCrossing() const override final;
// Functions
virtual StatusCode initialize() override;
diff --git a/LumiBlock/LumiBlockComps/src/LumiCalibrator.cxx b/LumiBlock/LumiBlockComps/src/LumiCalibrator.cxx
index 165e1cc4501e82f5f73806a84e1c6326d9da4a59..ffdec15261f9562d53673452e853aec4b851b8c3 100644
--- a/LumiBlock/LumiBlockComps/src/LumiCalibrator.cxx
+++ b/LumiBlock/LumiBlockComps/src/LumiCalibrator.cxx
@@ -69,7 +69,7 @@ LumiCalibrator::calibrateMu(float rawLumi, float& calMu) const
if (m_fType == "Polynomial") {
// Check parameter length
- if (m_parVec.size() < 1) return false;
+ if (m_parVec.empty()) return false;
unsigned int nrange = m_parVec[0];
@@ -177,7 +177,7 @@ LumiCalibrator::calibrateMu(float rawLumi, float& calMu) const
// Vincent's Newton-Rhapson method
float
-LumiCalibrator::getMuVis(float rawPerBX, float sigo, float siga) const
+LumiCalibrator::getMuVis(float rawPerBX, float sigo, float siga)
{
//std::cout << "getMuVis("<<rawPerBX<<","<<sigo<<","<<siga<<")"<<std::endl;
@@ -190,8 +190,8 @@ LumiCalibrator::getMuVis(float rawPerBX, float sigo, float siga) const
// Set a fixed number of cycles, but break if we converge faster
for (int i=0; i<30; i++) {
mu = munew;
- y = rawPerBX - 1. - exp(-b * mu) + 2. * exp(-a * mu);
- dy = b * exp(-b * mu) - 2. * a * exp(-a * mu);
+ y = rawPerBX - 1. - std::exp(-b * mu) + 2. * std::exp(-a * mu);
+ dy = b * std::exp(-b * mu) - 2. * a * std::exp(-a * mu);
munew = mu-y/dy;
//std::cout << i <<" - munew: " << munew << " mu:" << mu << " diff:"
@@ -199,7 +199,7 @@ LumiCalibrator::getMuVis(float rawPerBX, float sigo, float siga) const
// Protect against unphysical values
if (munew <= 0.) return -1.;
- if (fabs(munew-mu)/munew < 1.E-5) break;
+ if (std::abs(munew-mu)/munew < 1.E-5) break;
}
return munew;
@@ -207,11 +207,11 @@ LumiCalibrator::getMuVis(float rawPerBX, float sigo, float siga) const
// Mika's original brute-force method
float rpbx(float sr, float mu) {
- return 1. - 2.*exp(-(1+sr)*mu/2.) + exp(-sr*mu);
+ return 1. - 2.*std::exp(-(1+sr)*mu/2.) + std::exp(-sr*mu);
}
float
-LumiCalibrator::getMuVis2(float rawPerBX, float sigo, float siga) const
+LumiCalibrator::getMuVis2(float rawPerBX, float sigo, float siga)
{
float muvl=1e-10;
float muvu=100.;
diff --git a/LumiBlock/LumiBlockComps/src/LumiCalibrator.h b/LumiBlock/LumiBlockComps/src/LumiCalibrator.h
index 362fb77b2920ce3981cd85eb052e934959ce513b..afdcb37ac69441730d0beb690d75ddb6dfacabff 100644
--- a/LumiBlock/LumiBlockComps/src/LumiCalibrator.h
+++ b/LumiBlock/LumiBlockComps/src/LumiCalibrator.h
@@ -42,8 +42,8 @@ class LumiCalibrator {
float m_muToLumi;
std::vector<float> m_parVec;
- float getMuVis(float rawPerBX, float sigo, float siga) const;
- float getMuVis2(float rawPerBX, float sigo, float siga) const;
+ static float getMuVis(float rawPerBX, float sigo, float siga) ;
+ static float getMuVis2(float rawPerBX, float sigo, float siga) ;
};
diff --git a/LumiBlock/LumiBlockComps/src/LuminosityCondAlg.cxx b/LumiBlock/LumiBlockComps/src/LuminosityCondAlg.cxx
index 1d991fc7032cd92aa68e223105b48d769b23a4bd..b22058cb90a5fb4701a3ba250f7050b77dae02d7 100644
--- a/LumiBlock/LumiBlockComps/src/LuminosityCondAlg.cxx
+++ b/LumiBlock/LumiBlockComps/src/LuminosityCondAlg.cxx
@@ -110,7 +110,7 @@ LuminosityCondAlg::execute (const EventContext& ctx) const
const float avgMu = eventinfo->averageInteractionsPerCrossing();
const auto& attr = (**digitizationFolder)[std::string("BeamIntensityPattern")];
- const std::string sbunches = attr.data<std::string>();
+ const std::string& sbunches = attr.data<std::string>();
std::vector<float> bunchpattern = tokenize(sbunches);
if (bunchpattern.size() != LuminosityCondData::TOTAL_LHC_BCIDS) {
diff --git a/LumiBlock/LumiBlockComps/src/TrigLiveFractionCondAlg.cxx b/LumiBlock/LumiBlockComps/src/TrigLiveFractionCondAlg.cxx
index ad833ecf786e2ffb7a35f3bc9f3ee16a1bb6e0a6..6069e587abb33766fb33a3356db8e53f2f07a138 100644
--- a/LumiBlock/LumiBlockComps/src/TrigLiveFractionCondAlg.cxx
+++ b/LumiBlock/LumiBlockComps/src/TrigLiveFractionCondAlg.cxx
@@ -182,7 +182,7 @@ TrigLiveFractionCondAlg::lumiWeight (const LuminosityCondData& lumi,
const std::vector<float>& liveFractionLo,
const std::vector<float>& liveFractionHi,
float& lumiLiveFractionLo,
- float& lumiLiveFractionHi) const
+ float& lumiLiveFractionHi)
{
double numsumlo = 0.;
double numsumhi = 0.;
diff --git a/LumiBlock/LumiBlockComps/src/TrigLiveFractionCondAlg.h b/LumiBlock/LumiBlockComps/src/TrigLiveFractionCondAlg.h
index 51841c6a530e8b4b2c7c6e7033534af48e6d2e33..a33831601dc61ae88d89089e5699ddff87ea64e9 100644
--- a/LumiBlock/LumiBlockComps/src/TrigLiveFractionCondAlg.h
+++ b/LumiBlock/LumiBlockComps/src/TrigLiveFractionCondAlg.h
@@ -77,11 +77,11 @@ private:
* @param lumiLiveFractionLo[out] Weighted average live fractions, low-prio.
* @param lumiLiveFractionHi[out] Weighted average live fractions, high-prio.
*/
- StatusCode lumiWeight (const LuminosityCondData& lumi,
+ static StatusCode lumiWeight (const LuminosityCondData& lumi,
const std::vector<float>& liveFractionLo,
const std::vector<float>& liveFractionHi,
float& lumiLiveFractionLo,
- float& lumiLiveFractionHi) const;
+ float& lumiLiveFractionHi) ;
/// Input deadtime folder.
diff --git a/LumiBlock/LumiBlockComps/test/LBDurationCondAlg_test.cxx b/LumiBlock/LumiBlockComps/test/LBDurationCondAlg_test.cxx
index b743b41ab82910a4a3fe552dbc81e0654515381d..d756f095cc0992b66f59561258032734b2699af3 100644
--- a/LumiBlock/LumiBlockComps/test/LBDurationCondAlg_test.cxx
+++ b/LumiBlock/LumiBlockComps/test/LBDurationCondAlg_test.cxx
@@ -63,7 +63,7 @@ void test1 (ISvcLocator* svcloc)
CondCont<LBDurationCondData>* cc2 = nullptr;
assert( conditionStore->retrieve (cc2, "LBDurationCondData").isSuccess() );
- const LBDurationCondData* data = 0;
+ const LBDurationCondData* data = nullptr;
const EventIDRange* range2p = nullptr;
assert (cc2->find (eid, data, &range2p));
assert (range2p->start().time_stamp() == timestamp(0).time_stamp());
diff --git a/LumiBlock/LumiBlockComps/test/LuminosityCondAlg_test.cxx b/LumiBlock/LumiBlockComps/test/LuminosityCondAlg_test.cxx
index e1ede9b0be3fe30f5e005abe7f17efc3b4c18453..cc2068186d93822ceae58933a25898f130d10419 100644
--- a/LumiBlock/LumiBlockComps/test/LuminosityCondAlg_test.cxx
+++ b/LumiBlock/LumiBlockComps/test/LuminosityCondAlg_test.cxx
@@ -76,7 +76,7 @@ void push_float (float x, std::vector<uint8_t>& data)
union {
float f;
uint32_t i;
- } cnv;
+ } cnv{};
cnv.f = x;
data.push_back (cnv.i & 0xff);
data.push_back ((cnv.i>>8) & 0xff);
diff --git a/LumiBlock/LumiBlockComps/test/TrigLiveFractionCondAlg_test.cxx b/LumiBlock/LumiBlockComps/test/TrigLiveFractionCondAlg_test.cxx
index 7452f3bedad6ee336ed781d077df0974d92988e0..37a66589da1eb51f9d8a0b3d9df3082e550f7b21 100644
--- a/LumiBlock/LumiBlockComps/test/TrigLiveFractionCondAlg_test.cxx
+++ b/LumiBlock/LumiBlockComps/test/TrigLiveFractionCondAlg_test.cxx
@@ -195,7 +195,7 @@ void test1 (ISvcLocator* svcloc)
CondCont<TrigLiveFractionCondData>* ccout = nullptr;
assert( conditionStore->retrieve (ccout, "TrigLiveFractionCondData").isSuccess() );
- const TrigLiveFractionCondData* data = 0;
+ const TrigLiveFractionCondData* data = nullptr;
const EventIDRange* rangeout = nullptr;
assert (ccout->find (eid, data, &rangeout));
assert (rangeout->start().time_stamp() == timestamp(0).time_stamp());
diff --git a/Tools/PROCTools/data/master_q221_AOD_digest.ref b/Tools/PROCTools/data/master_q221_AOD_digest.ref
index 750b1c4dd09fd86452f674abe04b8aa100fedc7a..6162f2f91ab710d711ef4cc9066a69ba7baac619 100644
--- a/Tools/PROCTools/data/master_q221_AOD_digest.ref
+++ b/Tools/PROCTools/data/master_q221_AOD_digest.ref
@@ -6,7 +6,7 @@
284500 87473037 65 43 0 11 2 9 6 4 2
284500 87473040 104 93 1 16 1 15 14 7 7
284500 87473051 135 111 1 11 1 10 22 16 6
- 284500 87473063 62 76 3 6 2 4 6 4 2
+ 284500 87473063 62 77 3 6 2 4 6 4 2
284500 87473068 26 33 1 0 0 0 0 0 0
284500 87473075 67 87 2 5 0 5 5 4 1
284500 87473084 84 86 2 13 1 12 10 5 5