Merge branch 'clang.JetCalibTools-20210412' into 'master'

JetCalibTools: Fix clang warnings.

See merge request !42513

Reconstruction/Jet/JetCalibTools/JetCalibTools/CalibrationMethods/BcidOffsetCorrection.h

@@ -49,7 +49,6 @@ class BcidOffsetCorrection
  private:
   TEnv * m_config;
   TString m_jetAlgo, m_calibAreaTag;
-  bool m_dev;
   bool m_isData;
 
   bool m_doEMECIW2bcid;
@@ -69,42 +68,27 @@ class BcidOffsetCorrection
   bool m_doFCal2InnerBcid;
 
   TH2F* m_bcid_nCells_EMECIW2;
-  TH2F* m_bcid_nCells_EMECIW3;
   TH2F* m_bcid_nCells_HEC0;
   TH2F* m_bcid_nCells_HEC1;
-  TH2F* m_bcid_nCells_HEC2;
-  TH2F* m_bcid_nCells_HEC3;
   TH2F* m_bcid_nCells_FCal0;
 
   TH2F* m_bcid_slope_EMECIW2_pos;
-  TH2F* m_bcid_slope_EMECIW3_pos;
   TH2F* m_bcid_slope_HEC0_pos;
   TH2F* m_bcid_slope_HEC1_pos;
-  TH2F* m_bcid_slope_HEC2_pos;
-  TH2F* m_bcid_slope_HEC3_pos;
 
   TH2F* m_bcid_slope_EMECIW2_neg;
-  TH2F* m_bcid_slope_EMECIW3_neg;
   TH2F* m_bcid_slope_HEC0_neg;
   TH2F* m_bcid_slope_HEC1_neg;
-  TH2F* m_bcid_slope_HEC2_neg;
-  TH2F* m_bcid_slope_HEC3_neg;
 
   TH2F* m_bcid_slope_FCal0;
 
   TH2F* m_bcid_slope_EMECIW2_8b4e_pos;
-  TH2F* m_bcid_slope_EMECIW3_8b4e_pos;
   TH2F* m_bcid_slope_HEC0_8b4e_pos;
   TH2F* m_bcid_slope_HEC1_8b4e_pos;
-  TH2F* m_bcid_slope_HEC2_8b4e_pos;
-  TH2F* m_bcid_slope_HEC3_8b4e_pos;
 
   TH2F* m_bcid_slope_EMECIW2_8b4e_neg;
-  TH2F* m_bcid_slope_EMECIW3_8b4e_neg;
   TH2F* m_bcid_slope_HEC0_8b4e_neg;
   TH2F* m_bcid_slope_HEC1_8b4e_neg;
-  TH2F* m_bcid_slope_HEC2_8b4e_neg;
-  TH2F* m_bcid_slope_HEC3_8b4e_neg;
 
   TH2F* m_bcid_slope_FCal0_8b4e;
 

Reconstruction/Jet/JetCalibTools/Root/BcidOffsetCorrection.cxx

@@ -7,17 +7,17 @@
 
 BcidOffsetCorrection::BcidOffsetCorrection()
   : JetCalibrationToolBase( "BcidOffsetCorrection::BcidOffsetCorrection" ),
-    m_config(nullptr), m_jetAlgo(""), m_calibAreaTag(""), m_dev(false), m_isData(false)//,
+    m_config(nullptr), m_jetAlgo(""), m_calibAreaTag(""), m_isData(false)//,
 { }
 
 BcidOffsetCorrection::BcidOffsetCorrection(const std::string& name)
   : JetCalibrationToolBase( name ),
-    m_config(nullptr), m_jetAlgo(""), m_calibAreaTag(""), m_dev(false), m_isData(false)//,
+    m_config(nullptr), m_jetAlgo(""), m_calibAreaTag(""), m_isData(false)//,
 { }
 
-BcidOffsetCorrection::BcidOffsetCorrection(const std::string& name, TEnv * config, TString jetAlgo, TString calibAreaTag, bool isData, bool dev)
+BcidOffsetCorrection::BcidOffsetCorrection(const std::string& name, TEnv * config, TString jetAlgo, TString calibAreaTag, bool isData, bool /*dev*/)
   : JetCalibrationToolBase( name ),
-    m_config(config), m_jetAlgo(jetAlgo), m_calibAreaTag(calibAreaTag), m_dev(dev), m_isData(isData)//,
+    m_config(config), m_jetAlgo(jetAlgo), m_calibAreaTag(calibAreaTag), m_isData(isData)//,
 { }
 
 BcidOffsetCorrection::~BcidOffsetCorrection() {