From bbd8581ce947e1547cf5fe75835df9ad89c505c3 Mon Sep 17 00:00:00 2001
From: Sunanda <sunanda.banerjee@cern.ch>
Date: Mon, 7 Jun 2021 22:39:00 +0200
Subject: [PATCH 1/2] Try to update some of the region definitions for
 calorimeter and muon systems

---
 .../muonProdCuts/2026/v1/muonProdCuts.xml     | 70 ++++++++++++++++++
 .../muonProdCuts/2026/v2/muonProdCuts.xml     | 71 +++++++++++++++++++
 SimG4Core/Application/src/StackingAction.cc   |  2 +-
 3 files changed, 142 insertions(+), 1 deletion(-)
 create mode 100644 Geometry/MuonSimData/data/muonProdCuts/2026/v1/muonProdCuts.xml
 create mode 100644 Geometry/MuonSimData/data/muonProdCuts/2026/v2/muonProdCuts.xml

diff --git a/Geometry/MuonSimData/data/muonProdCuts/2026/v1/muonProdCuts.xml b/Geometry/MuonSimData/data/muonProdCuts/2026/v1/muonProdCuts.xml
new file mode 100644
index 0000000000000..d0fd30597ed9a
--- /dev/null
+++ b/Geometry/MuonSimData/data/muonProdCuts/2026/v1/muonProdCuts.xml
@@ -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>
diff --git a/Geometry/MuonSimData/data/muonProdCuts/2026/v2/muonProdCuts.xml b/Geometry/MuonSimData/data/muonProdCuts/2026/v2/muonProdCuts.xml
new file mode 100644
index 0000000000000..861fc836da21c
--- /dev/null
+++ b/Geometry/MuonSimData/data/muonProdCuts/2026/v2/muonProdCuts.xml
@@ -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="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"/>
+   <PartSelector path="//GHA.*"/>
+   <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>
diff --git a/SimG4Core/Application/src/StackingAction.cc b/SimG4Core/Application/src/StackingAction.cc
index 72a1dc0f929f1..9b8b366b67662 100644
--- a/SimG4Core/Application/src/StackingAction.cc
+++ b/SimG4Core/Application/src/StackingAction.cc
@@ -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" ||

From e5080b129a5b564a04e9a8802858fa062f9e4851 Mon Sep 17 00:00:00 2001
From: Sunanda <sunanda.banerjee@cern.ch>
Date: Tue, 8 Jun 2021 23:19:16 +0200
Subject: [PATCH 2/2] Take Vladimir's comments

---
 .../muonProdCuts/2026/v2/muonProdCuts.xml     | 26 +++++++++----------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/Geometry/MuonSimData/data/muonProdCuts/2026/v2/muonProdCuts.xml b/Geometry/MuonSimData/data/muonProdCuts/2026/v2/muonProdCuts.xml
index 861fc836da21c..9c2e26a128a03 100644
--- a/Geometry/MuonSimData/data/muonProdCuts/2026/v2/muonProdCuts.xml
+++ b/Geometry/MuonSimData/data/muonProdCuts/2026/v2/muonProdCuts.xml
@@ -4,9 +4,9 @@
   <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"/>
+   <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"/>
@@ -25,9 +25,9 @@
    <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"/>
+   <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"/>
@@ -36,7 +36,7 @@
    <PartSelector path="//RR.*"/>
    <PartSelector path="//GE.*"/>
    <Parameter name="CMSCutsRegion" value="MuonChamber" eval="false"/>
-   <Parameter name="ProdCutsForGamma" value="1.*mm"/>
+   <Parameter name="ProdCutsForGamma" value="1.0*mm"/>
    <Parameter name="ProdCutsForElectrons" value="0.002*mm"/>
    <Parameter name="ProdCutsForPositrons" value="0.002*mm"/>
   </SpecPar>
@@ -47,9 +47,9 @@
    <PartSelector path="//ME.*ActiveGasVol"/>
    <PartSelector path="//GHA.*"/>
    <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"/>
+   <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+ -->
@@ -63,9 +63,9 @@
    <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"/>
+   <Parameter name="ProdCutsForGamma" value="1.0*cm"/>
+   <Parameter name="ProdCutsForElectrons" value="8.0*mm"/>
+   <Parameter name="ProdCutsForPositrons" value="1.0*cm"/>
   </SpecPar>
  </SpecParSection>
 </DDDefinition>