Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
19 changes: 5 additions & 14 deletions PWGJE/Tasks/CMakeLists.txt
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 @@ -42,7 +42,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 45 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 photonChargedTriggerProducer.cxx
PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::AnalysisCore
COMPONENT_NAME Analysis)
o2physics_add_dpl_workflow(hadron-photon-correlation
SOURCES hadronPhotonCorrelation.cxx
PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::AnalysisCore
COMPONENT_NAME Analysis)

if(FastJet_FOUND)
o2physics_add_dpl_workflow(jet-background-analysis
Expand Down Expand Up @@ -354,17 +358,4 @@
SOURCES substructureDebug.cxx
PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::PWGJECore O2Physics::AnalysisCore
COMPONENT_NAME Analysis)
endif()

if(pythia_FOUND)
if(TARGET ROOT::EGPythia8)
set_target_properties(ROOT::EGPythia8 PROPERTIES
INTERFACE_LINK_LIBRARIES "ROOT::Core;ROOT::EG;ROOT::Graf;ROOT::Physics;${pythia_LIBRARY_SHARED}"
)

o2physics_add_dpl_workflow(hadron-photon-correlation
SOURCES hadronPhotonCorrelation.cxx
PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::AnalysisCore ROOT::EGPythia8
COMPONENT_NAME Analysis)
endif()
endif()
endif()
24 changes: 12 additions & 12 deletions PWGJE/Tasks/hadronPhotonCorrelation.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -40,10 +40,10 @@
#include "Framework/runDataProcessing.h"

#include <TClonesArray.h>
#include <TLorentzVector.h> // o2-linter: disable= root/lorentz-vector (TLorentzVector is needed for TPythia8Decayer)
// #include <TLorentzVector.h> // o2-linter: disable= root/lorentz-vector (TLorentzVector is needed for TPythia8Decayer)
#include <TPDGCode.h>
#include <TParticle.h>
#include <TPythia8Decayer.h>
// #include <TParticle.h>
// #include <TPythia8Decayer.h>

#include <cmath>
#include <map>
Expand Down Expand Up @@ -112,9 +112,9 @@ struct HadronPhotonCorrelation {
float ptMinAssoc;
float ptMaxAssoc;

TPythia8Decayer* decayer = new TPythia8Decayer;
TLorentzVector* motherLV = new TLorentzVector(); // o2-linter: disable= root/lorentz-vector (TLorentzVector is needed for TPythia8Decayer)
TClonesArray* decayParticles = new TClonesArray("TParticle", 10);
// TPythia8Decayer* decayer = new TPythia8Decayer;
// TLorentzVector* motherLV = new TLorentzVector(); // o2-linter: disable= root/lorentz-vector (TLorentzVector is needed for TPythia8Decayer)
// TClonesArray* decayParticles = new TClonesArray("TParticle", 10);

HistogramRegistry registry{"histogram registry"};

Expand Down Expand Up @@ -391,7 +391,7 @@ struct HadronPhotonCorrelation {
}

// Initialize Pythia8 decay particle
bool initDecayParticle(const TParticle* particle)
/*bool initDecayParticle(const TParticle* particle)
{

if (particle->GetMother(0) != 0) {
Expand All @@ -411,7 +411,7 @@ struct HadronPhotonCorrelation {
}

return true;
}
}*/

// Initialize trigger tracks
template <typename T>
Expand Down Expand Up @@ -991,7 +991,7 @@ struct HadronPhotonCorrelation {
}

// Use PYTHIA to simulate decay
decayer->Init();
/*decayer->Init();
for (int pid = 1; pid <= nHadrons; pid++) {
TParticlePDG* pdgParticle = nullptr;

Expand Down Expand Up @@ -1025,7 +1025,7 @@ struct HadronPhotonCorrelation {
registry.fill(HIST("generated/charged/hCocktailPhotonCorrelGen"), track_trig.pt(), track_assoc.pt(), daughter->Pt(), daughter->Eta() - track_trig.eta(), dphi, pidCodes[pdgParticle->GetName()], collision.weight());
}
}
}
}*/
}
registry.fill(HIST("generated/charged/hPionMultGen"), nPions, collision.weight());
}
Expand Down Expand Up @@ -1147,7 +1147,7 @@ struct HadronPhotonCorrelation {
}

// Use PYTHIA to simulate decay
decayer->Init();
/*decayer->Init();
motherLV->SetPtEtaPhiM(track_assoc.pt(), track_assoc.eta(), track_assoc.phi(), pdgParticle->Mass());
decayer->Decay(track_assoc.pdgCode(), motherLV);
decayer->ImportParticles(decayParticles);
Expand All @@ -1167,7 +1167,7 @@ struct HadronPhotonCorrelation {
float dphi = RecoDecay::constrainAngle(daughter->Phi() - track_trig.phi(), -PIHalf);
registry.fill(HIST("generated/neutral/hCocktailPhotonCorrelGen"), track_trig.pt(), track_assoc.pt(), daughter->Pt(), daughter->Eta() - track_trig.eta(), dphi, pidCodes[pdgParticle->GetName()], collision.weight());
}
}
}*/
}
registry.fill(HIST("generated/neutral/hNeutralMultGen"), nNeutrals, collision.weight());
}
Expand Down
Loading