Skip to content

Run3-gex24 Try to sort out the issue of SimHit for muons using dd4hep #31832

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

Merged
cmsbuild merged 10 commits into from
Oct 21, 2020
Merged

Run3-gex24 Try to sort out the issue of SimHit for muons using dd4hep #31832

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
d3c347a
Try to sort out the issue of SimHit for muons using dd4hep
Oct 16, 2020
aaa0f06
Code check
Oct 16, 2020
4fec42d
Make the list of names as input parameters
Oct 18, 2020
0344b48
Code check
Oct 18, 2020
9092c57
Change v2x to v3 for muonNumbering/2021
Oct 19, 2020
cd30f3e
Also get changes from Sergio
Oct 19, 2020
5f8afba
Avoid error from static analyzer
Oct 19, 2020
53de0fc
Take notes from Kevin
Oct 20, 2020
7f4ea15
Use Carl's suggestions
Oct 20, 2020
b301e10
Use Carl's suggestions
Oct 20, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 19 additions & 0 deletions CondFormats/GeometryObjects/interface/MuonOffsetMap.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
#ifndef CondFormats_GeometryObjects_MuonOffsetMap_h
#define CondFormats_GeometryObjects_MuonOffsetMap_h

#include "CondFormats/Serialization/interface/Serializable.h"
#include <string>
#include <vector>
#include <unordered_map>

class MuonOffsetMap {
public:
MuonOffsetMap() = default;
~MuonOffsetMap() = default;

std::unordered_map<std::string, std::pair<int, int> > muonMap_;

COND_SERIALIZABLE;
};

#endif
4 changes: 4 additions & 0 deletions CondFormats/GeometryObjects/src/T_EventSetup_MuonOffsetMap.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
#include "CondFormats/GeometryObjects/interface/MuonOffsetMap.h"
#include "FWCore/Utilities/interface/typelookup.h"

TYPELOOKUP_DATA_REG(MuonOffsetMap);
1 change: 1 addition & 0 deletions CondFormats/GeometryObjects/src/classes.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,3 +13,4 @@
#include "CondFormats/GeometryObjects/interface/EcalSimulationParameters.h"
#include "CondFormats/GeometryObjects/interface/PHGCalParameters.h"
#include "CondFormats/GeometryObjects/interface/PDetGeomDesc.h"
#include "CondFormats/GeometryObjects/interface/MuonOffsetMap.h"
3 changes: 3 additions & 0 deletions CondFormats/GeometryObjects/src/classes_def.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -206,6 +206,9 @@
<field name="matNames_" mapping="blob"/>
<field name="dzs_" mapping="blob"/>
</class>
<class name="MuonOffsetMap" class_version="0">
<field name="muonMap_" mapping="blob"/>
</class>

<class name="PDetGeomDesc" class_version="0">
<field name="container_" mapping="blob"/>
Expand Down
1 change: 1 addition & 0 deletions Configuration/Geometry/python/GeometryDD4hepExtended2021ZeroMaterial_cff.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,3 +24,4 @@
from Geometry.EcalCommonData.ecalSimulationParameters_cff import *
from Geometry.HcalCommonData.hcalDDDSimConstants_cff import *
from Geometry.MuonNumbering.muonGeometryConstants_cff import *
from Geometry.MuonNumbering.muonOffsetESProducer_cff import *
1 change: 1 addition & 0 deletions Configuration/Geometry/python/GeometryDD4hepExtended2021_cff.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,3 +24,4 @@
from Geometry.EcalCommonData.ecalSimulationParameters_cff import *
from Geometry.HcalCommonData.hcalDDDSimConstants_cff import *
from Geometry.MuonNumbering.muonGeometryConstants_cff import *
from Geometry.MuonNumbering.muonOffsetESProducer_cff import *
1 change: 1 addition & 0 deletions Configuration/Geometry/python/GeometryExtended2021ZeroMaterial_cff.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,5 @@
from Geometry.EcalCommonData.ecalSimulationParameters_cff import *
from Geometry.HcalCommonData.hcalDDDSimConstants_cff import *
from Geometry.MuonNumbering.muonGeometryConstants_cff import *
from Geometry.MuonNumbering.muonOffsetESProducer_cff import *

1 change: 1 addition & 0 deletions Configuration/Geometry/python/GeometryExtended2021_cff.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,5 @@
from Geometry.EcalCommonData.ecalSimulationParameters_cff import *
from Geometry.HcalCommonData.hcalDDDSimConstants_cff import *
from Geometry.MuonNumbering.muonGeometryConstants_cff import *
from Geometry.MuonNumbering.muonOffsetESProducer_cff import *

5 changes: 3 additions & 2 deletions Configuration/Geometry/python/dict2021Geometry.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1020,7 +1020,7 @@
'Geometry/MuonCommonData/data/mb3/2021/v1/mb3.xml',
'Geometry/MuonCommonData/data/mb4/2015/v2/mb4.xml',
'Geometry/MuonCommonData/data/mb4Shield/2021/v1/mb4Shield.xml',
'Geometry/MuonCommonData/data/muonYoke/2021/v4/muonYoke.xml',
'Geometry/MuonCommonData/data/muonYoke/2021/v5/muonYoke.xml',
'Geometry/MuonCommonData/data/mf/2021/v2/mf.xml',
'Geometry/MuonCommonData/data/rpcf/2015/v1/rpcf.xml',
'Geometry/MuonCommonData/data/gemf/TDR_BaseLine/gemf.xml',
Expand All @@ -1029,7 +1029,7 @@
'Geometry/MuonCommonData/data/mfshield/2017/v2/mfshield.xml',
],
2 : [
'Geometry/MuonCommonData/data/muonNumbering/2021/v2/muonNumbering.xml',
'Geometry/MuonCommonData/data/muonNumbering/2021/v3/muonNumbering.xml',
],
3 : [
'Geometry/MuonSimData/data/v2/muonSens.xml',
Expand All @@ -1045,6 +1045,7 @@
],
"sim" : [
'from Geometry.MuonNumbering.muonGeometryConstants_cff import *',
'from Geometry.MuonNumbering.muonOffsetESProducer_cff import *',
],
"reco" : [
'from Geometry.MuonNumbering.muonNumberingInitialization_cfi import *',
Expand Down
4 changes: 2 additions & 2 deletions Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2021.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -241,14 +241,14 @@
<Include ref='Geometry/MuonCommonData/data/mb3/2021/v1/mb3.xml'/>
<Include ref='Geometry/MuonCommonData/data/mb4/2015/v2/mb4.xml'/>
<Include ref='Geometry/MuonCommonData/data/mb4Shield/2021/v1/mb4Shield.xml'/>
<Include ref='Geometry/MuonCommonData/data/muonYoke/2021/v4/muonYoke.xml'/>
<Include ref='Geometry/MuonCommonData/data/muonYoke/2021/v5/muonYoke.xml'/>
<Include ref='Geometry/MuonCommonData/data/mf/2021/v2/mf.xml'/>
<Include ref='Geometry/MuonCommonData/data/rpcf/2015/v1/rpcf.xml'/>
<Include ref='Geometry/MuonCommonData/data/gemf/TDR_BaseLine/gemf.xml'/>
<Include ref='Geometry/MuonCommonData/data/gem11/TDR_BaseLine/gem11.xml'/>
<Include ref='Geometry/MuonCommonData/data/csc/2021/v2/csc.xml'/>
<Include ref='Geometry/MuonCommonData/data/mfshield/2017/v2/mfshield.xml'/>
<Include ref='Geometry/MuonCommonData/data/muonNumbering/2021/v2/muonNumbering.xml'/>
<Include ref='Geometry/MuonCommonData/data/muonNumbering/2021/v3/muonNumbering.xml'/>
<Include ref='Geometry/ForwardCommonData/data/forward/2021/v1/forward.xml'/>
<Include ref='Geometry/ForwardCommonData/data/totemt2/2021/v1/totemt2.xml'/>
<Include ref='Geometry/ForwardCommonData/data/forwardshield/2021/v1/forwardshield.xml'/>
Expand Down
4 changes: 2 additions & 2 deletions Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2021ZeroMaterial.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -240,14 +240,14 @@
<Include ref='Geometry/MuonCommonData/data/mb3/2021/v1/mb3.xml'/>
<Include ref='Geometry/MuonCommonData/data/mb4/2015/v2/mb4.xml'/>
<Include ref='Geometry/MuonCommonData/data/mb4Shield/2021/v1/mb4Shield.xml'/>
<Include ref='Geometry/MuonCommonData/data/muonYoke/2021/v4/muonYoke.xml'/>
<Include ref='Geometry/MuonCommonData/data/muonYoke/2021/v5/muonYoke.xml'/>
<Include ref='Geometry/MuonCommonData/data/mf/2021/v2/mf.xml'/>
<Include ref='Geometry/MuonCommonData/data/rpcf/2015/v1/rpcf.xml'/>
<Include ref='Geometry/MuonCommonData/data/gemf/TDR_BaseLine/gemf.xml'/>
<Include ref='Geometry/MuonCommonData/data/gem11/TDR_BaseLine/gem11.xml'/>
<Include ref='Geometry/MuonCommonData/data/csc/2021/v2/csc.xml'/>
<Include ref='Geometry/MuonCommonData/data/mfshield/2017/v2/mfshield.xml'/>
<Include ref='Geometry/MuonCommonData/data/muonNumbering/2021/v2/muonNumbering.xml'/>
<Include ref='Geometry/MuonCommonData/data/muonNumbering/2021/v3/muonNumbering.xml'/>
<Include ref='Geometry/ForwardCommonData/data/forward/2021/v1/forward.xml'/>
<Include ref='Geometry/ForwardCommonData/data/totemt2/2021/v1/totemt2.xml'/>
<Include ref='Geometry/ForwardCommonData/data/forwardshield/2021/v1/forwardshield.xml'/>
Expand Down
4 changes: 2 additions & 2 deletions Geometry/CMSCommonData/python/cmsExtendedGeometry2021XML_cfi.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -242,7 +242,7 @@
'Geometry/MuonCommonData/data/mb3/2021/v1/mb3.xml',
'Geometry/MuonCommonData/data/mb4/2015/v2/mb4.xml',
'Geometry/MuonCommonData/data/mb4Shield/2021/v1/mb4Shield.xml',
'Geometry/MuonCommonData/data/muonYoke/2021/v4/muonYoke.xml',
'Geometry/MuonCommonData/data/muonYoke/2021/v5/muonYoke.xml',
'Geometry/MuonCommonData/data/mf/2021/v2/mf.xml',
'Geometry/MuonCommonData/data/rpcf/2015/v1/rpcf.xml',
'Geometry/MuonCommonData/data/gemf/TDR_BaseLine/gemf.xml',
Expand All @@ -251,7 +251,7 @@
'Geometry/MuonCommonData/data/mfshield/2017/v2/mfshield.xml',
)+
cms.vstring(
'Geometry/MuonCommonData/data/muonNumbering/2021/v2/muonNumbering.xml',
'Geometry/MuonCommonData/data/muonNumbering/2021/v3/muonNumbering.xml',
'Geometry/ForwardCommonData/data/forward/2021/v1/forward.xml',
'Geometry/ForwardCommonData/data/totemt2/2021/v1/totemt2.xml',
'Geometry/ForwardCommonData/data/forwardshield/2021/v1/forwardshield.xml',
Expand Down
4 changes: 2 additions & 2 deletions Geometry/CMSCommonData/python/cmsExtendedGeometry2021ZeroMaterialXML_cfi.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -241,7 +241,7 @@
'Geometry/MuonCommonData/data/mb3/2021/v1/mb3.xml',
'Geometry/MuonCommonData/data/mb4/2015/v2/mb4.xml',
'Geometry/MuonCommonData/data/mb4Shield/2021/v1/mb4Shield.xml',
'Geometry/MuonCommonData/data/muonYoke/2021/v4/muonYoke.xml',
'Geometry/MuonCommonData/data/muonYoke/2021/v5/muonYoke.xml',
'Geometry/MuonCommonData/data/mf/2021/v2/mf.xml',
'Geometry/MuonCommonData/data/rpcf/2015/v1/rpcf.xml',
'Geometry/MuonCommonData/data/gemf/TDR_BaseLine/gemf.xml',
Expand All @@ -250,7 +250,7 @@
'Geometry/MuonCommonData/data/mfshield/2017/v2/mfshield.xml',
)+
cms.vstring(
'Geometry/MuonCommonData/data/muonNumbering/2021/v2/muonNumbering.xml',
'Geometry/MuonCommonData/data/muonNumbering/2021/v3/muonNumbering.xml',
'Geometry/ForwardCommonData/data/forward/2021/v1/forward.xml',
'Geometry/ForwardCommonData/data/totemt2/2021/v1/totemt2.xml',
'Geometry/ForwardCommonData/data/forwardshield/2021/v1/forwardshield.xml',
Expand Down
Loading