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

Cmssw 6 2 x slhc #93

Merged
merged 7 commits into from
Apr 4, 2014
Merged

Cmssw 6 2 x slhc #93

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
b6a587c
Back Dee Material substitute.
ianna Apr 2, 2014
6b19abe
Merge pull request #3162 from ianna/shortEE-back-support
cmsbuild Apr 3, 2014
81b3f9b
add back tracking particle selector, modify cuts to new defaults
mdhildreth Apr 1, 2014
3185f30
Added stableOnlyTP parameter. Should be False for FullSim and True fo…
Apr 3, 2014
4ef9ae3
Merge pull request #3191 from mark-grimes/fix3142
cmsbuild Apr 3, 2014
b01a867
making xmin<xmax
davidlange6 Apr 3, 2014
fd8d12c
Merge pull request #3194 from davidlange6/fix_gemValidation_slhc10
davidlange6 Apr 3, 2014
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
23 changes: 23 additions & 0 deletions Geometry/CMSCommonData/data/materials.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
<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">
<MaterialSection label="materials.xml">
<ElementaryMaterial name="Aluminium" density="2.7*g/cm3" symbol=" " atomicWeight="26.98*g/mole" atomicNumber="13"/>
<ElementaryMaterial name="TD_Aluminium" density="8.1*g/cm3" symbol=" " atomicWeight="26.98*g/mole" atomicNumber="13"/>
<ElementaryMaterial name="Antimony" density="6.679*g/cm3" symbol=" " atomicWeight="121.75*g/mole" atomicNumber="51"/>
<ElementaryMaterial name="Argon" density="1.639*mg/cm3" symbol=" " atomicWeight="39.948*g/mole" atomicNumber="18"/>
<ElementaryMaterial name="Arsenic" density="5.72*g/cm3" symbol=" " atomicWeight="74.922*g/mole" atomicNumber="33"/>
Expand Down Expand Up @@ -1487,6 +1488,20 @@
<rMaterial name="materials:Hydrogen"/>
</MaterialFraction>
</CompositeMaterial>
<CompositeMaterial name="DD_E_Cables" density="5.36*g/cm3" symbol=" " method="mixture by weight">
<MaterialFraction fraction="0.586">
<rMaterial name="materials:Copper"/>
</MaterialFraction>
<MaterialFraction fraction="0.259">
<rMaterial name="materials:Carbon"/>
</MaterialFraction>
<MaterialFraction fraction="0.138">
<rMaterial name="materials:Oxygen"/>
</MaterialFraction>
<MaterialFraction fraction="0.017">
<rMaterial name="materials:Hydrogen"/>
</MaterialFraction>
</CompositeMaterial>
<CompositeMaterial name="E_Carbon Fibre" density="1.45*g/cm3" symbol=" " method="mixture by weight">
<MaterialFraction fraction="0.65">
<rMaterial name="materials:Carbon"/>
Expand Down Expand Up @@ -3219,6 +3234,14 @@
<rMaterial name="materials:Hydrogen"/>
</MaterialFraction>
</CompositeMaterial>
<CompositeMaterial name="DD_Polyethylene" density="2*950*mg/cm3" symbol=" " method="mixture by weight">
<MaterialFraction fraction="0.85628451">
<rMaterial name="materials:Carbon"/>
</MaterialFraction>
<MaterialFraction fraction="0.14371549">
<rMaterial name="materials:Hydrogen"/>
</MaterialFraction>
</CompositeMaterial>
<CompositeMaterial name="Polymer Concrete" density="450*mg/cm3" symbol=" " method="mixture by weight">
<MaterialFraction fraction="0.23789097">
<rMaterial name="materials:Silicon"/>
Expand Down
35 changes: 22 additions & 13 deletions Geometry/EcalCommonData/data/PhaseII/ShortEE/eefixed.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,13 @@
<?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">

<ConstantsSection label="eefixed.xml" eval="true">
<Constant name="EEBackPlateOR" value="[eecon:EEBackPlateOR] - 2.*cm"/>
</ConstantsSection>

<SolidSection label="eefixed.xml">
<Tubs name="EEBackPlate" rMin="[eecon:EEBackPlateIR]" rMax="[eecon:EEBackPlateOR]" dz="[eecon:EEBackPlateThick]/2." startPhi="0*deg" deltaPhi="90*deg"/>
<Tubs name="EEBPPV" rMin="[eecon:EEBackPlateIR]" rMax="[eecon:EEBackPlateOR]" dz="[eecon:EEBPPOR]" startPhi="0*deg" deltaPhi="90*deg"/>
<Tubs name="EEBackPlate" rMin="[eecon:EEBackPlateIR]" rMax="[eefixed:EEBackPlateOR]-2.7*cm" dz="[eecon:EEBackPlateThick]/6." startPhi="0*deg" deltaPhi="90*deg"/>
<Tubs name="EEBPPV" rMin="[eecon:EEBackPlateIR]+1.4*cm" rMax="[eefixed:EEBackPlateOR]-1.*cm" dz="[eecon:EEBPPOR]" startPhi="0*deg" deltaPhi="90*deg"/>
<Tubs name="EEBPPAW" rMin="0*mm" rMax="[eecon:EEBPPIR]" dz="0.5*[eecon:EEBPPLA]" startPhi="0*deg" deltaPhi="360*deg"/>
<Tubs name="EEBPPAP" rMin="0*mm" rMax="[eecon:EEBPPOR]" dz="0.5*[eecon:EEBPPLA]" startPhi="0*deg" deltaPhi="360*deg"/>
<Tubs name="EEBPPBW" rMin="0*mm" rMax="[eecon:EEBPPIR]" dz="0.5*[eecon:EEBPPLB]" startPhi="0*deg" deltaPhi="360*deg"/>
Expand Down Expand Up @@ -121,7 +125,7 @@
<LogicalPartSection label="eefixed.xml">
<LogicalPart name="EEBackPlate" category="unspecified">
<rSolid name="EEBackPlate"/>
<rMaterial name="materials:Aluminium"/>
<rMaterial name="materials:TD_Aluminium"/>
</LogicalPart>
<LogicalPart name="EEBPPV" category="unspecified">
<rSolid name="EEBPPV"/>
Expand Down Expand Up @@ -378,16 +382,21 @@
<rChild name="eefixed:ESCone"/>
<Translation x="0*mm" y="0*mm" z="[eecon:ESRingZFront] + [eecon:ESRingZThick] - [eecon:ESConeZ1]"/>
</PosPart>
<PosPart copyNumber="1">
<rParent name="eregalgo:EREG"/>
<rChild name="eregalgo:EEBackMaterial"/>
<Translation x="0*mm" y="0*mm" z="0*mm"/>
</PosPart>
<!-- Backplate and its cooling pipes -->
<PosPart copyNumber="1">
<rParent name="eehier:EEBackQuad"/>
<rParent name="eehier:EEFrontQuad"/>
<rChild name="eefixed:EEBackPlate"/>
<Translation x="0*mm" y="0*mm" z="[eecon:EEzBack] + [eecon:EEBackPlateThick]/2"/>
<Translation x="0*mm" y="0*mm" z="[eecon:EEiEnvScrZ5]-[eecon:EEBackPlateThick]/6.-2*[eecon:EEBPPOR]"/>
</PosPart>
<PosPart copyNumber="1">
<rParent name="eehier:EEBackQuad"/>
<rParent name="eehier:EEFrontQuad"/>
<rChild name="eefixed:EEBPPV"/>
<Translation x="0*mm" y="0*mm" z="[eecon:EEzBackBack] + [eecon:EEBPPOR]"/>
<Translation x="0*mm" y="0*mm" z="[eecon:EEiEnvScrZ5]-[eecon:EEBPPOR]"/>
</PosPart>
<PosPart copyNumber="1">
<rParent name="eefixed:EEBPPAP"/>
Expand Down Expand Up @@ -440,37 +449,37 @@
<PosPart copyNumber="3">
<rParent name="eefixed:EEBPPV"/>
<rChild name="eefixed:EEBPPBP"/>
<Translation x="[eecon:EEBPPLC] - 2*[eecon:EEBPPOR]" y="[eecon:EEBackPlateOR] - [eecon:EEBPPLB]/2 - 5*[eecon:EEBPPOR]" z="0*mm"/>
<Translation x="[eecon:EEBPPLC] - 2*[eecon:EEBPPOR]" y="[eefixed:EEBackPlateOR] - [eecon:EEBPPLB]/2 - 5*[eecon:EEBPPOR]" z="0*mm"/>
<rRotation name="eecon:EEfCRotX"/>
</PosPart>
<PosPart copyNumber="4">
<rParent name="eefixed:EEBPPV"/>
<rChild name="eefixed:EEBPPBP"/>
<Translation x="[eecon:EEBPPLC] - 2*[eecon:EEBPPOR]" y="[eecon:EEBackPlateOR] - 3*[eecon:EEBPPLB]/2 - 5*[eecon:EEBPPOR]" z="0*mm"/>
<Translation x="[eecon:EEBPPLC] - 2*[eecon:EEBPPOR]" y="[eefixed:EEBackPlateOR] - 3*[eecon:EEBPPLB]/2 - 5*[eecon:EEBPPOR]" z="0*mm"/>
<rRotation name="eecon:EEfCRotX"/>
</PosPart>
<PosPart copyNumber="5">
<rParent name="eefixed:EEBPPV"/>
<rChild name="eefixed:EEBPPBP"/>
<Translation x="2*[eecon:EEBPPLC]" y="[eecon:EEBackPlateOR] - [eecon:EEBPPLB]/2 - 3*[eecon:EEBPPLC]/2" z="0*mm"/>
<Translation x="2*[eecon:EEBPPLC]" y="[eefixed:EEBackPlateOR] - [eecon:EEBPPLB]/2 - 3*[eecon:EEBPPLC]/2" z="0*mm"/>
<rRotation name="eecon:EEfCRotX"/>
</PosPart>
<PosPart copyNumber="6">
<rParent name="eefixed:EEBPPV"/>
<rChild name="eefixed:EEBPPBP"/>
<Translation x="3*[eecon:EEBPPLC]" y="[eecon:EEBackPlateOR] - [eecon:EEBPPLB]/2 - 3*[eecon:EEBPPLC]/2" z="0*mm"/>
<Translation x="3*[eecon:EEBPPLC]" y="[eefixed:EEBackPlateOR] - [eecon:EEBPPLB]/2 - 3*[eecon:EEBPPLC]/2" z="0*mm"/>
<rRotation name="eecon:EEfCRotX"/>
</PosPart>
<PosPart copyNumber="7">
<rParent name="eefixed:EEBPPV"/>
<rChild name="eefixed:EEBPPBP"/>
<Translation x="4*[eecon:EEBPPLC]" y="[eecon:EEBackPlateOR] - [eecon:EEBPPLB]/2 - 3*[eecon:EEBPPLC]/2" z="0*mm"/>
<Translation x="4*[eecon:EEBPPLC]" y="[eefixed:EEBackPlateOR] - [eecon:EEBPPLB]/2 - 3*[eecon:EEBPPLC]/2" z="0*mm"/>
<rRotation name="eecon:EEfCRotX"/>
</PosPart>
<PosPart copyNumber="8">
<rParent name="eefixed:EEBPPV"/>
<rChild name="eefixed:EEBPPBP"/>
<Translation x="5*[eecon:EEBPPLC]" y="[eecon:EEBackPlateOR] - [eecon:EEBPPLB]/2 - 3*[eecon:EEBPPLC]/2" z="0*mm"/>
<Translation x="5*[eecon:EEBPPLC]" y="[eefixed:EEBackPlateOR] - [eecon:EEBPPLB]/2 - 3*[eecon:EEBPPLC]/2" z="0*mm"/>
<rRotation name="eecon:EEfCRotX"/>
</PosPart>
<PosPart copyNumber="1">
Expand Down
83 changes: 82 additions & 1 deletion Geometry/EcalCommonData/data/PhaseII/ShortEE/eregalgo.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<ZSection z=" [escon:PRESH_Z_OFFSET] - [escon:PRESH_Z_TOTAL]/2. + [eecon:EEzMagF]" rMin="[eecon:EBRMin]" rMax="[eecon:EBRMax]"/>
<ZSection z=" [escon:PRESH_Z_OFFSET] - [escon:PRESH_Z_TOTAL]/2. + [eecon:EEzMagF]" rMin="[eecon:EEIRECAL]" rMax="[eecon:EBRMax]"/>
<ZSection z=" [eecon:EEzFront]" rMin="[eecon:EEIRECAL]" rMax="[eecon:EBRMax]"/>
<ZSection z=" [eecon:EEzBack]" rMin="[eecon:EEIRECAL]" rMax="[eecon:EBRMax]"/>
<ZSection z=" [eecon:EEzBack] + 8.9*cm" rMin="[eecon:EEIRECAL]" rMax="[eecon:EBRMax]"/>
</Polycone>
<Polycone name="EREG" startPhi="0*deg" deltaPhi="360*deg">
<ZSection z="[escon:PRESH_Z_OFFSET] - [escon:PRESH_Z_TOTAL]/2." rMin="[eecon:EEIREREG]" rMax="[escon:PRESH_RMAX_FRONT]"/>
Expand All @@ -22,7 +22,36 @@
<ZSection z="[eecon:EEzFront]" rMin="[eecon:EEIREREG]" rMax="[escon:PRESH_RMAX_BACK]"/>
<ZSection z="[eecon:EEzFront]" rMin="[eecon:EEIREREG]" rMax="[eecon:EErMax1]"/>
<ZSection z="[eecon:EEzBack]" rMin="[eecon:EEIREREG]" rMax="[eecon:EErMax2]"/>
<ZSection z="[eecon:EEzBack] + 10.5*cm" rMin="[eecon:EEIREREG]" rMax="[eecon:EErMax2]"/>
</Polycone>
<Polycone name="EEBackMaterial" startPhi="0*deg" deltaPhi="360*deg">
<ZSection z="359.5*cm" rMin="[eecon:EEIREREG]" rMax="[eecon:EErMax2]"/>
<ZSection z="370.0*cm" rMin="[eecon:EEIREREG]" rMax="[eecon:EErMax2]"/>
</Polycone>
<Polycone name="EEPolyMaterial" startPhi="0*deg" deltaPhi="360*deg">
<ZSection z="359.5*cm" rMin="42.*cm" rMax="130.*cm"/>
<ZSection z="359.5*cm + 4.*cm" rMin="42.*cm" rMax="130.*cm"/>
</Polycone>
<Polycone name="EECoolQMaterial" startPhi="0*deg" deltaPhi="360*deg">
<ZSection z="359.5*cm + 4.*cm" rMin="42.*cm" rMax="[eecon:EErMax2]"/>
<ZSection z="370.0*cm - 0.9*cm - 1.*cm - 0.2*cm" rMin="42.*cm" rMax="[eecon:EErMax2]"/>
</Polycone>
<Polycone name="EERMCPMaterial" startPhi="0*deg" deltaPhi="360*deg">
<ZSection z="370.0*cm - 0.9*cm - 1.*cm - 0.2*cm" rMin="42.*cm" rMax="[eecon:EErMax2]"/>
<ZSection z="370.0*cm - 0.9*cm - 1.*cm" rMin="42.*cm" rMax="[eecon:EErMax2]"/>
</Polycone>
<Polycone name="EEIModPolyMaterial" startPhi="0*deg" deltaPhi="360*deg">
<ZSection z="359.5*cm" rMin="36.5*cm" rMax="42.*cm"/>
<ZSection z="370.0*cm" rMin="36.5*cm" rMax="42.*cm"/>
</Polycone>
<Polycone name="EECableMaterial" startPhi="0*deg" deltaPhi="360*deg">
<ZSection z="370.0*cm - 0.9*cm - 1.*cm" rMin="42.*cm" rMax="[eecon:EErMax2]"/>
<ZSection z="370.0*cm - 0.9*cm" rMin="42.*cm" rMax="[eecon:EErMax2]"/>
</Polycone>
<Polycone name="EEBackPolyMaterial" startPhi="0*deg" deltaPhi="360*deg">
<ZSection z="370.0*cm - 0.9*cm" rMin="42.*cm" rMax="[eecon:EErMax2]"/>
<ZSection z="370.0*cm" rMin="42.*cm" rMax="[eecon:EErMax2]"/>
</Polycone>
</SolidSection>
<LogicalPartSection label="eregalgo.xml">
<LogicalPart name="ECAL" category="unspecified">
Expand All @@ -33,12 +62,64 @@
<rSolid name="EREG"/>
<rMaterial name="materials:E_Air"/>
</LogicalPart>
<LogicalPart name="EEBackMaterial" category="unspecified">
<rSolid name="EEBackMaterial"/>
<rMaterial name="materials:E_Air"/>
</LogicalPart>
<LogicalPart name="EECoolQMaterial" category="unspecified">
<rSolid name="EECoolQMaterial"/>
<rMaterial name="materials:E_Air"/>
</LogicalPart>
<LogicalPart name="EERMCPMaterial" category="unspecified">
<rSolid name="EERMCPMaterial"/>
<rMaterial name="materials:Aluminium"/>
</LogicalPart>
<LogicalPart name="EECableMaterial" category="unspecified">
<rSolid name="EECableMaterial"/>
<rMaterial name="materials:DD_E_Cables"/>
</LogicalPart>
<LogicalPart name="EEPolyMaterial" category="unspecified">
<rSolid name="EEPolyMaterial"/>
<rMaterial name="materials:DD_Polyethylene"/>
</LogicalPart>
<LogicalPart name="EEIModPolyMaterial" category="unspecified">
<rSolid name="EEIModPolyMaterial"/>
<rMaterial name="materials:Polyethylene"/>
</LogicalPart>
<LogicalPart name="EEBackPolyMaterial" category="unspecified">
<rSolid name="EEBackPolyMaterial"/>
<rMaterial name="materials:DD_Polyethylene"/>
</LogicalPart>
</LogicalPartSection>
<PosPartSection label="eregalgo.xml">
<PosPart copyNumber="1">
<rParent name="caloBase:CALO"/>
<rChild name="eregalgo:ECAL"/>
<rRotation name="rotations:000D"/>
</PosPart>
<PosPart copyNumber="1">
<rParent name="eregalgo:EEBackMaterial"/>
<rChild name="eregalgo:EEPolyMaterial"/>
</PosPart>
<PosPart copyNumber="1">
<rParent name="eregalgo:EEBackMaterial"/>
<rChild name="eregalgo:EEIModPolyMaterial"/>
</PosPart>
<PosPart copyNumber="1">
<rParent name="eregalgo:EEBackMaterial"/>
<rChild name="eregalgo:EECoolQMaterial"/>
</PosPart>
<PosPart copyNumber="1">
<rParent name="eregalgo:EEBackMaterial"/>
<rChild name="eregalgo:EECableMaterial"/>
</PosPart>
<PosPart copyNumber="1">
<rParent name="eregalgo:EEBackMaterial"/>
<rChild name="eregalgo:EERMCPMaterial"/>
</PosPart>
<PosPart copyNumber="1">
<rParent name="eregalgo:EEBackMaterial"/>
<rChild name="eregalgo:EEBackPolyMaterial"/>
</PosPart>
</PosPartSection>
</DDDefinition>
2 changes: 1 addition & 1 deletion SimGeneral/MixingModule/python/digitizers_cfi.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
from SimGeneral.MixingModule.ecalDigitizer_cfi import *
from SimGeneral.MixingModule.hcalDigitizer_cfi import *
from SimGeneral.MixingModule.castorDigitizer_cfi import *
from SimGeneral.MixingModule.trackingTruthProducer_cfi import *
from SimGeneral.MixingModule.trackingTruthProducerSelection_cfi import *

theDigitizers = cms.PSet(
pixel = cms.PSet(
Expand Down
9 changes: 5 additions & 4 deletions SimGeneral/MixingModule/python/trackingTruthProducerSelection_cfi.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,10 @@
chargedOnlyTP = cms.bool(True),
pdgIdTP = cms.vint32(),
signalOnlyTP = cms.bool(True),
minRapidityTP = cms.double(-2.6),
minRapidityTP = cms.double(-5.0),
minHitTP = cms.int32(3),
ptMinTP = cms.double(0.2),
maxRapidityTP = cms.double(2.6),
tipTP = cms.double(1000)
ptMinTP = cms.double(0.1),
maxRapidityTP = cms.double(5.0),
tipTP = cms.double(1000),
stableOnlyTP = cms.bool(False)
)
2 changes: 1 addition & 1 deletion Validation/MuonGEMRecHits/plugins/MuonGEMRecHits.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -429,7 +429,7 @@ void MuonGEMRecHits::bookHistograms()
meCollection_["recHitPullX"] = dbe_->book1D("recHitPullX","recHitPullX",100,-50,+50);
meCollection_["recHitDPhi"] = dbe_->book1D("recHitDPhi","DeltaPhi RecHit",100,-0.001,+0.001);
meCollection_["localrh_zr_rm1_st1"] = dbe_->book2D("localrh_zr_rm1_st1","GEM RecHit occupancy: region-1",200,-573,-564,110,130,240);
meCollection_["localrh_zr_rp1_st1"] = dbe_->book2D("localrh_zr_rp1_st1","GEM RecHit occupancy: region1",200,573,564,110,130,240);
meCollection_["localrh_zr_rp1_st1"] = dbe_->book2D("localrh_zr_rp1_st1","GEM RecHit occupancy: region1",200,564,573,110,130,240);
meCollection_["strip_rh_tot"] = dbe_->book1D("strip_rh_tot","GEM RecHit occupancy per strip number",384,0.5,384.5);
meCollection_["roll_vs_strip_rh"] = dbe_->book2D("roll_vs_strip_rh","GEM RecHit occupancy per roll and strip number",768,0.5,768.5,12,0.5,12.5);

Expand Down