From 91d4469b080f2e9dc26d4c2f0905043ba1af8814 Mon Sep 17 00:00:00 2001
From: Jean-Baptiste Sauvan <jean-baptiste.sauvan@cern.ch>
Date: Tue, 16 Jan 2018 15:42:50 +0100
Subject: [PATCH] Use TDR panel layout as default

---
 .../data/{panel_mapping_tdr.txt => panel_mapping_tdr_0.txt}     | 0
 L1Trigger/L1THGCal/python/hgcalTriggerGeometryESProducer_cfi.py | 2 +-
 L1Trigger/L1THGCal/test/testHGCalL1TGeometry_cfg.py             | 1 -
 3 files changed, 1 insertion(+), 2 deletions(-)
 rename L1Trigger/L1THGCal/data/{panel_mapping_tdr.txt => panel_mapping_tdr_0.txt} (100%)

diff --git a/L1Trigger/L1THGCal/data/panel_mapping_tdr.txt b/L1Trigger/L1THGCal/data/panel_mapping_tdr_0.txt
similarity index 100%
rename from L1Trigger/L1THGCal/data/panel_mapping_tdr.txt
rename to L1Trigger/L1THGCal/data/panel_mapping_tdr_0.txt
diff --git a/L1Trigger/L1THGCal/python/hgcalTriggerGeometryESProducer_cfi.py b/L1Trigger/L1THGCal/python/hgcalTriggerGeometryESProducer_cfi.py
index 8fdb2d395421f..b1b1e4ee7eff7 100644
--- a/L1Trigger/L1THGCal/python/hgcalTriggerGeometryESProducer_cfi.py
+++ b/L1Trigger/L1THGCal/python/hgcalTriggerGeometryESProducer_cfi.py
@@ -20,7 +20,7 @@
 
 geometry = cms.PSet( TriggerGeometryName = cms.string('HGCalTriggerGeometryHexLayerBasedImp1'),
                      L1TCellsMapping = cms.FileInPath("L1Trigger/L1THGCal/data/triggercell_mapping_8inch_aligned_192_432_V8_0.txt"),
-                     L1TModulesMapping = cms.FileInPath("L1Trigger/L1THGCal/data/panel_mapping_60deg_6mod_0.txt"),
+                     L1TModulesMapping = cms.FileInPath("L1Trigger/L1THGCal/data/panel_mapping_tdr_0.txt"),
                      L1TCellNeighborsMapping = cms.FileInPath("L1Trigger/L1THGCal/data/triggercell_neighbor_mapping_8inch_aligned_192_432_0.txt"),
                      L1TCellsBHMapping = cms.FileInPath("L1Trigger/L1THGCal/data/triggercell_mapping_BH_3x3_30deg_0.txt"),
                      L1TCellNeighborsBHMapping = cms.FileInPath("L1Trigger/L1THGCal/data/triggercell_neighbor_mapping_BH_3x3_30deg_0.txt"),
diff --git a/L1Trigger/L1THGCal/test/testHGCalL1TGeometry_cfg.py b/L1Trigger/L1THGCal/test/testHGCalL1TGeometry_cfg.py
index fc4c0276435c7..e3c38ff19fd8b 100644
--- a/L1Trigger/L1THGCal/test/testHGCalL1TGeometry_cfg.py
+++ b/L1Trigger/L1THGCal/test/testHGCalL1TGeometry_cfg.py
@@ -102,7 +102,6 @@
 
 process.load('L1Trigger.L1THGCal.hgcalTriggerPrimitives_cff')
 # Eventually modify default geometry parameters
-process.hgcalTriggerGeometryESProducer.TriggerGeometry.L1TModulesMapping = cms.FileInPath("L1Trigger/L1THGCal/data/panel_mapping_tdr.txt")
 
 process.hgcaltriggergeomtester = cms.EDAnalyzer(
     "HGCalTriggerGeomTester"