From 5d60b428a3d4ca7e5bb1b97c2532861bc5031053 Mon Sep 17 00:00:00 2001 From: Mircho Rodozov Date: Thu, 18 Feb 2021 11:22:04 +0100 Subject: [PATCH 1/4] Add header for boost lower_bound implementation, update deprecated header locaiton --- CondFormats/EcalObjects/src/EcalMustacheSCParameters.cc | 1 + CondFormats/EcalObjects/src/EcalSCDynamicDPhiParameters.cc | 1 + .../plugins/Basic2DGenericPFlowPositionCalc.cc | 2 +- 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/CondFormats/EcalObjects/src/EcalMustacheSCParameters.cc b/CondFormats/EcalObjects/src/EcalMustacheSCParameters.cc index 04469103d4c1d..7cb3c88b49c49 100644 --- a/CondFormats/EcalObjects/src/EcalMustacheSCParameters.cc +++ b/CondFormats/EcalObjects/src/EcalMustacheSCParameters.cc @@ -1,4 +1,5 @@ #include "CondFormats/EcalObjects/interface/EcalMustacheSCParameters.h" +#include float EcalMustacheSCParameters::sqrtLogClustETuning() const { return sqrtLogClustETuning_; } diff --git a/CondFormats/EcalObjects/src/EcalSCDynamicDPhiParameters.cc b/CondFormats/EcalObjects/src/EcalSCDynamicDPhiParameters.cc index 8734384db5f88..8d066c9589685 100644 --- a/CondFormats/EcalObjects/src/EcalSCDynamicDPhiParameters.cc +++ b/CondFormats/EcalObjects/src/EcalSCDynamicDPhiParameters.cc @@ -1,4 +1,5 @@ #include "CondFormats/EcalObjects/interface/EcalSCDynamicDPhiParameters.h" +#include const EcalSCDynamicDPhiParameters::DynamicDPhiParameters* EcalSCDynamicDPhiParameters::dynamicDPhiParameters( double clustE, double absSeedEta) const { diff --git a/RecoParticleFlow/PFClusterProducer/plugins/Basic2DGenericPFlowPositionCalc.cc b/RecoParticleFlow/PFClusterProducer/plugins/Basic2DGenericPFlowPositionCalc.cc index 770ca0897090f..94ecaf1783d95 100644 --- a/RecoParticleFlow/PFClusterProducer/plugins/Basic2DGenericPFlowPositionCalc.cc +++ b/RecoParticleFlow/PFClusterProducer/plugins/Basic2DGenericPFlowPositionCalc.cc @@ -6,7 +6,7 @@ #include #include "CommonTools/Utils/interface/DynArray.h" #include -#include +#include #include "vdt/vdtMath.h" From 0d1a55ee42f8cf6f942c21f104812563618b8a88 Mon Sep 17 00:00:00 2001 From: Mircho Rodozov Date: Thu, 18 Feb 2021 11:37:27 +0100 Subject: [PATCH 2/4] forgot code format :/ --- .../plugins/Basic2DGenericPFlowPositionCalc.cc | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/RecoParticleFlow/PFClusterProducer/plugins/Basic2DGenericPFlowPositionCalc.cc b/RecoParticleFlow/PFClusterProducer/plugins/Basic2DGenericPFlowPositionCalc.cc index 94ecaf1783d95..15771e496aede 100644 --- a/RecoParticleFlow/PFClusterProducer/plugins/Basic2DGenericPFlowPositionCalc.cc +++ b/RecoParticleFlow/PFClusterProducer/plugins/Basic2DGenericPFlowPositionCalc.cc @@ -69,11 +69,10 @@ void Basic2DGenericPFlowPositionCalc::calculateAndSetPositionActual(reco::PFClus const auto rh_rawenergy = rhf.energy; const auto rh_energy = rh_rawenergy * rh_fraction; #ifdef PF_DEBUG - if - UNLIKELY(edm::isNotFinite(rh_energy)) { - throw cms::Exception("PFClusterAlgo") << "rechit " << refhit.detId() << " has a NaN energy... " - << "The input of the particle flow clustering seems to be corrupted."; - } + if UNLIKELY (edm::isNotFinite(rh_energy)) { + throw cms::Exception("PFClusterAlgo") << "rechit " << refhit.detId() << " has a NaN energy... " + << "The input of the particle flow clustering seems to be corrupted."; + } #endif cl_energy += rh_energy; // If time resolution is given, calculated weighted average From 044bbc6def25993a27ec5c25121b8cb4968389c6 Mon Sep 17 00:00:00 2001 From: Mircho Rodozov Date: Thu, 18 Feb 2021 17:47:04 +0100 Subject: [PATCH 3/4] add and from where were missing --- CaloOnlineTools/HcalOnlineDb/interface/LMap.h | 2 +- CondFormats/EcalObjects/src/EcalMustacheSCParameters.cc | 2 +- CondFormats/EcalObjects/src/EcalSCDynamicDPhiParameters.cc | 2 +- CondTools/RPC/src/RPCLBLinkNameParser.cc | 2 +- EventFilter/L1TRawToDigi/interface/OmtfRpcPacker.h | 2 +- EventFilter/RPCRawToDigi/src/RPCLBPacker.cc | 2 +- L1Trigger/RPCTechnicalTrigger/interface/TTUTrackingAlg.h | 1 + 7 files changed, 7 insertions(+), 6 deletions(-) diff --git a/CaloOnlineTools/HcalOnlineDb/interface/LMap.h b/CaloOnlineTools/HcalOnlineDb/interface/LMap.h index f8eab70495073..6c92a29ae357a 100644 --- a/CaloOnlineTools/HcalOnlineDb/interface/LMap.h +++ b/CaloOnlineTools/HcalOnlineDb/interface/LMap.h @@ -23,7 +23,7 @@ #include #include #include - +#include #include "CaloOnlineTools/HcalOnlineDb/interface/ConfigurationDatabase.hh" #include "DataFormats/HcalDetId/interface/HcalSubdetector.h" #include "CondFormats/HcalObjects/interface/HcalElectronicsMap.h" diff --git a/CondFormats/EcalObjects/src/EcalMustacheSCParameters.cc b/CondFormats/EcalObjects/src/EcalMustacheSCParameters.cc index 7cb3c88b49c49..153e4d97893a4 100644 --- a/CondFormats/EcalObjects/src/EcalMustacheSCParameters.cc +++ b/CondFormats/EcalObjects/src/EcalMustacheSCParameters.cc @@ -1,5 +1,5 @@ #include "CondFormats/EcalObjects/interface/EcalMustacheSCParameters.h" -#include +#include float EcalMustacheSCParameters::sqrtLogClustETuning() const { return sqrtLogClustETuning_; } diff --git a/CondFormats/EcalObjects/src/EcalSCDynamicDPhiParameters.cc b/CondFormats/EcalObjects/src/EcalSCDynamicDPhiParameters.cc index 8d066c9589685..27f740ee880d8 100644 --- a/CondFormats/EcalObjects/src/EcalSCDynamicDPhiParameters.cc +++ b/CondFormats/EcalObjects/src/EcalSCDynamicDPhiParameters.cc @@ -1,5 +1,5 @@ #include "CondFormats/EcalObjects/interface/EcalSCDynamicDPhiParameters.h" -#include +#include const EcalSCDynamicDPhiParameters::DynamicDPhiParameters* EcalSCDynamicDPhiParameters::dynamicDPhiParameters( double clustE, double absSeedEta) const { diff --git a/CondTools/RPC/src/RPCLBLinkNameParser.cc b/CondTools/RPC/src/RPCLBLinkNameParser.cc index 66734dc632eea..6cc37953d42e0 100644 --- a/CondTools/RPC/src/RPCLBLinkNameParser.cc +++ b/CondTools/RPC/src/RPCLBLinkNameParser.cc @@ -1,7 +1,7 @@ #include "CondTools/RPC/interface/RPCLBLinkNameParser.h" #include - +#include #include "FWCore/Utilities/interface/Exception.h" void RPCLBLinkNameParser::parse(std::string const& name, RPCLBLink& lb_link) { diff --git a/EventFilter/L1TRawToDigi/interface/OmtfRpcPacker.h b/EventFilter/L1TRawToDigi/interface/OmtfRpcPacker.h index ab2acd9b17b92..2da0adbb7039d 100644 --- a/EventFilter/L1TRawToDigi/interface/OmtfRpcPacker.h +++ b/EventFilter/L1TRawToDigi/interface/OmtfRpcPacker.h @@ -2,7 +2,7 @@ #define EventFilter_L1TRawToDigi_Omtf_RpcPacker_H #include - +#include #include "DataFormats/RPCDigi/interface/RPCDigiCollection.h" #include "DataFormats/L1TMuon/interface/OMTF/OmtfDataWord64.h" #include "EventFilter/L1TRawToDigi/interface/OmtfLinkMappingRpc.h" diff --git a/EventFilter/RPCRawToDigi/src/RPCLBPacker.cc b/EventFilter/RPCRawToDigi/src/RPCLBPacker.cc index 02a9d471184de..eb9455a893ac7 100644 --- a/EventFilter/RPCRawToDigi/src/RPCLBPacker.cc +++ b/EventFilter/RPCRawToDigi/src/RPCLBPacker.cc @@ -1,7 +1,7 @@ #include "EventFilter/RPCRawToDigi/interface/RPCLBPacker.h" #include "FWCore/Utilities/interface/Exception.h" - +#include #include "CondFormats/RPCObjects/interface/RPCInverseLBLinkMap.h" #include "DataFormats/RPCDigi/interface/RPCDigi.h" diff --git a/L1Trigger/RPCTechnicalTrigger/interface/TTUTrackingAlg.h b/L1Trigger/RPCTechnicalTrigger/interface/TTUTrackingAlg.h index 6463de3278806..514a867e40f1a 100644 --- a/L1Trigger/RPCTechnicalTrigger/interface/TTUTrackingAlg.h +++ b/L1Trigger/RPCTechnicalTrigger/interface/TTUTrackingAlg.h @@ -2,6 +2,7 @@ #define TTUTRACKINGALG_H 1 // Include files +#include #include "L1Trigger/RPCTechnicalTrigger/interface/TTULogic.h" #include "L1Trigger/RPCTechnicalTrigger/interface/TTUInput.h" From 4d2f73e941615a1b22c9aa22242ef41e7fda10b5 Mon Sep 17 00:00:00 2001 From: Mircho Rodozov Date: Fri, 19 Feb 2021 08:24:28 +0100 Subject: [PATCH 4/4] missed one include --- CalibCalorimetry/HcalAlgos/interface/HcalDbASCIIIO.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CalibCalorimetry/HcalAlgos/interface/HcalDbASCIIIO.h b/CalibCalorimetry/HcalAlgos/interface/HcalDbASCIIIO.h index 26352c8058322..1eb1f37912a27 100644 --- a/CalibCalorimetry/HcalAlgos/interface/HcalDbASCIIIO.h +++ b/CalibCalorimetry/HcalAlgos/interface/HcalDbASCIIIO.h @@ -5,7 +5,7 @@ #define HcalDbASCIIIO_h #include - +#include #include "DataFormats/HcalDetId/interface/HcalDetId.h" #include "CondFormats/HcalObjects/interface/AllObjects.h" #include "CalibFormats/HcalObjects/interface/HcalCalibrationsSet.h"