Skip to content

Commit

Permalink
Bug fix. Add 2 overrides to LHESource
Browse files Browse the repository at this point in the history 
Add readRunAuxiliary_ and readLuminosityBlockAuxiliary_
function overrides to LHESource. (also includes code-check
fixes and indentation fixes that remove inconsistencies and
tabs, but the only substantive changes are the 2 new functions).
Earlier changes in the Framework broke LHESource and the
addition of these two functions fixes the problem by setting
the ProcessHistoryID properly.
  • Loading branch information
@wddgit
wddgit committed Oct 10, 2017
1 parent dd401df commit 45a584d
Show file tree
Hide file tree
Showing 2 changed files with 198 additions and 172 deletions.
291 changes: 157 additions & 134 deletions GeneratorInterface/LHEInterface/plugins/LHESource.cc
View file
Expand Up @@ -17,6 +17,9 @@
#include "FWCore/Utilities/interface/TypeID.h"

#include "DataFormats/Common/interface/OrphanHandle.h"
#include "DataFormats/Provenance/interface/LuminosityBlockAuxiliary.h"
#include "DataFormats/Provenance/interface/RunAuxiliary.h"
#include "DataFormats/Provenance/interface/Timestamp.h"

#include "SimDataFormats/GeneratorProducts/interface/LesHouches.h"
#include "SimDataFormats/GeneratorProducts/interface/LHERunInfoProduct.h"
Expand All @@ -32,21 +35,21 @@ using namespace lhef;

LHESource::LHESource(const edm::ParameterSet &params,
const edm::InputSourceDescription &desc) :
ProducerSourceFromFiles(params, desc, false),
reader(new LHEReader(fileNames(), params.getUntrackedParameter<unsigned int>("skipEvents", 0))),
wasMerged(false),
lheProvenanceHelper_(edm::TypeID(typeid(LHEEventProduct)), edm::TypeID(typeid(LHERunInfoProduct)), productRegistryUpdate()),
phid_(),
runPrincipal_()
ProducerSourceFromFiles(params, desc, false),
reader(new LHEReader(fileNames(), params.getUntrackedParameter<unsigned int>("skipEvents", 0))),
wasMerged(false),
lheProvenanceHelper_(edm::TypeID(typeid(LHEEventProduct)), edm::TypeID(typeid(LHERunInfoProduct)), productRegistryUpdate()),
phid_(),
runPrincipal_()
{
nextEvent();
lheProvenanceHelper_.lheAugment(runInfo.get());
// Initialize metadata, and save the process history ID for use every event.
phid_ = lheProvenanceHelper_.lheInit(processHistoryRegistryForUpdate());

// These calls are not wanted, because the principals are used for putting the products.
//produces<LHEEventProduct>();
//produces<LHERunInfoProduct, edm::InRun>();
nextEvent();
lheProvenanceHelper_.lheAugment(runInfo.get());
// Initialize metadata, and save the process history ID for use every event.
phid_ = lheProvenanceHelper_.lheInit(processHistoryRegistryForUpdate());

// These calls are not wanted, because the principals are used for putting the products.
//produces<LHEEventProduct>();
//produces<LHERunInfoProduct, edm::InRun>();
}

LHESource::~LHESource()
Expand All @@ -55,60 +58,60 @@ LHESource::~LHESource()

void LHESource::endJob()
{
reader.reset();
reader.reset();
}

void LHESource::nextEvent()
{
if (partonLevel) {
return;
}

bool newFileOpened;
do {
newFileOpened = false;
partonLevel = reader->next(&newFileOpened);
} while (newFileOpened && !partonLevel);

if (!partonLevel) {
return;
if (partonLevel) {
return;
}

bool newFileOpened;
do {
newFileOpened = false;
partonLevel = reader->next(&newFileOpened);
} while (newFileOpened && !partonLevel);

if (!partonLevel) {
return;
}

boost::shared_ptr<LHERunInfo> runInfoThis = partonLevel->getRunInfo();
if (runInfoThis != runInfoLast) {
runInfo = runInfoThis;
runInfoLast = runInfoThis;
}
if (runInfo) {
std::auto_ptr<LHERunInfoProduct> product(
new LHERunInfoProduct(*runInfo->getHEPRUP()));
std::for_each(runInfo->getHeaders().begin(),
runInfo->getHeaders().end(),
boost::bind(
&LHERunInfoProduct::addHeader,
product.get(), _1));
std::for_each(runInfo->getComments().begin(),
runInfo->getComments().end(),
boost::bind(&LHERunInfoProduct::addComment,
product.get(), _1));

if (!runInfoProducts.empty()) {
if (runInfoProducts.front().mergeProduct(*product)) {
if (!wasMerged) {
runInfoProducts.pop_front();
runInfoProducts.push_front(product);
wasMerged = true;
}

boost::shared_ptr<LHERunInfo> runInfoThis = partonLevel->getRunInfo();
if (runInfoThis != runInfoLast) {
runInfo = runInfoThis;
runInfoLast = runInfoThis;
}
if (runInfo) {
std::auto_ptr<LHERunInfoProduct> product(
new LHERunInfoProduct(*runInfo->getHEPRUP()));
std::for_each(runInfo->getHeaders().begin(),
runInfo->getHeaders().end(),
boost::bind(
&LHERunInfoProduct::addHeader,
product.get(), _1));
std::for_each(runInfo->getComments().begin(),
runInfo->getComments().end(),
boost::bind(&LHERunInfoProduct::addComment,
product.get(), _1));

if (!runInfoProducts.empty()) {
if (runInfoProducts.front().mergeProduct(*product)) {
if (!wasMerged) {
runInfoProducts.pop_front();
runInfoProducts.push_front(product);
wasMerged = true;
}
} else {
lheProvenanceHelper_.lheAugment(runInfo.get());
// Initialize metadata, and save the process history ID for use every event.
phid_ = lheProvenanceHelper_.lheInit(processHistoryRegistryForUpdate());
resetRunAuxiliary();
}
}

runInfo.reset();
}
} else {
lheProvenanceHelper_.lheAugment(runInfo.get());
// Initialize metadata, and save the process history ID for use every event.
phid_ = lheProvenanceHelper_.lheInit(processHistoryRegistryForUpdate());
resetRunAuxiliary();
}
}

runInfo.reset();
}
}

// This is the only way we can now access the run principal.
Expand All @@ -127,89 +130,109 @@ LHESource::readLuminosityBlock_(edm::LuminosityBlockPrincipal& lumiPrincipal) {

void LHESource::beginRun(edm::Run&)
{
if (runInfoLast) {
runInfo = runInfoLast;

std::unique_ptr<LHERunInfoProduct> product(
new LHERunInfoProduct(*runInfo->getHEPRUP()));
std::for_each(runInfo->getHeaders().begin(),
runInfo->getHeaders().end(),
boost::bind(
&LHERunInfoProduct::addHeader,
product.get(), _1));
std::for_each(runInfo->getComments().begin(),
runInfo->getComments().end(),
boost::bind(&LHERunInfoProduct::addComment,
product.get(), _1));

// keep a copy around in case of merging
runInfoProducts.push_back(new LHERunInfoProduct(*product));
wasMerged = false;

std::unique_ptr<edm::WrapperBase> rdp(new edm::Wrapper<LHERunInfoProduct>(std::move(product)));
runPrincipal_->put(lheProvenanceHelper_.runProductBranchDescription_, std::move(rdp));

runInfo.reset();
}
if (runInfoLast) {
runInfo = runInfoLast;

std::unique_ptr<LHERunInfoProduct> product(
new LHERunInfoProduct(*runInfo->getHEPRUP()));
std::for_each(runInfo->getHeaders().begin(),
runInfo->getHeaders().end(),
boost::bind(
&LHERunInfoProduct::addHeader,
product.get(), _1));
std::for_each(runInfo->getComments().begin(),
runInfo->getComments().end(),
boost::bind(&LHERunInfoProduct::addComment,
product.get(), _1));

// keep a copy around in case of merging
runInfoProducts.push_back(new LHERunInfoProduct(*product));
wasMerged = false;

std::unique_ptr<edm::WrapperBase> rdp(new edm::Wrapper<LHERunInfoProduct>(std::move(product)));
runPrincipal_->put(lheProvenanceHelper_.runProductBranchDescription_, std::move(rdp));

runInfo.reset();
}
}

void LHESource::endRun(edm::Run&)
{
if (!runInfoProducts.empty()) {
std::unique_ptr<LHERunInfoProduct> product(
runInfoProducts.pop_front().release());
std::unique_ptr<edm::WrapperBase> rdp(new edm::Wrapper<LHERunInfoProduct>(std::move(product)));
runPrincipal_->put(lheProvenanceHelper_.runProductBranchDescription_, std::move(rdp));
}
runPrincipal_ = nullptr;
if (!runInfoProducts.empty()) {
std::unique_ptr<LHERunInfoProduct> product(
runInfoProducts.pop_front().release());
std::unique_ptr<edm::WrapperBase> rdp(new edm::Wrapper<LHERunInfoProduct>(std::move(product)));
runPrincipal_->put(lheProvenanceHelper_.runProductBranchDescription_, std::move(rdp));
}
runPrincipal_ = nullptr;
}

bool LHESource::setRunAndEventInfo(edm::EventID&, edm::TimeValue_t&, edm::EventAuxiliary::ExperimentType&)
{
nextEvent();
if (!partonLevel) {
// We just finished an input file. See if there is another.
nextEvent();
if (!partonLevel) {
// No more input files.
return false;
}
}
return true;
nextEvent();
if (!partonLevel) {
// We just finished an input file. See if there is another.
nextEvent();
if (!partonLevel) {
// No more input files.
return false;
}
}
return true;
}

void
LHESource::readEvent_(edm::EventPrincipal& eventPrincipal) {
assert(eventCached() || processingMode() != RunsLumisAndEvents);
edm::EventAuxiliary aux(eventID(), processGUID(), edm::Timestamp(presentTime()), false);
aux.setProcessHistoryID(phid_);
eventPrincipal.fillEventPrincipal(aux, processHistoryRegistryForUpdate());

std::unique_ptr<LHEEventProduct> product(
new LHEEventProduct(*partonLevel->getHEPEUP(),
partonLevel->originalXWGTUP())
);
if (partonLevel->getPDF()) {
product->setPDF(*partonLevel->getPDF());
}
std::for_each(partonLevel->weights().begin(),
partonLevel->weights().end(),
boost::bind(&LHEEventProduct::addWeight,
product.get(), _1));
product->setScales(partonLevel->scales());
product->setNpLO(partonLevel->npLO());
product->setNpNLO(partonLevel->npNLO());
std::for_each(partonLevel->getComments().begin(),
partonLevel->getComments().end(),
boost::bind(&LHEEventProduct::addComment,
product.get(), _1));

std::unique_ptr<edm::WrapperBase> edp(new edm::Wrapper<LHEEventProduct>(std::move(product)));
eventPrincipal.put(lheProvenanceHelper_.eventProductBranchDescription_, std::move(edp), lheProvenanceHelper_.eventProductProvenance_);

partonLevel.reset();

resetEventCached();
assert(eventCached() || processingMode() != RunsLumisAndEvents);
edm::EventAuxiliary aux(eventID(), processGUID(), edm::Timestamp(presentTime()), false);
aux.setProcessHistoryID(phid_);
eventPrincipal.fillEventPrincipal(aux, processHistoryRegistryForUpdate());

std::unique_ptr<LHEEventProduct> product(
new LHEEventProduct(*partonLevel->getHEPEUP(),
partonLevel->originalXWGTUP())
);
if (partonLevel->getPDF()) {
product->setPDF(*partonLevel->getPDF());
}
std::for_each(partonLevel->weights().begin(),
partonLevel->weights().end(),
boost::bind(&LHEEventProduct::addWeight,
product.get(), _1));
product->setScales(partonLevel->scales());
product->setNpLO(partonLevel->npLO());
product->setNpNLO(partonLevel->npNLO());
std::for_each(partonLevel->getComments().begin(),
partonLevel->getComments().end(),
boost::bind(&LHEEventProduct::addComment,
product.get(), _1));

std::unique_ptr<edm::WrapperBase> edp(new edm::Wrapper<LHEEventProduct>(std::move(product)));
eventPrincipal.put(lheProvenanceHelper_.eventProductBranchDescription_, std::move(edp), lheProvenanceHelper_.eventProductProvenance_);

partonLevel.reset();

resetEventCached();
}

std::shared_ptr<edm::RunAuxiliary>
LHESource::readRunAuxiliary_() {
edm::Timestamp ts = edm::Timestamp(presentTime());
resetNewRun();
auto aux = std::make_shared<edm::RunAuxiliary>(eventID().run(), ts, edm::Timestamp::invalidTimestamp());
aux->setProcessHistoryID(phid_);
return aux;
}

std::shared_ptr<edm::LuminosityBlockAuxiliary>
LHESource::readLuminosityBlockAuxiliary_() {
if (processingMode() == Runs) return std::shared_ptr<edm::LuminosityBlockAuxiliary>();
edm::Timestamp ts = edm::Timestamp(presentTime());
resetNewLumi();
auto aux = std::make_shared<edm::LuminosityBlockAuxiliary>(eventID().run(), eventID().luminosityBlock(),
ts, edm::Timestamp::invalidTimestamp());
aux->setProcessHistoryID(phid_);
return aux;
}

DEFINE_FWK_INPUT_SOURCE(LHESource);

0 comments on commit 45a584d

Please sign in to comment.