Skip to content

Add ITS headers and improve invalid origin / description #388

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
ktf merged 1 commit into from
May 19, 2017
Merged

Add ITS headers and improve invalid origin / description #388

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions DataFormats/Headers/include/Headers/DataHeader.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -685,6 +685,7 @@ extern const o2::Header::DataOrigin gDataOriginInvalid;
extern const o2::Header::DataOrigin gDataOriginTPC;
extern const o2::Header::DataOrigin gDataOriginTRD;
extern const o2::Header::DataOrigin gDataOriginTOF;
extern const o2::Header::DataOrigin gDataOriginITS;

//possible data types
extern const o2::Header::DataDescription gDataDescriptionAny;
Expand Down
5 changes: 3 additions & 2 deletions DataFormats/Headers/src/DataHeader.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,14 +27,15 @@ const o2::Header::SerializationMethod o2::Header::gSerializationMethodFlatBuf("F
//__________________________________________________________________________________________________
//possible data origins
const o2::Header::DataOrigin o2::Header::gDataOriginAny ("***");
const o2::Header::DataOrigin o2::Header::gDataOriginInvalid(" ");
const o2::Header::DataOrigin o2::Header::gDataOriginInvalid("NIL");
const o2::Header::DataOrigin o2::Header::gDataOriginTPC ("TPC");
const o2::Header::DataOrigin o2::Header::gDataOriginTRD ("TRD");
const o2::Header::DataOrigin o2::Header::gDataOriginTOF ("TOF");
const o2::Header::DataOrigin o2::Header::gDataOriginITS ("ITS");

//possible data types
const o2::Header::DataDescription o2::Header::gDataDescriptionAny ("***************");
const o2::Header::DataDescription o2::Header::gDataDescriptionInvalid (" ");
const o2::Header::DataDescription o2::Header::gDataDescriptionInvalid ("INVALID ");
Copy link
Copy Markdown
Contributor

@mkrzewic mkrzewic May 19, 2017

Choose a reason for hiding this comment

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

do we keep INVALID here? Or should we also change it to NIL or so for consistency?

Copy link
Copy Markdown
Member Author

@ktf ktf May 19, 2017

Choose a reason for hiding this comment

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

I think we should avoid as much as possible to have the same values for origins and descriptions.

const o2::Header::DataDescription o2::Header::gDataDescriptionRawData ("RAWDATA ");
const o2::Header::DataDescription o2::Header::gDataDescriptionClusters("CLUSTERS ");
const o2::Header::DataDescription o2::Header::gDataDescriptionTracks ("TRACKS ");
Expand Down