Skip to content

[PWGCF] Updating resonance reconstructions for PID flow #9556

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
victor-gonzalez merged 17 commits into from
Jan 27, 2025
Merged

[PWGCF] Updating resonance reconstructions for PID flow #9556

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
76682af
Recommiting the generic frmework pid code
Nov 27, 2024
91cd117
Implementing formatting changes
Dec 5, 2024
808e391
Fixing format changes
Dec 5, 2024
206da1a
Changed the function names and modified the CMakeLists.txt to contain…
Dec 9, 2024
d3d7b87
Just commiting changed files
Dec 9, 2024
74ce320
Added phi reconstruction code
Jan 8, 2025
48ff1af
Added the formatting changes
Jan 8, 2025
bb06557
Flow for Phi meson
Jan 20, 2025
47473a9
Fixed the formatting and linter errors
Jan 20, 2025
59c84fd
Please consider the following formatting changes
alibuild Jan 20, 2025
83810e5
Merge pull request #13 from alibuild/alibot-cleanup-9406
Preet-Bhanjan Jan 20, 2025
d92f94a
Merge branch 'AliceO2Group:master' into master
Preet-Bhanjan Jan 20, 2025
9fc4496
Update and rename flowPbpbReso.cxx to resonancesGfwFlow.cxx
Preet-Bhanjan Jan 20, 2025
aea0bd9
Update CMakeLists.txt
Preet-Bhanjan Jan 20, 2025
fedbcb2
Merge branch 'master' of https://github.com/AliceO2Group/O2Physics
Jan 22, 2025
530a9ce
Updating the resonance reconstructions
Jan 27, 2025
3ce1428
FIxed the formatting changes
Jan 27, 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
Prev Previous commit
Next Next commit
Just commiting changed files
  • Loading branch information
Preet Pati committed Dec 9, 2024
commit d3d7b87c1dc45a96ee8bb4e8d59fa7ddfbe53d3b
5 changes: 5 additions & 0 deletions PWGCF/Flow/Tasks/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,13 @@ o2physics_add_dpl_workflow(flow-gf
PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::AnalysisCore O2Physics::GFWCore
COMPONENT_NAME Analysis)

<<<<<<< HEAD
o2physics_add_dpl_workflow(flow-pbpb-pikp-task
SOURCES flowPbPbpikp.cxx
=======
o2physics_add_dpl_workflow(flow-pbpb-pikp
SOURCES flowPbpbPikp.cxx
>>>>>>> 5b9f1eab610d3879f782c6b06957eb9eb3e1d5ec
PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::AnalysisCore O2Physics::GFWCore
COMPONENT_NAME Analysis)

Expand Down
19 changes: 18 additions & 1 deletion PWGCF/Flow/Tasks/flowPbpbPikp.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,11 @@
// granted to it by virtue of its status as an Intergovernmental Organization
// or submit itself to any jurisdiction.

<<<<<<< HEAD:PWGCF/Flow/Tasks/FlowPbPbpikp.cxx
/// \file flowPbPbpikp.cxx
=======
/// \file flowPbpbPikp.cxx
>>>>>>> 5b9f1eab610d3879f782c6b06957eb9eb3e1d5ec:PWGCF/Flow/Tasks/flowPbpbPikp.cxx
/// \brief PID flow using the generic framework
/// \author Preet Bhanjan Pati <bhanjanpreet@gmail.com>

Expand Down Expand Up @@ -55,7 +59,11 @@ using namespace std;

#define O2_DEFINE_CONFIGURABLE(NAME, TYPE, DEFAULT, HELP) Configurable<TYPE> NAME{#NAME, DEFAULT, HELP};

<<<<<<< HEAD:PWGCF/Flow/Tasks/FlowPbPbpikp.cxx
struct flowPbPbpikp {
=======
struct FlowPbpbPikp {
>>>>>>> 5b9f1eab610d3879f782c6b06957eb9eb3e1d5ec:PWGCF/Flow/Tasks/flowPbpbPikp.cxx
Service<ccdb::BasicCCDBManager> ccdb;
Configurable<int64_t> noLaterThan{"noLaterThan", std::chrono::duration_cast<std::chrono::milliseconds>(std::chrono::system_clock::now().time_since_epoch()).count(), "latest acceptable timestamp of creation for the object"};
Configurable<std::string> ccdbUrl{"ccdbUrl", "http://ccdb-test.cern.ch:8080", "url of the ccdb repository"};
Expand Down Expand Up @@ -91,7 +99,11 @@ struct flowPbPbpikp {
TRandom3* fRndm = new TRandom3(0);

using AodCollisions = soa::Filtered<soa::Join<aod::Collisions, aod::EvSels, aod::FT0Mults, aod::MultZeqs, aod::CentFT0Ms, aod::CentFT0As, aod::CentFT0Cs>>;
<<<<<<< HEAD:PWGCF/Flow/Tasks/FlowPbPbpikp.cxx
//using AodTracks = soa::Filtered<soa::Join<aod::Tracks, aod::TrackSelection, aod::TracksExtra, aod::pidBayes, aod::pidBayesPi, aod::pidBayesKa, aod::pidBayesPr, aod::pidTPCFullPi, aod::pidTPCFullKa, aod::pidTPCFullPr, aod::pidTOFFullPi, aod::pidTOFFullKa, aod::pidTOFFullPr>>;
=======
// using AodTracks = soa::Filtered<soa::Join<aod::Tracks, aod::TrackSelection, aod::TracksExtra, aod::pidBayes, aod::pidBayesPi, aod::pidBayesKa, aod::pidBayesPr, aod::pidTPCFullPi, aod::pidTPCFullKa, aod::pidTPCFullPr, aod::pidTOFFullPi, aod::pidTOFFullKa, aod::pidTOFFullPr>>;
>>>>>>> 5b9f1eab610d3879f782c6b06957eb9eb3e1d5ec:PWGCF/Flow/Tasks/flowPbpbPikp.cxx
using AodTracks = soa::Filtered<soa::Join<aod::Tracks, aod::TrackSelection, aod::TracksExtra, aod::pidTPCFullPi, aod::pidTPCFullKa, aod::pidTPCFullPr, aod::pidTOFFullPi, aod::pidTOFFullKa, aod::pidTOFFullPr>>;

void init(InitContext const&)
Expand Down Expand Up @@ -352,5 +364,10 @@ struct flowPbPbpikp {

WorkflowSpec defineDataProcessing(ConfigContext const& cfgc)
{
<<<<<<< HEAD:PWGCF/Flow/Tasks/FlowPbPbpikp.cxx
return WorkflowSpec{adaptAnalysisTask<flowPbPbpikp>(cfgc)};
}
}
=======
return WorkflowSpec{adaptAnalysisTask<FlowPbpbPikp>(cfgc)};
}
>>>>>>> 5b9f1eab610d3879f782c6b06957eb9eb3e1d5ec:PWGCF/Flow/Tasks/flowPbpbPikp.cxx
You are viewing a condensed version of this merge commit. You can view the full changes here.