Skip to content
Snippets Groups Projects
Commit 40ad6932 authored by Edward Moyse's avatar Edward Moyse
Browse files

Merge branch 'gcc12.TrkVKalVrtCore-20220112' into 'master'

TrkVKalVrtCore: Fix compilation with gcc12.

See merge request !49610
parents 73a66172 e29e9296
No related branches found
No related tags found
5 merge requests!69091Fix correlated smearing bug in JER in JetUncertainties in 22.0,!58791DataQualityConfigurations: Modify L1Calo config for web display,!51674Fixing hotSpotInHIST for Run3 HIST,!50012RecExConfig: Adjust log message levels from GetRunNumber and GetLBNumber,!49610TrkVKalVrtCore: Fix compilation with gcc12.
/* /*
Calculate mass and mass error for any subset of tracks Calculate mass and mass error for any subset of tracks
Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/ */
#include "TrkVKalVrtCore/CommonPars.h" #include "TrkVKalVrtCore/CommonPars.h"
#include "TrkVKalVrtCore/TrkVKalVrtCoreBase.h" #include "TrkVKalVrtCore/TrkVKalVrtCoreBase.h"
#include <cmath> #include <cmath>
#include <array>
namespace Trk { namespace Trk {
......
/* /*
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/ */
#include "TrkVKalVrtCore/CommonPars.h" #include "TrkVKalVrtCore/CommonPars.h"
#include "TrkVKalVrtCore/TrkVKalVrtCoreBase.h" #include "TrkVKalVrtCore/TrkVKalVrtCoreBase.h"
#include "TrkVKalVrtCore/VKalVrtBMag.h" #include "TrkVKalVrtCore/VKalVrtBMag.h"
#include <cmath> #include <cmath>
#include <array>
#include <iostream> #include <iostream>
namespace Trk { namespace Trk {
......
/* /*
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/ */
#include "TrkVKalVrtCore/CommonPars.h" #include "TrkVKalVrtCore/CommonPars.h"
#include "TrkVKalVrtCore/Propagator.h" #include "TrkVKalVrtCore/Propagator.h"
#include "TrkVKalVrtCore/TrkVKalVrtCoreBase.h" #include "TrkVKalVrtCore/TrkVKalVrtCoreBase.h"
#include <cmath> #include <cmath>
#include <array>
#include <iostream> #include <iostream>
namespace Trk { namespace Trk {
......
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