Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix event content & run transition #35

Merged
merged 2 commits into from
Oct 4, 2017
Merged

Fix event content & run transition #35

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a23e554
Fix event content (namespace nanoaod missing in the nanoaod dataformats)
gpetruc Oct 4, 2017
3e9aab9
Call produces<> with edm::Transition::EndRun instead of edm::InRun (t…
gpetruc Oct 4, 2017
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
2 changes: 1 addition & 1 deletion PhysicsTools/NanoAOD/plugins/GenWeightsTableProducer.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ class GenWeightsTableProducer : public edm::global::EDProducer<edm::StreamCache<
produces<nanoaod::FlatTable>("LHEScale");
produces<nanoaod::FlatTable>("LHEPdf");
produces<nanoaod::FlatTable>("LHENamed");
produces<nanoaod::MergeableCounterTable,edm::InRun>();
produces<nanoaod::MergeableCounterTable,edm::Transition::EndRun>();
if (namedWeightIDs_.size() != namedWeightLabels_.size()) {
throw cms::Exception("Configuration", "Size mismatch between namedWeightIDs & namedWeightLabels");
}
Expand Down
2 changes: 1 addition & 1 deletion PhysicsTools/NanoAOD/plugins/NanoAODOutputModule.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -320,7 +320,7 @@ NanoAODOutputModule::fillDescriptions(edm::ConfigurationDescriptions& descriptio
->setComment("Change the OutputModule name in the fwk job report to fake PoolOutputModule. This is needed to run on cran (and publish) till crab is fixed");

//replace with whatever you want to get from the EDM by default
const std::vector<std::string> keep = {"drop *", "keep FlatTable_*Table_*_*", "keep edmTriggerResults_*_*_*", "keep MergeableCounterTable_*Table_*_*", "keep UniqueString_nanoMetadata_*_*"};
const std::vector<std::string> keep = {"drop *", "keep nanoaodFlatTable_*Table_*_*", "keep edmTriggerResults_*_*_*", "keep nanoaodMergeableCounterTable_*Table_*_*", "keep nanoaodUniqueString_nanoMetadata_*_*"};
edm::OutputModule::fillDescription(desc, keep);

//Used by Workflow management for their own meta data
Expand Down
6 changes: 3 additions & 3 deletions PhysicsTools/NanoAOD/python/NanoAODEDMEventContent_cff.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@
NanoAODEDMEventContent = cms.PSet(
outputCommands = cms.untracked.vstring(
'drop *',
"keep FlatTable_*Table_*_*", # event data
"keep nanoaodFlatTable_*Table_*_*", # event data
"keep edmTriggerResults_*_*_*", # event data
"keep MergeableCounterTable_*Table_*_*", # accumulated per/run or per/lumi data
"keep UniqueString_nanoMetadata_*_*", # basic metadata
"keep nanoaodMergeableCounterTable_*Table_*_*", # accumulated per/run or per/lumi data
"keep nanoaodUniqueString_nanoMetadata_*_*", # basic metadata
)
)

Expand Down