From 92d120d789ba7c10551902f2bcdb663a2761c910 Mon Sep 17 00:00:00 2001
From: "Ian J. Watson" <ian.james.watson@cern.ch>
Date: Mon, 24 Aug 2020 15:50:16 +0900
Subject: [PATCH] The 16 eta partition GE2/1 should have half the strips/pads

compared to the 8 eta partition version.
---
 .../GEMGeometryBuilder/data/v11/GEMSpecs.xml  | 29 +++++++++++++++++++
 .../data/v11/GEMSpecsFilter.xml               | 22 ++++++++++++++
 .../testExtendedGeometry2026D54XML_cfi.py     |  4 +--
 3 files changed, 53 insertions(+), 2 deletions(-)
 create mode 100644 Geometry/GEMGeometryBuilder/data/v11/GEMSpecs.xml
 create mode 100644 Geometry/GEMGeometryBuilder/data/v11/GEMSpecsFilter.xml

diff --git a/Geometry/GEMGeometryBuilder/data/v11/GEMSpecs.xml b/Geometry/GEMGeometryBuilder/data/v11/GEMSpecs.xml
new file mode 100644
index 0000000000000..6f8abb91b47fa
--- /dev/null
+++ b/Geometry/GEMGeometryBuilder/data/v11/GEMSpecs.xml
@@ -0,0 +1,29 @@
+<?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">
+  <SpecParSection label="GEMSpecs.xml">
+    <SpecPar name="nStripsME0" eval="true">
+      <PartSelector path="//GHA0.."/>
+      <Parameter name="nStrips" value="384"/>
+    </SpecPar>
+    <SpecPar name="nStripsGE11" eval="true">
+      <PartSelector path="//GHA1.."/>
+      <Parameter name="nStrips" value="384"/>
+    </SpecPar>
+    <SpecPar name="nStripsGE21" eval="true">
+      <PartSelector path="//GHA2.."/>
+      <Parameter name="nStrips" value="384"/>
+    </SpecPar>
+    <SpecPar name="nPadsME0" eval="true">
+      <PartSelector path="//GHA0.."/>
+      <Parameter name="nPads" value="192"/>
+    </SpecPar>
+    <SpecPar name="nPadsGE11" eval="true">
+      <PartSelector path="//GHA1.."/>
+      <Parameter name="nPads" value="192"/>
+    </SpecPar>
+    <SpecPar name="nPadsGE21" eval="true">
+      <PartSelector path="//GHA2.."/>
+      <Parameter name="nPads" value="192"/>
+    </SpecPar>
+  </SpecParSection>
+</DDDefinition>
diff --git a/Geometry/GEMGeometryBuilder/data/v11/GEMSpecsFilter.xml b/Geometry/GEMGeometryBuilder/data/v11/GEMSpecsFilter.xml
new file mode 100644
index 0000000000000..6ab59738fc9a7
--- /dev/null
+++ b/Geometry/GEMGeometryBuilder/data/v11/GEMSpecsFilter.xml
@@ -0,0 +1,22 @@
+<?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">
+  <SpecParSection label="GEMSpecsFilter.xml">
+    <SpecPar name="MuonME0Tree">
+      <PartSelector path="//ME0Box"/>      
+      <PartSelector path="//ME0L"/>      
+      <PartSelector path="//GHA0..*"/>
+      <Parameter name="MuStructure" value="MuonEndCapME0"/>
+    </SpecPar>
+    <SpecPar name="MuonGEMTree">
+      <PartSelector path="//GEMBox11L"/>      
+      <PartSelector path="//GSAX11L"/>      
+      <PartSelector path="//GEMBox11S"/>      
+      <PartSelector path="//GSAX11S"/>      
+      <PartSelector path="//GHA1..*"/>
+      <PartSelector path="//GEMBox21.*"/>      
+      <PartSelector path="//GSAX21.*"/>      
+      <PartSelector path="//GHA2..*"/>
+      <Parameter name="MuStructure" value="MuonEndCapGEM"/>
+    </SpecPar>
+  </SpecParSection>
+</DDDefinition>
diff --git a/Geometry/MuonCommonData/python/testExtendedGeometry2026D54XML_cfi.py b/Geometry/MuonCommonData/python/testExtendedGeometry2026D54XML_cfi.py
index 5ce6f2229da68..a25895540f5a2 100644
--- a/Geometry/MuonCommonData/python/testExtendedGeometry2026D54XML_cfi.py
+++ b/Geometry/MuonCommonData/python/testExtendedGeometry2026D54XML_cfi.py
@@ -111,8 +111,8 @@
         'Geometry/CSCGeometryBuilder/data/cscSpecsFilter.xml',
         'Geometry/CSCGeometryBuilder/data/cscSpecs.xml',
         'Geometry/RPCGeometryBuilder/data/2026/v1/RPCSpecs.xml',
-        'Geometry/GEMGeometryBuilder/data/v7/GEMSpecsFilter.xml',
-        'Geometry/GEMGeometryBuilder/data/v7/GEMSpecs.xml',
+        'Geometry/GEMGeometryBuilder/data/v11/GEMSpecsFilter.xml',
+        'Geometry/GEMGeometryBuilder/data/v11/GEMSpecs.xml',
         'Geometry/ForwardCommonData/data/brmsens.xml',
         'Geometry/ForwardSimData/data/zdcsens.xml',
         'Geometry/MTDSimData/data/CrystalBarPhiFlat/mtdsens.xml',