Skip to content
Permalink

Comparing changes

This is a direct comparison between two commits made in this repository or its related repositories. View the default comparison for this range or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: key4hep/k4MarlinWrapper
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 732585793762a793c563e7abc422dd0218cbd790
Choose a base ref
..
head repository: key4hep/k4MarlinWrapper
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: b2e19a4ac03f6908e570399365e1063c427719f6
Choose a head ref
Showing with 4 additions and 4 deletions.
  1. +2 −2 k4MarlinWrapper/src/components/Lcio2EDM4hep.cpp
  2. +2 −2 k4MarlinWrapper/src/components/LcioEventOutput.cpp
4 changes: 2 additions & 2 deletions k4MarlinWrapper/src/components/Lcio2EDM4hep.cpp
Original file line number Diff line number Diff line change
@@ -177,11 +177,11 @@ StatusCode Lcio2EDM4hepTool::convertCollections(lcio::LCEventImpl* the_event) {
// We deal with subset collections and LCRelations once we have all data
// converted
if (lcio_coll->isSubset()) {
subsetColls.emplace_back(std::make_tuple(edm4hepName, lcio_coll, lcio_coll_type_str));
subsetColls.emplace_back(edm4hepName, lcio_coll, lcio_coll_type_str);
continue;
}
if (lcio_coll_type_str == "LCRelation") {
lcRelationColls.emplace_back(std::make_pair(edm4hepName, lcio_coll));
lcRelationColls.emplace_back(edm4hepName, lcio_coll);
}
if (lcio_coll_type_str == "ReconstructedParticle") {
// Collect the ParticleID meta information because that has to go to the
4 changes: 2 additions & 2 deletions k4MarlinWrapper/src/components/LcioEventOutput.cpp
Original file line number Diff line number Diff line change
@@ -110,12 +110,12 @@ void LcioEventOutput::dropCollections(lcio::LCEventImpl* event, std::vector<lcio
// don't store hit pointers if hits are dropped
if (evt_coll_type == lcio::LCIO::TRACK && th_drop) {
std::bitset<32> flag(evt_coll->getFlag());
flag[lcio::LCIO::TRBIT_HITS] = 0;
flag[lcio::LCIO::TRBIT_HITS] = false;
evt_coll->setFlag(flag.to_ulong());
}
if (evt_coll_type == lcio::LCIO::CLUSTER && ch_drop) {
std::bitset<32> flag(evt_coll->getFlag());
flag[lcio::LCIO::CLBIT_HITS] = 0;
flag[lcio::LCIO::CLBIT_HITS] = false;
evt_coll->setFlag(flag.to_ulong());
}
}