Skip to content

Commit

Permalink
Merge pull request #34004 from bsunanda/Phase2-gem61
Browse files Browse the repository at this point in the history
Phase2-gem61 Try to update some of the region definitions for calorimeter and muon systems
  • Loading branch information
cmsbuild authored Jun 9, 2021
2 parents 1b2c7fa + e5080b1 commit 4b8ed95
Show file tree
Hide file tree
Showing 3 changed files with 142 additions and 1 deletion.
70 changes: 70 additions & 0 deletions Geometry/MuonSimData/data/muonProdCuts/2026/v1/muonProdCuts.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,70 @@
<?xml version="1.0"?>
<DDDefinition>
<SpecParSection label="ProductionCuts" eval="true">
<SpecPar name="Muon">
<PartSelector path="//MUON"/>
<Parameter name="CMSCutsRegion" value="Muon" eval="false"/>
<Parameter name="ProdCutsForGamma" value="100.*mm"/>
<Parameter name="ProdCutsForElectrons" value="10.*mm"/>
<Parameter name="ProdCutsForPositrons" value="10.*mm"/>
</SpecPar>
<SpecPar name="MuonIron">
<PartSelector path="//MGNT"/>
<PartSelector path="//YBSepar.*"/>
<PartSelector path="//COI.*"/>
<PartSelector path="//COCF"/>
<PartSelector path="//YB.*"/>
<PartSelector path="//ZStopSpace"/>
<PartSelector path="//SupportTubeForHE.*"/>
<PartSelector path="//YN.*"/>
<PartSelector path="//YE1.*"/>
<PartSelector path="//YE2.*"/>
<PartSelector path="//YE3.*"/>
<!-- if you want to re-stage YE4, then remove the comments around this element <PartSelector path="//YE4.*"/> -->
<PartSelector path="//ShieldingME4.*"/>
<PartSelector path="//ShieldingBoronPoly.*"/>
<PartSelector path="//ME11SupportDisk"/>
<Parameter name="CMSCutsRegion" value="MuonIron" eval="false"/>
<Parameter name="ProdCutsForGamma" value="1.*mm"/>
<Parameter name="ProdCutsForElectrons" value="1.*mm"/>
<Parameter name="ProdCutsForPositrons" value="1.*mm"/>
</SpecPar>
<SpecPar name="MuonChamber">
<PartSelector path="//MB.*N"/>
<PartSelector path="//MB.*P"/>
<PartSelector path="//ME.*Space"/>
<PartSelector path="//RR.*"/>
<PartSelector path="//GE.*"/>
<Parameter name="CMSCutsRegion" value="MuonChamber" eval="false"/>
<Parameter name="ProdCutsForGamma" value="1.*mm"/>
<Parameter name="ProdCutsForElectrons" value="0.002*mm"/>
<Parameter name="ProdCutsForPositrons" value="0.002*mm"/>
</SpecPar>
<SpecPar name="MuonSensitive_DT-CSC">
<!-- 1 keV for gamma/e-, 1 MeV for e+ -->
<PartSelector path="//MB.*PhiGas"/>
<PartSelector path="//MB.*ZGas"/>
<PartSelector path="//ME.*ActiveGasVol"/>
<Parameter name="CMSCutsRegion" value="MuonSensitive_DT-CSC" eval="false"/>
<Parameter name="ProdCutsForGamma" value="25.*mm"/>
<Parameter name="ProdCutsForElectrons" value="1.*mm"/>
<Parameter name="ProdCutsForPositrons" value="2.5*m"/>
</SpecPar>
<SpecPar name="MuonSensitive_RPC">
<!-- 10 keV for gamma/e-, 1 MeV for e+ -->
<PartSelector path="//MB.*RPC_.*Gas.*"/>
<!-- <PartSelector path="//REA.*"/> -->
<PartSelector path="//REB.*"/>
<PartSelector path="//REC.*"/>
<!-- <PartSelector path="//RED.*"/> -->
<PartSelector path="//REE.*"/>
<PartSelector path="//REF.*"/>
<PartSelector path="//REG.*"/>
<PartSelector path="//REH.*"/>
<Parameter name="CMSCutsRegion" value="MuonSensitive_RPC" eval="false"/>
<Parameter name="ProdCutsForGamma" value="8.5*m"/>
<Parameter name="ProdCutsForElectrons" value="8.*mm"/>
<Parameter name="ProdCutsForPositrons" value="2.5*m"/>
</SpecPar>
</SpecParSection>
</DDDefinition>
71 changes: 71 additions & 0 deletions Geometry/MuonSimData/data/muonProdCuts/2026/v2/muonProdCuts.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,71 @@
<?xml version="1.0"?>
<DDDefinition>
<SpecParSection label="ProductionCuts" eval="true">
<SpecPar name="Muon">
<PartSelector path="//MUON"/>
<Parameter name="CMSCutsRegion" value="Muon" eval="false"/>
<Parameter name="ProdCutsForGamma" value="1.0*cm"/>
<Parameter name="ProdCutsForElectrons" value="1.0*cm"/>
<Parameter name="ProdCutsForPositrons" value="1.0*cm"/>
</SpecPar>
<SpecPar name="MuonIron">
<PartSelector path="//MGNT"/>
<PartSelector path="//YBSepar.*"/>
<PartSelector path="//COI.*"/>
<PartSelector path="//COCF"/>
<PartSelector path="//YB.*"/>
<PartSelector path="//ZStopSpace"/>
<PartSelector path="//SupportTubeForHE.*"/>
<PartSelector path="//YN.*"/>
<PartSelector path="//YE1.*"/>
<PartSelector path="//YE2.*"/>
<PartSelector path="//YE3.*"/>
<!-- if you want to re-stage YE4, then remove the comments around this element <PartSelector path="//YE4.*"/> -->
<PartSelector path="//ShieldingME4.*"/>
<PartSelector path="//ShieldingBoronPoly.*"/>
<PartSelector path="//ME11SupportDisk"/>
<Parameter name="CMSCutsRegion" value="MuonIron" eval="false"/>
<Parameter name="ProdCutsForGamma" value="1.0*cm"/>
<Parameter name="ProdCutsForElectrons" value="1.0*mm"/>
<Parameter name="ProdCutsForPositrons" value="1.0*mm"/>
</SpecPar>
<SpecPar name="MuonChamber">
<PartSelector path="//MB.*N"/>
<PartSelector path="//MB.*P"/>
<PartSelector path="//ME.*Space"/>
<PartSelector path="//RR.*"/>
<PartSelector path="//GE.*"/>
<Parameter name="CMSCutsRegion" value="MuonChamber" eval="false"/>
<Parameter name="ProdCutsForGamma" value="1.0*mm"/>
<Parameter name="ProdCutsForElectrons" value="0.002*mm"/>
<Parameter name="ProdCutsForPositrons" value="0.002*mm"/>
</SpecPar>
<SpecPar name="MuonSensitive_DT-CSC">
<!-- 1 keV for gamma/e-, 1 MeV for e+ -->
<PartSelector path="//MB.*PhiGas"/>
<PartSelector path="//MB.*ZGas"/>
<PartSelector path="//ME.*ActiveGasVol"/>
<PartSelector path="//GHA.*"/>
<Parameter name="CMSCutsRegion" value="MuonSensitive_DT-CSC" eval="false"/>
<Parameter name="ProdCutsForGamma" value="1.0*cm"/>
<Parameter name="ProdCutsForElectrons" value="1.0*mm"/>
<Parameter name="ProdCutsForPositrons" value="1.0*cm"/>
</SpecPar>
<SpecPar name="MuonSensitive_RPC">
<!-- 10 keV for gamma/e-, 1 MeV for e+ -->
<PartSelector path="//MB.*RPC_.*Gas.*"/>
<!-- <PartSelector path="//REA.*"/> -->
<PartSelector path="//REB.*"/>
<PartSelector path="//REC.*"/>
<!-- <PartSelector path="//RED.*"/> -->
<PartSelector path="//REE.*"/>
<PartSelector path="//REF.*"/>
<PartSelector path="//REG.*"/>
<PartSelector path="//REH.*"/>
<Parameter name="CMSCutsRegion" value="MuonSensitive_RPC" eval="false"/>
<Parameter name="ProdCutsForGamma" value="1.0*cm"/>
<Parameter name="ProdCutsForElectrons" value="8.0*mm"/>
<Parameter name="ProdCutsForPositrons" value="1.0*cm"/>
</SpecPar>
</SpecParSection>
</DDDefinition>
2 changes: 1 addition & 1 deletion SimG4Core/Application/src/StackingAction.cc
Original file line number Diff line number Diff line change
Expand Up @@ -388,7 +388,7 @@ void StackingAction::initPointer() {
trackerRegions.push_back(reg);
}
if (savePDandCinCalo && (rname == "HcalRegion" || rname == "EcalRegion" || rname == "PreshowerSensRegion" ||
rname == "PreshowerRegion")) {
rname == "PreshowerRegion" || rname == "APDRegion" || rname == "HGCalRegion")) {
caloRegions.push_back(reg);
}
if (savePDandCinMuon && (rname == "MuonChamber" || rname == "MuonSensitive_RPC" || rname == "MuonIron" ||
Expand Down

0 comments on commit 4b8ed95

Please sign in to comment.