Merge pull request #31767 from bsunanda/Run4-hgx264

Run4-hgx264 Changes in view of changed scenario numbering [Validation/HGCalValidation/test]

Validation/HGCalValidation/test/HGCalWaferStudy.cc

@@ -25,6 +25,7 @@
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "FWCore/ParameterSet/interface/ConfigurationDescriptions.h"
 #include "FWCore/ServiceRegistry/interface/Service.h"
+#include "FWCore/Utilities/interface/transform.h"
 #include "FWCore/Utilities/interface/InputTag.h"
 
 #include "Geometry/HcalCommonData/interface/HcalHitRelabeller.h"
@@ -65,6 +66,8 @@ class HGCalWaferStudy : public edm::one::EDAnalyzer<edm::one::WatchRuns, edm::on
   // ----------member data ---------------------------
   const std::vector<std::string> nameDetectors_, caloHitSources_;
   const std::vector<edm::InputTag> digiSources_;
+  const std::vector<edm::ESGetToken<HGCalDDDConstants, IdealGeometryRecord>> ddTokens_;
+  const std::vector<edm::ESGetToken<HGCalGeometry, IdealGeometryRecord>> geomTokens_;
   const int verbosity_, nBinHit_, nBinDig_;
   const double xyMinHit_, xyMaxHit_;
   const double xyMinDig_, xyMaxDig_;
@@ -74,7 +77,7 @@ class HGCalWaferStudy : public edm::one::EDAnalyzer<edm::one::WatchRuns, edm::on
   std::vector<int> layerSim_, layerDig_, layerFront_;
   std::vector<const HGCalDDDConstants*> hgcons_;
   std::vector<const HGCalGeometry*> hgeoms_;
-  std::vector<edm::EDGetTokenT<edm::PCaloHitContainer> > tok_hits_;
+  std::vector<edm::EDGetTokenT<edm::PCaloHitContainer>> tok_hits_;
   std::vector<edm::EDGetToken> tok_digi_;
 
   //histogram related stuff
@@ -84,9 +87,20 @@ class HGCalWaferStudy : public edm::one::EDAnalyzer<edm::one::WatchRuns, edm::on
 };
 
 HGCalWaferStudy::HGCalWaferStudy(const edm::ParameterSet& iConfig)
-    : nameDetectors_(iConfig.getParameter<std::vector<std::string> >("detectorNames")),
-      caloHitSources_(iConfig.getParameter<std::vector<std::string> >("caloHitSources")),
-      digiSources_(iConfig.getParameter<std::vector<edm::InputTag> >("digiSources")),
+    : nameDetectors_(iConfig.getParameter<std::vector<std::string>>("detectorNames")),
+      caloHitSources_(iConfig.getParameter<std::vector<std::string>>("caloHitSources")),
+      digiSources_(iConfig.getParameter<std::vector<edm::InputTag>>("digiSources")),
+      ddTokens_{
+          edm::vector_transform(nameDetectors_,
+                                [this](const std::string& name) {
+                                  return esConsumes<HGCalDDDConstants, IdealGeometryRecord, edm::Transition::BeginRun>(
+                                      edm::ESInputTag{"", name});
+                                })},
+      geomTokens_{edm::vector_transform(
+          nameDetectors_,
+          [this](const std::string& name) {
+            return esConsumes<HGCalGeometry, IdealGeometryRecord, edm::Transition::BeginRun>(edm::ESInputTag{"", name});
+          })},
       verbosity_(iConfig.getUntrackedParameter<int>("verbosity", 0)),
       nBinHit_(iConfig.getUntrackedParameter<int>("nBinHit", 600)),
       nBinDig_(iConfig.getUntrackedParameter<int>("nBinDig", 600)),
@@ -95,10 +109,10 @@ HGCalWaferStudy::HGCalWaferStudy(const edm::ParameterSet& iConfig)
       xyMinDig_(iConfig.getUntrackedParameter<double>("xyMinDig", -300.0)),
       xyMaxDig_(iConfig.getUntrackedParameter<double>("xyMaxDig", 300.0)),
       ifNose_(iConfig.getUntrackedParameter<bool>("ifNose", false)),
-      layerMnSim_(iConfig.getUntrackedParameter<std::vector<int> >("layerMinSim")),
-      layerMxSim_(iConfig.getUntrackedParameter<std::vector<int> >("layerMaxSim")),
-      layerMnDig_(iConfig.getUntrackedParameter<std::vector<int> >("layerMinDig")),
-      layerMxDig_(iConfig.getUntrackedParameter<std::vector<int> >("layerMaxDig")) {
+      layerMnSim_(iConfig.getUntrackedParameter<std::vector<int>>("layerMinSim")),
+      layerMxSim_(iConfig.getUntrackedParameter<std::vector<int>>("layerMaxSim")),
+      layerMnDig_(iConfig.getUntrackedParameter<std::vector<int>>("layerMinDig")),
+      layerMxDig_(iConfig.getUntrackedParameter<std::vector<int>>("layerMaxDig")) {
   usesResource(TFileService::kSharedResource);
 
   for (auto const& source : caloHitSources_) {
@@ -119,9 +133,9 @@ void HGCalWaferStudy::fillDescriptions(edm::ConfigurationDescriptions& descripti
                                            edm::InputTag("simHGCalUnsuppressedDigis", "HEfront")};
   std::vector<int> layers = {28, 24};
   std::vector<int> layerMin = {1, 1};
-  desc.add<std::vector<std::string> >("detectorNames", names);
-  desc.add<std::vector<std::string> >("caloHitSources", simSources);
-  desc.add<std::vector<edm::InputTag> >("digiSources", digSources);
+  desc.add<std::vector<std::string>>("detectorNames", names);
+  desc.add<std::vector<std::string>>("caloHitSources", simSources);
+  desc.add<std::vector<edm::InputTag>>("digiSources", digSources);
   desc.addUntracked<int>("verbosity", 0);
   desc.addUntracked<int>("nBinHit", 600);
   desc.addUntracked<int>("nBinDig", 600);
@@ -130,10 +144,10 @@ void HGCalWaferStudy::fillDescriptions(edm::ConfigurationDescriptions& descripti
   desc.addUntracked<double>("xyMinDig", -300.0);
   desc.addUntracked<double>("xyMaxDig", 300.0);
   desc.addUntracked<bool>("ifNose", false);
-  desc.addUntracked<std::vector<int> >("layerMaxSim", layers);
-  desc.addUntracked<std::vector<int> >("layerMaxDig", layers);
-  desc.addUntracked<std::vector<int> >("layerMinSim", layerMin);
-  desc.addUntracked<std::vector<int> >("layerMinDig", layerMin);
+  desc.addUntracked<std::vector<int>>("layerMaxSim", layers);
+  desc.addUntracked<std::vector<int>>("layerMaxDig", layers);
+  desc.addUntracked<std::vector<int>>("layerMinSim", layerMin);
+  desc.addUntracked<std::vector<int>>("layerMinDig", layerMin);
   descriptions.add("hgcalWaferStudy", desc);
 }
 
@@ -246,9 +260,8 @@ void HGCalWaferStudy::analyze(const edm::Event& iEvent, const edm::EventSetup& i
 // ------------ method called when starting to processes a run  ------------
 void HGCalWaferStudy::beginRun(const edm::Run&, const edm::EventSetup& iSetup) {
   for (unsigned int k = 0; k < nameDetectors_.size(); ++k) {
-    edm::ESHandle<HGCalDDDConstants> pHGDC;
-    iSetup.get<IdealGeometryRecord>().get(nameDetectors_[k], pHGDC);
-    hgcons_.emplace_back(&(*pHGDC));
+    const auto& pHGDC = iSetup.getData(ddTokens_[k]);
+    hgcons_.emplace_back(&pHGDC);
     layerSim_.emplace_back(hgcons_.back()->layers(false));
     layerDig_.emplace_back(hgcons_.back()->layers(true));
     layerFront_.emplace_back(hgcons_.back()->firstLayer());
@@ -257,9 +270,8 @@ void HGCalWaferStudy::beginRun(const edm::Run&, const edm::EventSetup& iSetup) {
     layerMxSim_[k] = std::min((layerFront_[k] + layerSim_[k] - 1), layerMxSim_[k]);
     layerMxDig_[k] = std::min((layerFront_[k] + layerDig_[k] - 1), layerMxDig_[k]);
 
-    edm::ESHandle<HGCalGeometry> geom;
-    iSetup.get<IdealGeometryRecord>().get(nameDetectors_[k], geom);
-    hgeoms_.emplace_back(geom.product());
+    const auto& geom = iSetup.getData(geomTokens_[k]);
+    hgeoms_.emplace_back(&geom);
     if (verbosity_ > 0)
       edm::LogVerbatim("HGCalValidation")
           << nameDetectors_[k] << " defined with " << layerFront_[k] << ":" << layerSim_[k] << ":" << layerDig_[k]

Validation/HGCalValidation/test/python/protoHGCalSimWatcher_cfg.py

@@ -1,8 +1,8 @@
 ###############################################################################
 # Way to use this:
-#   cmsRun protoVHGCalSimWatcher_cfg.py geometry=D62
+#   cmsRun protoVHGCalSimWatcher_cfg.py geometry=D71
 #
-#   Options for geometry D49, D58, D59, D62
+#   Options for geometry D49, D68, D70, D71
 #
 ###############################################################################
 import FWCore.ParameterSet.Config as cms
@@ -13,10 +13,10 @@
 ### SETUP OPTIONS
 options = VarParsing.VarParsing('standard')
 options.register('geometry',
-                 "D62",
+                 "D71",
                   VarParsing.VarParsing.multiplicity.singleton,
                   VarParsing.VarParsing.varType.string,
-                  "geometry of operations: D49, D58, D59, D62")
+                  "geometry of operations: D49, D68, D70, D71")
 
 ### get and parse the command line arguments
 options.parseArguments()
@@ -31,21 +31,21 @@
     process = cms.Process('PROD',Phase2C9)
     process.load('Configuration.Geometry.GeometryExtended2026D49_cff')
     process.load('Configuration.Geometry.GeometryExtended2026D49Reco_cff')
-elif (options.geometry == "D58"):
+elif (options.geometry == "D68"):
     from Configuration.Eras.Era_Phase2C12_cff import Phase2C12
     process = cms.Process('PROD',Phase2C12)
-    process.load('Configuration.Geometry.GeometryExtended2026D58_cff')
-    process.load('Configuration.Geometry.GeometryExtended2026D58Reco_cff')
-elif (options.geometry == "D59"):
+    process.load('Configuration.Geometry.GeometryExtended2026D68_cff')
+    process.load('Configuration.Geometry.GeometryExtended2026D68Reco_cff')
+elif (options.geometry == "D70"):
     from Configuration.Eras.Era_Phase2C11_cff import Phase2C11
     process = cms.Process('PROD',Phase2C11)
-    process.load('Configuration.Geometry.GeometryExtended2026D59_cff')
-    process.load('Configuration.Geometry.GeometryExtended2026D59Reco_cff')
+    process.load('Configuration.Geometry.GeometryExtended2026D70_cff')
+    process.load('Configuration.Geometry.GeometryExtended2026D70Reco_cff')
 else:
     from Configuration.Eras.Era_Phase2C11_cff import Phase2C11
     process = cms.Process('PROD',Phase2C11)
-    process.load('Configuration.Geometry.GeometryExtended2026D62_cff')
-    process.load('Configuration.Geometry.GeometryExtended2026D62Reco_cff')
+    process.load('Configuration.Geometry.GeometryExtended2026D71_cff')
+    process.load('Configuration.Geometry.GeometryExtended2026D71Reco_cff')
 
 # import of standard configurations
 process.load('Configuration.StandardSequences.Services_cff')

Validation/HGCalValidation/test/python/protoSimValid_cfg.py

@@ -1,8 +1,8 @@
 ###############################################################################
 # Way to use this:
-#   cmsRun protoSimValid_cfg.py geometry=D62 type=hgcalBHValidation
+#   cmsRun protoSimValid_cfg.py geometry=D71 type=hgcalBHValidation
 #
-#   Options for geometry D49, D58, D59, D62
+#   Options for geometry D49, D68, D70, D71
 #               type hgcalBHValidation, hgcalSiliconValidation
 #
 ###############################################################################
@@ -14,10 +14,10 @@
 ### SETUP OPTIONS
 options = VarParsing.VarParsing('standard')
 options.register('geometry',
-                 "D62",
+                 "D71",
                   VarParsing.VarParsing.multiplicity.singleton,
                   VarParsing.VarParsing.varType.string,
-                  "geometry of operations: D49, D58, D59, D62")
+                  "geometry of operations: D49, D68, D70, D71")
 options.register ('type',
                   "hgcalBHValidation",
                   VarParsing.VarParsing.multiplicity.singleton,
@@ -41,33 +41,33 @@
         fileName = 'hgcSilValidD49.root'
     else:
         fileName = 'hgcBHValidD49.root'
-elif (options.geometry == "D58"):
+elif (options.geometry == "D68"):
     from Configuration.Eras.Era_Phase2C12_cff import Phase2C12
     process = cms.Process('PROD',Phase2C12)
-    process.load('Configuration.Geometry.GeometryExtended2026D58_cff')
-    process.load('Configuration.Geometry.GeometryExtended2026D58Reco_cff')
+    process.load('Configuration.Geometry.GeometryExtended2026D68_cff')
+    process.load('Configuration.Geometry.GeometryExtended2026D68Reco_cff')
     if (options.type == "hgcalSiliconValidation"):
-        fileName = 'hgcSilValidD58.root'
+        fileName = 'hgcSilValidD68.root'
     else:
-        fileName = 'hgcBHValidD58.root'
-elif (options.geometry == "D59"):
+        fileName = 'hgcBHValidD68.root'
+elif (options.geometry == "D70"):
     from Configuration.Eras.Era_Phase2C11_cff import Phase2C11
     process = cms.Process('PROD',Phase2C11)
-    process.load('Configuration.Geometry.GeometryExtended2026D59_cff')
-    process.load('Configuration.Geometry.GeometryExtended2026D59Reco_cff')
+    process.load('Configuration.Geometry.GeometryExtended2026D70_cff')
+    process.load('Configuration.Geometry.GeometryExtended2026D70Reco_cff')
     if (options.type == "hgcalSiliconValidation"):
-        fileName = 'hgcSilValidD59.root'
+        fileName = 'hgcSilValidD70.root'
     else:
-        fileName = 'hgcBHValidD59.root'
+        fileName = 'hgcBHValidD70.root'
 else:
     from Configuration.Eras.Era_Phase2C11_cff import Phase2C11
     process = cms.Process('PROD',Phase2C11)
-    process.load('Configuration.Geometry.GeometryExtended2026D62_cff')
-    process.load('Configuration.Geometry.GeometryExtended2026D62Reco_cff')
+    process.load('Configuration.Geometry.GeometryExtended2026D71_cff')
+    process.load('Configuration.Geometry.GeometryExtended2026D71Reco_cff')
     if (options.type == "hgcalSiliconValidation"):
-        fileName = 'hgcSilValidD62.root'
+        fileName = 'hgcSilValidD71.root'
     else:
-        fileName = 'hgcBHValidD62.root'
+        fileName = 'hgcBHValidD71.root'
 
 # import of standard configurations
 process.load('Configuration.StandardSequences.Services_cff')

Validation/HGCalValidation/test/python/protoValid_cfg.py

@@ -1,8 +1,8 @@
 ###############################################################################
 # Way to use this:
-#   cmsRun protoValid_cfg.py geometry=D62 type=hgcalSimHitStudy defaultInput=1
+#   cmsRun protoValid_cfg.py geometry=D71 type=hgcalSimHitStudy defaultInput=1
 #
-#   Options for geometry D49, D58, D59, D62
+#   Options for geometry D49, D68, D70, D71
 #               type hgcalGeomCheck, hgcalSimHitStudy, hgcalDigiStudy,
 #                    hgcalRecHitStudy, hgcalSiliconValidation
 #               defaultInput 1, 0
@@ -16,10 +16,10 @@
 ### SETUP OPTIONS
 options = VarParsing.VarParsing('standard')
 options.register('geometry',
-                 "D62",
+                 "D71",
                   VarParsing.VarParsing.multiplicity.singleton,
                   VarParsing.VarParsing.varType.string,
-                  "geometry of operations: D49, D58, D59, D62")
+                  "geometry of operations: D49, D68, D70, D71")
 options.register('type',
                  "hgcalGeomCheck",
                  VarParsing.VarParsing.multiplicity.singleton,
@@ -57,60 +57,60 @@
             fileName = 'hgcSilValidD49.root'
     else:
         fileName = 'hgcGeomCheckD49.root'
-elif (options.geometry == "D58"):
+elif (options.geometry == "D68"):
     from Configuration.Eras.Era_Phase2C12_cff import Phase2C12
     process = cms.Process('PROD',Phase2C12)
-    process.load('Configuration.Geometry.GeometryExtended2026D58_cff')
-    process.load('Configuration.Geometry.GeometryExtended2026D58Reco_cff')
+    process.load('Configuration.Geometry.GeometryExtended2026D68_cff')
+    process.load('Configuration.Geometry.GeometryExtended2026D68Reco_cff')
     if (options.type == "hgcalSimHitStudy"):
-        fileName = 'hgcSimHitD58.root'
+        fileName = 'hgcSimHitD68.root'
     elif (options.type == "hgcalDigiStudy"):
-        fileName = 'hgcDigiD58.root'
+        fileName = 'hgcDigiD68.root'
     elif (options.type == "hgcalRecHitStudy"):
-        fileName = 'hgcRecHitD58.root'
+        fileName = 'hgcRecHitD68.root'
     elif (options.type == "hgcalSiliconValidation"):
         if (options.defaultInput == 0):
-            fileName = 'hgcDigValidD58.root'
+            fileName = 'hgcDigValidD68.root'
         else:
-            fileName = 'hgcSilValidD58.root'
+            fileName = 'hgcSilValidD68.root'
     else:
-        fileName = 'hgcGeomCheckD58.root'
-elif (options.geometry == "D59"):
+        fileName = 'hgcGeomCheckD68.root'
+elif (options.geometry == "D70"):
     from Configuration.Eras.Era_Phase2C11_cff import Phase2C11
     process = cms.Process('PROD',Phase2C11)
-    process.load('Configuration.Geometry.GeometryExtended2026D59_cff')
-    process.load('Configuration.Geometry.GeometryExtended2026D59Reco_cff')
+    process.load('Configuration.Geometry.GeometryExtended2026D70_cff')
+    process.load('Configuration.Geometry.GeometryExtended2026D70Reco_cff')
     if (options.type == "hgcalSimHitStudy"):
-        fileName = 'hgcSimHitD59.root'
+        fileName = 'hgcSimHitD70.root'
     elif (options.type == "hgcalDigiStudy"):
-        fileName = 'hgcDigiD59.root'
+        fileName = 'hgcDigiD70.root'
     elif (options.type == "hgcalRecHitStudy"):
-        fileName = 'hgcRecHitD59.root'
+        fileName = 'hgcRecHitD70.root'
     elif (options.type == "hgcalSiliconValidation"):
         if (options.defaultInput == 0):
-            fileName = 'hgcDigValidD59.root'
+            fileName = 'hgcDigValidD70.root'
         else:
-            fileName = 'hgcSilValidD59.root'
+            fileName = 'hgcSilValidD70.root'
     else:
-        fileName = 'hgcGeomCheckD59.root'
+        fileName = 'hgcGeomCheckD70.root'
 else:
     from Configuration.Eras.Era_Phase2C11_cff import Phase2C11
     process = cms.Process('PROD',Phase2C11)
-    process.load('Configuration.Geometry.GeometryExtended2026D62_cff')
-    process.load('Configuration.Geometry.GeometryExtended2026D62Reco_cff')
+    process.load('Configuration.Geometry.GeometryExtended2026D71_cff')
+    process.load('Configuration.Geometry.GeometryExtended2026D71Reco_cff')
     if (options.type == "hgcalSimHitStudy"):
-        fileName = 'hgcSimHitD62.root'
+        fileName = 'hgcSimHitD71.root'
     elif (options.type == "hgcalDigiStudy"):
-        fileName = 'hgcDigiD62.root'
+        fileName = 'hgcDigiD71.root'
     elif (options.type == "hgcalRecHitStudy"):
-        fileName = 'hgcRecHitD62.root'
+        fileName = 'hgcRecHitD71.root'
     elif (options.type == "hgcalSiliconValidation"):
         if (options.defaultInput == 0):
-            fileName = 'hgcDigValidD62.root'
+            fileName = 'hgcDigValidD71.root'
         else:
-            fileName = 'hgcSilValidD62.root'
+            fileName = 'hgcSilValidD71.root'
     else:
-        fileName = 'hgcGeomCheckD62.root'
+        fileName = 'hgcGeomCheckD71.root'
 
 process.load("SimGeneral.HepPDTESSource.pythiapdt_cfi")
 process.load("Configuration.StandardSequences.MagneticField_cff")

Validation/HGCalValidation/test/python/runHFNoseDigiStudy_cfg.py

@@ -1,11 +1,11 @@
 import FWCore.ParameterSet.Config as cms
 
-from Configuration.Eras.Era_Phase2C6_cff import Phase2C6
-process = cms.Process('PROD',Phase2C6)
+from Configuration.Eras.Era_Phase2C10_cff import Phase2C10
+process = cms.Process('PROD',Phase2C10)
 
 process.load("SimGeneral.HepPDTESSource.pythiapdt_cfi")
-process.load('Configuration.Geometry.GeometryExtended2026D44_cff')
-process.load('Configuration.Geometry.GeometryExtended2026D44Reco_cff')
+process.load('Configuration.Geometry.GeometryExtended2026D60_cff')
+process.load('Configuration.Geometry.GeometryExtended2026D60Reco_cff')
 process.load("Configuration.StandardSequences.MagneticField_cff")
 process.load('FWCore.MessageService.MessageLogger_cfi')
 process.load('Configuration.StandardSequences.RawToDigi_cff')
@@ -29,7 +29,7 @@
 )
 
 process.TFileService = cms.Service("TFileService",
-                                   fileName = cms.string('hfnDigiD44tt.root'),
+                                   fileName = cms.string('hfnDigiD60tt.root'),
                                    closeFileFast = cms.untracked.bool(True)
                                    )