diff --git a/ForwardDetectors/ZDC/ZdcAnalysis/Root/ZdcAnalysisTool.cxx b/ForwardDetectors/ZDC/ZdcAnalysis/Root/ZdcAnalysisTool.cxx
index 499cef5fc0e5204f3cd7364952ba9a0418330365..cb3fe44ffc2f7420d455c1822ce130e7c84fa5c1 100644
--- a/ForwardDetectors/ZDC/ZdcAnalysis/Root/ZdcAnalysisTool.cxx
+++ b/ForwardDetectors/ZDC/ZdcAnalysis/Root/ZdcAnalysisTool.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
*/
#include "ZdcAnalysis/ZdcAnalysisTool.h"
@@ -439,30 +439,30 @@ std::unique_ptr<ZDCDataAnalyzer> ZdcAnalysisTool::initializePbPb2018()
static constexpr float peak2ndDerivRepassHG = -10;
static constexpr float peak2ndDerivRepassLG = -6;
- ZDCDataAnalyzer::ZDCModuleFloatArray tau1Arr = {3.877, 3.998, 3.821, 3.858,
- 4.296, 4.064, 3.497, 3.642
- };
+ ZDCDataAnalyzer::ZDCModuleFloatArray tau1Arr = {{{3.877, 3.998, 3.821, 3.858},
+ {4.296, 4.064, 3.497, 3.642}
+ }};
- ZDCDataAnalyzer::ZDCModuleFloatArray tau2Arr = {24.40, 25.28, 25.66, 24.12,
- 24.42, 24.99, 25.72, 25.29
- };
+ ZDCDataAnalyzer::ZDCModuleFloatArray tau2Arr = {{{24.40, 25.28, 25.66, 24.12},
+ {24.42, 24.99, 25.72, 25.29}
+ }};
- ZDCDataAnalyzer::ZDCModuleFloatArray t0HG = {70.51, 70.57, 70.13, 69.98,
- 74.18, 72.79, 71.77, 72.62
- };
- ZDCDataAnalyzer::ZDCModuleFloatArray t0LG = {70.70, 70.78, 70.76, 70.91,
- 75.16, 73.71, 72.25, 73.61
- };
+ ZDCDataAnalyzer::ZDCModuleFloatArray t0HG = {{{70.51, 70.57, 70.13, 69.98},
+ {74.18, 72.79, 71.77, 72.62}
+ }};
+ ZDCDataAnalyzer::ZDCModuleFloatArray t0LG = {{{70.70, 70.78, 70.76, 70.91},
+ {75.16, 73.71, 72.25, 73.61}
+ }};
- ZDCDataAnalyzer::ZDCModuleFloatArray moduleAmpFractionLG = {0.2760, 0.3045, 0.2369, 0.1826,
- 0.3216, 0.2593, 0.2511, 0.1680
- };
+ ZDCDataAnalyzer::ZDCModuleFloatArray moduleAmpFractionLG = {{{0.2760, 0.3045, 0.2369, 0.1826},
+ {0.3216, 0.2593, 0.2511, 0.1680}
+ }};
// Delta T0 cut
- ZDCDataAnalyzer::ZDCModuleFloatArray DeltaT0CutLowHG = { -6, -5, -5, -5, -5, -5, -5, -5};
- ZDCDataAnalyzer::ZDCModuleFloatArray DeltaT0CutHighHG = {8, 8, 8, 11, 8, 10, 8, 12};
- ZDCDataAnalyzer::ZDCModuleFloatArray DeltaT0CutLowLG = { -6, -5, -5, -5, -5, -5, -5, -5};
- ZDCDataAnalyzer::ZDCModuleFloatArray DeltaT0CutHighLG = {8, 8, 8, 11, 8, 10, 8, 12};
+ ZDCDataAnalyzer::ZDCModuleFloatArray DeltaT0CutLowHG = {{{ -6, -5, -5, -5}, {-5, -5, -5, -5}}};
+ ZDCDataAnalyzer::ZDCModuleFloatArray DeltaT0CutHighHG = {{{8, 8, 8, 11}, {8, 10, 8, 12}}};
+ ZDCDataAnalyzer::ZDCModuleFloatArray DeltaT0CutLowLG = {{{ -6, -5, -5, -5}, {-5, -5, -5, -5}}};
+ ZDCDataAnalyzer::ZDCModuleFloatArray DeltaT0CutHighLG = {{{8, 8, 8, 11}, {8, 10, 8, 12}}};
for (size_t side : {0, 1}) {
for (size_t module : {0, 1, 2, 3}) {
diff --git a/ForwardDetectors/ZDC/ZdcAnalysis/ZdcAnalysis/ZDCPulseAnalyzer.h b/ForwardDetectors/ZDC/ZdcAnalysis/ZdcAnalysis/ZDCPulseAnalyzer.h
index f6b97adcf91e099621191c944cd24e4c61da0bd8..30fede95ad160e37369dc63559e54e532ba48b39 100644
--- a/ForwardDetectors/ZDC/ZdcAnalysis/ZdcAnalysis/ZDCPulseAnalyzer.h
+++ b/ForwardDetectors/ZDC/ZdcAnalysis/ZdcAnalysis/ZDCPulseAnalyzer.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
*/
#ifndef ZDCANALYSIS_ZDCPulseAnalyzer_h
@@ -182,7 +182,6 @@ private:
bool m_preExpTail;
bool m_fixPrePulse;
- bool m_fixPostPulse;
bool m_fitMinAmp;
bool m_repassPulse;
diff --git a/ForwardDetectors/ZDC/ZdcRec/ZdcRec/ZdcRecV3.h b/ForwardDetectors/ZDC/ZdcRec/ZdcRec/ZdcRecV3.h
index 7b05d1a200cf7018f707c32504ce1b80ac5613df..0cf87de31deec279723ec4266f88626d9bae88ee 100755
--- a/ForwardDetectors/ZDC/ZdcRec/ZdcRec/ZdcRecV3.h
+++ b/ForwardDetectors/ZDC/ZdcRec/ZdcRec/ZdcRecV3.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
*/
///////////////////////////////////////////////////////////////////
@@ -81,10 +81,6 @@ private:
/** Pointer to Zdc input "digits" data */
//const xAOD::TriggerTowerContainer* m_ttContainer;
- int m_eventCount;
- bool m_complainContain;
- bool m_complainRetrieve;
-
SG::WriteHandleKey<xAOD::ZdcModuleContainer> m_zdcModuleContainerName
{ this, "ZdcModuleContainerName", "ZdcModules", "" };
diff --git a/ForwardDetectors/ZDC/ZdcRec/src/ZdcRecV3.cxx b/ForwardDetectors/ZDC/ZdcRec/src/ZdcRecV3.cxx
index 7e5cd2b5235ddf56ef894a17e112e67ea3630135..44fe92b38a8242571aec77ce9a35f1747254c456 100644
--- a/ForwardDetectors/ZDC/ZdcRec/src/ZdcRecV3.cxx
+++ b/ForwardDetectors/ZDC/ZdcRec/src/ZdcRecV3.cxx
@@ -33,14 +33,11 @@ ZdcRecV3::ZdcRecV3(const std::string& name, ISvcLocator* pSvcLocator) :
AthAlgorithm(name, pSvcLocator),
//m_storeGate("StoreGateSvc", name),
- m_ownPolicy(static_cast<int> (SG::OWN_ELEMENTS)),
+ m_ownPolicy(static_cast<int> (SG::OWN_ELEMENTS))
//m_ttContainerName("ZdcTriggerTowers"),
//m_zdcModuleContainerName("ZdcModules"),
//m_zdcModuleAuxContainerName("ZdcModulesAux."),
//m_ttContainer(0),
- m_eventCount(0),
- m_complainContain(1),
- m_complainRetrieve(1)
//m_zdcTool("ZDC::ZdcAnalysisTool/ZdcAnalysisTool")
{
declareProperty("OwnPolicy",m_ownPolicy) ;