From 575304362cd34412be3aa6dc5898ef857048b876 Mon Sep 17 00:00:00 2001
From: Fredrik <fredrik.oljemark@helsinki.fi>
Date: Sun, 4 Jun 2023 15:00:24 +0200
Subject: [PATCH] Make Totem T2 xml mapping schema selector tracked

---
 CalibPPS/ESProducers/plugins/TotemDAQMappingESSourceXML.cc    | 4 +++-
 CalibPPS/ESProducers/python/totemDAQMappingESSourceXML_cfi.py | 1 +
 CalibPPS/ESProducers/python/totemT2DAQMapping_cff.py          | 2 +-
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/CalibPPS/ESProducers/plugins/TotemDAQMappingESSourceXML.cc b/CalibPPS/ESProducers/plugins/TotemDAQMappingESSourceXML.cc
index 56f5a4ded3776..dd0af72c65e78 100644
--- a/CalibPPS/ESProducers/plugins/TotemDAQMappingESSourceXML.cc
+++ b/CalibPPS/ESProducers/plugins/TotemDAQMappingESSourceXML.cc
@@ -276,7 +276,9 @@ TotemDAQMappingESSourceXML::TotemDAQMappingESSourceXML(const edm::ParameterSet &
     : verbosity(conf.getUntrackedParameter<unsigned int>("verbosity", 0)),
       subSystemName(conf.getUntrackedParameter<string>("subSystem")),
       sampicSubDetId(conf.getParameter<unsigned int>("sampicSubDetId")),
-      packedPayload(conf.getUntrackedParameter<bool>("multipleChannelsPerPayload", false)),
+      packedPayload(
+          conf.existsAs<bool>("multipleChannelsPerPayload", true)
+                             ? conf.getParameter<bool>("multipleChannelsPerPayload") : false),
       currentBlock(0),
       currentBlockValid(false) {
   for (const auto &it : conf.getParameter<vector<ParameterSet>>("configuration")) {
diff --git a/CalibPPS/ESProducers/python/totemDAQMappingESSourceXML_cfi.py b/CalibPPS/ESProducers/python/totemDAQMappingESSourceXML_cfi.py
index db425a1a7e347..961fa3e55ce6b 100644
--- a/CalibPPS/ESProducers/python/totemDAQMappingESSourceXML_cfi.py
+++ b/CalibPPS/ESProducers/python/totemDAQMappingESSourceXML_cfi.py
@@ -5,6 +5,7 @@
 
   # set it to: TrackingStrip, ...
   subSystem = cms.untracked.string(""),
+  multipleChannelsPerPayload = cms.bool(False),
 
   configuration = cms.VPSet(
     # example configuration block:
diff --git a/CalibPPS/ESProducers/python/totemT2DAQMapping_cff.py b/CalibPPS/ESProducers/python/totemT2DAQMapping_cff.py
index 4910e30138c1b..316d7fff99faf 100644
--- a/CalibPPS/ESProducers/python/totemT2DAQMapping_cff.py
+++ b/CalibPPS/ESProducers/python/totemT2DAQMapping_cff.py
@@ -4,7 +4,6 @@
 
 totemDAQMappingESSourceXML = _xml.clone(
     subSystem = "TotemT2",
-    multipleChannelsPerPayload = cms.untracked.bool(True),
     configuration = cms.VPSet(
         #initial dummy diamond map copy, use only for Run 2 where T2 mapping is read with old schema
         cms.PSet(
@@ -26,4 +25,5 @@
         )
     ),
     sampicSubDetId = cms.uint32(6),
+    multipleChannelsPerPayload = True,
 )