From 73d2063bfbac2867d5edbb66bfd5ef51bf7e7bdf Mon Sep 17 00:00:00 2001 From: jmcarcell Date: Thu, 7 Dec 2023 16:44:02 +0100 Subject: [PATCH] Remove the totalRepeat variables --- detector/calorimeter/ECalBarrel_o2_v01_geo.cpp | 4 +--- detector/calorimeter/GenericCalBarrel_o1_v01_geo.cpp | 4 +--- detector/calorimeter/HCalBarrel_o1_v01_geo.cpp | 3 +-- detector/calorimeter/SteppedMuonBarrel_o2_v02_geo.cpp | 3 +-- detector/calorimeter/YokeBarrel_o1_v01_geo.cpp | 3 +-- 5 files changed, 5 insertions(+), 12 deletions(-) diff --git a/detector/calorimeter/ECalBarrel_o2_v01_geo.cpp b/detector/calorimeter/ECalBarrel_o2_v01_geo.cpp index 0346f45fe..47195d0e7 100644 --- a/detector/calorimeter/ECalBarrel_o2_v01_geo.cpp +++ b/detector/calorimeter/ECalBarrel_o2_v01_geo.cpp @@ -71,8 +71,7 @@ static Ref_t create_detector(Detector& theDetector, xml_h e, SensitiveDetector s string det_type = x_det.typeStr(); Material air = theDetector.air(); double totalThickness = layering.totalThickness(); - // These are used later but clang complains - int totalRepeat [[maybe_unused]] = 0; + // Used later but clang complains without the [[maybe_unused]] attribute int totalSlices [[maybe_unused]] = 0; double gap = xml_dim_t(x_det).gap(); int nsides = dim.numsides(); @@ -112,7 +111,6 @@ static Ref_t create_detector(Detector& theDetector, xml_h e, SensitiveDetector s for (xml_coll_t c(x_det, _U(layer)); c; ++c) { xml_comp_t x_layer = c; int repeat = x_layer.repeat(); - totalRepeat += repeat; totalSlices += x_layer.numChildren(_U(slice)); } diff --git a/detector/calorimeter/GenericCalBarrel_o1_v01_geo.cpp b/detector/calorimeter/GenericCalBarrel_o1_v01_geo.cpp index be7e1c44c..960ccaa3d 100644 --- a/detector/calorimeter/GenericCalBarrel_o1_v01_geo.cpp +++ b/detector/calorimeter/GenericCalBarrel_o1_v01_geo.cpp @@ -74,8 +74,7 @@ static Ref_t create_detector(Detector& theDetector, xml_h e, SensitiveDetector s string det_type = x_det.typeStr(); Material air = theDetector.air(); double totalThickness = layering.totalThickness(); - // These are used later but clang complains - int totalRepeat [[maybe_unused]] = 0; + // Used later but clang complains without the [[maybe_unused]] attribute int totalSlices [[maybe_unused]] = 0; double gap = xml_dim_t(x_det).gap(); int nsides = dim.numsides(); @@ -115,7 +114,6 @@ static Ref_t create_detector(Detector& theDetector, xml_h e, SensitiveDetector s for (xml_coll_t c(x_det, _U(layer)); c; ++c) { xml_comp_t x_layer = c; int repeat = x_layer.repeat(); - totalRepeat += repeat; totalSlices += x_layer.numChildren(_U(slice)); } diff --git a/detector/calorimeter/HCalBarrel_o1_v01_geo.cpp b/detector/calorimeter/HCalBarrel_o1_v01_geo.cpp index 07c40f2d6..bfd082a18 100644 --- a/detector/calorimeter/HCalBarrel_o1_v01_geo.cpp +++ b/detector/calorimeter/HCalBarrel_o1_v01_geo.cpp @@ -70,7 +70,7 @@ static Ref_t create_detector(Detector& theDetector, xml_h e, SensitiveDetector s string det_type = x_det.typeStr(); Material air = theDetector.air(); double totalThickness = layering.totalThickness(); - int totalRepeat [[maybe_unused]] = 0; + // Used later but clang complains without the [[maybe_unused]] attribute int totalSlices [[maybe_unused]] = 0; double gap = xml_dim_t(x_det).gap(); int nsides = dim.numsides(); @@ -110,7 +110,6 @@ static Ref_t create_detector(Detector& theDetector, xml_h e, SensitiveDetector s for (xml_coll_t c(x_det, _U(layer)); c; ++c) { xml_comp_t x_layer = c; int repeat = x_layer.repeat(); - totalRepeat += repeat; totalSlices += x_layer.numChildren(_U(slice)); } diff --git a/detector/calorimeter/SteppedMuonBarrel_o2_v02_geo.cpp b/detector/calorimeter/SteppedMuonBarrel_o2_v02_geo.cpp index 91fe2397d..27bcdf7e6 100644 --- a/detector/calorimeter/SteppedMuonBarrel_o2_v02_geo.cpp +++ b/detector/calorimeter/SteppedMuonBarrel_o2_v02_geo.cpp @@ -52,7 +52,7 @@ static Ref_t create_detector(Detector& theDetector, xml_h e, SensitiveDetector s string det_type = x_det.typeStr(); Material air = theDetector.air(); double totalThickness = layering.totalThickness(); - int totalRepeat [[maybe_unused]] = 0; + // Used later but clang complains without the [[maybe_unused]] attribute int totalSlices [[maybe_unused]] = 0; double gap = xml_dim_t(x_det).gap(); int nsides = dim.numsides(); @@ -96,7 +96,6 @@ static Ref_t create_detector(Detector& theDetector, xml_h e, SensitiveDetector s for (xml_coll_t c(x_det, _U(layer)); c; ++c) { xml_comp_t x_layer = c; int repeat = x_layer.repeat(); - totalRepeat += repeat; totalSlices += x_layer.numChildren(_U(slice)); } diff --git a/detector/calorimeter/YokeBarrel_o1_v01_geo.cpp b/detector/calorimeter/YokeBarrel_o1_v01_geo.cpp index dd76ba37b..0f84d4c8d 100644 --- a/detector/calorimeter/YokeBarrel_o1_v01_geo.cpp +++ b/detector/calorimeter/YokeBarrel_o1_v01_geo.cpp @@ -70,7 +70,7 @@ static Ref_t create_detector(Detector& theDetector, xml_h e, SensitiveDetector s string det_type = x_det.typeStr(); Material air = theDetector.air(); double totalThickness = layering.totalThickness(); - int totalRepeat [[maybe_unused]] = 0; + // Used later but clang complains without the [[maybe_unused]] attribute int totalSlices [[maybe_unused]] = 0; double gap = xml_dim_t(x_det).gap(); int numSides = dim.numsides(); @@ -102,7 +102,6 @@ static Ref_t create_detector(Detector& theDetector, xml_h e, SensitiveDetector s for (xml_coll_t c(x_det, _U(layer)); c; ++c) { xml_comp_t x_layer = c; int repeat = x_layer.repeat(); - totalRepeat += repeat; totalSlices += x_layer.numChildren(_U(slice)); }