Merge branch 'cms-sw:master' into master

Calibration/LumiAlCaRecoProducers/plugins/AlcaPCCIntegrator.cc

@@ -10,28 +10,24 @@ ________________________________________________________________**/
 // C++ standard
 #include <string>
 // CMS
-#include "DataFormats/Luminosity/interface/PixelClusterCountsInEvent.h"
 #include "DataFormats/Luminosity/interface/PixelClusterCounts.h"
-
-#include "FWCore/MessageLogger/interface/MessageLogger.h"
-#include "FWCore/Framework/interface/MakerMacros.h"
+#include "DataFormats/Luminosity/interface/PixelClusterCountsInEvent.h"
 #include "FWCore/Framework/interface/ConsumesCollector.h"
+#include "FWCore/Framework/interface/Event.h"
+#include "FWCore/Framework/interface/EventSetup.h"
 #include "FWCore/Framework/interface/Frameworkfwd.h"
+#include "FWCore/Framework/interface/LuminosityBlock.h"
+#include "FWCore/Framework/interface/MakerMacros.h"
 #include "FWCore/Framework/interface/one/EDProducer.h"
-#include "FWCore/Framework/interface/Event.h"
+#include "FWCore/MessageLogger/interface/MessageLogger.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "FWCore/Utilities/interface/EDGetToken.h"
-#include "FWCore/ServiceRegistry/interface/Service.h"
-#include "FWCore/Framework/interface/ESHandle.h"
-#include "FWCore/Framework/interface/EventSetup.h"
-#include "FWCore/Framework/interface/LuminosityBlock.h"
-#include "TMath.h"
 //The class
 class AlcaPCCIntegrator
     : public edm::one::EDProducer<edm::EndLuminosityBlockProducer, edm::one::WatchLuminosityBlocks> {
 public:
   explicit AlcaPCCIntegrator(const edm::ParameterSet&);
-  ~AlcaPCCIntegrator() override;
+  ~AlcaPCCIntegrator() override = default;
 
 private:
   void beginLuminosityBlock(edm::LuminosityBlock const& lumiSeg, const edm::EventSetup& iSetup) override;
@@ -67,9 +63,6 @@ AlcaPCCIntegrator::AlcaPCCIntegrator(const edm::ParameterSet& iConfig) {
   pccToken_ = consumes<reco::PixelClusterCountsInEvent>(PCCInputTag_);
 }
 
-//--------------------------------------------------------------------------------------------------
-AlcaPCCIntegrator::~AlcaPCCIntegrator() {}
-
 //--------------------------------------------------------------------------------------------------
 void AlcaPCCIntegrator::produce(edm::Event& iEvent, const edm::EventSetup& iSetup) {
   countEvt_++;
@@ -83,7 +76,12 @@ void AlcaPCCIntegrator::produce(edm::Event& iEvent, const edm::EventSetup& iSetu
   edm::Handle<reco::PixelClusterCountsInEvent> pccHandle;
   iEvent.getByToken(pccToken_, pccHandle);
 
-  const reco::PixelClusterCountsInEvent inputPcc = *(pccHandle.product());
+  if (!pccHandle.isValid()) {
+    // do not resolve a not existing product!
+    return;
+  }
+
+  const reco::PixelClusterCountsInEvent inputPcc = *pccHandle;
   thePCCob->add(inputPcc);
 }
 

Geometry/HcalCommonData/python/GeometryDD4HepExtended2018Reco_cff.py → Configuration/Geometry/python/GeometryDD4hepExtended2018DD4hepReco_cff.py

@@ -1,6 +1,6 @@
 import FWCore.ParameterSet.Config as cms
 
-from Geometry.HcalCommonData.GeometryDD4HepExtended2018_cff import *
+from Configuration.Geometry.GeometryDD4hepExtended2018DD4hep_cff import *
 
 from Geometry.CommonTopologies.globalTrackingGeometry_cfi import *
 from RecoTracker.GeometryESProducer.TrackerRecoGeometryESProducer_cfi import *

Geometry/HcalCommonData/python/GeometryDD4HepExtended2018_cff.py → Configuration/Geometry/python/GeometryDD4hepExtended2018DD4hep_cff.py

@@ -1,7 +1,7 @@
 import FWCore.ParameterSet.Config as cms
 
 from Configuration.Geometry.GeometryDD4hep_cff import *
-DDDetectorESProducer.confGeomXMLFiles = cms.FileInPath("Geometry/HcalCommonData/data/cmsExtendedGeometry2018.xml")
+DDDetectorESProducer.confGeomXMLFiles = cms.FileInPath("Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2018DD4hep.xml")
 
 from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cff import *
 from Geometry.EcalCommonData.ecalSimulationParameters_cff import *

Geometry/HcalCommonData/python/GeometryExtended2018Reco_cff.py → Configuration/Geometry/python/GeometryExtended2018DDDReco_cff.py

@@ -1,7 +1,7 @@
 import FWCore.ParameterSet.Config as cms
 
 # Ideal geometry, needed for transient ECAL alignement
-from Geometry.HcalCommonData.GeometryExtended2018_cff import *
+from Configuration.Geometry.GeometryExtended2018DDD_cff import *
 
 
 # Reconstruction geometry services

Geometry/HcalCommonData/python/GeometryExtended2018_cff.py → Configuration/Geometry/python/GeometryExtended2018DDD_cff.py

@@ -4,7 +4,7 @@
 # Geometry master configuration
 #
 # Ideal geometry, needed for simulation
-from Geometry.HcalCommonData.cmsExtendedGeometry2018XML_cfi import *
+from Geometry.CMSCommonData.cmsExtendedGeometry2018DDDXML_cfi import *
 from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cfi import *
 from Geometry.EcalCommonData.ecalSimulationParameters_cff import *
 from Geometry.HcalCommonData.hcalDDDSimConstants_cff import *

Configuration/ProcessModifiers/python/gpuValidationPixel_cff.py

@@ -0,0 +1,5 @@
+import FWCore.ParameterSet.Config as cms
+
+# This modifier is for turning on gpu validation modules for Pixel DQM
+
+gpuValidationPixel =  cms.Modifier()

Configuration/ProcessModifiers/python/gpuValidation_cff.py

@@ -3,11 +3,13 @@
 from Configuration.ProcessModifiers.gpu_cff import *
 from Configuration.ProcessModifiers.gpuValidationEcal_cff import *
 from Configuration.ProcessModifiers.gpuValidationHcal_cff import *
+from Configuration.ProcessModifiers.gpuValidationPixel_cff import *
 
 # This modifier chain is for turning on DQM modules used for gpu validation
 
 gpuValidation =  cms.ModifierChain(
     gpu,
     gpuValidationEcal,
-    gpuValidationHcal
+    gpuValidationHcal,
+    gpuValidationPixel
 )

Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py

@@ -638,7 +638,8 @@ def setup_(self, step, stepName, stepDict, k, properties):
         '--procModifiers': 'pixelNtupletFit,gpuValidation'
     },
     harvest = {
-        '-s': 'HARVESTING:@trackingOnlyValidation+@pixelTrackingOnlyDQM'
+        '-s': 'HARVESTING:@trackingOnlyValidation+@pixelTrackingOnlyDQM',
+        '--procModifiers': 'gpuValidation'
     },
     suffix = 'Patatrack_PixelOnlyGPU_Validation',
     offset = 0.503,
@@ -720,7 +721,8 @@ def setup_(self, step, stepName, stepDict, k, properties):
         '--customise': 'RecoPixelVertexing/Configuration/customizePixelTracksForTriplets.customizePixelTracksForTriplets'
     },
     harvest = {
-        '-s': 'HARVESTING:@trackingOnlyValidation+@pixelTrackingOnlyDQM'
+        '-s': 'HARVESTING:@trackingOnlyValidation+@pixelTrackingOnlyDQM',
+        '--procModifiers': 'gpuValidation',
     },
     suffix = 'Patatrack_PixelOnlyTripletsGPU_Validation',
     offset = 0.507,
@@ -955,7 +957,8 @@ def setup_(self, step, stepName, stepDict, k, properties):
         '--procModifiers': 'pixelNtupletFit,gpuValidation'
     },
     harvest = {
-        '-s': 'HARVESTING:@trackingOnlyValidation+@pixelTrackingOnlyDQM+@ecalOnlyValidation+@ecal+@hcalOnlyValidation+@hcalOnly+@hcal2Only'
+        '-s': 'HARVESTING:@trackingOnlyValidation+@pixelTrackingOnlyDQM+@ecalOnlyValidation+@ecal+@hcalOnlyValidation+@hcalOnly+@hcal2Only',
+        '--procModifiers': 'gpuValidation'
     },
     suffix = 'Patatrack_AllGPU_Validation',
     offset = 0.583,
@@ -1021,7 +1024,8 @@ def setup_(self, step, stepName, stepDict, k, properties):
         '--procModifiers': 'pixelNtupletFit,gpuValidation'
     },
     harvest = {
-        '-s': 'HARVESTING:@trackingOnlyValidation+@pixelTrackingOnlyDQM+@ecalOnlyValidation+@ecal+@hcalOnlyValidation+@hcalOnly+@hcal2Only'
+        '-s': 'HARVESTING:@trackingOnlyValidation+@pixelTrackingOnlyDQM+@ecalOnlyValidation+@ecal+@hcalOnlyValidation+@hcalOnly+@hcal2Only',
+        '--procModifiers': 'gpuValidation'
     },
     suffix = 'Patatrack_AllTripletsGPU_Validation',
     offset = 0.587,