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

ME0 migration to DD4HEP #29813

Merged
merged 2 commits into from May 13, 2020
Merged

ME0 migration to DD4HEP #29813

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
eb63f3a
ME0 migration to DD4HEP
slomeo May 12, 2020
1936f02
restored format BuildFile.xml
slomeo May 12, 2020
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
21 changes: 21 additions & 0 deletions Configuration/Geometry/python/GeometryDD4hepExtended2026D41_cff.py
View file
Open in desktop
@@ -0,0 +1,21 @@
import FWCore.ParameterSet.Config as cms

#
# Geometry master configuration
#
# Ideal geometry, needed for simulation
DDDetectorESProducer = cms.ESSource("DDDetectorESProducer",
confGeomXMLFiles = cms.FileInPath('Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D41.xml'),
appendToDataLabel = cms.string('')
)

DDSpecParRegistryESProducer = cms.ESProducer("DDSpecParRegistryESProducer",
appendToDataLabel = cms.string('')
)

DDVectorRegistryESProducer = cms.ESProducer("DDVectorRegistryESProducer",
appendToDataLabel = cms.string(''))

DDCompactViewESProducer = cms.ESProducer("DDCompactViewESProducer",
appendToDataLabel = cms.string('')
)
3 changes: 3 additions & 0 deletions Configuration/StandardSequences/python/DD4hep_GeometrySimPhase2_cff.py
View file
Open in desktop
@@ -0,0 +1,3 @@
import FWCore.ParameterSet.Config as cms

from Configuration.Geometry.GeometryDD4hepExtended2026D41_cff import *
4 changes: 2 additions & 2 deletions Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D41.xml
View file
Open in desktop
Expand Up @@ -106,8 +106,8 @@
<Include ref="Geometry/CSCGeometryBuilder/data/cscSpecsFilter.xml"/>
<Include ref="Geometry/CSCGeometryBuilder/data/cscSpecs.xml"/>
<Include ref="Geometry/RPCGeometryBuilder/data/2026/v1/RPCSpecs.xml"/>
<Include ref="Geometry/GEMGeometryBuilder/data/v7/GEMSpecsFilter.xml"/>
<Include ref="Geometry/GEMGeometryBuilder/data/v7/GEMSpecs.xml"/>
<Include ref="Geometry/GEMGeometryBuilder/data/v10/GEMSpecsFilter.xml"/>
<Include ref="Geometry/GEMGeometryBuilder/data/v10/GEMSpecs.xml"/>
<Include ref="Geometry/ForwardCommonData/data/brmsens.xml"/>
<Include ref="Geometry/ForwardSimData/data/zdcsens.xml"/>
<Include ref="Geometry/MTDSimData/data/CrystalBarPhiFlat/mtdsens.xml"/>
Expand Down
4 changes: 2 additions & 2 deletions Geometry/GEMGeometry/test/testME0Geometry_cfg.py
View file
Open in desktop
Expand Up @@ -14,7 +14,7 @@
###############################################################
process.load("FWCore.MessageLogger.MessageLogger_cfi")
# process.MessageLogger.categories.append("ME0GeometryESModule")
# process.MessageLogger.categories.append("ME0GeometryBuilderFromDDD")
# process.MessageLogger.categories.append("ME0GeometryBuilder")
# process.MessageLogger.categories.append("ME0NumberingScheme")
process.MessageLogger.debugModules = cms.untracked.vstring("*")
process.MessageLogger.destinations = cms.untracked.vstring("cout","junk")
Expand All @@ -23,7 +23,7 @@
default = cms.untracked.PSet( limit = cms.untracked.int32(0) ),
FwkReport = cms.untracked.PSet( limit = cms.untracked.int32(-1) ),
# ME0GeometryESModule = cms.untracked.PSet( limit = cms.untracked.int32(-1) ),
# ME0GeometryBuilderFromDDD = cms.untracked.PSet( limit = cms.untracked.int32(-1) ),
# ME0GeometryBuilder = cms.untracked.PSet( limit = cms.untracked.int32(-1) ),
# ME0NumberingScheme = cms.untracked.PSet( limit = cms.untracked.int32(-1) ),
)

Expand Down
29 changes: 29 additions & 0 deletions Geometry/GEMGeometryBuilder/data/v10/GEMSpecs.xml
View file
Open in desktop
@@ -0,0 +1,29 @@
<?xml version="1.0"?>
<DDDefinition xmlns="http://www.cern.ch/cms/DDL" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.cern.ch/cms/DDL ../../../DetectorDescription/Schema/DDLSchema.xsd">
<SpecParSection label="GEMSpecs.xml">
<SpecPar name="nStripsME0" eval="true">
<PartSelector path="//ME0Box/ME0L/GHA0.."/>
<Parameter name="nStrips" value="384"/>
</SpecPar>
<SpecPar name="nStripsGE11" eval="true">
<PartSelector path="//GHA1.."/>
<Parameter name="nStrips" value="384"/>
</SpecPar>
<SpecPar name="nStripsGE21" eval="true">
<PartSelector path="//GHA2.."/>
<Parameter name="nStrips" value="768"/>
</SpecPar>
<SpecPar name="nPadsME0" eval="true">
<PartSelector path="//ME0Box/ME0L/GHA0.."/>
<Parameter name="nPads" value="192"/>
</SpecPar>
<SpecPar name="nPadsGE11" eval="true">
<PartSelector path="//GHA1.."/>
<Parameter name="nPads" value="192"/>
</SpecPar>
<SpecPar name="nPadsGE21" eval="true">
<PartSelector path="//GHA2.."/>
<Parameter name="nPads" value="384"/>
</SpecPar>
</SpecParSection>
</DDDefinition>
22 changes: 22 additions & 0 deletions Geometry/GEMGeometryBuilder/data/v10/GEMSpecsFilter.xml
View file
Open in desktop
@@ -0,0 +1,22 @@
<?xml version="1.0"?>
<DDDefinition xmlns="http://www.cern.ch/cms/DDL" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.cern.ch/cms/DDL ../../../DetectorDescription/Schema/DDLSchema.xsd">
<SpecParSection label="GEMSpecsFilter.xml">
<SpecPar name="MuonME0Tree">
<PartSelector path="//ME0Box"/>
<PartSelector path="//ME0Box/ME0L"/>
<PartSelector path="//ME0Box/ME0L/GHA0..*"/>
<Parameter name="MuStructure" value="MuonEndCapME0"/>
</SpecPar>
<SpecPar name="MuonGEMTree">
<PartSelector path="//GEMBox11L"/>
<PartSelector path="//GSAX11L"/>
<PartSelector path="//GEMBox11S"/>
<PartSelector path="//GSAX11S"/>
<PartSelector path="//GHA1..*"/>
<PartSelector path="//GEMBox21.*"/>
<PartSelector path="//GSAX21.*"/>
<PartSelector path="//GHA2..*"/>
<Parameter name="MuStructure" value="MuonEndCapGEM"/>
</SpecPar>
</SpecParSection>
</DDDefinition>
34 changes: 21 additions & 13 deletions Geometry/GEMGeometryBuilder/plugins/BuildFile.xml
View file
Open in desktop
Expand Up @@ -6,29 +6,37 @@
<use name="FWCore/ParameterSet"/>
<use name="Geometry/MuonNumbering"/>
<use name="Geometry/Records"/>

<library name="GEMGeometryPlugins" file="GEMGeometryESModule.cc">
<use name="DetectorDescription/Core"/>
<use name="DetectorDescription/DDCMS"/>
<use name="Geometry/GEMGeometry"/>
<use name="dd4hep"/>
<lib name="Geom"/>
<use name="Geometry/GEMGeometryBuilder"/>
<flags EDM_PLUGIN="1"/>
<use name="DetectorDescription/Core"/>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

it looks like you undid the buildfile changes from the recent xml formatting pass, please revert

Copy link
Contributor Author

@slomeo slomeo May 12, 2020 •
edited

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@kpedro88 : now "diff new_BuildFile.xml old_BuildFile.xml" is related only to the ME0 Validation part:

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@kpedro88 : I restored the old format and I added only the ME0 validation part

<use name="DetectorDescription/DDCMS"/>
<use name="Geometry/GEMGeometry"/>
<use name="dd4hep"/>
<lib name="Geom"/>
<use name="Geometry/GEMGeometryBuilder"/>
<flags EDM_PLUGIN="1"/>
</library>

<library name="GEMGeometryValidationPlugins" file="GEMGeometryValidate.cc">
<use name="Fireworks/Core"/>
<use name="Geometry/GEMGeometry"/>
<use name="rootgeom"/>
<flags EDM_PLUGIN="1"/>
</library>
</library>

<library name="ME0GeometryPlugins" file="ME0GeometryESModule.cc">
<use name="DetectorDescription/Core"/>
<use name="DetectorDescription/DDCMS"/>
<use name="DetectorDescription/Core"/>
<use name="DetectorDescription/DDCMS"/>
<use name="Geometry/GEMGeometry"/>
<use name="dd4hep"/>
<lib name="Geom"/>
<use name="Geometry/GEMGeometryBuilder"/>
<flags EDM_PLUGIN="1"/>
</library>

<library name="ME0GeometryValidationPlugins" file="ME0GeometryValidate.cc">
<use name="Fireworks/Core"/>
<use name="Geometry/GEMGeometry"/>
<use name="dd4hep"/>
<lib name="Geom"/>
<use name="Geometry/GEMGeometryBuilder"/>
<use name="rootgeom"/>
<flags EDM_PLUGIN="1"/>
</library>
41 changes: 28 additions & 13 deletions Geometry/GEMGeometryBuilder/plugins/ME0GeometryESModule.cc
View file
Open in desktop
@@ -1,15 +1,23 @@
/** \file
*
* \author M. Maggi - INFN Bari
*/
/*
//\class ME0GeometryESModule

#include "Geometry/GEMGeometryBuilder/src/ME0GeometryBuilderFromDDD.h"
Description: ME0 GeometryESModule from DD & DD4hep
DD4hep part added to the original old file (DD version) made by M. Maggi (INFN Bari)
//
// Author: Sergio Lo Meo (sergio.lo.meo@cern.ch) following what Ianna Osborne made for DTs (DD4HEP migration)
// Created: 29 Apr 2020
*/

#include "Geometry/GEMGeometryBuilder/src/ME0GeometryBuilder.h"
#include "Geometry/GEMGeometryBuilder/src/ME0GeometryBuilderFromCondDB.h"

#include "Geometry/Records/interface/IdealGeometryRecord.h"
#include "Geometry/MuonNumbering/interface/MuonGeometryConstants.h"
#include "DetectorDescription/Core/interface/DDCompactView.h"

#include "Geometry/MuonNumbering/interface/DD4hep_MuonNumbering.h"
#include <DetectorDescription/DDCMS/interface/DDCompactView.h>

#include "Geometry/Records/interface/ME0RecoGeometryRcd.h"
#include "Geometry/Records/interface/MuonGeometryRecord.h"
#include "Geometry/GEMGeometry/interface/ME0Geometry.h"
Expand All @@ -28,28 +36,30 @@ using namespace edm;

class ME0GeometryESModule : public edm::ESProducer {
public:
/// Constructor
ME0GeometryESModule(const edm::ParameterSet& p);

/// Destructor
~ME0GeometryESModule() override;

/// Produce ME0Geometry.
std::unique_ptr<ME0Geometry> produce(const MuonGeometryRecord& record);

private:
edm::ESGetToken<DDCompactView, IdealGeometryRecord> cpvToken_;
edm::ESGetToken<MuonGeometryConstants, IdealGeometryRecord> mdcToken_;
edm::ESGetToken<cms::DDCompactView, IdealGeometryRecord> dd4hepcpvToken_;
edm::ESGetToken<cms::MuonNumbering, MuonNumberingRecord> dd4hepmdcToken_;
edm::ESGetToken<RecoIdealGeometry, ME0RecoGeometryRcd> rigme0Token_;
// use the DDD as Geometry source
// use the DDD or DD4hep as Geometry source
bool useDDD_;
bool useDD4hep_;
};

ME0GeometryESModule::ME0GeometryESModule(const edm::ParameterSet& p) {
useDDD_ = p.getParameter<bool>("useDDD");
useDD4hep_ = p.getUntrackedParameter<bool>("useDD4hep", false);
auto cc = setWhatProduced(this);
if (useDDD_) {
cc.setConsumes(cpvToken_).setConsumes(mdcToken_);
} else if (useDD4hep_) {
cc.setConsumes(dd4hepcpvToken_).setConsumes(dd4hepmdcToken_);
} else {
cc.setConsumes(rigme0Token_);
}
Expand All @@ -59,12 +69,17 @@ ME0GeometryESModule::~ME0GeometryESModule() {}

std::unique_ptr<ME0Geometry> ME0GeometryESModule::produce(const MuonGeometryRecord& record) {
LogTrace("ME0GeometryESModule") << "ME0GeometryESModule::produce with useDDD = " << useDDD_;

if (useDDD_) {
LogTrace("ME0GeometryESModule") << "ME0GeometryESModule::produce :: ME0GeometryBuilderFromDDD builder";
LogTrace("ME0GeometryESModule") << "ME0GeometryESModule::produce :: ME0GeometryBuilder builder";
auto cpv = record.getTransientHandle(cpvToken_);
const auto& mdc = record.get(mdcToken_);
ME0GeometryBuilderFromDDD builder;
ME0GeometryBuilder builder;
return std::unique_ptr<ME0Geometry>(builder.build(cpv.product(), mdc));
} else if (useDD4hep_) {
LogTrace("ME0GeometryESModule") << "ME0GeometryESModule::produce :: ME0GeometryBuilder builder DD4hep";
auto cpv = record.getTransientHandle(dd4hepcpvToken_);
const auto& mdc = record.get(dd4hepmdcToken_);
ME0GeometryBuilder builder;
return std::unique_ptr<ME0Geometry>(builder.build(cpv.product(), mdc));
} else {
LogTrace("ME0GeometryESModule") << "ME0GeometryESModule::produce :: ME0GeometryBuilderFromCondDB builder";
Expand Down