Skip to content
Snippets Groups Projects
Commit 82cdef1a authored by Chandler Robert Baker's avatar Chandler Robert Baker
Browse files

Merge branch 'trig_gcc13_1' into '23.0'

TrigT1CaloCalibConditions: fix compilation with gcc13

See merge request !64093
parents 4a3d521f 9a9d6bf7
No related branches found
No related tags found
2 merge requests!641532023-07-05: Daily sweep of 23.0 into main,!64093TrigT1CaloCalibConditions: fix compilation with gcc13
// -*- C++ -*-
/*
Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
Copyright (C) 2002-2023 CERN for the benefit of the ATLAS collaboration
*/
#ifndef TRIGT1CALOCALIBCONDITIONS_L1CALOPPRCHANCALIBV1CONTAINER_H
......@@ -30,7 +30,7 @@ private:
public:
L1CaloPprChanCalibV1Container();
L1CaloPprChanCalibV1Container(const std::string& folderKey);
virtual ~L1CaloPprChanCalibV1Container() {}
virtual ~L1CaloPprChanCalibV1Container();
// interface of AbstractL1CaloPersistentCondition
using AbstractL1CaloPersistentCondition::makeTransient;
......@@ -38,7 +38,7 @@ public:
virtual DataObject* makePersistent() const;
virtual std::vector<std::string> coolInputKeys() const { return {m_coolFolderKey}; }
virtual std::string coolOutputKey() const { return m_coolFolderKey; }
virtual void clear() { m_pprChanCalibs.clear(); }
virtual void clear();
// getters
const L1CaloPprChanCalibV1* pprChanCalibV1(unsigned int channelId) const;
......
/*
Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
Copyright (C) 2002-2023 CERN for the benefit of the ATLAS collaboration
*/
#include "TrigT1CaloCalibConditions/L1CaloPprChanCalibV1Container.h"
......@@ -44,6 +44,9 @@ L1CaloPprChanCalibV1Container::L1CaloPprChanCalibV1Container(const std::string&
m_coolFolderKey = folderKey;
}
L1CaloPprChanCalibV1Container::~L1CaloPprChanCalibV1Container()
{
}
DataObject* L1CaloPprChanCalibV1Container::makePersistent() const
{
......@@ -141,3 +144,8 @@ void L1CaloPprChanCalibV1Container::addPprChanCalibV1(const L1CaloPprChanCalibV1
}),
pprChanCalib);
}
void L1CaloPprChanCalibV1Container::clear()
{
m_pprChanCalibs.clear();
}
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment