Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
44 commits
Select commit Hold shift + click to select a range
64b4ba9
Added K*(892) functionality, as well as a host of optimizations and f…
smaff92 Jul 23, 2024
9d8a771
Please consider the following formatting changes
alibuild Jul 23, 2024
b24ae4b
Merge pull request #16 from alibuild/alibot-cleanup-6940
smaff92 Jul 23, 2024
178f60f
Megalinter fixes for pull 6940
smaff92 Jul 23, 2024
54ddc1e
Please consider the following formatting changes
alibuild Jul 23, 2024
67f2d37
Merge pull request #17 from alibuild/alibot-cleanup-6940
smaff92 Jul 23, 2024
7718a44
Fixed rand_r() bug
smaff92 Jul 23, 2024
99d37c0
Please consider the following formatting changes
alibuild Jul 23, 2024
2fea1c9
Merge pull request #18 from alibuild/alibot-cleanup-6940
smaff92 Jul 23, 2024
c62af22
Bugfix to random evaluator
smaff92 Jul 29, 2024
50b4ad4
New update, properly creates the response matrix efficiency on the ge…
smaff92 Jul 31, 2024
9e97e38
Bugfix on the MC-REC matching
smaff92 Jul 31, 2024
bffcd56
Merge branch 'master' into master
smaff92 Jul 31, 2024
b067da4
Please consider the following formatting changes
alibuild Jul 31, 2024
343d4cd
Merge pull request #20 from alibuild/alibot-cleanup-7092
smaff92 Jul 31, 2024
9bc0c54
Megalinter requests for if/else braces
smaff92 Jul 31, 2024
a00309e
Please consider the following formatting changes
alibuild Jul 31, 2024
2000869
Merge pull request #21 from alibuild/alibot-cleanup-7092
smaff92 Jul 31, 2024
06deb00
Reorganized and optimized histogram booking
smaff92 Aug 5, 2024
13fbed4
Merge branch 'master' into master
smaff92 Aug 5, 2024
7570e5f
Please consider the following formatting changes
alibuild Aug 5, 2024
a60d0c1
Merge pull request #22 from alibuild/alibot-cleanup-7151
smaff92 Aug 5, 2024
84c7536
Please consider the following formatting changes
alibuild Aug 5, 2024
4906b3b
Merge pull request #23 from alibuild/alibot-cleanup-7151
smaff92 Aug 5, 2024
df0aa9d
PWGJE: Added phi gen-to-rec matched finding
smaff92 Aug 7, 2024
86640e6
Merge branch 'master' into master
smaff92 Aug 7, 2024
74fb666
Please consider the following formatting changes
alibuild Aug 7, 2024
c2a1739
Merge pull request #24 from alibuild/alibot-cleanup-7193
smaff92 Aug 7, 2024
29074e4
Bugfix to fix whitespace/tab issue
smaff92 Aug 7, 2024
d8848fb
Bugfix to remove tab and replace it with whitespace, take 2
smaff92 Aug 7, 2024
ab57afa
Bugfix to remove tab and replace it with whitespace, take 3
smaff92 Aug 7, 2024
68df4a0
PWGJE: Added Real rec jets per event estimation in MC
smaff92 Aug 22, 2024
5152c32
PWGJE: Quick fix of histogram name typo
smaff92 Aug 22, 2024
f64a3a3
PWGJE: First addition of a new, statistical prompt photon analysis.
smaff92 Sep 2, 2024
02de06d
PWGJE: Added Stat Prompt Photon Task to CMake file
smaff92 Sep 3, 2024
e37d6e3
Merge branch 'master' into master
smaff92 Sep 3, 2024
7d61fa1
Please consider the following formatting changes
alibuild Sep 3, 2024
dd2fe3b
Merge pull request #28 from alibuild/alibot-cleanup-7545
smaff92 Sep 3, 2024
7b94034
Update statPromptPhoton.cxx
smaff92 Sep 3, 2024
09d3a5c
Update statPromptPhoton.cxx
smaff92 Sep 3, 2024
35eefa7
Please consider the following formatting changes
alibuild Sep 3, 2024
f0e919c
Merge pull request #29 from alibuild/alibot-cleanup-7545
smaff92 Sep 3, 2024
291a198
Update statPromptPhoton.cxx
smaff92 Sep 3, 2024
f34f412
Update CMakeLists.txt
smaff92 Sep 3, 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
4 changes: 4 additions & 0 deletions PWGJE/Tasks/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -160,6 +160,10 @@ if(FastJet_FOUND)
SOURCES bjetTreeCreator.cxx
PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::PWGJECore O2Physics::AnalysisCore
COMPONENT_NAME Analysis)
o2physics_add_dpl_workflow(stat-prompt-photon
SOURCES statPromptPhoton.cxx
PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::PWGJECore O2Physics::AnalysisCore
COMPONENT_NAME Analysis)
o2physics_add_dpl_workflow(full-jet-spectra-pp
SOURCES fulljetspectrapp.cxx
PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::PWGJECore O2Physics::AnalysisCore
Expand Down
7 changes: 5 additions & 2 deletions PWGJE/Tasks/statPromptPhoton.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,6 @@ struct statPromptPhoton {
Configurable<int> cfgMinNCells{"MinNCelss", 2, "Minimal amount of cells per cluster"};
Configurable<int> cfgMaxNLM{"MaxNLM", 2, "Maximal amount of local Maxima per cluster"};
Configurable<bool> cfgExoticContribution{"ExoticContribution", false, "Exotic cluster in the data"};

Configurable<double> cfgtrkMinPt{"cfgtrkMinPt", 0.15, "set track min pT"};
Configurable<double> cfgtrkMaxEta{"cfgtrkMaxEta", 0.6, "set track max Eta"};
Configurable<float> cfgMinR{"MinR", 0.1, "Min. Radii of Delta R cone around photon trigger"};
Expand Down Expand Up @@ -116,6 +115,7 @@ struct statPromptPhoton {
Filter mcPosZFilter = nabs(aod::mccollision::posZ) < cfgVtxCut;

using MCCells = o2::soa::Join<aod::Calos, aod::McCaloLabels_001>;

using MCClusters = o2::soa::Join<o2::aod::EMCALMCClusters, o2::aod::EMCALClusters>;
using selectedCollisions = soa::Join<aod::Collisions, aod::EvSels>;
using selectedMCCollisions = aod::McCollisions;
Expand All @@ -136,10 +136,10 @@ struct statPromptPhoton {
/////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////
template <typename Tracks, typename Trigger>

double GetPtHadSum(const Tracks& tracks, const Trigger& trigger, double MinR, double MaxR, bool IsStern, bool IsParticle, bool DodR)
{
double eta_trigger, phi_trigger;

if constexpr (requires { trigger.eta(); }) {
eta_trigger = trigger.eta();
phi_trigger = trigger.phi();
Expand All @@ -153,6 +153,7 @@ struct statPromptPhoton {
double phi_track = track.phi();
double eta_track = track.eta();
double pt_track = track.pt();

if constexpr (requires { track.isPVContributor(); }) {
if (!IsParticle) {
if (!trackSelection(track)) {
Expand Down Expand Up @@ -259,6 +260,7 @@ struct statPromptPhoton {
}; // end of track selection
/////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////

/////////////////////////////////////////////////////////////////////////////
// PROCESS

Expand Down Expand Up @@ -372,6 +374,7 @@ struct statPromptPhoton {
if (!recocoll.sel8())
return;
if (fabs(recocoll.posZ()) > cfgVtxCut)

return;
}

Expand Down