Fix L1CTJetFileWriter fillDescriptions and l1tJetFileWriter_cfi

cms-sw · Oct 20, 2023 · 3cbf8e9 · 3cbf8e9
1 parent d9ba6fe
commit 3cbf8e9
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 30 deletions.
diff --git a/L1Trigger/Phase2L1ParticleFlow/plugins/L1CTJetFileWriter.cc b/L1Trigger/Phase2L1ParticleFlow/plugins/L1CTJetFileWriter.cc
@@ -26,7 +26,7 @@ class L1CTJetFileWriter : public edm::one::EDAnalyzer<edm::one::SharedResources>
 public:
   explicit L1CTJetFileWriter(const edm::ParameterSet&);
 
-  //static void fillDescriptions(edm::ConfigurationDescriptions& descriptions);
+  static void fillDescriptions(edm::ConfigurationDescriptions& descriptions);
 
 private:
   // ----------constants, enums and typedefs ---------
@@ -163,25 +163,15 @@ std::vector<ap_uint<64>> L1CTJetFileWriter::encodeSums(const std::vector<l1t::Et
 }
 
 // ------------ method fills 'descriptions' with the allowed parameters for the module  ------------
-/*void L1CTJetFileWriter::fillDescriptions(edm::ConfigurationDescriptions& descriptions) {
-  //The following says we do not know what parameters are allowed so do no validation
-  // Please change this to state exactly what you do use, even if it is no parameters
+void L1CTJetFileWriter::fillDescriptions(edm::ConfigurationDescriptions& descriptions) {
+
   edm::ParameterSetDescription desc;
   {
     edm::ParameterSetDescription vpsd1;
-    vpsd1.add<edm::InputTag>("jets", edm::InputTag("sc4PFL1PuppiCorrectedEmulator"));
-    vpsd1.add<edm::InputTag>("mht", edm::InputTag("sc4PFL1PuppiCorrectedEmulatorMHT"));
-    std::vector<edm::ParameterSet> temp1;
-    temp1.reserve(1);
-    {
-      edm::ParameterSet temp2;
-      temp2.addParameter<edm::InputTag>("jets", edm::InputTag("sc4PFL1PuppiCorrectedEmulator"));
-      temp2.addParameter<edm::InputTag>("mht", edm::InputTag("sc4PFL1PuppiCorrectedEmulatorMHT"));
-      temp1.push_back(temp2);
-    }
-    desc.addVPSetUntracked("collections", vpsd1, temp1);
+    vpsd1.addOptional<edm::InputTag>("jets");
+    vpsd1.addOptional<edm::InputTag>("mht");
+    desc.addVPSetUntracked("collections", vpsd1);
   }
-  //desc.add<std::vector<edm::ParameterSet>>("collections");
   desc.add<std::string>("outputFilename");
   desc.add<std::string>("outputFileExtension", "txt");
   desc.add<uint32_t>("nJets", 12);
@@ -190,7 +180,7 @@ std::vector<ap_uint<64>> L1CTJetFileWriter::encodeSums(const std::vector<l1t::Et
   desc.add<uint32_t>("maxLinesPerFile", 1024);
   desc.add<std::string>("format", "EMPv2");
   descriptions.addDefault(desc);
-}*/
+}
 
 //define this as a plug-in
 DEFINE_FWK_MODULE(L1CTJetFileWriter);
diff --git a/L1Trigger/Phase2L1ParticleFlow/python/l1ctJetFileWriter_cfi.py b/L1Trigger/Phase2L1ParticleFlow/python/l1ctJetFileWriter_cfi.py
diff --git a/L1Trigger/Phase2L1ParticleFlow/python/l1tJetFileWriter_cfi.py b/L1Trigger/Phase2L1ParticleFlow/python/l1tJetFileWriter_cfi.py
@@ -1,7 +1,8 @@
 import FWCore.ParameterSet.Config as cms
 
 l1tSeededConeJetFileWriter = cms.EDAnalyzer('L1CTJetFileWriter',
-  jets = cms.InputTag("l1tSCPFL1PuppiEmulatorCorrected"),
+  collections = cms.untracked.VPSet([cms.PSet(jets = cms.InputTag("l1tSC4PFL1PuppiCorrectedEmulator"),
+                                              mht  = cms.InputTag("l1tSC4PFL1PuppiCorrectedEmulatorMHT"))]),
   nJets = cms.uint32(12),
   nFramesPerBX = cms.uint32(9), # 360 MHz clock or 25 Gb/s link
   TMUX = cms.uint32(6),