Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
45 commits
Select commit Hold shift + click to select a range
d1b0c89
add task for p-Dplus femto
Yunfan-Liu Jul 17, 2025
815cfcf
add task for p-Dplus femto
Yunfan-Liu Jul 17, 2025
50f1a89
Please consider the following formatting changes
alibuild Jul 17, 2025
7cf67bc
Merge pull request #24 from alibuild/alibot-cleanup-12102
Yunfan-Liu Jul 17, 2025
c845ad5
implement table producing for p-Dplus femto
Yunfan-Liu Jul 18, 2025
0f75be8
Delete PWGHF/HFC/TableProducer/femtoDreamProducerDplus.cxx
Yunfan-Liu Jul 18, 2025
55c1b8a
Update CMakeLists.txt
Yunfan-Liu Jul 18, 2025
2f9a51f
Update CMakeLists.txt
Yunfan-Liu Jul 18, 2025
6e91f47
Update femtoDreamProducer.cxx
Yunfan-Liu Jul 18, 2025
76ccef9
Please consider the following formatting changes
alibuild Jul 18, 2025
51cec53
Merge pull request #25 from alibuild/alibot-cleanup-12102
Yunfan-Liu Jul 18, 2025
6a13088
Update taskCharmHadronsFemtoDream.cxx
Yunfan-Liu Jul 18, 2025
1900630
Update femtoDreamProducer.cxx
Yunfan-Liu Jul 18, 2025
8acaec6
Please consider the following formatting changes
alibuild Jul 18, 2025
2538f03
Merge pull request #26 from alibuild/alibot-cleanup-12102
Yunfan-Liu Jul 18, 2025
5d29b11
Update PWGHF/HFC/TableProducer/femtoDreamProducer.cxx
Yunfan-Liu Jul 21, 2025
2089657
Update PWGHF/HFC/TableProducer/femtoDreamProducer.cxx
Yunfan-Liu Jul 21, 2025
51e2685
Update PWGHF/HFC/TableProducer/femtoDreamProducer.cxx
Yunfan-Liu Jul 21, 2025
a64fcc9
add flag for p-Dplus femto
Yunfan-Liu Jul 28, 2025
dc2d10f
Please consider the following formatting changes
alibuild Jul 28, 2025
946cc62
Update femtoDreamProducer.cxx
Yunfan-Liu Jul 28, 2025
b7d1b09
Merge pull request #27 from alibuild/alibot-cleanup-12102
Yunfan-Liu Jul 28, 2025
a618c1b
Please consider the following formatting changes
alibuild Jul 28, 2025
ad0eab2
Merge pull request #28 from alibuild/alibot-cleanup-12102
Yunfan-Liu Jul 28, 2025
6684abe
Update femtoDreamProducer.cxx
Yunfan-Liu Jul 28, 2025
3428e73
Please consider the following formatting changes
alibuild Jul 28, 2025
7c92dc9
Merge pull request #29 from alibuild/alibot-cleanup-12102
Yunfan-Liu Jul 28, 2025
c923c55
Update femtoDreamContainer.h
Yunfan-Liu Aug 5, 2025
2cad3a6
Update taskCharmHadronsFemtoDream.cxx
Yunfan-Liu Aug 5, 2025
b8c700e
Update taskCharmHadronsFemtoDream.cxx
Yunfan-Liu Aug 5, 2025
8114a17
Please consider the following formatting changes
alibuild Aug 5, 2025
a84ed5a
Merge pull request #30 from alibuild/alibot-cleanup-12102
Yunfan-Liu Aug 5, 2025
bb90b34
Update taskCharmHadronsFemtoDream.cxx
Yunfan-Liu Aug 5, 2025
a7fdde0
Update taskCharmHadronsFemtoDream.cxx
Yunfan-Liu Aug 5, 2025
fcb44fa
Update taskCharmHadronsFemtoDream.cxx
Yunfan-Liu Aug 5, 2025
f83ebf4
Update taskCharmHadronsFemtoDream.cxx
Yunfan-Liu Aug 5, 2025
12e029e
Please consider the following formatting changes
alibuild Aug 5, 2025
a4930a9
Merge pull request #31 from alibuild/alibot-cleanup-12102
Yunfan-Liu Aug 5, 2025
c7a43ff
fix the linter errors in taskCharmHadronsFemtoDream.cxx
Yunfan-Liu Aug 5, 2025
2806afe
Please consider the following formatting changes
alibuild Aug 5, 2025
03f4713
Merge pull request #32 from alibuild/alibot-cleanup-12102
Yunfan-Liu Aug 5, 2025
3c36e42
fix the linter errors in taskCharmHadronsFemtoDream.cxx
Yunfan-Liu Aug 5, 2025
b9a20b4
Use UpperCamelCase for names of constexpr constants.
Yunfan-Liu Aug 5, 2025
755c17d
Add #include <utility> for std::move
Yunfan-Liu Aug 5, 2025
020bc07
Fix Compilation Errors in femtoDreamContainer.h
Yunfan-Liu Aug 5, 2025
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
5 changes: 3 additions & 2 deletions PWGCF/DataModel/FemtoDerived.h
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright 2019-2025 CERN and copyright holders of ALICE O2.

Check failure on line 1 in PWGCF/DataModel/FemtoDerived.h

View workflow job for this annotation

GitHub Actions / O2 linter

[doc/file]

Provide mandatory file documentation.
// See https://alice-o2.web.cern.ch/copyright for details of the copyright holders.
// All rights not expressly granted are reserved.
//
Expand All @@ -8,7 +8,7 @@
// In applying this license CERN does not waive the privileges and immunities
// granted to it by virtue of its status as an Intergovernmental Organization
// or submit itself to any jurisdiction.

Check failure on line 11 in PWGCF/DataModel/FemtoDerived.h

View workflow job for this annotation

GitHub Actions / O2 linter

[doc/file]

Documentation for \author is missing, incorrect or misplaced.

Check failure on line 11 in PWGCF/DataModel/FemtoDerived.h

View workflow job for this annotation

GitHub Actions / O2 linter

[doc/file]

Documentation for \brief is missing, incorrect or misplaced.

Check failure on line 11 in PWGCF/DataModel/FemtoDerived.h

View workflow job for this annotation

GitHub Actions / O2 linter

[doc/file]

Documentation for \file is missing, incorrect or misplaced.
#ifndef PWGCF_DATAMODEL_FEMTODERIVED_H_
#define PWGCF_DATAMODEL_FEMTODERIVED_H_

Expand Down Expand Up @@ -45,9 +45,9 @@

using BitMaskType = uint32_t; //! Definition of the data type for the collision masks

DECLARE_SOA_COLUMN(BitMaskTrackOne, bitmaskTrackOne, BitMaskType); //! Bit for track one

Check failure on line 48 in PWGCF/DataModel/FemtoDerived.h

View workflow job for this annotation

GitHub Actions / O2 linter

[name/o2-column]

Use UpperCamelCase for names of O2 columns and matching lowerCamelCase names for their getters.
DECLARE_SOA_COLUMN(BitMaskTrackTwo, bitmaskTrackTwo, BitMaskType); //! Bit for track two

Check failure on line 49 in PWGCF/DataModel/FemtoDerived.h

View workflow job for this annotation

GitHub Actions / O2 linter

[name/o2-column]

Use UpperCamelCase for names of O2 columns and matching lowerCamelCase names for their getters.
DECLARE_SOA_COLUMN(BitMaskTrackThree, bitmaskTrackThree, BitMaskType); //! Bit for track three

Check failure on line 50 in PWGCF/DataModel/FemtoDerived.h

View workflow job for this annotation

GitHub Actions / O2 linter

[name/o2-column]

Use UpperCamelCase for names of O2 columns and matching lowerCamelCase names for their getters.

DECLARE_SOA_COLUMN(Downsample, downsample, bool); //! Flag for downsampling
} // namespace femtodreamcollision
Expand Down Expand Up @@ -81,7 +81,7 @@

namespace mcfdcolllabel
{
DECLARE_SOA_INDEX_COLUMN(FDMCCollision, fdMCCollision); //! MC collision for femtodreamcollision

Check failure on line 84 in PWGCF/DataModel/FemtoDerived.h

View workflow job for this annotation

GitHub Actions / O2 linter

[name/o2-column]

Use UpperCamelCase for names of O2 columns and matching lowerCamelCase names for their getters.
}
DECLARE_SOA_TABLE_STAGED(FDMCCollLabels, "FDMCCollLabel", mcfdcolllabel::FDMCCollisionId);

Expand Down Expand Up @@ -122,13 +122,13 @@

static constexpr std::string_view TrackTypeName[kNTrackTypes] = {"Trk", "Pos", "Neg", "Bach"}; //! Naming of the different particle types

DECLARE_SOA_INDEX_COLUMN(FDCollision, fdCollision);

Check failure on line 125 in PWGCF/DataModel/FemtoDerived.h

View workflow job for this annotation

GitHub Actions / O2 linter

[name/o2-column]

Use UpperCamelCase for names of O2 columns and matching lowerCamelCase names for their getters.
DECLARE_SOA_COLUMN(Pt, pt, float); //! p_T (GeV/c)
DECLARE_SOA_COLUMN(Eta, eta, float); //! Eta
DECLARE_SOA_COLUMN(Phi, phi, float); //! Phi
DECLARE_SOA_COLUMN(PartType, partType, uint8_t); //! Type of the particle, according to femtodreamparticle::ParticleType
DECLARE_SOA_COLUMN(Cut, cut, cutContainerType); //! Bit-wise container for the different selection criteria
DECLARE_SOA_COLUMN(PIDCut, pidcut, cutContainerType); //! Bit-wise container for the different PID selection criteria \todo since bit-masking cannot be done yet with filters we use a second field for the PID

Check failure on line 131 in PWGCF/DataModel/FemtoDerived.h

View workflow job for this annotation

GitHub Actions / O2 linter

[name/o2-column]

Use UpperCamelCase for names of O2 columns and matching lowerCamelCase names for their getters.
DECLARE_SOA_COLUMN(TempFitVar, tempFitVar, float); //! Observable for the template fitting (Track: DCA_xy, V0: CPA)
DECLARE_SOA_SELF_ARRAY_INDEX_COLUMN(Children, children); //! Field for the track indices to remove auto-correlations
DECLARE_SOA_COLUMN(MLambda, mLambda, float); //! The invariant mass of V0 candidate, assuming lambda
Expand Down Expand Up @@ -208,7 +208,8 @@
enum CharmHadronMassHypo {
wrongParticle = 0,
lcToPKPi = 1,
lcToPiKP = 2
lcToPiKP = 2,
dplusToPiKPi = 4
};
DECLARE_SOA_COLUMN(GIndexCol, gIndexCol, int); //! Global index for the collision
DECLARE_SOA_COLUMN(TimeStamp, timeStamp, int64_t); //! Timestamp for the collision
Expand All @@ -227,7 +228,7 @@
DECLARE_SOA_COLUMN(Prong0Phi, prong0Phi, float); //! Track phi of charm hadron prong0
DECLARE_SOA_COLUMN(Prong1Phi, prong1Phi, float); //! Track phi of charm hadron prong1
DECLARE_SOA_COLUMN(Prong2Phi, prong2Phi, float); //! Track phi of charm hadron prong2
DECLARE_SOA_COLUMN(CandidateSelFlag, candidateSelFlag, int8_t); //! Selection of mass hypothesis for charm hadron (1 for Lc -> pkpi, 2 for Lc -> pikp)
DECLARE_SOA_COLUMN(CandidateSelFlag, candidateSelFlag, int8_t); //! Selection of mass hypothesis for charm hadron (1 for Lc -> pkpi, 2 for Lc -> pikp, 4 for D+ -> pikpi)
DECLARE_SOA_COLUMN(BDTBkg, bdtBkg, float); //! Background score using Boosted Decision Tree for charm hadron
DECLARE_SOA_COLUMN(BDTPrompt, bdtPrompt, float); //! Prompt signal score using Boosted Decision Tree for charm hadron
DECLARE_SOA_COLUMN(BDTFD, bdtFD, float); //! Feed-down score using Boosted Decision Tree for charm hadron
Expand Down
8 changes: 5 additions & 3 deletions PWGCF/FemtoDream/Core/femtoDreamContainer.h
Original file line number Diff line number Diff line change
Expand Up @@ -202,10 +202,12 @@ class FemtoDreamContainer
{
const float kT = FemtoDreamMath::getkT(part1, mMassOne, part2, mMassTwo);
if constexpr (isHF) {
float mP2;
if (part2.candidateSelFlag() == o2::aod::fdhf::lcToPKPi) {
float mP2 = 0.0;
if (part2.candidateSelFlag() == o2::aod::fdhf::dplusToPiKPi) {
mP2 = part2.m(std::array{o2::constants::physics::MassPiPlus, o2::constants::physics::MassKPlus, o2::constants::physics::MassPiPlus});
} else if (part2.candidateSelFlag() == o2::aod::fdhf::lcToPKPi) {
mP2 = part2.m(std::array{o2::constants::physics::MassProton, o2::constants::physics::MassKPlus, o2::constants::physics::MassPiPlus});
} else {
} else if (part2.candidateSelFlag() == o2::aod::fdhf::lcToPiKP) {
mP2 = part2.m(std::array{o2::constants::physics::MassPiPlus, o2::constants::physics::MassKPlus, o2::constants::physics::MassProton});
}
mHistogramRegistry->fill(HIST(mFolderSuffix[mEventType]) + HIST(o2::aod::femtodreamMCparticle::MCTypeName[mc]) + HIST("/relPairkstarmP2"), femtoObs, mP2);
Expand Down
3 changes: 3 additions & 0 deletions PWGCF/FemtoDream/Core/femtoDreamUtils.h
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,9 @@ inline float getMass(int pdgCode)
case o2::constants::physics::Pdg::kPhi:
mass = o2::constants::physics::MassPhi;
break;
case o2::constants::physics::Pdg::kDPlus:
mass = o2::constants::physics::MassDPlus;
break;
case o2::constants::physics::Pdg::kLambdaCPlus:
mass = o2::constants::physics::MassLambdaCPlus;
break;
Expand Down
Loading
Loading