-
Notifications
You must be signed in to change notification settings - Fork 620
[PWGHF] Add D*pi channel in B0 reduced workflow #12451
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.
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
Merged
Changes from 6 commits
Commits
Show all changes
12 commits
Select commit
Hold shift + click to select a range
3ab9242
Add D*pi channel in B0 reduced workflow
Marcellocosti 6311959
Please consider the following formatting changes
alibuild 5911f24
Fix megalinter
Marcellocosti 21835ac
Add include string
Marcellocosti 99ee022
Implement Vit comments
Marcellocosti c370d11
Remove massB0
Marcellocosti 3e77f58
Implement Fabrizio comments
Marcellocosti 2446055
Please consider the following formatting changes
alibuild 8a6b04e
Merge pull request #31 from alibuild/alibot-cleanup-12451
Marcellocosti e529118
Implement Fabrizio and Vit comments
Marcellocosti 953bb91
Please consider the following formatting changes
alibuild 6b3be6e
Merge pull request #32 from alibuild/alibot-cleanup-12451
Marcellocosti File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -293,25 +293,6 @@ DECLARE_SOA_TABLE(HfRedTracksCov, "AOD", "HFREDTRACKCOV", //! Table with track c | |
| HFTRACKPARCOV_COLUMNS, | ||
| o2::soa::Marker<1>); | ||
|
|
||
| DECLARE_SOA_TABLE(HfRedSoftPiBases, "AOD", "HFREDSOFTPIBASE", //! Table with track information for reduced workflow | ||
| soa::Index<>, | ||
| hf_track_index_reduced::TrackId, | ||
| hf_track_index_reduced::HfRedCollisionId, | ||
| HFTRACKPAR_COLUMNS, | ||
| hf_track_vars_reduced::ItsNCls, | ||
| hf_track_vars_reduced::TpcNClsCrossedRows, | ||
| hf_track_vars_reduced::TpcChi2NCl, | ||
| aod::track::Px<aod::track::Signed1Pt, aod::track::Snp, aod::track::Alpha>, | ||
| aod::track::Py<aod::track::Signed1Pt, aod::track::Snp, aod::track::Alpha>, | ||
| aod::track::Pz<aod::track::Signed1Pt, track::Tgl>, | ||
| aod::track::PVector<aod::track::Signed1Pt, aod::track::Snp, aod::track::Alpha, aod::track::Tgl>, | ||
| o2::soa::Marker<2>); | ||
|
|
||
| DECLARE_SOA_TABLE(HfRedSoftPiCov, "AOD", "HFREDSOFTPICOV", //! Table with track covariance information for reduced workflow | ||
| soa::Index<>, | ||
| HFTRACKPARCOV_COLUMNS, | ||
| o2::soa::Marker<2>); | ||
|
|
||
| // CAREFUL: need to follow convention [Name = Description + 's'] in DECLARE_SOA_TABLE(Name, "AOD", Description) | ||
| // to call DECLARE_SOA_INDEX_COLUMN_FULL later on | ||
| DECLARE_SOA_TABLE(HfRedBach0Bases, "AOD", "HFREDBACH0BASE", //! Table with track information for reduced workflow | ||
|
|
@@ -546,6 +527,68 @@ DECLARE_SOA_TABLE(HfRed2ProngsMl, "AOD", "HFRED2PRONGML", //! Table with 2prong | |
| hf_charm_cand_reduced::MlScorePromptMassHypo1, | ||
| hf_charm_cand_reduced::MlScoreNonpromptMassHypo1); | ||
|
|
||
| // CAREFUL: need to follow convention [Name = Description + 's'] in DECLARE_SOA_TABLE(Name, "AOD", Description) | ||
| // to call DECLARE_SOA_INDEX_COLUMN_FULL later on | ||
| DECLARE_SOA_TABLE(HfRedSoftPiBases, "AOD", "HFREDSOFTPIBASE", //! Table with track information for reduced workflow | ||
| soa::Index<>, | ||
| hf_track_index_reduced::TrackId, | ||
| hf_track_index_reduced::HfRedCollisionId, | ||
| HFTRACKPAR_COLUMNS, | ||
| hf_track_vars_reduced::ItsNCls, | ||
| hf_track_vars_reduced::TpcNClsCrossedRows, | ||
| hf_track_vars_reduced::TpcChi2NCl, | ||
| aod::track::Px<aod::track::Signed1Pt, aod::track::Snp, aod::track::Alpha>, | ||
| aod::track::Py<aod::track::Signed1Pt, aod::track::Snp, aod::track::Alpha>, | ||
| aod::track::Pz<aod::track::Signed1Pt, track::Tgl>, | ||
| aod::track::PVector<aod::track::Signed1Pt, aod::track::Snp, aod::track::Alpha, aod::track::Tgl>); | ||
|
|
||
| DECLARE_SOA_TABLE(HfRedSoftPiCov, "AOD", "HFREDSOFTPICOV", //! Table with track covariance information for reduced workflow | ||
| soa::Index<>, | ||
| HFTRACKPARCOV_COLUMNS, | ||
| o2::soa::Marker<2>); | ||
|
|
||
| DECLARE_SOA_TABLE(HfRedSoftPiPid, "AOD", "HFREDSOFTPIPID", | ||
| soa::Index<>, | ||
| hf_cand_dstar::TPCNSigmaPiSoftPi, | ||
| hf_cand_dstar::TOFNSigmaPiSoftPi, | ||
| hf_cand_dstar::TPCNSigmaKaSoftPi, | ||
| hf_cand_dstar::TOFNSigmaKaSoftPi, | ||
| hf_track_vars_reduced::HasTOF, | ||
| hf_track_vars_reduced::HasTPC, | ||
| hf_cand_dstar::TPCTOFNSigmaPiSoftPi<hf_cand_dstar::TPCNSigmaPiSoftPi, hf_cand_dstar::TOFNSigmaPiSoftPi>, | ||
| hf_cand_dstar::TPCTOFNSigmaKaSoftPi<hf_cand_dstar::TPCNSigmaKaSoftPi, hf_cand_dstar::TOFNSigmaKaSoftPi>) | ||
|
|
||
| namespace hf_track_index_reduced | ||
| { | ||
| DECLARE_SOA_INDEX_COLUMN_FULL(SoftPi, softPi, int, HfRedSoftPiBases, ""); //! ReducedCollision index | ||
| }; // namespace hf_track_index_reduced | ||
|
|
||
| // CAREFUL: need to follow convention [Name = Description + 's'] in DECLARE_SOA_TABLE(Name, "AOD", Description) | ||
| // to call DECLARE_SOA_INDEX_COLUMN_FULL later on | ||
| DECLARE_SOA_TABLE(HfRedDStars, "AOD", "HFREDDSTAR", //! Table with 2prong candidate information for reduced workflow | ||
fgrosa marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
| o2::soa::Index<>, | ||
| hf_track_index_reduced::Prong0Id, hf_track_index_reduced::Prong1Id, hf_track_index_reduced::Prong2Id, | ||
fgrosa marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
| hf_track_index_reduced::SoftPiId, hf_track_index_reduced::HfRedCollisionId, | ||
| HFTRACKPAR_COLUMNS, | ||
| hf_cand::XSecondaryVertex, hf_cand::YSecondaryVertex, hf_cand::ZSecondaryVertex, | ||
| hf_charm_cand_reduced::InvMassHypo0, hf_charm_cand_reduced::InvMassHypo1, | ||
| hf_track_vars_reduced::PtProngMin, hf_track_vars_reduced::AbsEtaProngMin, | ||
| hf_track_vars_reduced::ItsNClsProngMin, hf_track_vars_reduced::TpcNClsCrossedRowsProngMin, hf_track_vars_reduced::TpcChi2NClProngMax, | ||
| aod::track::Px<aod::track::Signed1Pt, aod::track::Snp, aod::track::Alpha>, | ||
| aod::track::Py<aod::track::Signed1Pt, aod::track::Snp, aod::track::Alpha>, | ||
| aod::track::Pz<aod::track::Signed1Pt, track::Tgl>, | ||
| aod::track::PVector<aod::track::Signed1Pt, aod::track::Snp, aod::track::Alpha, aod::track::Tgl>); | ||
|
|
||
| DECLARE_SOA_TABLE(HfRedDStarsCov, "AOD", "HFREDDSTARCOV", //! Table with DStar candidate covariance for reduced workflow | ||
| o2::soa::Index<>, | ||
| HFTRACKPARCOV_COLUMNS, | ||
| o2::soa::Marker<1>); | ||
|
|
||
| DECLARE_SOA_TABLE(HfRedDStarsMl, "AOD", "HFREDDSTARML", //! Table with DStar candidate ML scores | ||
| hf_charm_cand_reduced::MlScoreBkgMassHypo0, | ||
| hf_charm_cand_reduced::MlScorePromptMassHypo0, | ||
| hf_charm_cand_reduced::MlScoreNonpromptMassHypo0); | ||
|
|
||
| // CAREFUL: need to follow convention [Name = Description + 's'] in DECLARE_SOA_TABLE(Name, "AOD", Description) | ||
| // to call DECLARE_SOA_INDEX_COLUMN_FULL later on | ||
| DECLARE_SOA_TABLE(HfRed3Prongs, "AOD", "HFRED3PRONG", //! Table with 3prong candidate information for reduced workflow | ||
|
|
@@ -711,11 +754,20 @@ using HfRedPidDau2s = HfRedPidDau2s_001; | |
| using HfRedPidDau0 = HfRedPidDau0s::iterator; | ||
| using HfRedPidDau1 = HfRedPidDau1s::iterator; | ||
| using HfRedPidDau2 = HfRedPidDau2s::iterator; | ||
|
|
||
| DECLARE_SOA_TABLE(HfRedB0SoftPi, "AOD", "HFREDB0SOFTPI", //! Table with track information for reduced workflow | ||
fgrosa marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
| o2::soa::Index<>, | ||
| hf_track_index::CollisionId, | ||
| hf_cand_dstar::PxSoftPi, hf_cand_dstar::PySoftPi, hf_cand_dstar::PzSoftPi, | ||
| hf_cand_dstar::DcaYSoftPi, hf_cand_dstar::SigmaYSoftPi); | ||
|
|
||
| // Beauty candidates prongs | ||
| namespace hf_cand_b0_reduced | ||
| { | ||
| DECLARE_SOA_INDEX_COLUMN_FULL(Prong0, prong0, int, HfRed3Prongs, "_0"); //! Prong0 index | ||
| DECLARE_SOA_INDEX_COLUMN_FULL(Prong1, prong1, int, HfRedTrackBases, "_1"); //! Prong1 index | ||
| DECLARE_SOA_INDEX_COLUMN_FULL(ProngDStar, prongDStar, int, HfRedDStars, ""); //! ProngDStar index | ||
| DECLARE_SOA_INDEX_COLUMN_FULL(ProngSoftPi, prongSoftPi, int, HfRedB0SoftPi, ""); //! ProngSoftPi index | ||
| DECLARE_SOA_COLUMN(Prong0MlScoreBkg, prong0MlScoreBkg, float); //! Bkg ML score of the D daughter | ||
| DECLARE_SOA_COLUMN(Prong0MlScorePrompt, prong0MlScorePrompt, float); //! Prompt ML score of the D daughter | ||
| DECLARE_SOA_COLUMN(Prong0MlScoreNonprompt, prong0MlScoreNonprompt, float); //! Nonprompt ML score of the D daughter | ||
|
|
@@ -724,13 +776,17 @@ DECLARE_SOA_COLUMN(Prong0MlScoreNonprompt, prong0MlScoreNonprompt, float); //! N | |
| DECLARE_SOA_TABLE(HfRedB0Prongs, "AOD", "HFREDB0PRONG", //! Table with B0 daughter indices | ||
| hf_cand_b0_reduced::Prong0Id, hf_cand_b0_reduced::Prong1Id); | ||
|
|
||
| DECLARE_SOA_TABLE(HfRedB0ProngDStars, "AOD", "HFREDB0PRONGDST", //! Table with B0 daughter indices | ||
| hf_cand_b0_reduced::ProngDStarId, hf_cand_b0_reduced::Prong1Id, hf_cand_b0_reduced::ProngSoftPiId); | ||
|
||
|
|
||
| DECLARE_SOA_TABLE(HfRedB0DpMls, "AOD", "HFREDB0DPML", //! Table with ML scores for the D+ daughter | ||
| hf_cand_b0_reduced::Prong0MlScoreBkg, | ||
| hf_cand_b0_reduced::Prong0MlScorePrompt, | ||
| hf_cand_b0_reduced::Prong0MlScoreNonprompt, | ||
| o2::soa::Marker<1>); | ||
|
|
||
| using HfRedCandB0 = soa::Join<HfCandB0Ext, HfRedB0Prongs>; | ||
| using HfRedCandB0DStar = soa::Join<HfCandB0Ext, HfRedB0ProngDStars>; | ||
|
|
||
| namespace hf_cand_bplus_reduced | ||
| { | ||
|
|
@@ -848,6 +904,16 @@ DECLARE_SOA_TABLE(HfMcCheckDpPis, "AOD", "HFMCCHECKDPPI", //! Table with reconst | |
| hf_b0_mc::PdgCodeProng3, | ||
| o2::soa::Marker<1>); | ||
|
|
||
| // table with results of reconstruction level MC matching | ||
| DECLARE_SOA_TABLE(HfMcRecRedDStarPis, "AOD", "HFMCRECREDDSTPI", //! Table with reconstructed MC information on DStarPi pairs for reduced workflow | ||
| hf_cand_b0_reduced::ProngDStarId, | ||
fgrosa marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
| hf_cand_b0_reduced::Prong1Id, | ||
| hf_cand_b0_reduced::ProngSoftPiId, | ||
| hf_cand_b0::FlagMcMatchRec, | ||
| hf_cand_b0::FlagWrongCollision, | ||
| hf_cand_b0::DebugMcRec, | ||
| hf_b0_mc::PtMother); | ||
|
|
||
| // Table with same size as HFCANDB0 | ||
| DECLARE_SOA_TABLE(HfMcRecRedB0s, "AOD", "HFMCRECREDB0", //! Reconstruction-level MC information on B0 candidates for reduced workflow | ||
| hf_cand_b0::FlagMcMatchRec, | ||
|
|
||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.