From 534a323ec44eec830805679ffdf2be6ca277e6df Mon Sep 17 00:00:00 2001 From: nburmaso Date: Thu, 17 Sep 2020 15:11:23 +0300 Subject: [PATCH 1/2] Added trigger selection. Analysis task moved to PWGUD --- Analysis/Tasks/{ => PWGUD}/upcAnalysis.cxx | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) rename Analysis/Tasks/{ => PWGUD}/upcAnalysis.cxx (96%) diff --git a/Analysis/Tasks/upcAnalysis.cxx b/Analysis/Tasks/PWGUD/upcAnalysis.cxx similarity index 96% rename from Analysis/Tasks/upcAnalysis.cxx rename to Analysis/Tasks/PWGUD/upcAnalysis.cxx index 36514fa770ac9..57f7583cc9ffd 100644 --- a/Analysis/Tasks/upcAnalysis.cxx +++ b/Analysis/Tasks/PWGUD/upcAnalysis.cxx @@ -38,10 +38,8 @@ struct UPCAnalysis { bool checkFDD = col.bbFDA() || col.bbFDC() || col.bgFDA() || col.bgFDC(); if (checkFDD) return; - // TODO: - // Add trigger class check - // if (!col.alias()[kCUP9]) - // return; + if (!col.alias()[kCUP9]) + return; std::vector::iterator> selTracks; for (auto track : tracks) { if (!track.isGlobalTrack()) From 12de71ffbb55c6c9f25e20b3b60c950babf93bea Mon Sep 17 00:00:00 2001 From: nburmaso Date: Thu, 17 Sep 2020 17:43:04 +0300 Subject: [PATCH 2/2] Fixed CMake files --- Analysis/Tasks/CMakeLists.txt | 8 ++------ Analysis/Tasks/PWGUD/CMakeLists.txt | 14 ++++++++++++++ 2 files changed, 16 insertions(+), 6 deletions(-) create mode 100644 Analysis/Tasks/PWGUD/CMakeLists.txt diff --git a/Analysis/Tasks/CMakeLists.txt b/Analysis/Tasks/CMakeLists.txt index b0fadfc5dab07..8c9db9ab64be2 100644 --- a/Analysis/Tasks/CMakeLists.txt +++ b/Analysis/Tasks/CMakeLists.txt @@ -12,6 +12,7 @@ add_subdirectory(PWGCF) add_subdirectory(PWGDQ) add_subdirectory(PWGHF) add_subdirectory(PWGLF) +add_subdirectory(PWGUD) o2_add_dpl_workflow(trackselection SOURCES trackselection.cxx @@ -56,11 +57,6 @@ o2_add_dpl_workflow(jetfinder COMPONENT_NAME Analysis) endif() -o2_add_dpl_workflow(upc-an - SOURCES upcAnalysis.cxx - PUBLIC_LINK_LIBRARIES O2::Framework O2::AnalysisDataModel O2::AnalysisCore O2::DetectorsBase - COMPONENT_NAME Analysis) - o2_add_dpl_workflow(event-selection SOURCES eventSelection.cxx PUBLIC_LINK_LIBRARIES O2::Framework O2::AnalysisDataModel O2::AnalysisCore O2::DetectorsBase O2::CCDB @@ -109,4 +105,4 @@ o2_add_dpl_workflow(run2-matcher o2_add_dpl_workflow(run3-matcher SOURCES run3Matcher.cxx PUBLIC_LINK_LIBRARIES O2::Framework O2::DetectorsBase O2::AnalysisDataModel - COMPONENT_NAME Analysis) \ No newline at end of file + COMPONENT_NAME Analysis) diff --git a/Analysis/Tasks/PWGUD/CMakeLists.txt b/Analysis/Tasks/PWGUD/CMakeLists.txt new file mode 100644 index 0000000000000..ab3c773a4ce99 --- /dev/null +++ b/Analysis/Tasks/PWGUD/CMakeLists.txt @@ -0,0 +1,14 @@ +# Copyright CERN and copyright holders of ALICE O2. This software is distributed +# under the terms of the GNU General Public License v3 (GPL Version 3), copied +# verbatim in the file "COPYING". +# +# See http://alice-o2.web.cern.ch/license for full licensing information. +# +# In applying this license CERN does not waive the privileges and immunities +# granted to it by virtue of its status as an Intergovernmental Organization or +# submit itself to any jurisdiction. + +o2_add_dpl_workflow(upc-an + SOURCES upcAnalysis.cxx + PUBLIC_LINK_LIBRARIES O2::Framework O2::AnalysisDataModel O2::AnalysisCore O2::DetectorsBase + COMPONENT_NAME Analysis)