Add missing newline at the end of file + rename for the DMA source id

cms-sw · Mar 14, 2024 · f6b631a · f6b631a
1 parent 2f2fe06
commit f6b631a
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/EventFilter/L1ScoutingRawToDigi/plugins/ScCALORawToDigi.cc b/EventFilter/L1ScoutingRawToDigi/plugins/ScCALORawToDigi.cc
@@ -48,7 +48,7 @@ void ScCaloRawToDigi::produce(edm::Event& iEvent, const edm::EventSetup& iSetup)
   std::string dataSourceMode = dataSourceConfig_.getParameter<std::string>("dataSourceMode");
   if (dataSourceMode == "DMA") {
     // Packet from DMA contains all the objects
-    int sourceId = dataSourceConfig_.getParameter<int>("sourceId");
+    int sourceId = dataSourceConfig_.getParameter<int>("dmaSourceId");
     if (sourceId != SDSNumbering::CaloSDSID)
       edm::LogWarning("ScCaloRawToDIgi::produce") << "Provided an unexpected source ID: " << sourceId << "/"
                                                   << SDSNumbering::CaloSDSID << " [provided/expected]";
@@ -430,6 +430,7 @@ void ScCaloRawToDigi::fillDescriptions(edm::ConfigurationDescriptions& descripti
     dataSource.add<std::vector<int>>("eGammaSourceIdList", std::vector<int>({23}));
     dataSource.add<std::vector<int>>("tauSourceIdList", std::vector<int>({25}));
     dataSource.add<std::vector<int>>("etSumSourceIdList", std::vector<int>({24}));
+    dataSource.add<int>("dmaSourceId", 2);
     desc.add("dataSource", dataSource);
   }
   desc.add<bool>("enableAllSums", true);

diff --git a/EventFilter/L1ScoutingRawToDigi/python/ScCaloRawToDigi_cfi.py b/EventFilter/L1ScoutingRawToDigi/python/ScCaloRawToDigi_cfi.py
@@ -3,7 +3,7 @@
 # default parameters for the DMA input source
 dmaDataModeParameters = cms.PSet(
   dataSourceMode=cms.string("DMA"),
-  sourceId=cms.int32(2)
+  dmaSourceId=cms.int32(2)
 )
 
 # default parameters for the TCP source
@@ -23,4 +23,5 @@
   enableAllSums = cms.bool(True),
   # print all objects
   debug = cms.untracked.bool(False)
-)
+)
+
diff --git a/EventFilter/L1ScoutingRawToDigi/python/ScGMTRawToDigi_cfi.py b/EventFilter/L1ScoutingRawToDigi/python/ScGMTRawToDigi_cfi.py
@@ -7,3 +7,4 @@
   # print all objects
   debug = cms.untracked.bool(False)
 )
+
Original file line number	Diff line number	Diff line change
Expand Up		@@ -7,3 +7,4 @@
		# print all objects
		debug = cms.untracked.bool(False)
		)