Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -87,8 +87,7 @@
#you may need to set manually the GT in the line below
process.GlobalTag = gtCustomise(process.GlobalTag, 'auto:run3_hlt', '')


print("Will process with GlobalTag %s",process.GlobalTag.globaltag.value())
print("Will process with GlobalTag: %s" % process.GlobalTag.globaltag.value())

#--------------------------------------------
# Patch to avoid using Run Info information in reconstruction
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -128,5 +128,6 @@ def checkInputFolder(streamer_folder):
skipFirstLumis = cms.untracked.bool(options.skipFirstLumis),
deleteDatFiles = cms.untracked.bool(False),
endOfRunKills = cms.untracked.bool(False),
inputFileTransitionsEachEvent = cms.untracked.bool(False)
inputFileTransitionsEachEvent = cms.untracked.bool(False),
unitTest = cms.untracked.bool(True) # stop processing if the input data cannot be deserialized
)
10 changes: 5 additions & 5 deletions DQM/Integration/test/BuildFile.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
<test name="TestDQMOnlineClient-beam_dqm_sourceclient" command="runtest.sh beam_dqm_sourceclient-live_cfg.py"/>
<test name="TestDQMOnlineClient-beamhlt_dqm_sourceclient-legacy" command="runtest.sh beamhlt_dqm_sourceclient-live_cfg.py" /> <!-- To be removed once https://github.com/cms-sw/cmssw/issues/43108 is solved -->
<test name="TestDQMOnlineClient-beamhlt_dqm_sourceclient" command="runtest.sh beamhlt_dqm_sourceclient-live_cfg.py 370580"/>
<test name="TestDQMOnlineClient-beamhlt_dqm_sourceclient" command="runtest.sh beamhlt_dqm_sourceclient-live_cfg.py 381594"/>
<test name="TestDQMOnlineClient-beampixel_dqm_sourceclient" command="runtest.sh beampixel_dqm_sourceclient-live_cfg.py"/>
<test name="TestDQMOnlineClient-csc_dqm_sourceclient" command="runtest.sh csc_dqm_sourceclient-live_cfg.py"/>
<test name="TestDQMOnlineClient-ctpps_dqm_sourceclient" command="runtest.sh ctpps_dqm_sourceclient-live_cfg.py"/>
Expand All @@ -25,9 +24,10 @@
<test name="TestDQMOnlineClient-sistrip_dqm_sourceclient" command="runtest.sh sistrip_dqm_sourceclient-live_cfg.py"/>
<test name="TestDQMOnlineClient-sistrip_approx_dqm_sourceclient" command="runtest.sh sistrip_approx_dqm_sourceclient-live_cfg.py 362321 hi_run"/>
<test name="TestDQMOnlineClient-onlinebeammonitor_dqm_sourceclient" command="runtest.sh onlinebeammonitor_dqm_sourceclient-live_cfg.py"/>
<test name="TestDQMOnlineClient-ecalgpu_dqm_sourceclient" command="runtest.sh ecalgpu_dqm_sourceclient-live_cfg.py 373710"/>
<test name="TestDQMOnlineClient-hcalgpu_dqm_sourceclient" command="runtest.sh hcalgpu_dqm_sourceclient-live_cfg.py 373710"/>
<test name="TestDQMOnlineClient-pixelgpu_dqm_sourceclient" command="runtest.sh pixelgpu_dqm_sourceclient-live_cfg.py 373710"/>
<test name="TestDQMOnlineClient-ecalgpu_dqm_sourceclient" command="runtest.sh ecalgpu_dqm_sourceclient-live_cfg.py 381594"/>
<test name="TestDQMOnlineClient-hcalgpu_dqm_sourceclient" command="runtest.sh hcalgpu_dqm_sourceclient-live_cfg.py 381594"/>
<test name="TestDQMOnlineClient-pixelgpu_dqm_sourceclient" command="runtest.sh pixelgpu_dqm_sourceclient-live_cfg.py 381594"/>
<test name="TestDQMOnlineClient-pfgpu_dqm_sourceclient" command="runtest.sh pfgpu_dqm_sourceclient-live_cfg.py 381594"/>
<!-- streamDQMCalibration is required -->
<!-- <test name="TestDQMOnlineClient-ecalcalib_dqm_sourceclient" command="runtest.sh ecalcalib_dqm_sourceclient-live_cfg.py" /> -->
<!-- streamDQMCalibration is required -->
Expand Down
12 changes: 11 additions & 1 deletion DQMServices/StreamerIO/plugins/DQMStreamerReader.cc
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,8 @@ namespace dqmservices {
flagSkipFirstLumis_(pset.getUntrackedParameter<bool>("skipFirstLumis")),
flagEndOfRunKills_(pset.getUntrackedParameter<bool>("endOfRunKills")),
flagDeleteDatFiles_(pset.getUntrackedParameter<bool>("deleteDatFiles")),
hltSel_(pset.getUntrackedParameter<std::vector<std::string>>("SelectEvents")) {
hltSel_(pset.getUntrackedParameter<std::vector<std::string>>("SelectEvents")),
unitTest_(pset.getUntrackedParameter<bool>("unitTest", false)) {
setAcceptAllEvt();
reset_();
}
Expand Down Expand Up @@ -167,6 +168,12 @@ namespace dqmservices {
openFileImp_(currentLumi);
return true;
} catch (const cms::Exception& e) {
if (unitTest_) {
throw edm::Exception(edm::errors::FileReadError, "DQMStreamerReader::openNextFileInp")
<< std::string("Can't deserialize registry data (in open file): ") + e.what()
<< "\n error: data file corrupted";
}

fiterator_.logFileAction(std::string("Can't deserialize registry data (in open file): ") + e.what(), p);
fiterator_.logLumiState(currentLumi, "error: data file corrupted");

Expand Down Expand Up @@ -463,6 +470,9 @@ namespace dqmservices {
"Kill the processing as soon as the end-of-run file appears, even if "
"there are/will be unprocessed lumisections.");

desc.addUntracked<bool>("unitTest", false)
->setComment("Kill the processing if the input data cannot be deserialized");

// desc.addUntracked<unsigned int>("skipEvents", 0U)
// ->setComment("Skip the first 'skipEvents' events that otherwise would "
// "have been processed.");
Expand Down
1 change: 1 addition & 0 deletions DQMServices/StreamerIO/plugins/DQMStreamerReader.h
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@ namespace dqmservices {
bool const flagEndOfRunKills_;
bool const flagDeleteDatFiles_;
std::vector<std::string> const hltSel_;
bool const unitTest_;

bool acceptAllEvt_ = false;
bool setAcceptAllEvt();
Expand Down