Merge pull request #33444 from dildick/from-CMSSW_11_3_X_2021-04-15-1…

…100-pack-cscshowerdigi-v3

Load CLCT pre-trigger digis in CSC packer. Skeleton code to pack/unpack CSCShowerDigi (HadronicShowerTrigger-3)

EventFilter/CSCRawToDigi/interface/CSCDigiToRaw.h

@@ -1,5 +1,5 @@
-#ifndef EventFilter_CSCDigiToRaw_h
-#define EventFilter_CSCDigiToRaw_h
+#ifndef EventFilter_CSCRawToDigi_CSCDigiToRaw_h
+#define EventFilter_CSCRawToDigi_CSCDigiToRaw_h
 
 /** \class CSCDigiToRaw
  *
@@ -13,7 +13,9 @@
 #include "DataFormats/CSCDigi/interface/CSCALCTDigiCollection.h"
 #include "DataFormats/CSCDigi/interface/CSCCLCTDigiCollection.h"
 #include "DataFormats/CSCDigi/interface/CSCCLCTPreTriggerCollection.h"
+#include "DataFormats/CSCDigi/interface/CSCCLCTPreTriggerDigiCollection.h"
 #include "DataFormats/CSCDigi/interface/CSCCorrelatedLCTDigiCollection.h"
+#include "DataFormats/CSCDigi/interface/CSCShowerDigiCollection.h"
 #include "DataFormats/GEMDigi/interface/GEMPadDigiClusterCollection.h"
 #include "EventFilter/CSCRawToDigi/interface/CSCEventData.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
@@ -34,7 +36,9 @@ class CSCDigiToRaw {
                         const CSCALCTDigiCollection& alctDigis,
                         const CSCCLCTDigiCollection& clctDigis,
                         const CSCCLCTPreTriggerCollection* preTriggers,
+                        const CSCCLCTPreTriggerDigiCollection* preTriggerDigis,
                         const CSCCorrelatedLCTDigiCollection& correlatedLCTDigis,
+                        const CSCShowerDigiCollection* showerDigis,
                         const GEMPadDigiClusterCollection* padDigiClusters,
                         FEDRawDataCollection& fed_buffers,
                         const CSCChamberMap* theMapping,
@@ -55,6 +59,7 @@ class CSCDigiToRaw {
   // specialized because it reverses strip direction
   void add(const CSCStripDigiCollection& stripDigis,
            const CSCCLCTPreTriggerCollection* preTriggers,
+           const CSCCLCTPreTriggerDigiCollection* preTriggerDigis,
            FindEventDataInfo&,
            bool packEverything) const;
   void add(const CSCWireDigiCollection& wireDigis,
@@ -69,6 +74,7 @@ class CSCDigiToRaw {
   void add(const CSCALCTDigiCollection& alctDigis, FindEventDataInfo&) const;
   void add(const CSCCLCTDigiCollection& clctDigis, FindEventDataInfo&) const;
   void add(const CSCCorrelatedLCTDigiCollection& corrLCTDigis, FindEventDataInfo&) const;
+  void add(const CSCShowerDigiCollection& cscShowerDigis, FindEventDataInfo&) const;
   void add(const GEMPadDigiClusterCollection& gemPadClusters, FindEventDataInfo&) const;
   /// pick out the correct data object for this chamber
   CSCEventData& findEventData(const CSCDetId& cscDetId, FindEventDataInfo&) const;

EventFilter/CSCRawToDigi/interface/CSCEventData.h

@@ -102,6 +102,7 @@ class CSCEventData {
   void add(const std::vector<CSCALCTDigi> &);
   void add(const std::vector<CSCCLCTDigi> &);
   void add(const std::vector<CSCCorrelatedLCTDigi> &);
+  void add(const std::vector<CSCShowerDigi> &);
   void add(const std::vector<GEMPadDigiCluster> &, const GEMDetId &);
 
   /// this will fill the DMB header, and change all related fields in

EventFilter/CSCRawToDigi/interface/CSCTMBHeader.h

@@ -10,6 +10,7 @@
 #include "DataFormats/CSCDigi/interface/CSCALCTDigi.h"
 #include "DataFormats/CSCDigi/interface/CSCCLCTDigi.h"
 #include "DataFormats/CSCDigi/interface/CSCCorrelatedLCTDigi.h"
+#include "DataFormats/CSCDigi/interface/CSCShowerDigi.h"
 #include "DataFormats/GEMDigi/interface/GEMPadDigiCluster.h"
 #include "EventFilter/CSCRawToDigi/interface/CSCVTMBHeaderFormat.h"
 #include "FWCore/Utilities/interface/Exception.h"
@@ -99,6 +100,7 @@ class CSCTMBHeader {
   /// these methods need more brains to figure which one goes first
   void add(const std::vector<CSCCLCTDigi>& digis);
   void add(const std::vector<CSCCorrelatedLCTDigi>& digis);
+  void add(const std::vector<CSCShowerDigi>& digis);
 
   /// tests that packing and unpacking give same results
   static void selfTest(int firmwwareVersion, int firmwareRevision);

EventFilter/CSCRawToDigi/interface/CSCTMBHeader2006.h

@@ -47,6 +47,7 @@ struct CSCTMBHeader2006 : public CSCVTMBHeaderFormat {
   void addALCT1(const CSCALCTDigi& digi) override;
   void addCorrelatedLCT0(const CSCCorrelatedLCTDigi& digi) override;
   void addCorrelatedLCT1(const CSCCorrelatedLCTDigi& digi) override;
+  void addShower(const CSCShowerDigi& digi) override {}
 
   void swapCLCTs(CSCCLCTDigi& digi1, CSCCLCTDigi& digi2);
 

EventFilter/CSCRawToDigi/interface/CSCTMBHeader2007.h

@@ -50,6 +50,7 @@ struct CSCTMBHeader2007 : public CSCVTMBHeaderFormat {
   void addALCT1(const CSCALCTDigi& digi) override;
   void addCorrelatedLCT0(const CSCCorrelatedLCTDigi& digi) override;
   void addCorrelatedLCT1(const CSCCorrelatedLCTDigi& digi) override;
+  void addShower(const CSCShowerDigi& digi) override {}
 
   void swapCLCTs(CSCCLCTDigi& digi1, CSCCLCTDigi& digi2);
 

EventFilter/CSCRawToDigi/interface/CSCTMBHeader2007_rev0x50c3.h

@@ -50,6 +50,7 @@ struct CSCTMBHeader2007_rev0x50c3 : public CSCVTMBHeaderFormat {
   void addALCT1(const CSCALCTDigi& digi) override;
   void addCorrelatedLCT0(const CSCCorrelatedLCTDigi& digi) override;
   void addCorrelatedLCT1(const CSCCorrelatedLCTDigi& digi) override;
+  void addShower(const CSCShowerDigi& digi) override {}
 
   void swapCLCTs(CSCCLCTDigi& digi1, CSCCLCTDigi& digi2);
 

EventFilter/CSCRawToDigi/interface/CSCTMBHeader2013.h

@@ -50,6 +50,7 @@ struct CSCTMBHeader2013 : public CSCVTMBHeaderFormat {
   void addALCT1(const CSCALCTDigi& digi) override;
   void addCorrelatedLCT0(const CSCCorrelatedLCTDigi& digi) override;
   void addCorrelatedLCT1(const CSCCorrelatedLCTDigi& digi) override;
+  void addShower(const CSCShowerDigi& digi) override {}
 
   void swapCLCTs(CSCCLCTDigi& digi1, CSCCLCTDigi& digi2);
 

EventFilter/CSCRawToDigi/interface/CSCVTMBHeaderFormat.h

@@ -4,6 +4,7 @@
 #include "DataFormats/CSCDigi/interface/CSCCLCTDigi.h"
 #include "DataFormats/CSCDigi/interface/CSCALCTDigi.h"
 #include "DataFormats/CSCDigi/interface/CSCCorrelatedLCTDigi.h"
+#include "DataFormats/CSCDigi/interface/CSCShowerDigi.h"
 #include "DataFormats/MuonDetId/interface/CSCDetId.h"
 #include "DataFormats/CSCDigi/interface/CSCConstants.h"
 #include <vector>
@@ -56,6 +57,7 @@ class CSCVTMBHeaderFormat {
   virtual void addALCT1(const CSCALCTDigi& digi) = 0;
   virtual void addCorrelatedLCT0(const CSCCorrelatedLCTDigi& digi) = 0;
   virtual void addCorrelatedLCT1(const CSCCorrelatedLCTDigi& digi) = 0;
+  virtual void addShower(const CSCShowerDigi& digi) = 0;
 
   virtual void print(std::ostream& os) const = 0;
 

EventFilter/CSCRawToDigi/plugins/CSCDCCUnpacker.cc

@@ -39,6 +39,7 @@
 #include "DataFormats/CSCDigi/interface/CSCCLCTDigiCollection.h"
 #include "DataFormats/CSCDigi/interface/CSCRPCDigiCollection.h"
 #include "DataFormats/CSCDigi/interface/CSCCorrelatedLCTDigiCollection.h"
+#include "DataFormats/CSCDigi/interface/CSCShowerDigiCollection.h"
 #include "DataFormats/GEMDigi/interface/GEMPadDigiClusterCollection.h"
 #include "DataFormats/CSCDigi/interface/CSCDMBStatusDigiCollection.h"
 #include "DataFormats/CSCDigi/interface/CSCTMBStatusDigiCollection.h"
@@ -85,6 +86,9 @@ class CSCDCCUnpacker : public edm::stream::EDProducer<> {
   /// option to unpack GEM cluster data
   bool useGEMs_;
 
+  /// option to unpack CSC shower data
+  bool useCSCShowers_;
+
   /// Visualization of raw data
   bool visualFEDInspect, visualFEDShort, formatedEventDump;
   /// Suppress zeros LCTs
@@ -117,8 +121,9 @@ CSCDCCUnpacker::CSCDCCUnpacker(const edm::ParameterSet& pset) : numOfEvents(0) {
   useFormatStatus = pset.getParameter<bool>("UseFormatStatus");
 
   useGEMs_ = pset.getParameter<bool>("useGEMs");
-  // Untracked
+  useCSCShowers_ = pset.getParameter<bool>("useCSCShowers");
 
+  // Untracked
   printEventNumber = pset.getUntrackedParameter<bool>("PrintEventNumber", true);
   debug = pset.getUntrackedParameter<bool>("Debug", false);
   instantiateDQM = pset.getUntrackedParameter<bool>("runDQM", false);
@@ -159,6 +164,11 @@ CSCDCCUnpacker::CSCDCCUnpacker(const edm::ParameterSet& pset) : numOfEvents(0) {
   if (useGEMs_) {
     produces<GEMPadDigiClusterCollection>("MuonGEMPadDigiCluster");
   }
+
+  if (useCSCShowers_) {
+    produces<CSCShowerDigiCollection>("MuonCSCShowerDigi");
+  }
+
   //CSCAnodeData::setDebug(debug);
   CSCALCTHeader::setDebug(debug);
   CSCComparatorData::setDebug(debug);
@@ -188,6 +198,7 @@ void CSCDCCUnpacker::fillDescriptions(edm::ConfigurationDescriptions& descriptio
   desc.add<bool>("UnpackStatusDigis", false)->setComment("# Unpack general status digis?");
   desc.add<bool>("UseFormatStatus", true)->setComment("# Unpack FormatStatus digi?");
   desc.add<bool>("useGEMs", false)->setComment("Unpack GEM trigger data");
+  desc.add<bool>("useCSCShowers", false)->setComment("Unpack CSCShower trigger data");
   desc.addUntracked<bool>("Debug", false)->setComment("# Turn on lots of output");
   desc.addUntracked<bool>("PrintEventNumber", false);
   desc.addUntracked<bool>("runDQM", false);
@@ -237,6 +248,8 @@ void CSCDCCUnpacker::produce(edm::Event& e, const edm::EventSetup& c) {
 
   auto gemProduct = std::make_unique<GEMPadDigiClusterCollection>();
 
+  auto showerProduct = std::make_unique<CSCShowerDigiCollection>();
+
   // If set selective unpacking mode
   // hardcoded examiner mask below to check for DCC and DDU level errors will be used first
   // then examinerMask for CSC level errors will be used during unpacking of each CSC block
@@ -636,6 +649,9 @@ void CSCDCCUnpacker::produce(edm::Event& e, const edm::EventSetup& c) {
   if (useGEMs_) {
     e.put(std::move(gemProduct), "MuonGEMPadDigiCluster");
   }
+  if (useCSCShowers_) {
+    e.put(std::move(showerProduct), "MuonCSCShowerDigi");
+  }
   if (printEventNumber)
     LogTrace("CSCDCCUnpacker|CSCRawToDigi") << "[CSCDCCUnpacker]: " << numOfEvents << " events processed ";
 }

EventFilter/CSCRawToDigi/plugins/CSCDigiToRawModule.cc

@@ -28,7 +28,9 @@
 #include "DataFormats/CSCDigi/interface/CSCALCTDigiCollection.h"
 #include "DataFormats/CSCDigi/interface/CSCCLCTDigiCollection.h"
 #include "DataFormats/CSCDigi/interface/CSCCLCTPreTriggerCollection.h"
+#include "DataFormats/CSCDigi/interface/CSCCLCTPreTriggerDigiCollection.h"
 #include "DataFormats/CSCDigi/interface/CSCCorrelatedLCTDigiCollection.h"
+#include "DataFormats/CSCDigi/interface/CSCShowerDigiCollection.h"
 #include "DataFormats/GEMDigi/interface/GEMPadDigiClusterCollection.h"
 
 namespace edm {
@@ -53,6 +55,7 @@ class CSCDigiToRawModule : public edm::global::EDProducer<> {
   bool usePreTriggers;            // Select if to use Pre-Triigers CLCT digis
   bool packEverything_;           // bypass all cuts and (pre)trigger requirements
   bool useGEMs_;
+  bool useCSCShowers_;
 
   std::unique_ptr<const CSCDigiToRaw> packer_;
 
@@ -62,27 +65,29 @@ class CSCDigiToRawModule : public edm::global::EDProducer<> {
   edm::EDGetTokenT<CSCALCTDigiCollection> al_token;
   edm::EDGetTokenT<CSCCLCTDigiCollection> cl_token;
   edm::EDGetTokenT<CSCCLCTPreTriggerCollection> pr_token;
+  edm::EDGetTokenT<CSCCLCTPreTriggerDigiCollection> prdigi_token;
   edm::EDGetTokenT<CSCCorrelatedLCTDigiCollection> co_token;
+  edm::EDGetTokenT<CSCShowerDigiCollection> shower_token;
   edm::ESGetToken<CSCChamberMap, CSCChamberMapRcd> cham_token;
   edm::EDGetTokenT<GEMPadDigiClusterCollection> gem_token;
 
   edm::EDPutTokenT<FEDRawDataCollection> put_token_;
 };
 
 CSCDigiToRawModule::CSCDigiToRawModule(const edm::ParameterSet& pset) : packer_(std::make_unique<CSCDigiToRaw>(pset)) {
-  //theStrip = pset.getUntrackedParameter<string>("DigiCreator", "cscunpacker");
-
   theFormatVersion = pset.getParameter<unsigned int>("useFormatVersion");  // pre-LS1 - '2005'. post-LS1 - '2013'
   usePreTriggers = pset.getParameter<bool>("usePreTriggers");              // disable checking CLCT PreTriggers digis
   packEverything_ = pset.getParameter<bool>("packEverything");  // don't check for consistency with trig primitives
                                                                 // overrides usePreTriggers
 
   useGEMs_ = pset.getParameter<bool>("useGEMs");
+  useCSCShowers_ = pset.getParameter<bool>("useCSCShowers");
   wd_token = consumes<CSCWireDigiCollection>(pset.getParameter<edm::InputTag>("wireDigiTag"));
   sd_token = consumes<CSCStripDigiCollection>(pset.getParameter<edm::InputTag>("stripDigiTag"));
   cd_token = consumes<CSCComparatorDigiCollection>(pset.getParameter<edm::InputTag>("comparatorDigiTag"));
   if (usePreTriggers) {
     pr_token = consumes<CSCCLCTPreTriggerCollection>(pset.getParameter<edm::InputTag>("preTriggerTag"));
+    prdigi_token = consumes<CSCCLCTPreTriggerDigiCollection>(pset.getParameter<edm::InputTag>("preTriggerDigiTag"));
   }
   al_token = consumes<CSCALCTDigiCollection>(pset.getParameter<edm::InputTag>("alctDigiTag"));
   cl_token = consumes<CSCCLCTDigiCollection>(pset.getParameter<edm::InputTag>("clctDigiTag"));
@@ -91,27 +96,13 @@ CSCDigiToRawModule::CSCDigiToRawModule(const edm::ParameterSet& pset) : packer_(
   if (useGEMs_) {
     gem_token = consumes<GEMPadDigiClusterCollection>(pset.getParameter<edm::InputTag>("padDigiClusterTag"));
   }
+  if (useCSCShowers_) {
+    shower_token = consumes<CSCShowerDigiCollection>(pset.getParameter<edm::InputTag>("showerDigiTag"));
+  }
   put_token_ = produces<FEDRawDataCollection>("CSCRawData");
 }
 
 void CSCDigiToRawModule::fillDescriptions(edm::ConfigurationDescriptions& descriptions) {
-  /*** From python/cscPacker_cfi.py
-    wireDigiTag = cms.InputTag("simMuonCSCDigis","MuonCSCWireDigi"),
-    stripDigiTag = cms.InputTag("simMuonCSCDigis","MuonCSCStripDigi"),
-    comparatorDigiTag = cms.InputTag("simMuonCSCDigis","MuonCSCComparatorDigi"),
-    alctDigiTag = cms.InputTag("simCscTriggerPrimitiveDigis"),
-    clctDigiTag = cms.InputTag("simCscTriggerPrimitiveDigis"),
-    preTriggerTag = cms.InputTag("simCscTriggerPrimitiveDigis"),
-    correlatedLCTDigiTag = cms.InputTag("simCscTriggerPrimitiveDigis", "MPCSORTED"),
-    # if min parameter = -999 always accept
-    alctWindowMin = cms.int32(-3),
-    alctWindowMax = cms.int32(3),
-    clctWindowMin = cms.int32(-3),
-    clctWindowMax = cms.int32(3),
-    preTriggerWindowMin = cms.int32(-3),
-    preTriggerWindowMax = cms.int32(1)
-*/
-
   edm::ParameterSetDescription desc;
 
   desc.add<unsigned int>("useFormatVersion", 2005)
@@ -120,15 +111,18 @@ void CSCDigiToRawModule::fillDescriptions(edm::ConfigurationDescriptions& descri
   desc.add<bool>("packEverything", false)
       ->setComment("Set to true to disable trigger-related constraints on readout data");
   desc.add<bool>("useGEMs", false)->setComment("Pack GEM trigger data");
+  desc.add<bool>("useCSCShowers", false)->setComment("Pack CSC shower trigger data");
 
   desc.add<edm::InputTag>("wireDigiTag", edm::InputTag("simMuonCSCDigis", "MuonCSCWireDigi"));
   desc.add<edm::InputTag>("stripDigiTag", edm::InputTag("simMuonCSCDigis", "MuonCSCStripDigi"));
   desc.add<edm::InputTag>("comparatorDigiTag", edm::InputTag("simMuonCSCDigis", "MuonCSCComparatorDigi"));
   desc.add<edm::InputTag>("alctDigiTag", edm::InputTag("simCscTriggerPrimitiveDigis"));
   desc.add<edm::InputTag>("clctDigiTag", edm::InputTag("simCscTriggerPrimitiveDigis"));
   desc.add<edm::InputTag>("preTriggerTag", edm::InputTag("simCscTriggerPrimitiveDigis"));
+  desc.add<edm::InputTag>("preTriggerDigiTag", edm::InputTag("simCscTriggerPrimitiveDigis"));
   desc.add<edm::InputTag>("correlatedLCTDigiTag", edm::InputTag("simCscTriggerPrimitiveDigis", "MPCSORTED"));
   desc.add<edm::InputTag>("padDigiClusterTag", edm::InputTag("simMuonGEMPadDigiClusters"));
+  desc.add<edm::InputTag>("showerDigiTag", edm::InputTag("simCscTriggerPrimitiveDigis"));
 
   desc.add<int32_t>("alctWindowMin", -3)->setComment("If min parameter = -999 always accept");
   desc.add<int32_t>("alctWindowMax", 3);
@@ -137,7 +131,7 @@ void CSCDigiToRawModule::fillDescriptions(edm::ConfigurationDescriptions& descri
   desc.add<int32_t>("preTriggerWindowMin", -3)->setComment("If min parameter = -999 always accept");
   desc.add<int32_t>("preTriggerWindowMax", 1);
 
-  descriptions.add("cscPacker", desc);
+  descriptions.add("cscPackerDef", desc);
 }
 
 void CSCDigiToRawModule::produce(edm::StreamID, edm::Event& e, const edm::EventSetup& c) const {
@@ -155,27 +149,46 @@ void CSCDigiToRawModule::produce(edm::StreamID, edm::Event& e, const edm::EventS
   edm::Handle<CSCCLCTDigiCollection> clctDigis;
   edm::Handle<CSCCorrelatedLCTDigiCollection> correlatedLCTDigis;
 
+  // collections that are always packed
   e.getByToken(wd_token, wireDigis);
   e.getByToken(sd_token, stripDigis);
   e.getByToken(cd_token, comparatorDigis);
   e.getByToken(al_token, alctDigis);
   e.getByToken(cl_token, clctDigis);
+  e.getByToken(co_token, correlatedLCTDigis);
+
+  // packing with pre-triggers
   CSCCLCTPreTriggerCollection const* preTriggersPtr = nullptr;
-  if (usePreTriggers)
+  CSCCLCTPreTriggerDigiCollection const* preTriggerDigisPtr = nullptr;
+  if (usePreTriggers) {
     preTriggersPtr = &e.get(pr_token);
-  e.getByToken(co_token, correlatedLCTDigis);
+    preTriggerDigisPtr = &e.get(prdigi_token);
+  }
+
+  // collections that are packed optionally
+
+  // packing of GEM hits
   const GEMPadDigiClusterCollection* padDigiClustersPtr = nullptr;
   if (useGEMs_) {
     padDigiClustersPtr = &e.get(gem_token);
   }
+
+  // packing of CSC shower digis
+  const CSCShowerDigiCollection* cscShowerDigisPtr = nullptr;
+  if (useCSCShowers_) {
+    cscShowerDigisPtr = &e.get(shower_token);
+  }
+
   // Create the packed data
   packer_->createFedBuffers(*stripDigis,
                             *wireDigis,
                             *comparatorDigis,
                             *alctDigis,
                             *clctDigis,
                             preTriggersPtr,
+                            preTriggerDigisPtr,
                             *correlatedLCTDigis,
+                            cscShowerDigisPtr,
                             padDigiClustersPtr,
                             fed_buffers,
                             theMapping,

EventFilter/CSCRawToDigi/python/cscPacker_cfi.py

@@ -1,33 +1,21 @@
 import FWCore.ParameterSet.Config as cms
 
-cscpacker = cms.EDProducer("CSCDigiToRawModule",
-    wireDigiTag = cms.InputTag("simMuonCSCDigis","MuonCSCWireDigi"),
-    stripDigiTag = cms.InputTag("simMuonCSCDigis","MuonCSCStripDigi"),
-    comparatorDigiTag = cms.InputTag("simMuonCSCDigis","MuonCSCComparatorDigi"),
-    alctDigiTag = cms.InputTag("simCscTriggerPrimitiveDigis"),
-    clctDigiTag = cms.InputTag("simCscTriggerPrimitiveDigis"),
-    preTriggerTag = cms.InputTag("simCscTriggerPrimitiveDigis"),
-    correlatedLCTDigiTag = cms.InputTag("simCscTriggerPrimitiveDigis", "MPCSORTED"),
-    # if min parameter = -999 always accept
-    alctWindowMin = cms.int32(-3),
-    alctWindowMax = cms.int32(3),
-    clctWindowMin = cms.int32(-3),
-    clctWindowMax = cms.int32(3),
-    preTriggerWindowMin = cms.int32(-3),
-    preTriggerWindowMax = cms.int32(1)
-)
-
+## baseline configuration in the class itself
+from EventFilter.CSCRawToDigi.cscPackerDef_cfi import cscPackerDef
+cscpacker = cscPackerDef.clone()
 
 ##
 ## Make changes for running in Run 2
 ##
 # packer - simply get rid of it
 from Configuration.Eras.Modifier_run2_common_cff import run2_common
-run2_common.toModify( cscpacker, useFormatVersion = cms.uint32(2013) )
-run2_common.toModify( cscpacker, usePreTriggers = cms.bool(False) )
-run2_common.toModify( cscpacker, packEverything = cms.bool(True) )
+run2_common.toModify( cscpacker,
+                      useFormatVersion = 2013,
+                      usePreTriggers = False,
+                      packEverything = True)
 
 ## in Run-3 include GEMs
 from Configuration.Eras.Modifier_run3_GEM_cff import run3_GEM
-run3_GEM.toModify( cscpacker, padDigiClusterTag = cms.InputTag("simMuonGEMPadDigiClusters") )
-run3_GEM.toModify( cscpacker, useGEMs = cms.bool(False) )
+run3_GEM.toModify( cscpacker,
+                   padDigiClusterTag = "simMuonGEMPadDigiClusters",
+                   useGEMs = False)