lecriste · felicepantaleo · Mar 16, 2021 · Mar 16, 2021 · Mar 22, 2021 · Mar 31, 2021
diff --git a/CalibCalorimetry/HcalAlgos/interface/HcalPulseShapes.h b/CalibCalorimetry/HcalAlgos/interface/HcalPulseShapes.h
@@ -7,6 +7,7 @@
 #include "CalibCalorimetry/HcalAlgos/interface/HcalPulseShape.h"
 #include "DataFormats/HcalDetId/interface/HcalDetId.h"
 #include "FWCore/Framework/interface/Frameworkfwd.h"
+#include "FWCore/Utilities/interface/isFinite.h"
 #include "CalibFormats/HcalObjects/interface/HcalDbService.h"
 #include "CalibFormats/HcalObjects/interface/HcalDbRecord.h"
 
@@ -62,7 +63,7 @@ class HcalPulseShapes {
     for (unsigned i = 0; i < 2 * nbin - 1; ++i) {
       for (unsigned j = 0; j < std::min(i + 1, nbin); ++j) {
         double tmp = f1(j) * f2(i - j);
-        if (std::isnan(tmp) or std::isinf(tmp))
+        if (edm::isNotFinite(tmp))
           continue;
         result[i] += tmp;
       }

diff --git a/CalibPPS/ESProducers/plugins/PPSPixelTopologyESSource.cc b/CalibPPS/ESProducers/plugins/PPSPixelTopologyESSource.cc
@@ -157,8 +157,8 @@ void PPSPixelTopologyESSource::fillDescriptions(edm::ConfigurationDescriptions&
   desc.add<double>("PitchSimX", 100e-3);
   desc.add<double>("thickness", 0.23);
   desc.add<int>("noOfPixelSimX", 160);
-  desc.add<int>("noOfPixelSimY", 156);
-  desc.add<int>("noOfPixels", 160 * 156);
+  desc.add<int>("noOfPixelSimY", 104);
+  desc.add<int>("noOfPixels", 160 * 104);
   desc.add<double>("simXWidth", 16.6);
   desc.add<double>("simYWidth", 16.2);
   desc.add<double>("deadEdgeWidth", 200e-3);

diff --git a/CalibTracker/SiPixelESProducers/interface/SiPixelGainCalibrationForHLTService.h b/CalibTracker/SiPixelESProducers/interface/SiPixelGainCalibrationForHLTService.h
@@ -21,10 +21,9 @@
 class SiPixelGainCalibrationForHLTService final
     : public SiPixelGainCalibrationServicePayloadGetter<SiPixelGainCalibrationForHLT, SiPixelGainCalibrationForHLTRcd> {
 public:
-  explicit SiPixelGainCalibrationForHLTService(const edm::ParameterSet& conf)
+  explicit SiPixelGainCalibrationForHLTService(const edm::ParameterSet& conf, edm::ConsumesCollector iC)
       : SiPixelGainCalibrationServicePayloadGetter<SiPixelGainCalibrationForHLT, SiPixelGainCalibrationForHLTRcd>(
-            conf){};
-  ~SiPixelGainCalibrationForHLTService() override{};
+            conf, std::move(iC)){};
 
   void calibrate(
       uint32_t detID, DigiIterator b, DigiIterator e, float conversionFactor, float offset, int* electron) override;

diff --git a/CalibTracker/SiPixelESProducers/interface/SiPixelGainCalibrationForHLTSimService.h b/CalibTracker/SiPixelESProducers/interface/SiPixelGainCalibrationForHLTSimService.h
@@ -23,10 +23,9 @@ class SiPixelGainCalibrationForHLTSimService
     : public SiPixelGainCalibrationServicePayloadGetter<SiPixelGainCalibrationForHLT,
                                                         SiPixelGainCalibrationForHLTSimRcd> {
 public:
-  explicit SiPixelGainCalibrationForHLTSimService(const edm::ParameterSet& conf)
+  explicit SiPixelGainCalibrationForHLTSimService(const edm::ParameterSet& conf, edm::ConsumesCollector iC)
       : SiPixelGainCalibrationServicePayloadGetter<SiPixelGainCalibrationForHLT, SiPixelGainCalibrationForHLTSimRcd>(
-            conf){};
-  ~SiPixelGainCalibrationForHLTSimService() override{};
+            conf, std::move(iC)){};
 
   // column granularity
   float getPedestal(const uint32_t& detID, const int& col, const int& row) override;

diff --git a/CalibTracker/SiPixelESProducers/interface/SiPixelGainCalibrationOfflineService.h b/CalibTracker/SiPixelESProducers/interface/SiPixelGainCalibrationOfflineService.h
@@ -21,10 +21,9 @@
 class SiPixelGainCalibrationOfflineService
     : public SiPixelGainCalibrationServicePayloadGetter<SiPixelGainCalibrationOffline, SiPixelGainCalibrationOfflineRcd> {
 public:
-  explicit SiPixelGainCalibrationOfflineService(const edm::ParameterSet& conf)
+  explicit SiPixelGainCalibrationOfflineService(const edm::ParameterSet& conf, edm::ConsumesCollector iC)
       : SiPixelGainCalibrationServicePayloadGetter<SiPixelGainCalibrationOffline, SiPixelGainCalibrationOfflineRcd>(
-            conf){};
-  ~SiPixelGainCalibrationOfflineService() override{};
+            conf, std::move(iC)){};
 
   // pixel granularity
   float getPedestal(const uint32_t& detID, const int& col, const int& row) override;

diff --git a/CalibTracker/SiPixelESProducers/interface/SiPixelGainCalibrationOfflineSimService.h b/CalibTracker/SiPixelESProducers/interface/SiPixelGainCalibrationOfflineSimService.h
@@ -23,10 +23,8 @@ class SiPixelGainCalibrationOfflineSimService
     : public SiPixelGainCalibrationServicePayloadGetter<SiPixelGainCalibrationOffline,
                                                         SiPixelGainCalibrationOfflineSimRcd> {
 public:
-  explicit SiPixelGainCalibrationOfflineSimService(const edm::ParameterSet& conf)
-      : SiPixelGainCalibrationServicePayloadGetter<SiPixelGainCalibrationOffline, SiPixelGainCalibrationOfflineSimRcd>(
-            conf){};
-  ~SiPixelGainCalibrationOfflineSimService() override{};
+  explicit SiPixelGainCalibrationOfflineSimService(const edm::ParameterSet& conf, edm::ConsumesCollector iC)
+      : SiPixelGainCalibrationServicePayloadGetter(conf, iC){};
 
   // pixel granularity
   float getPedestal(const uint32_t& detID, const int& col, const int& row) override;

diff --git a/CalibTracker/SiPixelESProducers/interface/SiPixelGainCalibrationService.h b/CalibTracker/SiPixelESProducers/interface/SiPixelGainCalibrationService.h
@@ -21,9 +21,9 @@
 class SiPixelGainCalibrationService
     : public SiPixelGainCalibrationServicePayloadGetter<SiPixelGainCalibration, SiPixelGainCalibrationRcd> {
 public:
-  explicit SiPixelGainCalibrationService(const edm::ParameterSet& conf)
-      : SiPixelGainCalibrationServicePayloadGetter<SiPixelGainCalibration, SiPixelGainCalibrationRcd>(conf){};
-  ~SiPixelGainCalibrationService() override{};
+  explicit SiPixelGainCalibrationService(const edm::ParameterSet& conf, edm::ConsumesCollector iC)
+      : SiPixelGainCalibrationServicePayloadGetter<SiPixelGainCalibration, SiPixelGainCalibrationRcd>(conf,
+                                                                                                      std::move(iC)){};
 
   // pixel granularity
   float getPedestal(const uint32_t& detID, const int& col, const int& row) override;

diff --git a/CalibTracker/SiPixelESProducers/interface/SiPixelGainCalibrationServiceBase.h b/CalibTracker/SiPixelESProducers/interface/SiPixelGainCalibrationServiceBase.h
@@ -19,10 +19,11 @@
 
 // Framework
 #include "FWCore/Framework/interface/EventSetup.h"
-#include "FWCore/Framework/interface/ESHandle.h"
+#include "FWCore/Framework/interface/ConsumesCollector.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "FWCore/ParameterSet/interface/ParameterSetDescription.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
+#include "FWCore/Utilities/interface/ESGetToken.h"
 #include "FWCore/Utilities/interface/Exception.h"
 
 // Abstract base class provides common interface to different payload getters
@@ -57,8 +58,7 @@ class SiPixelGainCalibrationServiceBase {
 template <class thePayloadObject, class theDBRecordType>
 class SiPixelGainCalibrationServicePayloadGetter : public SiPixelGainCalibrationServiceBase {
 public:
-  explicit SiPixelGainCalibrationServicePayloadGetter(const edm::ParameterSet& conf);
-  ~SiPixelGainCalibrationServicePayloadGetter() override{};
+  explicit SiPixelGainCalibrationServicePayloadGetter(const edm::ParameterSet& conf, edm::ConsumesCollector iC);
 
   //Abstract methods
   float getGain(const uint32_t& detID, const int& col, const int& row) override = 0;
@@ -94,7 +94,8 @@ class SiPixelGainCalibrationServicePayloadGetter : public SiPixelGainCalibration
 
   edm::ParameterSet conf_;
   bool ESetupInit_;
-  edm::ESHandle<thePayloadObject> ped;
+  const edm::ESGetToken<thePayloadObject, theDBRecordType> pedToken_;
+  const thePayloadObject* ped = nullptr;
   int numberOfRowsAveragedOver_;
   double gainLow_;
   double gainHigh_;
@@ -123,8 +124,8 @@ class SiPixelGainCalibrationServicePayloadGetter : public SiPixelGainCalibration
 
 template <class thePayloadObject, class theDBRecordType>
 SiPixelGainCalibrationServicePayloadGetter<thePayloadObject, theDBRecordType>::SiPixelGainCalibrationServicePayloadGetter(
-    const edm::ParameterSet& conf)
-    : conf_(conf), ESetupInit_(false) {
+    const edm::ParameterSet& conf, edm::ConsumesCollector iC)
+    : conf_(conf), ESetupInit_(false), pedToken_(iC.esConsumes()) {
   edm::LogInfo("SiPixelGainCalibrationServicePayloadGetter")
       << "[SiPixelGainCalibrationServicePayloadGetter::SiPixelGainCalibrationServicePayloadGetter]";
   // Initialize cache variables
@@ -145,7 +146,7 @@ SiPixelGainCalibrationServicePayloadGetter<thePayloadObject, theDBRecordType>::S
 template <class thePayloadObject, class theDBRecordType>
 void SiPixelGainCalibrationServicePayloadGetter<thePayloadObject, theDBRecordType>::setESObjects(
     const edm::EventSetup& es) {
-  es.get<theDBRecordType>().get(ped);
+  ped = &es.getData(pedToken_);
   // ped->initialize();  moved to cond infrastructure
   numberOfRowsAveragedOver_ = ped->getNumberOfRowsToAverageOver();
   ESetupInit_ = true;

diff --git a/CalibTracker/SiPixelESProducers/test/SiPixelFakeGainForHLTReader.cc b/CalibTracker/SiPixelESProducers/test/SiPixelFakeGainForHLTReader.cc
@@ -9,7 +9,7 @@ namespace cms {
       : conf_(conf),
         trackerGeomToken_(esConsumes<TrackerGeometry, TrackerDigiGeometryRecord>()),
         trackerGeomTokenBeginRun_(esConsumes<TrackerGeometry, TrackerDigiGeometryRecord, edm::Transition::BeginRun>()),
-        SiPixelGainCalibrationForHLTService_(conf),
+        SiPixelGainCalibrationForHLTService_(conf, consumesCollector()),
         filename_(conf.getParameter<std::string>("fileName")) {}
 
   void SiPixelFakeGainForHLTReader::analyze(const edm::Event& iEvent, const edm::EventSetup& iSetup) {

diff --git a/CalibTracker/SiPixelESProducers/test/SiPixelFakeGainOfflineReader.cc b/CalibTracker/SiPixelESProducers/test/SiPixelFakeGainOfflineReader.cc
@@ -7,7 +7,7 @@
 namespace cms {
   SiPixelFakeGainOfflineReader::SiPixelFakeGainOfflineReader(const edm::ParameterSet& conf)
       : conf_(conf),
-        SiPixelGainCalibrationOfflineService_(conf),
+        SiPixelGainCalibrationOfflineService_(conf, consumesCollector()),
         trackerGeomToken_(esConsumes<TrackerGeometry, TrackerDigiGeometryRecord>()),
         trackerGeomTokenBeginRun_(esConsumes<TrackerGeometry, TrackerDigiGeometryRecord, edm::Transition::BeginRun>()),
         filename_(conf.getParameter<std::string>("fileName")) {}

diff --git a/CalibTracker/SiPixelESProducers/test/SiPixelFakeGainReader.cc b/CalibTracker/SiPixelESProducers/test/SiPixelFakeGainReader.cc
@@ -9,7 +9,7 @@ namespace cms {
       : conf_(conf),
         trackerGeomToken_(esConsumes<TrackerGeometry, TrackerDigiGeometryRecord>()),
         trackerGeomTokenBeginRun_(esConsumes<TrackerGeometry, TrackerDigiGeometryRecord, edm::Transition::BeginRun>()),
-        SiPixelGainCalibrationService_(conf),
+        SiPixelGainCalibrationService_(conf, consumesCollector()),
         filename_(conf.getParameter<std::string>("fileName")) {}
 
   void SiPixelFakeGainReader::analyze(const edm::Event& iEvent, const edm::EventSetup& iSetup) {

diff --git a/CalibTracker/SiStripCommon/plugins/ShallowSimTracksProducer.cc b/CalibTracker/SiStripCommon/plugins/ShallowSimTracksProducer.cc
@@ -3,7 +3,7 @@
 
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
-#include "DataFormats/RecoCandidate/interface/TrackAssociation.h"
+#include "SimDataFormats/Associations/interface/TrackAssociation.h"
 
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 

diff --git a/...usterTools/interface/PFClusterWidthAlgo.h → ...rticleFlow/interface/PFClusterWidthAlgo.h b/...usterTools/interface/PFClusterWidthAlgo.h → ...rticleFlow/interface/PFClusterWidthAlgo.h
@@ -1,5 +1,5 @@
-#ifndef PFClusterShapeProducer_PFClusterWidthAlgo_H
-#define PFClusterShapeProducer_PFClusterWidthAlgo_H
+#ifndef CommonTools_ParticleFlow_PFClusterWidthAlgo_H
+#define CommonTools_ParticleFlow_PFClusterWidthAlgo_H
 #include "DataFormats/ParticleFlowReco/interface/PFCluster.h"
 #include "DataFormats/EcalRecHit/interface/EcalRecHitCollections.h"
 

diff --git a/.../PFClusterTools/src/PFClusterWidthAlgo.cc → ...ls/ParticleFlow/src/PFClusterWidthAlgo.cc b/.../PFClusterTools/src/PFClusterWidthAlgo.cc → ...ls/ParticleFlow/src/PFClusterWidthAlgo.cc
@@ -1,4 +1,4 @@
-#include "RecoParticleFlow/PFClusterTools/interface/PFClusterWidthAlgo.h"
+#include "CommonTools/ParticleFlow/interface/PFClusterWidthAlgo.h"
 #include "DataFormats/ParticleFlowReco/interface/PFRecHitFraction.h"
 #include "DataFormats/ParticleFlowReco/interface/PFRecHitFwd.h"
 #include "DataFormats/ParticleFlowReco/interface/PFRecHit.h"

diff --git a/CommonTools/RecoAlgos/BuildFile.xml b/CommonTools/RecoAlgos/BuildFile.xml
@@ -13,6 +13,7 @@
 <use name="TrackingTools/IPTools"/>
 <use name="TrackingTools/TransientTrack"/>
 <use name="Geometry/TrackerGeometryBuilder"/>
+<use name="SimDataFormats/TrackingAnalysis"/>
 <use name="fastjet"/>
 <export>
   <lib name="1"/>

diff --git a/CondCore/DBOutputService/interface/OnlineDBOutputService.h b/CondCore/DBOutputService/interface/OnlineDBOutputService.h
@@ -84,6 +84,7 @@ namespace cond {
       std::string m_omsServiceUrl;
       std::string m_lastLumiFile;
       std::string m_preLoadConnectionString;
+      std::string m_frontierKey;
       bool m_debug;
 
     };  //OnlineDBOutputService

diff --git a/CondCore/DBOutputService/src/OnlineDBOutputService.cc b/CondCore/DBOutputService/src/OnlineDBOutputService.cc
@@ -84,10 +84,18 @@ cond::service::OnlineDBOutputService::OnlineDBOutputService(const edm::Parameter
       m_latencyInLumisections(iConfig.getUntrackedParameter<unsigned int>("latency", 1)),
       m_omsServiceUrl(iConfig.getUntrackedParameter<std::string>("omsServiceUrl", "")),
       m_preLoadConnectionString(iConfig.getUntrackedParameter<std::string>("preLoadConnectionString", "")),
+      m_frontierKey(""),
       m_debug(iConfig.getUntrackedParameter<bool>("debugLogging", false)) {
   if (m_omsServiceUrl.empty()) {
     m_lastLumiFile = iConfig.getUntrackedParameter<std::string>("lastLumiFile", "");
   }
+  std::string frontierKeyFilePath(iConfig.getUntrackedParameter<std::string>("frontierKeyFilePath", ""));
+  if (!frontierKeyFilePath.empty()) {
+    std::ifstream frontierKeyFile(frontierKeyFilePath);
+    if (!frontierKeyFile)
+      throw Exception(std::string("Can't access frontierKey file ") + frontierKeyFilePath);
+    frontierKeyFile >> m_frontierKey;
+  }
 }
 
 cond::service::OnlineDBOutputService::~OnlineDBOutputService() {}
@@ -124,5 +132,10 @@ cond::Iov_t cond::service::OnlineDBOutputService::preLoadIov(const std::string&
 }
 
 cond::persistency::Session cond::service::OnlineDBOutputService::getReadOnlyCache(cond::Time_t targetTime) {
-  return PoolDBOutputService::newReadOnlySession(m_preLoadConnectionString, std::to_string(targetTime));
+  std::stringstream transId;
+  transId << targetTime;
+  if (!m_frontierKey.empty()) {
+    transId << "_" << m_frontierKey;
+  }
+  return PoolDBOutputService::newReadOnlySession(m_preLoadConnectionString, transId.str());
 }
diff --git a/CondCore/DBOutputService/test/python/testLumiBasedUpdateAnalyzer_oracle.cfg.py b/CondCore/DBOutputService/test/python/testLumiBasedUpdateAnalyzer_oracle.cfg.py
@@ -32,12 +32,12 @@
         messageLevel = cms.untracked.int32(1),
         authenticationPath = cms.untracked.string('.')
     ),
-    #timetype = cms.untracked.string('runnumber'),
     jobName = cms.untracked.string("TestLumiBasedUpdate"),
     connect = cms.string('oracle://cms_orcoff_prep/CMS_CONDITIONS'),
     preLoadConnectionString = cms.untracked.string('frontier://FrontierPrep/CMS_CONDITIONS'),
     runNumber = cms.untracked.uint64(options.runNumber),
     #lastLumiFile = cms.untracked.string('last_lumi.txt'),
+    #frontierKeyFilePath = cms.untracked.string('frontier.key'),
     writeTransactionDelay = cms.untracked.uint32(options.transDelay),
     autoCommit = cms.untracked.bool(True),
     saveLogsOnDB = cms.untracked.bool(True),

diff --git a/CondCore/ESSources/plugins/CondDBESSource.cc b/CondCore/ESSources/plugins/CondDBESSource.cc
@@ -98,6 +98,7 @@ namespace {
 CondDBESSource::CondDBESSource(const edm::ParameterSet& iConfig)
     : m_connection(),
       m_connectionString(""),
+      m_frontierKey(""),
       m_lastRun(0),   // for the stat
       m_lastLumi(0),  // for the stat
       m_policy(NOREFRESH),
@@ -139,6 +140,11 @@ CondDBESSource::CondDBESSource(const edm::ParameterSet& iConfig)
   } else if (iConfig.exists("connect"))  // default connection string
     m_connectionString = iConfig.getParameter<std::string>("connect");
 
+  // frontier key
+  if (iConfig.exists("frontierKey")) {
+    m_frontierKey = iConfig.getParameter<std::string>("frontierKey");
+  }
+
   // snapshot
   boost::posix_time::ptime snapshotTime;
   if (iConfig.exists("snapshotTime")) {
@@ -453,8 +459,10 @@ void CondDBESSource::setIntervalFor(const EventSetupRecordKey& iKey,
             << "Checking if the session must be closed and re-opened for getting correct conditions"
             << "; from CondDBESSource::setIntervalFor";
         std::stringstream transId;
-        //transId << "long" << m_lastRun;
         transId << lastTime;
+        if (!m_frontierKey.empty()) {
+          transId << "_" << m_frontierKey;
+        }
         std::string connStr = m_connectionString;
         std::pair<std::string, std::string> tagParams = cond::persistency::parseTag(tcIter->second.tagName());
         if (!tagParams.second.empty())

diff --git a/CondCore/ESSources/plugins/CondDBESSource.h b/CondCore/ESSources/plugins/CondDBESSource.h
@@ -110,6 +110,7 @@ class CondDBESSource : public edm::eventsetup::DataProxyProvider, public edm::Ev
 
   cond::persistency::ConnectionPool m_connection;
   std::string m_connectionString;
+  std::string m_frontierKey;
 
   // Container of DataProxy, implemented as multi-map keyed by records
   ProxyMap m_proxies;

diff --git a/CondCore/ESSources/test/python/loadall_from_one_record_empty_source_cfg.py b/CondCore/ESSources/test/python/loadall_from_one_record_empty_source_cfg.py
@@ -107,6 +107,7 @@
                                   DBParameters = CondDBParameters,
                                   connect = cms.string( options.connectionString ),
                                   snapshotTime = cms.string( options.snapshotTime ),
+                                  frontierKey = cms.string('abcdefghijklmnopqrstuvwxyz0123456789'),
                                   toGet = cms.VPSet(cms.PSet(
                                       record = cms.string('BeamSpotObjectsRcd'),
                                       tag = cms.string( options.tag ),