From 5665a2cdcf6d375ce0390c85b83fb4c37607eb71 Mon Sep 17 00:00:00 2001 From: Mircho Rodozov Date: Sat, 15 May 2021 00:33:11 +0200 Subject: [PATCH 1/2] Add init values for struct members to silence Arm warning --- .../interface/L1TrackJetProducer.h | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/L1Trigger/L1TTrackMatch/interface/L1TrackJetProducer.h b/L1Trigger/L1TTrackMatch/interface/L1TrackJetProducer.h index 7d7340d585389..45f413b5d6d59 100644 --- a/L1Trigger/L1TTrackMatch/interface/L1TrackJetProducer.h +++ b/L1Trigger/L1TTrackMatch/interface/L1TrackJetProducer.h @@ -8,21 +8,21 @@ //Each individual box in the eta and phi dimension. // Also used to store final cluster data for each zbin. struct EtaPhiBin { - float pTtot; - int numtracks; - int numttrks; - int numtdtrks; - int numttdtrks; - bool used; - float phi; //average phi value (halfway b/t min and max) - float eta; //average eta value + float pTtot = 0; + int numtracks = 0; + int numttrks = 0; + int numtdtrks = 0; + int numttdtrks = 0; + bool used = true; + float phi = 0; //average phi value (halfway b/t min and max) + float eta = 0; //average eta value }; //store important information for plots struct MaxZBin { - int znum; //Numbered from 0 to nzbins (16, 32, or 64) in order - int nclust; //number of clusters in this bin - float zbincenter; - EtaPhiBin *clusters; //list of all the clusters in this bin - float ht; //sum of all cluster pTs--only the zbin with the maximum ht is stored + int znum = 0; //Numbered from 0 to nzbins (16, 32, or 64) in order + int nclust = 0; //number of clusters in this bin + float zbincenter = 0; + EtaPhiBin *clusters = nullptr; //list of all the clusters in this bin + float ht = 0; //sum of all cluster pTs--only the zbin with the maximum ht is stored }; From 5ee4b99e08d9aecbb6aa99e44489f73a59679b40 Mon Sep 17 00:00:00 2001 From: Cms Build Date: Sat, 15 May 2021 17:16:43 +0200 Subject: [PATCH 2/2] remove redundant variable and init an array --- .../interface/L1TrackJetProducer.h | 26 +++++++++---------- .../plugins/L1TrackJetProducer.cc | 3 +-- 2 files changed, 14 insertions(+), 15 deletions(-) diff --git a/L1Trigger/L1TTrackMatch/interface/L1TrackJetProducer.h b/L1Trigger/L1TTrackMatch/interface/L1TrackJetProducer.h index 45f413b5d6d59..7d7340d585389 100644 --- a/L1Trigger/L1TTrackMatch/interface/L1TrackJetProducer.h +++ b/L1Trigger/L1TTrackMatch/interface/L1TrackJetProducer.h @@ -8,21 +8,21 @@ //Each individual box in the eta and phi dimension. // Also used to store final cluster data for each zbin. struct EtaPhiBin { - float pTtot = 0; - int numtracks = 0; - int numttrks = 0; - int numtdtrks = 0; - int numttdtrks = 0; - bool used = true; - float phi = 0; //average phi value (halfway b/t min and max) - float eta = 0; //average eta value + float pTtot; + int numtracks; + int numttrks; + int numtdtrks; + int numttdtrks; + bool used; + float phi; //average phi value (halfway b/t min and max) + float eta; //average eta value }; //store important information for plots struct MaxZBin { - int znum = 0; //Numbered from 0 to nzbins (16, 32, or 64) in order - int nclust = 0; //number of clusters in this bin - float zbincenter = 0; - EtaPhiBin *clusters = nullptr; //list of all the clusters in this bin - float ht = 0; //sum of all cluster pTs--only the zbin with the maximum ht is stored + int znum; //Numbered from 0 to nzbins (16, 32, or 64) in order + int nclust; //number of clusters in this bin + float zbincenter; + EtaPhiBin *clusters; //list of all the clusters in this bin + float ht; //sum of all cluster pTs--only the zbin with the maximum ht is stored }; diff --git a/L1Trigger/L1TTrackMatch/plugins/L1TrackJetProducer.cc b/L1Trigger/L1TTrackMatch/plugins/L1TrackJetProducer.cc index 7cc773ea687cd..9d8d7d9afd73d 100644 --- a/L1Trigger/L1TTrackMatch/plugins/L1TrackJetProducer.cc +++ b/L1Trigger/L1TTrackMatch/plugins/L1TrackJetProducer.cc @@ -274,9 +274,8 @@ void L1TrackJetProducer::L2_cluster( vector > L1TrkPtrs_, vector ttrk_, vector tdtrk_, vector ttdtrk_, MaxZBin &mzb) { const int nz = zBins_; MaxZBin all_zBins[nz]; - MaxZBin mzbtemp; for (int z = 0; z < nz; ++z) - all_zBins[z] = mzbtemp; + all_zBins[z] = MaxZBin{0, 0, 0, nullptr, 0}; float zmin = -1.0 * trkZMax_; float zmax = zmin + 2 * zStep_;