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
2 changes: 1 addition & 1 deletion Common/TableProducer/PID/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 Common/TableProducer/PID/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,52 +10,52 @@
# or submit itself to any jurisdiction.

# ITS
o2physics_add_dpl_workflow(pid-its

Check failure on line 13 in Common/TableProducer/PID/CMakeLists.txt

View workflow job for this annotation

GitHub Actions / O2 linter

[name/o2-workflow]

Workflow name pid-its does not match its file name pidITS.cxx. (Matches pidIts.cxx.)
SOURCES pidITS.cxx
PUBLIC_LINK_LIBRARIES O2Physics::AnalysisCore
COMPONENT_NAME Analysis)

# TOF
o2physics_add_dpl_workflow(pid-tof-base

Check failure on line 19 in Common/TableProducer/PID/CMakeLists.txt

View workflow job for this annotation

GitHub Actions / O2 linter

[name/o2-workflow]

Workflow name pid-tof-base does not match its file name pidTOFBase.cxx. (Matches pidTofBase.cxx.)
SOURCES pidTOFBase.cxx
PUBLIC_LINK_LIBRARIES O2Physics::AnalysisCore O2::TOFBase
COMPONENT_NAME Analysis)

o2physics_add_dpl_workflow(pid-tof

Check failure on line 24 in Common/TableProducer/PID/CMakeLists.txt

View workflow job for this annotation

GitHub Actions / O2 linter

[name/o2-workflow]

Workflow name pid-tof does not match its file name pidTOF.cxx. (Matches pidTof.cxx.)
SOURCES pidTOF.cxx
PUBLIC_LINK_LIBRARIES O2Physics::AnalysisCore O2::TOFWorkflowUtils
COMPONENT_NAME Analysis)

o2physics_add_dpl_workflow(pid-tof-merge

Check failure on line 29 in Common/TableProducer/PID/CMakeLists.txt

View workflow job for this annotation

GitHub Actions / O2 linter

[name/o2-workflow]

Workflow name pid-tof-merge does not match its file name pidTOFMerge.cxx. (Matches pidTofMerge.cxx.)
SOURCES pidTOFMerge.cxx
PUBLIC_LINK_LIBRARIES O2Physics::AnalysisCore O2::TOFWorkflowUtils
COMPONENT_NAME Analysis)

o2physics_add_dpl_workflow(pid-tof-beta

Check failure on line 34 in Common/TableProducer/PID/CMakeLists.txt

View workflow job for this annotation

GitHub Actions / O2 linter

[name/o2-workflow]

Workflow name pid-tof-beta does not match its file name pidTOFbeta.cxx. (Matches pidTofBeta.cxx.)
SOURCES pidTOFbeta.cxx
PUBLIC_LINK_LIBRARIES O2Physics::AnalysisCore O2::TOFWorkflowUtils
COMPONENT_NAME Analysis)

o2physics_add_dpl_workflow(pid-tof-full

Check failure on line 39 in Common/TableProducer/PID/CMakeLists.txt

View workflow job for this annotation

GitHub Actions / O2 linter

[name/o2-workflow]

Workflow name pid-tof-full does not match its file name pidTOFFull.cxx. (Matches pidTofFull.cxx.)
SOURCES pidTOFFull.cxx
PUBLIC_LINK_LIBRARIES O2Physics::AnalysisCore O2::TOFWorkflowUtils
COMPONENT_NAME Analysis)

# TPC

o2physics_add_dpl_workflow(pid-tpc-service

Check failure on line 46 in Common/TableProducer/PID/CMakeLists.txt

View workflow job for this annotation

GitHub Actions / O2 linter

[name/o2-workflow]

Workflow name pid-tpc-service does not match its file name pidTPCService.cxx. (Matches pidTpcService.cxx.)
SOURCES pidTPCService.cxx
PUBLIC_LINK_LIBRARIES O2Physics::AnalysisCore O2Physics::MLCore O2Physics::AnalysisCCDB
COMPONENT_NAME Analysis)

o2physics_add_dpl_workflow(pid-tpc-base

Check failure on line 51 in Common/TableProducer/PID/CMakeLists.txt

View workflow job for this annotation

GitHub Actions / O2 linter

[name/o2-workflow]

Workflow name pid-tpc-base does not match its file name pidTPCBase.cxx. (Matches pidTpcBase.cxx.)
SOURCES pidTPCBase.cxx
PUBLIC_LINK_LIBRARIES O2Physics::AnalysisCore O2Physics::AnalysisCCDB
COMPONENT_NAME Analysis)

o2physics_add_dpl_workflow(pid-tpc

Check failure on line 56 in Common/TableProducer/PID/CMakeLists.txt

View workflow job for this annotation

GitHub Actions / O2 linter

[name/o2-workflow]

Workflow name pid-tpc does not match its file name pidTPC.cxx. (Matches pidTpc.cxx.)
SOURCES pidTPC.cxx
PUBLIC_LINK_LIBRARIES O2Physics::AnalysisCore O2Physics::MLCore
PUBLIC_LINK_LIBRARIES O2Physics::AnalysisCore O2::DetectorsBase O2Physics::AnalysisCCDB O2Physics::MLCore
COMPONENT_NAME Analysis)

# HMPID
Expand Down
14 changes: 13 additions & 1 deletion Common/TableProducer/PID/pidTPC.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@
#include "TableHelper.h"
#include "pidTPCBase.h"

#include "Common/CCDB/ctpRateFetcher.h"
#include "Common/Core/PID/TPCPIDResponse.h"
#include "Common/DataModel/EventSelection.h"
#include "Common/DataModel/Multiplicity.h"
Expand Down Expand Up @@ -151,7 +152,8 @@ struct tpcPid {
Configurable<int> useNetworkAl{"useNetworkAl", 1, {"Switch for applying neural network on the alpha mass hypothesis (if network enabled) (set to 0 to disable)"}};
Configurable<float> networkBetaGammaCutoff{"networkBetaGammaCutoff", 0.45, {"Lower value of beta-gamma to override the NN application"}};
Configurable<float> networkInputBatchedMode{"networkInputBatchedMode", -1, {"-1: Takes all tracks, >0: Takes networkInputBatchedMode number of tracks at once"}};

Configurable<std::string> irSource{"irSource", "ZNC hadronic", "Estimator of the interaction rate (Recommended: pp --> T0VTX, Pb-Pb --> ZNC hadronic)"};
ctpRateFetcher mRateFetcher;
// Parametrization configuration
bool useCCDBParam = false;
std::vector<float> track_properties;
Expand Down Expand Up @@ -400,6 +402,16 @@ struct tpcPid {
if (input_dimensions == 7 && networkVersion == "2") {
track_properties[counter_track_props + 6] = trk.has_collision() ? collisions.iteratorAt(trk.collisionId()).ft0cOccupancyInTimeRange() / 60000. : 1.;
}
if (input_dimensions == 8 && networkVersion == "3") {
if (trk.has_collision()) {
auto trk_bc = (collisions.iteratorAt(trk.collisionId())).template bc_as<B>();
float hadronicRate = mRateFetcher.fetch(ccdb.service, trk_bc.timestamp(), trk_bc.runNumber(), irSource) * 1.e-3;
track_properties[counter_track_props + 7] = hadronicRate / 50.;
} else {
track_properties[counter_track_props + 7] = 1;
}
}

counter_track_props += input_dimensions;
in_batch_counter++;
total_input_count++;
Expand Down
Loading