Skip to content

[PWGJE] Add MC mixing and adjusting task for use on Hyperloop #12670

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
nzardosh merged 6 commits into from
Oct 6, 2025
Merged

[PWGJE] Add MC mixing and adjusting task for use on Hyperloop #12670

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
cae061e
addMcMixing_addEta_generalImprovements
jkinner2 Jul 17, 2025
b0f9b97
linter_fix
jkinner2 Jul 24, 2025
023bc4f
adjust_trigger_used_for_mixing
jkinner2 Aug 19, 2025
682f3a8
MegaLinter_errors
jkinner2 Aug 20, 2025
44989d8
add_ptTrigAxis_to_photonPairHist
jkinner2 Aug 21, 2025
f795172
remove_unnecessary_aod::Collision_subscription
jkinner2 Oct 2, 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
13 changes: 8 additions & 5 deletions PWGJE/DataModel/PhotonChargedTriggerCorrelation.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,12 @@
#ifndef PWGJE_DATAMODEL_PHOTONCHARGEDTRIGGERCORRELATION_H_
#define PWGJE_DATAMODEL_PHOTONCHARGEDTRIGGERCORRELATION_H_

#include "Framework/AnalysisDataModel.h"
#include "PWGJE/Core/JetDerivedDataUtilities.h"
#include "PWGJE/DataModel/Jet.h"
#include "PWGEM/PhotonMeson/DataModel/gammaTables.h"
#include "PWGEM/PhotonMeson/Utils/PCMUtilities.h"
#include "PWGJE/Core/JetDerivedDataUtilities.h"
#include "PWGJE/DataModel/Jet.h"

#include "Framework/AnalysisDataModel.h"

namespace o2::aod
{
Expand All @@ -44,9 +45,10 @@ namespace collision_extra_corr
{
DECLARE_SOA_COLUMN(SelEv, selEv, bool);
DECLARE_SOA_COLUMN(TrigEv, trigEv, bool);
DECLARE_SOA_COLUMN(NGlobalTracks, nGlobalTracks, int);
} // namespace collision_extra_corr
DECLARE_SOA_TABLE(CollisionsExtraCorr, "AOD", "COLLISIONSEXTRACORR",
collision_extra_corr::SelEv, collision_extra_corr::TrigEv);
collision_extra_corr::SelEv, collision_extra_corr::TrigEv, collision_extra_corr::NGlobalTracks);

// trigger
namespace trigger
Expand Down Expand Up @@ -114,9 +116,10 @@ using PhotonPCMPair = PhotonPCMPairs::iterator;
namespace mc_collision_extra_corr
{
DECLARE_SOA_COLUMN(TrigEv, trigEv, bool);
DECLARE_SOA_COLUMN(NChargedInEtaRange, nChargedInEtaRange, int);
} // namespace mc_collision_extra_corr
DECLARE_SOA_TABLE(McCollisionsExtraCorr, "AOD", "MCCOLLISIONSEXTRACORR",
mc_collision_extra_corr::TrigEv);
mc_collision_extra_corr::TrigEv, mc_collision_extra_corr::NChargedInEtaRange);

// trigger
namespace trigger_particle
Expand Down
4 changes: 4 additions & 0 deletions PWGJE/Tasks/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright 2019-2020 CERN and copyright holders of ALICE O2.

Check failure on line 1 in PWGJE/Tasks/CMakeLists.txt

View workflow job for this annotation

GitHub Actions / O2 linter

[name/o2-workflow] 

Use kebab-case for names of workflows and match the name of the workflow file.
# See https://alice-o2.web.cern.ch/copyright for details of the copyright holders.
# All rights not expressly granted are reserved.
#
Expand All @@ -10,19 +10,19 @@
# or submit itself to any jurisdiction.


o2physics_add_dpl_workflow(emc-cellmonitor

Check failure on line 13 in PWGJE/Tasks/CMakeLists.txt

View workflow job for this annotation

GitHub Actions / O2 linter

[name/o2-workflow] 

Workflow name emc-cellmonitor does not match its file name emcCellMonitor.cxx. (Matches emcCellmonitor.cxx.)
SOURCES emcCellMonitor.cxx
PUBLIC_LINK_LIBRARIES O2::Framework O2::EMCALBase O2::EMCALCalib O2Physics::AnalysisCore
COMPONENT_NAME Analysis)
o2physics_add_dpl_workflow(emc-clustermonitor

Check failure on line 17 in PWGJE/Tasks/CMakeLists.txt

View workflow job for this annotation

GitHub Actions / O2 linter

[name/o2-workflow] 

Workflow name emc-clustermonitor does not match its file name emcClusterMonitor.cxx. (Matches emcClustermonitor.cxx.)
SOURCES emcClusterMonitor.cxx
PUBLIC_LINK_LIBRARIES O2::Framework O2::EMCALBase O2::EMCALCalib O2Physics::AnalysisCore
COMPONENT_NAME Analysis)
o2physics_add_dpl_workflow(emc-eventselection-qa

Check failure on line 21 in PWGJE/Tasks/CMakeLists.txt

View workflow job for this annotation

GitHub Actions / O2 linter

[name/o2-workflow] 

Workflow name emc-eventselection-qa does not match its file name emcEventSelectionQA.cxx. (Matches emcEventselectionQa.cxx.)
SOURCES emcEventSelectionQA.cxx
PUBLIC_LINK_LIBRARIES O2::Framework O2::EMCALBase O2::EMCALCalib O2Physics::AnalysisCore
COMPONENT_NAME Analysis)
o2physics_add_dpl_workflow(emc-vertexselection-qa

Check failure on line 25 in PWGJE/Tasks/CMakeLists.txt

View workflow job for this annotation

GitHub Actions / O2 linter

[name/o2-workflow] 

Workflow name emc-vertexselection-qa does not match its file name emcVertexSelectionQA.cxx. (Matches emcVertexselectionQa.cxx.)
SOURCES emcVertexSelectionQA.cxx
PUBLIC_LINK_LIBRARIES O2::Framework O2::EMCALBase O2::EMCALCalib O2Physics::AnalysisCore
COMPONENT_NAME Analysis)
Expand All @@ -30,11 +30,11 @@
SOURCES emcalGammaGammaBcWise.cxx
PUBLIC_LINK_LIBRARIES O2::Framework O2::EMCALBase O2::EMCALCalib O2Physics::AnalysisCore
COMPONENT_NAME Analysis)
o2physics_add_dpl_workflow(emc-pi0-energyscale-calib

Check failure on line 33 in PWGJE/Tasks/CMakeLists.txt

View workflow job for this annotation

GitHub Actions / O2 linter

[name/o2-workflow] 

Workflow name emc-pi0-energyscale-calib does not match its file name emcalPi0EnergyScaleCalib.cxx. (Matches emcPi0EnergyscaleCalib.cxx.)
SOURCES emcalPi0EnergyScaleCalib.cxx
PUBLIC_LINK_LIBRARIES O2::Framework O2::EMCALBase O2::EMCALCalib O2Physics::AnalysisCore
COMPONENT_NAME Analysis)
o2physics_add_dpl_workflow(emc-tmmonitor

Check failure on line 37 in PWGJE/Tasks/CMakeLists.txt

View workflow job for this annotation

GitHub Actions / O2 linter

[name/o2-workflow] 

Workflow name emc-tmmonitor does not match its file name emcTmMonitor.cxx. (Matches emcTmmonitor.cxx.)
SOURCES emcTmMonitor.cxx
PUBLIC_LINK_LIBRARIES O2::Framework O2::EMCALBase O2::EMCALCalib O2Physics::AnalysisCore
COMPONENT_NAME Analysis)
Expand All @@ -46,7 +46,7 @@
SOURCES mcGeneratorStudies.cxx
PUBLIC_LINK_LIBRARIES O2::Framework O2::EMCALBase O2::EMCALCalib O2Physics::AnalysisCore
COMPONENT_NAME Analysis)
o2physics_add_dpl_workflow(photon-isolation-qa

Check failure on line 49 in PWGJE/Tasks/CMakeLists.txt

View workflow job for this annotation

GitHub Actions / O2 linter

[name/o2-workflow] 

Workflow name photon-isolation-qa does not match its file name photonIsolationQA.cxx. (Matches photonIsolationQa.cxx.)
SOURCES photonIsolationQA.cxx
PUBLIC_LINK_LIBRARIES O2::Framework O2::EMCALBase O2::EMCALCalib O2Physics::AnalysisCore
COMPONENT_NAME Analysis)
Expand All @@ -58,6 +58,10 @@
SOURCES taskEmcExtensiveMcQa.cxx
PUBLIC_LINK_LIBRARIES O2::Framework O2::EMCALBase O2Physics::AnalysisCore O2Physics::EventFilteringUtils
COMPONENT_NAME Analysis)
o2physics_add_dpl_workflow(photon-charged-trigger-producer
SOURCES photonChargedTriggerProducer.cxx
PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::AnalysisCore
COMPONENT_NAME Analysis)

if(FastJet_FOUND)
o2physics_add_dpl_workflow(jet-background-analysis
Expand Down
Loading
Loading