Skip to content

TRD: Benefit from custom streamer for labels #3068

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
Mar 4, 2020
Merged

TRD: Benefit from custom streamer for labels #3068

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
fe340d8
TRD: Benefit from custom streamer for labels
sawenzel Mar 3, 2020
13b4eb6
Update analyzeDigitLabels.C
sawenzel Mar 3, 2020
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 DataFormats/simulation/include/SimulationDataFormat/MCCompLabel.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ class MCCompLabel
// mask for all used fields
static constexpr ULong64_t maskFull = (ul0x1 << (nbitsTrackID + nbitsEvID + nbitsSrcID)) - 1;

MCCompLabel(int trackID, int evID, int srcID, bool fake) { set(trackID, evID, srcID, fake); }
MCCompLabel(int trackID, int evID, int srcID, bool fake = false) { set(trackID, evID, srcID, fake); }
MCCompLabel(bool noise = false)
{
if (noise) {
Expand Down
12 changes: 1 addition & 11 deletions Detectors/TRD/base/include/TRDBase/MCLabel.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,17 +19,7 @@ namespace o2
{
namespace trd
{

class MCLabel : public o2::MCCompLabel
{
public:
MCLabel() = default;
MCLabel(int trackID, int eventID, int srcID)
: o2::MCCompLabel(trackID, eventID, srcID, false) {}

ClassDefNV(MCLabel, 1);
};

using MCLabel = o2::MCCompLabel;

@jolopezl jolopezl Mar 3, 2020 •
edited
Loading

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

With this change, I am wondering if we really need to keep o2::trd::MCLabel. I would suggest removing it, unless we want to keep it for future specializations. It is more direct and easier to maintain if we just o2::MCCompLabel as this is suggesting.

} // namespace trd
} // namespace o2

Expand Down
3 changes: 0 additions & 3 deletions Detectors/TRD/base/src/TRDBaseLinkDef.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@
#pragma link C++ class o2::trd::CalDet + ;
#pragma link C++ class o2::trd::CalROC + ;
#pragma link C++ class o2::trd::PadResponse + ;
#pragma link C++ class o2::trd::MCLabel + ;
#pragma link C++ class o2::trd::PadParameters < unsigned short > +;
#pragma link C++ class o2::trd::PadParameters < float > +;
#pragma link C++ class o2::trd::PadParameters < char > +;
Expand All @@ -46,6 +45,4 @@

#include "SimulationDataFormat/MCTruthContainer.h"

#pragma link C++ class o2::dataformats::MCTruthContainer < o2::trd::MCLabel> + ;

#endif
2 changes: 1 addition & 1 deletion macro/analyzeDigitLabels.C
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -245,7 +245,7 @@ void analyzeTOF(TTree* reftree)
void analyzeTRD(TTree* reftree)
{
LabelStats result;
analyse<o2::trd::MCLabel>(reftree, "TRDMCLabels", result);
analyse<o2::MCCompLabel>(reftree, "TRDMCLabels", result);
std::cout << gPrefix << " TRD ";
result.print();
}
Expand Down