Merge pull request #11536 from smorovic/add-checksum-param-75X

Checksum parameter cfi export (75X)
cms-sw · Oct 12, 2015 · 741f882 · 741f882
2 parents 560a615 + 6a5ad2f
commit 741f882
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/EventFilter/Utilities/plugins/FedRawDataInputSource.cc b/EventFilter/Utilities/plugins/FedRawDataInputSource.cc
@@ -55,13 +55,13 @@ FedRawDataInputSource::FedRawDataInputSource(edm::ParameterSet const& pset,
                                              edm::InputSourceDescription const& desc) :
   edm::RawInputSource(pset, desc),
   defPath_(pset.getUntrackedParameter<std::string> ("buDefPath", std::string(getenv("CMSSW_BASE"))+"/src/EventFilter/Utilities/plugins/budef.jsd")),
-  eventChunkSize_(pset.getUntrackedParameter<unsigned int> ("eventChunkSize",16)*1048576),
+  eventChunkSize_(pset.getUntrackedParameter<unsigned int> ("eventChunkSize",32)*1048576),
   eventChunkBlock_(pset.getUntrackedParameter<unsigned int> ("eventChunkBlock",eventChunkSize_/1048576)*1048576),
-  numBuffers_(pset.getUntrackedParameter<unsigned int> ("numBuffers",1)),
+  numBuffers_(pset.getUntrackedParameter<unsigned int> ("numBuffers",2)),
   maxBufferedFiles_(pset.getUntrackedParameter<unsigned int> ("maxBufferedFiles",2)),
   getLSFromFilename_(pset.getUntrackedParameter<bool> ("getLSFromFilename", true)),
   verifyAdler32_(pset.getUntrackedParameter<bool> ("verifyAdler32", true)),
-  verifyChecksum_(pset.getUntrackedParameter<bool> ("verifyChecksum", true)),
+  verifyChecksum_(pset.getUntrackedParameter<bool> ("verifyChecksum", verifyAdler32_)),
   useL1EventID_(pset.getUntrackedParameter<bool> ("useL1EventID", false)),
   runNumber_(edm::Service<evf::EvFDaqDirector>()->getRunNumber()),
   fuOutputDir_(edm::Service<evf::EvFDaqDirector>()->baseRunDir()),

diff --git a/EventFilter/Utilities/python/EvFDaqDirector_cfi.py b/EventFilter/Utilities/python/EvFDaqDirector_cfi.py
@@ -7,6 +7,7 @@
     outputAdler32Recheck=cms.untracked.bool(False),
     requireTransfersPSet=cms.untracked.bool(False),
     selectedTransferMode=cms.untracked.string(""),
-    fuLockPollInterval = cms.untracked.uint32(2000)
+    fuLockPollInterval = cms.untracked.uint32(2000),
+    emptyLumisectionMode = cms.untracked.bool(True)
     )
 
diff --git a/EventFilter/Utilities/python/FedRawDataInputSource_cfi.py b/EventFilter/Utilities/python/FedRawDataInputSource_cfi.py
@@ -5,7 +5,9 @@
     eventChunkSize = cms.untracked.uint32(32),
     eventChunkBlock = cms.untracked.uint32(32),
     numBuffers = cms.untracked.uint32(2),
+    maxBufferedFiles = cms.untracked.uint32(2),
     verifyAdler32 = cms.untracked.bool(True),
+    verifyChecksum = cms.untracked.bool(True),
     useL1EventID = cms.untracked.bool(False)
     )