Skip to content

Bring back info treatment in MCEventHeader #5163

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

Merged
sawenzel merged 2 commits into from
Jan 12, 2021
Merged

Bring back info treatment in MCEventHeader #5163

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
97c20d6
O2HitMerger: Use non-owning MCEventHeader
sawenzel Jan 12, 2021
72b20aa
Revert "Revert "Populate event header with information of the current…
sawenzel Jan 12, 2021
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
6 changes: 6 additions & 0 deletions DataFormats/simulation/include/SimulationDataFormat/MCEventHeader.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,12 @@ class MCEventHeader : public FairMCEventHeader
return ref;
};

/// prints a summary of info keys/types attached to this header
void printInfo() const
{
mEventInfo.print();
}

/** methods **/
virtual void Reset();

Expand Down
24 changes: 23 additions & 1 deletion Generators/src/GeneratorPythia8.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,15 +196,37 @@ void GeneratorPythia8::updateHeader(o2::dataformats::MCEventHeader* eventHeader)
{
/** update header **/

eventHeader->putInfo<std::string>("generator", "pythia8");
eventHeader->putInfo<int>("version", PYTHIA_VERSION_INTEGER);

#if PYTHIA_VERSION_INTEGER < 8300
auto hiinfo = mPythia.info.hiinfo;
#else
auto hiinfo = mPythia.info.hiInfo;
#endif

/** set impact parameter if in heavy-ion mode **/
if (hiinfo) {
/** set impact parameter **/
eventHeader->SetB(hiinfo->b());
eventHeader->putInfo<double>("Bimpact", hiinfo->b());
/** set Ncoll, Npart and Nremn **/
int nColl, nPart;
int nPartProtonProj, nPartNeutronProj, nPartProtonTarg, nPartNeutronTarg;
int nRemnProtonProj, nRemnNeutronProj, nRemnProtonTarg, nRemnNeutronTarg;
getNcoll(nColl);
getNpart(nPart);
getNpart(nPartProtonProj, nPartNeutronProj, nPartProtonTarg, nPartNeutronTarg);
getNremn(nRemnProtonProj, nRemnNeutronProj, nRemnProtonTarg, nRemnNeutronTarg);
eventHeader->putInfo<int>("Ncoll", nColl);
eventHeader->putInfo<int>("Npart", nPart);
eventHeader->putInfo<int>("Npart_proj_p", nPartProtonProj);
eventHeader->putInfo<int>("Npart_proj_n", nPartNeutronProj);
eventHeader->putInfo<int>("Npart_targ_p", nPartProtonTarg);
eventHeader->putInfo<int>("Npart_targ_n", nPartNeutronTarg);
eventHeader->putInfo<int>("Nremn_proj_p", nRemnProtonProj);
eventHeader->putInfo<int>("Nremn_proj_n", nRemnNeutronProj);
eventHeader->putInfo<int>("Nremn_targ_p", nRemnProtonTarg);
eventHeader->putInfo<int>("Nremn_targ_n", nRemnNeutronTarg);
}
}

Expand Down
12 changes: 6 additions & 6 deletions run/O2HitMerger.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -551,7 +551,7 @@ class O2HitMerger : public FairMQDevice
std::vector<int> nprimaries; // collecting primary particles in each subevent
std::vector<int> nsubevents; // collecting of subevent numbers

std::unique_ptr<o2::dataformats::MCEventHeader> eventheader; // The event header
o2::dataformats::MCEventHeader* eventheader = nullptr; // The event header

// the MC labels (trackID) for hits
o2::data::SubEventInfo* info = nullptr;
Expand All @@ -562,9 +562,9 @@ class O2HitMerger : public FairMQDevice
trackoffsets.emplace_back(info->npersistenttracks);
nprimaries.emplace_back(info->nprimarytracks);
nsubevents.emplace_back(info->part);
info->mMCEventHeader.printInfo();
if (eventheader == nullptr) {
eventheader = std::unique_ptr<dataformats::MCEventHeader>(
new dataformats::MCEventHeader(info->mMCEventHeader));
eventheader = &info->mMCEventHeader;
} else {
eventheader->getMCEventStats().add(info->mMCEventHeader.getMCEventStats());
}
Expand All @@ -580,9 +580,9 @@ class O2HitMerger : public FairMQDevice
}

// put the event headers into the new TTree
o2::dataformats::MCEventHeader* headerptr = eventheader.get();
auto headerbr = o2::base::getOrMakeBranch(*mOutTree, "MCEventHeader.", &headerptr);
headerbr->SetAddress(&headerptr);
eventheader->printInfo();
auto headerbr = o2::base::getOrMakeBranch(*mOutTree, "MCEventHeader.", &eventheader);
headerbr->SetAddress(&eventheader);
headerbr->Fill();
headerbr->ResetAddress();

Expand Down