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.

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

Run3-sim106 Investigating dd4hep initialization with root name other than cms::OCMS #35050

Merged
merged 2 commits into from Aug 30, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 3 additions & 0 deletions DetectorDescription/DDCMS/plugins/DDDetectorESProducer.cc
Expand Up @@ -70,6 +70,9 @@ DDDetectorESProducer::DDDetectorESProducer(const ParameterSet& iConfig)
rootDDName_(iConfig.getParameter<string>("rootDDName")),
label_(iConfig.getParameter<string>("label")) {
usesResources({edm::ESSharedResourceNames::kDD4Hep});
edm::LogVerbatim("Geometry") << "DDDetectorESProducer::fromDB " << fromDB_ << " appendToDataLabel "
<< appendToDataLabel_ << " rootDDName " << rootDDName_ << " label " << label_
<< " confGeomXMLFiles " << confGeomXMLFiles_;
if (rootDDName_ == "MagneticFieldVolumes:MAGF" || rootDDName_ == "cmsMagneticField:MAGF") {
auto c = setWhatProduced(this,
&DDDetectorESProducer::produceMagField,
Expand Down
Expand Up @@ -13,8 +13,9 @@
#include "FWCore/Framework/interface/ConsumesCollector.h"
#include "FWCore/Framework/interface/EventSetup.h"
#include "FWCore/Utilities/interface/ESGetToken.h"
#include "FWCore/PluginManager/interface/ModuleDef.h"
#include "FWCore/MessageLogger/interface/MessageLogger.h"
#include "FWCore/ParameterSet/interface/ParameterSet.h"
#include "FWCore/PluginManager/interface/ModuleDef.h"

class DreamSensitiveDetectorBuilder : public SensitiveDetectorMakerBase {
public:
Expand All @@ -24,6 +25,7 @@ class DreamSensitiveDetectorBuilder : public SensitiveDetectorMakerBase {
cpvTokenDD4Hep_ = cc.esConsumes<edm::Transition::BeginRun>();
else
cpvTokenDDD_ = cc.esConsumes<edm::Transition::BeginRun>();
edm::LogVerbatim("EcalSim") << "DreamSensitiveDetectorBuilder called with dd4hep flag " << fromDD4Hep_;
}

void beginRun(const edm::EventSetup& es) final {
Expand Down
3 changes: 3 additions & 0 deletions SimG4CMS/CherenkovAnalysis/test/runSingleDREAMDD4Hep_cfg.py
Expand Up @@ -7,6 +7,7 @@
process.load('FWCore.MessageService.MessageLogger_cfi')
process.load("SimG4CMS.CherenkovAnalysis.gun_cff")
process.load("Configuration.Geometry.GeometryDD4hep_cff")
process.load("DetectorDescription.DDCMS.DDDetectorESProducer_cfi")
process.load("Geometry.HcalCommonData.caloSimulationParameters_cff")
process.load('GeneratorInterface.Core.generatorSmeared_cfi')
process.load("SimG4Core.Application.g4SimHits_cfi")
Expand All @@ -24,6 +25,7 @@
if hasattr(process,'MessageLogger'):
process.MessageLogger.EcalSim=dict()
process.MessageLogger.HCalGeom=dict()
process.MessageLogger.Geometry=dict()
process.MessageLogger.CherenkovAnalysis=dict()
process.MessageLogger.SimG4CoreGeometry=dict()

Expand All @@ -37,6 +39,7 @@
process.p1 = cms.Path(process.generator*process.VtxSmeared*process.generatorSmeared*process.g4SimHits*process.cherenkovAnalysis)

process.DDDetectorESProducer.confGeomXMLFiles = cms.FileInPath("SimG4CMS/CherenkovAnalysis/data/SingleDREAMDD4Hep.xml")
process.DDDetectorESProducer.rootDDName = 'singleDREAM:DREAM'
process.generator.PGunParameters.MinE = 10.0
process.generator.PGunParameters.MaxE = 10.0
process.g4SimHits.UseMagneticField = False
Expand Down