Skip to content

Commit

Permalink
Merge pull request cms-sw#12 from gem-sw/CMSSW_6_2_X_SLHC
Browse files Browse the repository at this point in the history 
update
  • Loading branch information
Cesare committed Jan 24, 2014
2 parents b0b9d9c + 5b87b17 commit 06db0a4
Show file tree
Hide file tree
Showing 63 changed files with 4,608 additions and 1,919 deletions.
1 change: 1 addition & 0 deletions Configuration/Geometry/python/GeometryRecoECALHCAL_cff.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
from Geometry.CaloEventSetup.EcalTrigTowerConstituents_cfi import *
from Geometry.EcalMapping.EcalMapping_cfi import *
from Geometry.EcalMapping.EcalMappingRecord_cfi import *
from Geometry.HcalCommonData.hcalRecNumberingInitialization_cfi import *



Expand Down
4 changes: 1 addition & 3 deletions Configuration/Geometry/python/GeometrySimECALHCAL_cff.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@

# Ideal geometry for ECAL+HCAL, needed for simulation
from Geometry.CMSCommonData.ecalhcalGeometryXML_cfi import *



from Geometry.HcalCommonData.hcalSimNumberingInitialization_cfi import *


13 changes: 8 additions & 5 deletions DataFormats/ForwardDetId/interface/CFCDetId.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ class CFCDetId : public DetId {
CFCDetId();
/** Create cellid from raw id (0=invalid tower id) */
CFCDetId(uint32_t rawid);
/** Constructor from subdetector, signed ieta,iphi, depth and type */
CFCDetId(ForwardSubdetector subdet, int ieta, int iphi, int depth, int type);
/** Constructor from subdetector, module, signed ieta, signed iphi, depth and type */
CFCDetId(ForwardSubdetector subdet, int module, int ieta, int iphi, int depth, int type);
/** Constructor from a generic cell id */
CFCDetId(const DetId& id);
/** Assignment from a generic cell id */
Expand All @@ -22,13 +22,16 @@ class CFCDetId : public DetId {
/// get the subdetector
ForwardSubdetector subdet() const { return (ForwardSubdetector)(subdetId()); }
/// get the z-side of the cell (1/-1)
int zside() const { return (id_&0x1000000)?(1):(-1); }
int zside() const { return (id_&0x80000)?(1):(-1); }
/// get the absolute value of the cell ieta
int ietaAbs() const { return (id_>>10)&0x3FF; }
int ietaAbs() const { return (id_>>11)&0xFF; }
/// get the cell ieta
int ieta() const { return zside()*ietaAbs(); }
/// get the module #
int module() const { return (id_>>6)&0x1F; }
/// get the cell iphi
int iphi() const { return id_&0x3FF; }
int signPhi() const { return (id_&0x20)?(1):(-1); }
int iphi() const { return (id_&0x1F)*signPhi(); }
/// get the tower depth
int depth() const { return (id_>>21)&0x7; }
/// get the fibre type
Expand Down
2 changes: 1 addition & 1 deletion DataFormats/ForwardDetId/interface/ForwardSubdetector.h
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#ifndef DataFormats_ForwardDetId_ForwardSubDetector_H
#define DataFormats_ForwardDetId_ForwardSubDetector_H 1

enum ForwardSubdetector { ForwardEmpty=0, ForwardCFC=1, ForwardBHM=2, HGCEE=3, HGCHE=4};
enum ForwardSubdetector { ForwardEmpty=0, CFC=1, BHM=2, HGCEE=3, HGCHE=4};

#endif
10 changes: 4 additions & 6 deletions DataFormats/ForwardDetId/interface/HGCEEDetId.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,7 @@ class HGCEEDetId : public DetId {
/** Create cellid from raw id (0=invalid tower id) */
HGCEEDetId(uint32_t rawid);
/** Constructor from subdetector, zplus, layer, module, cell numbers */
HGCEEDetId(ForwardSubdetector subdet, int zp, int lay, int mod,
int cellx, int celly);
HGCEEDetId(ForwardSubdetector subdet, int zp, int lay, int mod, int cell);
/** Constructor from a generic cell id */
HGCEEDetId(const DetId& id);
/** Assignment from a generic cell id */
Expand All @@ -26,12 +25,11 @@ class HGCEEDetId : public DetId {
/// get the z-side of the cell (1/-1)
int zside() const { return (id_&0x1000000)?(1):(-1); }
/// get the absolute value of the cell #'s in x and y
int cellX() const { return (id_>>6)&0x3F; }
int cellY() const { return id_&0x3F; }
int cell() const { return id_&0x7FFF; }
/// get the module #
int module() const { return (id_>>12)&0x3F; }
int module() const { return (id_>>14)&0x1F; }
/// get the layer #
int layer() const { return (id_>>18)&0x3F; }
int layer() const { return (id_>>19)&0x1F; }

static const HGCEEDetId Undefined;

Expand Down
21 changes: 11 additions & 10 deletions DataFormats/ForwardDetId/src/CFCDetId.cc
View file
Original file line number Diff line number Diff line change
@@ -1,27 +1,28 @@
#include "DataFormats/ForwardDetId/interface/CFCDetId.h"
#include "FWCore/Utilities/interface/Exception.h"
#include <ostream>
#include <iostream>

const CFCDetId CFCDetId::Undefined(ForwardEmpty,0,0,0,0);
const CFCDetId CFCDetId::Undefined(ForwardEmpty,0,0,0,0,0);

CFCDetId::CFCDetId() : DetId() {
}

CFCDetId::CFCDetId(uint32_t rawid) : DetId(rawid) {
}

CFCDetId::CFCDetId(ForwardSubdetector subdet, int ieta, int iphi, int depth,
int type) : DetId(Forward,subdet) {
CFCDetId::CFCDetId(ForwardSubdetector subdet, int module, int ieta, int iphi,
int depth, int type) : DetId(Forward,subdet) {

// (no checking at this point!)
id_ |= ((depth&0x7)<<21) | ((type&0x1)<20) |
((ieta>0)?(0x1000000|((ieta&0x3FF)<<10)):(((-ieta)&0x3FF)<<10)) |
(iphi&0x3FF);
id_ |= ((depth&0x7)<<21) | ((type&0x1)<<20) |
((ieta>0)?(0x80000|((ieta&0xFF)<<11)):(((-ieta)&0xFF)<<11)) |
((module&0x1F)<<6) | ((iphi>0)?(0x20|(iphi&0x1F)):((-iphi&0x1F)));
}

CFCDetId::CFCDetId(const DetId& gen) {
if (!gen.null()) {
ForwardSubdetector subdet=(ForwardSubdetector(gen.subdetId()));
if (gen.det()!=Forward || (subdet!=ForwardCFC)) {
if (gen.det()!=Forward || (subdet!=CFC)) {
throw cms::Exception("Invalid DetId") << "Cannot initialize CFCDetId from " << std::hex << gen.rawId() << std::dec;
}
}
Expand All @@ -31,7 +32,7 @@ CFCDetId::CFCDetId(const DetId& gen) {
CFCDetId& CFCDetId::operator=(const DetId& gen) {
if (!gen.null()) {
ForwardSubdetector subdet=(ForwardSubdetector(gen.subdetId()));
if (gen.det()!=Forward || (subdet!=ForwardCFC)) {
if (gen.det()!=Forward || (subdet!=CFC)) {
throw cms::Exception("Invalid DetId") << "Cannot assign CFCDetId from " << std::hex << gen.rawId() << std::dec;
}
}
Expand All @@ -41,7 +42,7 @@ CFCDetId& CFCDetId::operator=(const DetId& gen) {

std::ostream& operator<<(std::ostream& s,const CFCDetId& id) {
switch (id.subdet()) {
case(ForwardCFC) : return s << "(CFC " << id.ieta() << ',' << id.iphi() << ',' << id.depth() << ',' << id.type() << ')';
case(CFC) : return s << "(CFC " << id.ieta() << ',' << id.module() << ',' << id.iphi() << ',' << id.depth() << ',' << id.type() << ')';
default : return s << id.rawId();
}
}
Expand Down
10 changes: 5 additions & 5 deletions DataFormats/ForwardDetId/src/HGCEEDetId.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
#include "FWCore/Utilities/interface/Exception.h"
#include <ostream>

const HGCEEDetId HGCEEDetId::Undefined(ForwardEmpty,0,0,0,0,0);
const HGCEEDetId HGCEEDetId::Undefined(ForwardEmpty,0,0,0,0);

HGCEEDetId::HGCEEDetId() : DetId() {
}
Expand All @@ -11,10 +11,10 @@ HGCEEDetId::HGCEEDetId(uint32_t rawid) : DetId(rawid) {
}

HGCEEDetId::HGCEEDetId(ForwardSubdetector subdet, int zp, int lay, int mod,
int cellx, int celly) : DetId(Forward,subdet) {
int cell) : DetId(Forward,subdet) {
// (no checking at this point!)
id_ |= (((zp>0) ? 0x1000000 : 0) | ((lay&0x3F)<<18) | ((mod&0x3F)<12) |
((cellx&0x3F)<<6) | (celly&0x3F));
id_ |= (((zp>0) ? 0x1000000 : 0) | ((lay&0x1F)<<19) | ((mod&0x1F)<14) |
(cell&0x7FFF));
}

HGCEEDetId::HGCEEDetId(const DetId& gen) {
Expand All @@ -40,7 +40,7 @@ HGCEEDetId& HGCEEDetId::operator=(const DetId& gen) {

std::ostream& operator<<(std::ostream& s,const HGCEEDetId& id) {
switch (id.subdet()) {
case(HGCEE) : return s << "(HGCEE " << id.zside() << ',' << id.layer() << ',' << id.module() << ',' << id.cellX() << ',' << id.cellY() << ')';
case(HGCEE) : return s << "(HGCEE " << id.zside() << ',' << id.layer() << ',' << id.module() << ',' << id.cell() << ')';
default : return s << id.rawId();
}
}
Expand Down
47 changes: 22 additions & 25 deletions Geometry/CMSCommonData/data/PhaseII/caloBase.xml
View file
Original file line number Diff line number Diff line change
@@ -1,28 +1,25 @@
<?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">

<SolidSection label="caloBase.xml">
<Polycone name="CALO" startPhi="0*deg" deltaPhi="360*deg">
<ZSection z="-[cms:CalorBeamZ2]" rMin="[cms:CalorMuonR2]" rMax="[cms:CalorMuonR]"/>
<ZSection z="-[cms:CalorBeamZ3]" rMin="[cms:CalorMuonR2]" rMax="[cms:CalorMuonR]"/>
<ZSection z="-[cms:CalorBeamZ3]" rMin="[cms:CalorBeamR2]" rMax="[cms:CalorMuonR]"/>
<ZSection z="-[cms:CalorBeamZ1]" rMin="[cms:CalorBeamR1]" rMax="[cms:CalorMuonR]"/>
<ZSection z="-[cms:TrackBeamZ2]" rMin="[cms:TrackBeamR2]" rMax="[cms:CalorMuonR]"/>
<ZSection z="-[cms:TrackBeamZ2]" rMin="[cms:TrackCalorR]" rMax="[cms:CalorMuonR]"/>
<ZSection z="[cms:TrackBeamZ2]" rMin="[cms:TrackCalorR]" rMax="[cms:CalorMuonR]"/>
<ZSection z="[cms:TrackBeamZ2]" rMin="[cms:TrackBeamR2]" rMax="[cms:CalorMuonR]"/>
<ZSection z="[cms:CalorBeamZ1]" rMin="[cms:CalorBeamR1]" rMax="[cms:CalorMuonR]"/>
<ZSection z="[cms:CalorBeamZ3]" rMin="[cms:CalorBeamR2]" rMax="[cms:CalorMuonR]"/>
<ZSection z="[cms:CalorBeamZ3]" rMin="[cms:CalorMuonR2]" rMax="[cms:CalorMuonR]"/>
<ZSection z="[cms:CalorBeamZ2]" rMin="[cms:CalorMuonR2]" rMax="[cms:CalorMuonR]"/>
</Polycone>
</SolidSection>

<LogicalPartSection label="caloBase.xml">
<LogicalPart name="CALO" category="unspecified">
<rSolid name="CALO"/>
<rMaterial name="materials:Air"/>
</LogicalPart>
</LogicalPartSection>

<SolidSection label="caloBase.xml">
<Polycone name="CALO" startPhi="0*deg" deltaPhi="360*deg">
<ZSection z="-[cms:CalorBeamZ2]" rMin="273.76*cm" rMax="[cms:CalorMuonR]"/>
<ZSection z="-524.1*cm" rMin="273.76*cm" rMax="[cms:CalorMuonR]"/>
<ZSection z="-524.1*cm" rMin="[cms:CalorBeamR2]" rMax="[cms:CalorMuonR]"/>
<ZSection z="-[cms:CalorBeamZ1]" rMin="[cms:CalorBeamR1]" rMax="[cms:CalorMuonR]"/>
<ZSection z="-[cms:TrackBeamZ2]" rMin="[cms:TrackBeamR2]" rMax="[cms:CalorMuonR]"/>
<ZSection z="-[cms:TrackBeamZ2]" rMin="[cms:TrackCalorR]" rMax="[cms:CalorMuonR]"/>
<ZSection z="[cms:TrackBeamZ2]" rMin="[cms:TrackCalorR]" rMax="[cms:CalorMuonR]"/>
<ZSection z="[cms:TrackBeamZ2]" rMin="[cms:TrackBeamR2]" rMax="[cms:CalorMuonR]"/>
<ZSection z="[cms:CalorBeamZ1]" rMin="[cms:CalorBeamR1]" rMax="[cms:CalorMuonR]"/>
<ZSection z="524.1*cm" rMin="[cms:CalorBeamR2]" rMax="[cms:CalorMuonR]"/>
<ZSection z="524.1*cm" rMin="273.76*cm" rMax="[cms:CalorMuonR]"/>
<ZSection z="[cms:CalorBeamZ2]" rMin="273.76*cm" rMax="[cms:CalorMuonR]"/>
</Polycone>
</SolidSection>
<LogicalPartSection label="caloBase.xml">
<LogicalPart name="CALO" category="unspecified">
<rSolid name="CALO"/>
<rMaterial name="materials:Air"/>
</LogicalPart>
</LogicalPartSection>
</DDDefinition>
15 changes: 4 additions & 11 deletions Geometry/CMSCommonData/python/cmsExtendedGeometry2019PFCalXML_cfi.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
'Geometry/CMSCommonData/data/cmsMuon.xml',
'Geometry/CMSCommonData/data/mgnt.xml',
'Geometry/CMSCommonData/data/PhaseI/beampipe.xml',
'Geometry/CMSCommonData/data/eta3/etaMax.xml',
'Geometry/CMSCommonData/data/cmsBeam.xml',
'Geometry/CMSCommonData/data/muonMB.xml',
'Geometry/CMSCommonData/data/muonMagnet.xml',
Expand Down Expand Up @@ -205,13 +206,6 @@
'Geometry/EcalCommonData/data/ebrot.xml',
'Geometry/EcalCommonData/data/eecon.xml',
'Geometry/EcalCommonData/data/ectkcable.xml',
## 'Geometry/EcalCommonData/data/eefixed.xml',
## 'Geometry/EcalCommonData/data/eehier.xml',
## 'Geometry/EcalCommonData/data/eealgo.xml',
## 'Geometry/EcalCommonData/data/escon.xml',
## 'Geometry/EcalCommonData/data/esalgo.xml',
## 'Geometry/EcalCommonData/data/eeF.xml',
## 'Geometry/EcalCommonData/data/eeB.xml',
'Geometry/HcalCommonData/data/hcalrotations.xml',
'Geometry/HcalCommonData/data/PhaseII/hcalalgo.xml',
'Geometry/HcalCommonData/data/hcalcablealgo.xml',
Expand All @@ -231,7 +225,8 @@
'Geometry/MuonCommonData/data/design/muonYoke.xml',
'Geometry/MuonCommonData/data/v2/mf.xml',
'Geometry/MuonCommonData/data/v2/rpcf.xml',
'Geometry/MuonCommonData/data/v4/gemf.xml',
'Geometry/MuonCommonData/data/v2/gemf.xml',
'Geometry/MuonCommonData/data/v5/gem11.xml',
'Geometry/MuonCommonData/data/v2/csc.xml',
'Geometry/MuonCommonData/data/v2/mfshield.xml',
'Geometry/ForwardCommonData/data/forward.xml',
Expand All @@ -252,7 +247,6 @@
'Geometry/ForwardCommonData/data/zdclumi.xml',
'Geometry/ForwardCommonData/data/cmszdc.xml')+cms.vstring(
'Geometry/MuonCommonData/data/v2/muonNumbering.xml',
'Geometry/MuonCommonData/data/v2/muonGemNumbering.xml',
'Geometry/TrackerCommonData/data/PhaseI/trackerStructureTopology.xml',
'Geometry/TrackerSimData/data/PhaseI/trackersens.xml',
'Geometry/TrackerRecoData/data/PhaseI/trackerRecoMaterial.xml',
Expand All @@ -273,10 +267,9 @@
'Geometry/ForwardSimData/data/zdcsens.xml',
'Geometry/HcalSimData/data/HcalProdCuts.xml',
'Geometry/EcalSimData/data/EcalProdCuts.xml',
## 'Geometry/EcalSimData/data/ESProdCuts.xml',
'Geometry/TrackerSimData/data/PhaseI/trackerProdCuts.xml',
'Geometry/TrackerSimData/data/trackerProdCutsBEAM.xml',
'Geometry/MuonSimData/data/muonProdCuts.xml',
'Geometry/MuonSimData/data/v2/muonProdCuts.xml',
'Geometry/ForwardSimData/data/CastorProdCuts.xml',
'Geometry/ForwardSimData/data/zdcProdCuts.xml',
'Geometry/ForwardSimData/data/ForwardShieldProdCuts.xml',
Expand Down
6 changes: 3 additions & 3 deletions Geometry/CMSCommonData/python/cmsExtendedGeometry2019XML_cfi.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -230,7 +230,8 @@
'Geometry/MuonCommonData/data/design/muonYoke.xml',
'Geometry/MuonCommonData/data/v2/mf.xml',
'Geometry/MuonCommonData/data/v2/rpcf.xml',
'Geometry/MuonCommonData/data/v5/gemf.xml',
'Geometry/MuonCommonData/data/v2/gemf.xml',
'Geometry/MuonCommonData/data/v5/gem11.xml',
'Geometry/MuonCommonData/data/v2/csc.xml',
'Geometry/MuonCommonData/data/v2/mfshield.xml',
'Geometry/ForwardCommonData/data/forward.xml',
Expand All @@ -250,7 +251,6 @@
'Geometry/ForwardCommonData/data/zdc.xml',
'Geometry/ForwardCommonData/data/zdclumi.xml',
'Geometry/ForwardCommonData/data/cmszdc.xml')+cms.vstring(
'Geometry/MuonCommonData/data/v2/muonNumbering.xml',
'Geometry/MuonCommonData/data/v5/muonGemNumbering.xml',
'Geometry/TrackerCommonData/data/PhaseI/trackerStructureTopology.xml',
'Geometry/TrackerSimData/data/PhaseI/trackersens.xml',
Expand All @@ -275,7 +275,7 @@
'Geometry/EcalSimData/data/ESProdCuts.xml',
'Geometry/TrackerSimData/data/PhaseI/trackerProdCuts.xml',
'Geometry/TrackerSimData/data/trackerProdCutsBEAM.xml',
'Geometry/MuonSimData/data/muonProdCuts.xml',
'Geometry/MuonSimData/data/v2/muonProdCuts.xml',
'Geometry/ForwardSimData/data/CastorProdCuts.xml',
'Geometry/ForwardSimData/data/zdcProdCuts.xml',
'Geometry/ForwardSimData/data/ForwardShieldProdCuts.xml',
Expand Down
4 changes: 2 additions & 2 deletions Geometry/CMSCommonData/python/cmsExtendedGeometry2023HGCalMuonXML_cfi.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
'Geometry/CMSCommonData/data/PhaseI/cms.xml',
'Geometry/CMSCommonData/data/cmsMother.xml',
'Geometry/CMSCommonData/data/cmsTracker.xml',
'Geometry/CMSCommonData/data/eta3/etaMax.xml',
'Geometry/CMSCommonData/data/PhaseII/caloBase.xml',
'Geometry/CMSCommonData/data/cmsCalo.xml',
'Geometry/CMSCommonData/data/PhaseII/muonBase.xml',
Expand Down Expand Up @@ -54,15 +55,14 @@
'Geometry/EcalCommonData/data/ebrot.xml',
'Geometry/EcalCommonData/data/eecon.xml',
'Geometry/HcalCommonData/data/hcalrotations.xml',
'Geometry/HcalCommonData/data/PhaseII/hcalalgo.xml',
'Geometry/HcalCommonData/data/PhaseII/NoHE/hcalalgo.xml',
'Geometry/HcalCommonData/data/hcalbarrelalgo.xml',
'Geometry/HcalCommonData/data/hcalouteralgo.xml',
'Geometry/HcalCommonData/data/hcalforwardalgo.xml',
'Geometry/HcalCommonData/data/average/hcalforwardmaterial.xml',
'Geometry/HGCalCommonData/data/hgcal.xml',
'Geometry/HGCalCommonData/data/hgcalEE.xml',
'Geometry/HGCalCommonData/data/hgcalHE.xml',
## 'Geometry/PFCalGeometry/data/pfcal.xml',
'Geometry/MuonCommonData/data/v1/mbCommon.xml',
'Geometry/MuonCommonData/data/v1/mb1.xml',
'Geometry/MuonCommonData/data/v1/mb2.xml',
Expand Down
12 changes: 8 additions & 4 deletions Geometry/CMSCommonData/python/cmsExtendedGeometry2023HGCalXML_cfi.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
'Geometry/CMSCommonData/data/PhaseI/cms.xml',
'Geometry/CMSCommonData/data/cmsMother.xml',
'Geometry/CMSCommonData/data/cmsTracker.xml',
'Geometry/CMSCommonData/data/eta3/etaMax.xml',
'Geometry/CMSCommonData/data/PhaseII/caloBase.xml',
'Geometry/CMSCommonData/data/cmsCalo.xml',
'Geometry/CMSCommonData/data/PhaseII/muonBase.xml',
Expand Down Expand Up @@ -57,17 +58,16 @@
'Geometry/EcalCommonData/data/ectkcable.xml',
'Geometry/HcalCommonData/data/hcalrotations.xml',
'Geometry/HcalCommonData/data/PhaseII/hcalalgo.xml',
'Geometry/HcalCommonData/data/hcalcablealgo.xml',
'Geometry/HcalCommonData/data/hcalbarrelalgo.xml',
'Geometry/HcalCommonData/data/hcalcablealgo.xml',
'Geometry/HcalCommonData/data/hcalouteralgo.xml',
'Geometry/HcalCommonData/data/hcalforwardalgo.xml',
'Geometry/HcalCommonData/data/average/hcalforwardmaterial.xml',
'Geometry/HcalCommonData/data/PhaseII/NoHE/hcalSimNumbering.xml',
'Geometry/HcalCommonData/data/PhaseII/NoHE/hcalRecNumbering.xml',
'Geometry/HcalCommonData/data/PhaseII/NoHE/hcalRecNumbering.xml',
'Geometry/HGCalCommonData/data/hgcal.xml',
'Geometry/HGCalCommonData/data/hgcalEE.xml',
'Geometry/HGCalCommonData/data/hgcalHE.xml',
## 'Geometry/PFCalGeometry/data/pfcal.xml',
'Geometry/MuonCommonData/data/v1/mbCommon.xml',
'Geometry/MuonCommonData/data/v1/mb1.xml',
'Geometry/MuonCommonData/data/v1/mb2.xml',
Expand All @@ -76,7 +76,8 @@
'Geometry/MuonCommonData/data/design/muonYoke.xml',
'Geometry/MuonCommonData/data/v7/mf.xml',
'Geometry/MuonCommonData/data/v2/rpcf.xml',
'Geometry/MuonCommonData/data/v6/gemf.xml',
'Geometry/MuonCommonData/data/v2/gemf.xml',
'Geometry/MuonCommonData/data/v5/gem11.xml',
'Geometry/MuonCommonData/data/v6/gem21.xml',
'Geometry/MuonCommonData/data/v2/csc.xml',
'Geometry/MuonCommonData/data/v7/mfshield.xml',
Expand Down Expand Up @@ -108,6 +109,8 @@
'Geometry/HcalSimData/data/hfpmt.xml',
'Geometry/HcalSimData/data/hffibrebundle.xml',
'Geometry/HcalSimData/data/CaloUtil.xml',
'Geometry/HGCalSimData/data/hgcsens.xml',
'Geometry/HGCalSimData/data/hgccons.xml',
'Geometry/MuonSimData/data/v4/muonSens.xml',
'Geometry/DTGeometryBuilder/data/dtSpecsFilter.xml',
'Geometry/CSCGeometryBuilder/data/cscSpecsFilter.xml',
Expand All @@ -119,6 +122,7 @@
'Geometry/ForwardSimData/data/zdcsens.xml',
'Geometry/HcalSimData/data/HcalProdCuts.xml',
'Geometry/EcalSimData/data/EcalProdCuts.xml',
'Geometry/HGCalSimData/data/hgcProdCuts.xml',
'Geometry/TrackerSimData/data/PhaseII/BarrelEndcap5D/trackerProdCuts.xml',
'Geometry/TrackerSimData/data/trackerProdCutsBEAM.xml',
'Geometry/MuonSimData/data/v2/muonProdCuts.xml',
Expand Down
Loading

0 comments on commit 06db0a4

Please sign in to comment.