Skip to content

Commit ebb2e1c

Browse files
dsekihatdsekihat
authored
Revert "[PWGEM/Dilepton] remove unused tasks (#16846)"
This reverts commit 7d3ef4f.
1 parent 7d3ef4f commit ebb2e1c

8 files changed

Lines changed: 1518 additions & 15 deletions

File tree

‎PWGEM/Dilepton/Core/DileptonProducer.h‎

Lines changed: 782 additions & 0 deletions
Large diffs are not rendered by default.

‎PWGEM/Dilepton/Core/DileptonSV.h‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1108,15 +1108,15 @@ struct DileptonSV {
11081108
candidate.phi2 = t2.phi();
11091109
}
11101110

1111-
if constexpr (pairtype == o2::aod::pwgem::dilepton::utils::pairutil::DileptonPairType::kDielectron) {
1112-
if (!cut.IsSelectedPair(t1, t2)) {
1113-
return false;
1114-
}
1115-
} else if constexpr (pairtype == o2::aod::pwgem::dilepton::utils::pairutil::DileptonPairType::kDimuon) {
1116-
if (!cut.IsSelectedPair(t1, t2)) {
1117-
return false;
1118-
}
1119-
}
1111+
// if constexpr (pairtype == o2::aod::pwgem::dilepton::utils::pairutil::DileptonPairType::kDielectron) {
1112+
// if (!cut.IsSelectedPair(t1, t2)) {
1113+
// return false;
1114+
// }
1115+
// } else if constexpr (pairtype == o2::aod::pwgem::dilepton::utils::pairutil::DileptonPairType::kDimuon) {
1116+
// if (!cut.IsSelectedPair(t1, t2)) {
1117+
// return false;
1118+
// }
1119+
// }
11201120

11211121
float weight = 1.f;
11221122
if constexpr (ev_id == 0) {

‎PWGEM/Dilepton/Core/DileptonSVMC.h‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1573,9 +1573,9 @@ struct DileptonSVMC {
15731573
return false;
15741574
}
15751575

1576-
if (!cut.IsSelectedPair(t1, t2)) {
1577-
return false;
1578-
}
1576+
// if (!cut.IsSelectedPair(t1, t2)) {
1577+
// return false;
1578+
// }
15791579
} else if constexpr (pairtype == o2::aod::pwgem::dilepton::utils::pairutil::DileptonPairType::kDimuon) {
15801580
if (!cut.template IsSelectedTrack<false>(t1) || !cut.template IsSelectedTrack<false>(t2)) {
15811581
return false;
@@ -1617,9 +1617,9 @@ struct DileptonSVMC {
16171617
return false;
16181618
}
16191619

1620-
if (!cut.IsSelectedPair(t1, t2)) {
1621-
return false;
1622-
}
1620+
// if (!cut.IsSelectedPair(t1, t2)) {
1621+
// return false;
1622+
// }
16231623
}
16241624

16251625
float pt1 = 0.f, eta1 = 0.f, phi1 = 0.f, pt2 = 0.f, eta2 = 0.f, phi2 = 0.f;

‎PWGEM/Dilepton/TableProducer/CMakeLists.txt‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,16 @@ o2physics_add_dpl_workflow(filter-eoi
8686
PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::AnalysisCore
8787
COMPONENT_NAME Analysis)
8888

89+
o2physics_add_dpl_workflow(dielectron-producer
90+
SOURCES dielectronProducer.cxx
91+
PUBLIC_LINK_LIBRARIES O2::Framework O2::DetectorsBase O2Physics::AnalysisCore O2Physics::PWGEMDileptonCore
92+
COMPONENT_NAME Analysis)
93+
94+
o2physics_add_dpl_workflow(dimuon-producer
95+
SOURCES dimuonProducer.cxx
96+
PUBLIC_LINK_LIBRARIES O2::Framework O2::DetectorsBase O2Physics::AnalysisCore O2Physics::PWGEMDileptonCore
97+
COMPONENT_NAME Analysis)
98+
8999
o2physics_add_dpl_workflow(qvector-dummy-otf
90100
SOURCES qVectorDummyOTF.cxx
91101
PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::AnalysisCore

‎PWGEM/Dilepton/TableProducer/dielectronProducer.cxx‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
// Copyright 2019-2020 CERN and copyright holders of ALICE O2.
2+
// See https://alice-o2.web.cern.ch/copyright for details of the copyright holders.
3+
// All rights not expressly granted are reserved.
4+
//
5+
// This software is distributed under the terms of the GNU General Public
6+
// License v3 (GPL Version 3), copied verbatim in the file "COPYING".
7+
//
8+
// In applying this license CERN does not waive the privileges and immunities
9+
// granted to it by virtue of its status as an Intergovernmental Organization
10+
// or submit itself to any jurisdiction.
11+
//
12+
// ========================
13+
//
14+
// This code is for dielectron analyses.
15+
// Please write to: daiki.sekihata@cern.ch
16+
17+
#include "PWGEM/Dilepton/Core/DileptonProducer.h"
18+
#include "PWGEM/Dilepton/Utils/PairUtilities.h"
19+
20+
#include <Framework/AnalysisTask.h>
21+
#include <Framework/runDataProcessing.h>
22+
23+
using namespace o2::framework;
24+
25+
WorkflowSpec defineDataProcessing(ConfigContext const& cfgc)
26+
{
27+
return WorkflowSpec{adaptAnalysisTask<DileptonProducer<o2::aod::pwgem::dilepton::utils::pairutil::DileptonPairType::kDielectron, FilteredMyElectrons>>(cfgc, TaskName{"dielectron-producer"})};
28+
}

‎PWGEM/Dilepton/TableProducer/dimuonProducer.cxx‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
// Copyright 2019-2020 CERN and copyright holders of ALICE O2.
2+
// See https://alice-o2.web.cern.ch/copyright for details of the copyright holders.
3+
// All rights not expressly granted are reserved.
4+
//
5+
// This software is distributed under the terms of the GNU General Public
6+
// License v3 (GPL Version 3), copied verbatim in the file "COPYING".
7+
//
8+
// In applying this license CERN does not waive the privileges and immunities
9+
// granted to it by virtue of its status as an Intergovernmental Organization
10+
// or submit itself to any jurisdiction.
11+
//
12+
// ========================
13+
//
14+
// This code is for dimuon analyses.
15+
// Please write to: daiki.sekihata@cern.ch
16+
17+
#include "PWGEM/Dilepton/Core/DileptonProducer.h"
18+
#include "PWGEM/Dilepton/Utils/PairUtilities.h"
19+
20+
#include <Framework/AnalysisTask.h>
21+
#include <Framework/runDataProcessing.h>
22+
23+
using namespace o2::framework;
24+
25+
WorkflowSpec defineDataProcessing(ConfigContext const& cfgc)
26+
{
27+
return WorkflowSpec{adaptAnalysisTask<DileptonProducer<o2::aod::pwgem::dilepton::utils::pairutil::DileptonPairType::kDimuon, FilteredMyMuons>>(cfgc, TaskName{"dimuon-producer"})};
28+
}

‎PWGEM/Dilepton/Tasks/CMakeLists.txt‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -160,6 +160,11 @@ o2physics_add_dpl_workflow(evaluate-acceptance
160160
PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::AnalysisCore
161161
COMPONENT_NAME Analysis)
162162

163+
o2physics_add_dpl_workflow(dilepton-polarization
164+
SOURCES dileptonPolarization.cxx
165+
PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::AnalysisCore
166+
COMPONENT_NAME Analysis)
167+
163168
o2physics_add_dpl_workflow(check-mc-template
164169
SOURCES checkMCTemplate.cxx
165170
PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::AnalysisCore O2::GlobalTracking

0 commit comments

Comments
 (0)