Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Phase2-hgx280X Modify the tests in Geometry/HGCalCommonData/test to declare automatic creation of cfi #33287

Merged
merged 1 commit into from Mar 31, 2021
Merged

Phase2-hgx280X Modify the tests in Geometry/HGCalCommonData/test to declare automatic creation of cfi #33287

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
10 changes: 9 additions & 1 deletion Geometry/HGCalCommonData/test/HGCGeometryTester.cc
View file
Open in desktop
Expand Up @@ -35,12 +35,14 @@
#include "DetectorDescription/Core/interface/DDSolid.h"
#include "DetectorDescription/Core/interface/DDSpecifics.h"
#include "FWCore/ParameterSet/interface/ParameterSet.h"
#include "FWCore/ParameterSet/interface/ConfigurationDescriptions.h"
#include "Geometry/Records/interface/IdealGeometryRecord.h"

class HGCGeometryTester : public edm::one::EDAnalyzer<> {
public:
explicit HGCGeometryTester(const edm::ParameterSet&);
~HGCGeometryTester() override;
static void fillDescriptions(edm::ConfigurationDescriptions& descriptions);

void beginJob() override {}
void analyze(edm::Event const& iEvent, edm::EventSetup const&) override;
Expand All @@ -53,11 +55,17 @@ class HGCGeometryTester : public edm::one::EDAnalyzer<> {

HGCGeometryTester::HGCGeometryTester(const edm::ParameterSet& iC)
: ddToken_{esConsumes<DDCompactView, IdealGeometryRecord>(edm::ESInputTag{})} {
square = iC.getUntrackedParameter<bool>("SquareType", true);
square = iC.getUntrackedParameter<bool>("SquareType", false);
}

HGCGeometryTester::~HGCGeometryTester() {}

void HGCGeometryTester::fillDescriptions(edm::ConfigurationDescriptions& descriptions) {
edm::ParameterSetDescription desc;
desc.addUntracked<bool>("SquareType", false);
descriptions.add("hgcGeometryTester", desc);
}

// ------------ method called to produce the data ------------
void HGCGeometryTester::analyze(const edm::Event& iEvent, const edm::EventSetup& iSetup) {
const auto& pDD = iSetup.getData(ddToken_);
Expand Down
15 changes: 15 additions & 0 deletions Geometry/HGCalCommonData/test/HGCalNumberingTester.cc
View file
Open in desktop
Expand Up @@ -36,12 +36,14 @@
#include "DetectorDescription/Core/interface/DDExpandedView.h"
#include "DetectorDescription/Core/interface/DDSpecifics.h"
#include "FWCore/ParameterSet/interface/ParameterSet.h"
#include "FWCore/ParameterSet/interface/ConfigurationDescriptions.h"
#include "Geometry/HGCalCommonData/interface/HGCalDDDConstants.h"
#include "Geometry/Records/interface/IdealGeometryRecord.h"

class HGCalNumberingTester : public edm::one::EDAnalyzer<> {
public:
explicit HGCalNumberingTester(const edm::ParameterSet&);
static void fillDescriptions(edm::ConfigurationDescriptions& descriptions);

void beginJob() override {}
void analyze(edm::Event const& iEvent, edm::EventSetup const&) override;
Expand Down Expand Up @@ -88,6 +90,19 @@ HGCalNumberingTester::HGCalNumberingTester(const edm::ParameterSet& iC) {
<< std::endl;
}

void HGCalNumberingTester::fillDescriptions(edm::ConfigurationDescriptions& descriptions) {
std::vector<double> vecxy;
edm::ParameterSetDescription desc;
desc.add<std::string>("NameSense", "HGCalEESensitive");
desc.add<std::string>("NameDevice", "HGCal EE");
desc.add<std::vector<double> >("LocalPositionX", vecxy);
desc.add<std::vector<double> >("LocalPositionY", vecxy);
desc.add<int>("Increment", 19);
desc.add<int>("DetType", 2);
desc.add<bool>("Reco", false);
descriptions.add("hgcalNumberingTesterEE", desc);
}

// ------------ method called to produce the data ------------
void HGCalNumberingTester::analyze(const edm::Event& iEvent, const edm::EventSetup& iSetup) {
const HGCalDDDConstants& hgdc = iSetup.getData(dddToken_);
Expand Down
14 changes: 12 additions & 2 deletions Geometry/HGCalCommonData/test/HGCalParameterTester.cc
View file
Open in desktop
Expand Up @@ -5,6 +5,8 @@
#include "FWCore/Framework/interface/EventSetup.h"
#include "FWCore/Framework/interface/MakerMacros.h"
#include "FWCore/Framework/interface/one/EDAnalyzer.h"
#include "FWCore/ParameterSet/interface/ParameterSet.h"
#include "FWCore/ParameterSet/interface/ConfigurationDescriptions.h"

#include "Geometry/HGCalCommonData/interface/HGCalParameters.h"
#include "Geometry/HGCalCommonData/interface/HGCalTileIndex.h"
Expand All @@ -15,6 +17,7 @@ class HGCalParameterTester : public edm::one::EDAnalyzer<> {
public:
explicit HGCalParameterTester(const edm::ParameterSet&);
~HGCalParameterTester() override {}
static void fillDescriptions(edm::ConfigurationDescriptions& descriptions);

void beginJob() override {}
void analyze(edm::Event const& iEvent, edm::EventSetup const&) override;
Expand All @@ -36,9 +39,16 @@ class HGCalParameterTester : public edm::one::EDAnalyzer<> {
};

HGCalParameterTester::HGCalParameterTester(const edm::ParameterSet& ic)
: name_(ic.getUntrackedParameter<std::string>("Name")),
: name_(ic.getParameter<std::string>("Name")),
token_(esConsumes<HGCalParameters, IdealGeometryRecord>(edm::ESInputTag{"", name_})),
mode_(ic.getUntrackedParameter<int>("Mode")) {}
mode_(ic.getParameter<int>("Mode")) {}

void HGCalParameterTester::fillDescriptions(edm::ConfigurationDescriptions& descriptions) {
edm::ParameterSetDescription desc;
desc.add<std::string>("Name", "HGCalEESensitive");
desc.add<int>("Mode", 1);
descriptions.add("hgcParameterTesterEE", desc);
}

void HGCalParameterTester::analyze(const edm::Event& iEvent, const edm::EventSetup& iSetup) {
edm::LogVerbatim("HGCalGeomr") << "HGCalParameter::Here I am";
Expand Down
7 changes: 2 additions & 5 deletions Geometry/HGCalCommonData/test/python/testHGCGeometry_cfg.py
View file
Open in desktop
Expand Up @@ -15,6 +15,7 @@
process.load("Geometry.HGCalCommonData.hgcalParametersInitialization_cfi")
process.load("Geometry.HGCalCommonData.hgcalNumberingInitialization_cfi")
process.load('FWCore.MessageService.MessageLogger_cfi')
process.load("Geometry.HGCalCommonData.hgcGeometryTester_cfi")

if hasattr(process,'MessageLogger'):
process.MessageLogger.HGCalGeom=dict()
Expand Down Expand Up @@ -43,8 +44,4 @@
input = cms.untracked.int32(1)
)

process.prod = cms.EDAnalyzer("HGCGeometryTester",
SquareType = cms.untracked.bool(False),
)

process.p1 = cms.Path(process.generator*process.prod)
process.p1 = cms.Path(process.generator*process.hgcGeometryTester)
18 changes: 6 additions & 12 deletions Geometry/HGCalCommonData/test/python/testHGCalNumberingV15_cfg.py
View file
Open in desktop
Expand Up @@ -38,23 +38,17 @@
input = cms.untracked.int32(1)
)

process.prodEE = cms.EDAnalyzer("HGCalNumberingTester",
NameSense = cms.string("HGCalEESensitive"),
NameDevice = cms.string("HGCal EE"),
LocalPositionX= cms.vdouble(500.0,350.0,800.0,1400.0),
LocalPositionY= cms.vdouble(500.0,0.0,0.0,0.0),
Increment = cms.int32(19),
DetType = cms.int32(2),
Reco = cms.bool(False)
)
process.load("Geometry.HGCalCommonData.hgcalNumberingTesterEE_cfi")
process.hgcalNumberingTesterEE.LocalPositionX= [500.0,350.0,800.0,1400.0]
process.hgcalNumberingTesterEE.LocalPositionY= [500.0,0.0,0.0,0.0]

process.prodHEF = process.prodEE.clone(
process.hgcalNumberingTesterHEF = process.hgcalNumberingTesterEE.clone(
NameSense = "HGCalHESiliconSensitive",
NameDevice = "HGCal HE Front",
Increment = 9
)

process.prodHEB = process.prodEE.clone(
process.hgcalNumberingTesterHEB = process.hgcalNumberingTesterEE.clone(
NameSense = "HGCalHEScintillatorSensitive",
NameDevice = "HGCal HE Back",
Increment = 9,
Expand All @@ -63,4 +57,4 @@
DetType = 0
)

process.p1 = cms.Path(process.generator*process.prodEE*process.prodHEF*process.prodHEB)
process.p1 = cms.Path(process.generator*process.hgcalNumberingTesterEE*process.hgcalNumberingTesterHEF*process.hgcalNumberingTesterHEB)
23 changes: 8 additions & 15 deletions Geometry/HGCalCommonData/test/python/testHGCalNumbering_cfg.py
View file
Open in desktop
Expand Up @@ -8,7 +8,6 @@
#process.load("Geometry.CMSCommonData.cmsExtendedGeometry2026D68XML_cfi")
#process.load("Geometry.CMSCommonData.cmsExtendedGeometry2026D70XML_cfi")
process.load("Geometry.HGCalCommonData.testHGCalV14XML_cfi")
#process.load("Geometry.HGCalCommonData.testHGCalV15XML_cfi")
process.load("Geometry.HGCalCommonData.hgcalParametersInitialization_cfi")
process.load("Geometry.HGCalCommonData.hgcalNumberingInitialization_cfi")
process.load("Geometry.EcalCommonData.ecalSimulationParameters_cff")
Expand Down Expand Up @@ -42,24 +41,18 @@
input = cms.untracked.int32(1)
)

process.prodEE = cms.EDAnalyzer("HGCalNumberingTester",
NameSense = cms.string("HGCalEESensitive"),
NameDevice = cms.string("HGCal EE"),
LocalPositionX= cms.vdouble(500.0,350.0,800.0,1400.0),
LocalPositionY= cms.vdouble(500.0,0.0,0.0,0.0),
Increment = cms.int32(19),
# DetType = cms.int32(1),
DetType = cms.int32(2),
Reco = cms.bool(False)
)
process.load("Geometry.HGCalCommonData.hgcalNumberingTesterEE_cfi")
process.hgcalNumberingTesterEE.LocalPositionX= [500.0,350.0,800.0,1400.0]
process.hgcalNumberingTesterEE.LocalPositionY= [500.0,0.0,0.0,0.0]
#process.hgcalNumberingTesterEE.DetType = 1

process.prodHEF = process.prodEE.clone(
process.hgcalNumberingTesterHEF = process.hgcalNumberingTesterEE.clone(
NameSense = "HGCalHESiliconSensitive",
NameDevice = "HGCal HE Front",
Increment = 9
)

process.prodHEB = process.prodEE.clone(
process.hgcalNumberingTesterHEB = process.hgcalNumberingTesterEE.clone(
NameSense = "HGCalHEScintillatorSensitive",
NameDevice = "HGCal HE Back",
Increment = 9,
Expand All @@ -68,5 +61,5 @@
DetType = 0
)

#process.p1 = cms.Path(process.generator*process.prodEE*process.prodHEF)
process.p1 = cms.Path(process.generator*process.prodEE*process.prodHEF*process.prodHEB)
#process.p1 = cms.Path(process.generator*process.hgcalNumberingTesterEE*process.hgcalNumberingTesterHEF)
process.p1 = cms.Path(process.generator*process.hgcalNumberingTesterEE*process.hgcalNumberingTesterHEF*process.hgcalNumberingTesterHEB)
21 changes: 9 additions & 12 deletions Geometry/HGCalCommonData/test/python/testHGCalParametersDD4Hep_cfg.py
View file
Open in desktop
Expand Up @@ -42,20 +42,17 @@
firstRun = cms.untracked.uint32(1)
)

process.testEE = cms.EDAnalyzer("HGCalParameterTester",
Name = cms.untracked.string("HGCalEESensitive"),
Mode = cms.untracked.int32(1)
# Mode = cms.untracked.int32(0)
)
process.load("Geometry.HGCalCommonData.hgcParameterTesterEE_cfi")
#process.hgcParameterTesterEE.Mode = 0

process.testHESil = process.testEE.clone(
Name = cms.untracked.string("HGCalHESiliconSensitive")
process.hgcParameterTesterHESil = process.hgcParameterTesterEE.clone(
Name = cms.string("HGCalHESiliconSensitive")
)

process.testHESci = process.testEE.clone(
Name = cms.untracked.string("HGCalHEScintillatorSensitive"),
Mode = cms.untracked.int32(2)
process.hgcParameterTesterHESci = process.hgcParameterTesterEE.clone(
Name = cms.string("HGCalHEScintillatorSensitive"),
Mode = cms.int32(2)
)

process.p1 = cms.Path(process.generator*process.testEE*process.testHESil*process.testHESci)
#process.p1 = cms.Path(process.generator*process.testEE*process.testHESil)
process.p1 = cms.Path(process.generator*process.hgcParameterTesterEE*process.hgcParameterTesterHESil*process.hgcParameterTesterHESci)
#process.p1 = cms.Path(process.generator*process.hgcParameterTesterEE*process.hgcParameterTesterHESil)
23 changes: 10 additions & 13 deletions Geometry/HGCalCommonData/test/python/testHGCalParametersDDD_cfg.py
View file
Open in desktop
Expand Up @@ -36,20 +36,17 @@
firstRun = cms.untracked.uint32(1)
)

process.testEE = cms.EDAnalyzer("HGCalParameterTester",
Name = cms.untracked.string("HGCalEESensitive"),
Mode = cms.untracked.int32(1)
# Mode = cms.untracked.int32(0)
)
process.load("Geometry.HGCalCommonData.hgcParameterTesterEE_cfi")
#process.hgcParameterTesterEE.Mode = 0

process.testHESil = process.testEE.clone(
Name = cms.untracked.string("HGCalHESiliconSensitive")
process.hgcParameterTesterHESil = process.hgcParameterTesterEE.clone(
Name = cms.string("HGCalHESiliconSensitive")
)

process.testHESci = process.testEE.clone(
Name = cms.untracked.string("HGCalHEScintillatorSensitive"),
Mode = cms.untracked.int32(2)
process.hgcParameterTesterHESci = process.hgcParameterTesterEE.clone(
Name = cms.string("HGCalHEScintillatorSensitive"),
Mode = cms.int32(2)
)
process.p1 = cms.Path(process.generator*process.testEE*process.testHESil*process.testHESci)
#process.p1 = cms.Path(process.generator*process.testEE*process.testHESil)

process.p1 = cms.Path(process.generator*process.hgcParameterTesterEE*process.hgcParameterTesterHESil*process.hgcParameterTesterHESci)
#process.p1 = cms.Path(process.generator*process.hgcParameterTesterEE*process.hgcParameterTesterHESil)
17 changes: 7 additions & 10 deletions Geometry/HGCalCommonData/test/python/testHGCalParametersV15DD4Hep_cfg.py
View file
Open in desktop
Expand Up @@ -46,18 +46,15 @@
process.hgcalHESiParametersInitialize.fromDD4Hep = cms.bool(True)
process.hgcalHEScParametersInitialize.fromDD4Hep = cms.bool(True)

process.testEE = cms.EDAnalyzer("HGCalParameterTester",
Name = cms.untracked.string("HGCalEESensitive"),
Mode = cms.untracked.int32(1)
)
process.load("Geometry.HGCalCommonData.hgcParameterTesterEE_cfi")

process.testHESil = process.testEE.clone(
Name = cms.untracked.string("HGCalHESiliconSensitive")
process.hgcParameterTesterHESil = process.hgcParameterTesterEE.clone(
Name = cms.string("HGCalHESiliconSensitive")
)

process.testHESci = process.testEE.clone(
Name = cms.untracked.string("HGCalHEScintillatorSensitive"),
Mode = cms.untracked.int32(2)
process.hgcParameterTesterHESci = process.hgcParameterTesterEE.clone(
Name = cms.string("HGCalHEScintillatorSensitive"),
Mode = cms.int32(2)
)

process.p1 = cms.Path(process.generator*process.testEE*process.testHESil*process.testHESci)
process.p1 = cms.Path(process.generator*process.hgcParameterTesterEE*process.hgcParameterTesterHESil*process.hgcParameterTesterHESci)
17 changes: 7 additions & 10 deletions Geometry/HGCalCommonData/test/python/testHGCalParametersV15DDD_cfg.py
View file
Open in desktop
Expand Up @@ -34,18 +34,15 @@
firstRun = cms.untracked.uint32(1)
)

process.testEE = cms.EDAnalyzer("HGCalParameterTester",
Name = cms.untracked.string("HGCalEESensitive"),
Mode = cms.untracked.int32(1)
)
process.load("Geometry.HGCalCommonData.hgcParameterTesterEE_cfi")

process.testHESil = process.testEE.clone(
Name = cms.untracked.string("HGCalHESiliconSensitive")
process.hgcParameterTesterHESil = process.hgcParameterTesterEE.clone(
Name = cms.string("HGCalHESiliconSensitive")
)

process.testHESci = process.testEE.clone(
Name = cms.untracked.string("HGCalHEScintillatorSensitive"),
Mode = cms.untracked.int32(2)
process.hgcParameterTesterHESci = process.hgcParameterTesterEE.clone(
Name = cms.string("HGCalHEScintillatorSensitive"),
Mode = cms.int32(2)
)

process.p1 = cms.Path(process.generator*process.testEE*process.testHESil*process.testHESci)
process.p1 = cms.Path(process.generator*process.hgcParameterTesterEE*process.hgcParameterTesterHESil*process.hgcParameterTesterHESci)
9 changes: 3 additions & 6 deletions Geometry/HGCalCommonData/test/python/testHGCalTBParametersDD4Hep_cfg.py
View file
Open in desktop
Expand Up @@ -45,10 +45,7 @@
process.hgcalHESiParametersInitialize.fromDD4Hep = cms.bool(True)
process.hgcalHEScParametersInitialize.fromDD4Hep = cms.bool(True)

process.testEE = cms.EDAnalyzer("HGCalParameterTester",
Name = cms.untracked.string("HGCalEESensitive"),
Mode = cms.untracked.int32(0)
)

process.load("Geometry.HGCalCommonData.hgcParameterTesterEE_cfi")
process.hgcParameterTesterEE.Mode = 0

process.p1 = cms.Path(process.generator*process.testEE)
process.p1 = cms.Path(process.generator*process.hgcParameterTesterEE)
8 changes: 3 additions & 5 deletions Geometry/HGCalCommonData/test/python/testHGCalTBParametersDDD_cfg.py
View file
Open in desktop
Expand Up @@ -33,9 +33,7 @@
firstRun = cms.untracked.uint32(1)
)

process.testEE = cms.EDAnalyzer("HGCalParameterTester",
Name = cms.untracked.string("HGCalEESensitive"),
Mode = cms.untracked.int32(0)
)
process.load("Geometry.HGCalCommonData.hgcParameterTesterEE_cfi")
process.hgcParameterTesterEE.Mode = 0

process.p1 = cms.Path(process.generator*process.testEE)
process.p1 = cms.Path(process.generator*process.hgcParameterTesterEE)