Skip to content

Data model: add extra information for run 2 evsel #13810

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
pzhristov merged 4 commits into from
Dec 18, 2024
Merged

Data model: add extra information for run 2 evsel #13810

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1d779d1
Data model: add extra information for run 2 evsel
ddobrigk Dec 17, 2024
6cccef5
Please consider the following formatting changes
alibuild Dec 17, 2024
9fff54a
Merge pull request #36 from alibuild/alibot-cleanup-13810
ddobrigk Dec 17, 2024
220a470
Fix bug
ddobrigk Dec 17, 2024
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
15 changes: 14 additions & 1 deletion Framework/Core/include/Framework/AnalysisDataModel.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1699,6 +1699,8 @@ DECLARE_SOA_COLUMN(SPDFiredFastOrL0, spdFiredFastOrL0, uint16_t); //! Fired
DECLARE_SOA_COLUMN(SPDFiredFastOrL1, spdFiredFastOrL1, uint16_t); //! Fired FASTOR signals in the first layer of the SPD (online)
DECLARE_SOA_COLUMN(V0TriggerChargeA, v0TriggerChargeA, uint16_t); //! V0A trigger charge
DECLARE_SOA_COLUMN(V0TriggerChargeC, v0TriggerChargeC, uint16_t); //! V0C trigger charge
DECLARE_SOA_COLUMN(NTPCClusters, nTPCClusters, uint32_t); //! total number of TPC clusters (for ev sel)
DECLARE_SOA_COLUMN(NSDDSSDClusters, nSDDSSDClusters, uint32_t); //! total number of SSD + SDD clusters (for ev sel)
namespace oftv0
{
DECLARE_SOA_INDEX_COLUMN(Collision, collision); //! Collision index
Expand All @@ -1721,12 +1723,23 @@ DECLARE_SOA_COLUMN(Mass, mass, float); //! mass
} // namespace oftv0
} // namespace run2

DECLARE_SOA_TABLE(Run2BCInfos, "AOD", "RUN2BCINFO", run2::EventCuts, //! Legacy information for Run 2 event selection
DECLARE_SOA_TABLE(Run2BCInfos_000, "AOD", "RUN2BCINFO", run2::EventCuts, //! Legacy information for Run 2 event selection
run2::TriggerMaskNext50, run2::L0TriggerInputMask,
run2::SPDClustersL0, run2::SPDClustersL1,
run2::SPDFiredChipsL0, run2::SPDFiredChipsL1,
run2::SPDFiredFastOrL0, run2::SPDFiredFastOrL1,
run2::V0TriggerChargeA, run2::V0TriggerChargeC);

DECLARE_SOA_TABLE_VERSIONED(Run2BCInfos_001, "AOD", "RUN2BCINFO", 1,
run2::EventCuts, //! Legacy information for Run 2 event selection
run2::TriggerMaskNext50, run2::L0TriggerInputMask,
run2::SPDClustersL0, run2::SPDClustersL1,
run2::SPDFiredChipsL0, run2::SPDFiredChipsL1,
run2::SPDFiredFastOrL0, run2::SPDFiredFastOrL1,
run2::V0TriggerChargeA, run2::V0TriggerChargeC,
run2::NTPCClusters, run2::NSDDSSDClusters);

using Run2BCInfos = Run2BCInfos_000;
Copy link
Contributor

@victor-gonzalez victor-gonzalez Dec 17, 2024

Choose a reason for hiding this comment

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

@ddobrigk Shouldn't be the 001 in place if there are going to be a converter?

Copy link
Contributor Author

@ddobrigk ddobrigk Dec 17, 2024

Choose a reason for hiding this comment

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

@victor-gonzalez no, step 1 is to keep using vwrsion 000, then step 2 is to add the converter, and then step 3 is to switch to version 001. This is as intended :-)

using Run2BCInfo = Run2BCInfos::iterator;

DECLARE_SOA_TABLE(Run2OTFV0s, "AOD", "Run2OTFV0", //! Run 2 V0 on the fly table
Expand Down
1 change: 1 addition & 0 deletions Framework/Core/include/Framework/DataTypes.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@ enum TrackFlagsRun2Enum {
FreeClsSPDTracklet = 0x1, // for SPD tracklets, tracklet from cluster not used in tracking
TPCrefit = 0x2,
GoldenChi2 = 0x4,
TPCout = 0x8
// NOTE Highest 4 (29..32) bits reserved for PID hypothesis
};
enum DetectorMapEnum : uint8_t {
Expand Down
Loading