Skip to content
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

Please consider the following formatting changes to #4022 #193

Merged
merged 1 commit into from
Nov 29, 2023
Merged

Please consider the following formatting changes to #4022 #193

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 3 additions & 3 deletions PWGLF/DataModel/LFStrangenessPIDTables.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,11 +32,11 @@ DECLARE_SOA_COLUMN(TPCNSigmaPi, tpcNSigmaPi, float); //! Nsigma proton
DECLARE_SOA_COLUMN(TPCNSigmaKa, tpcNSigmaKa, float); //! Nsigma proton
DECLARE_SOA_COLUMN(TPCNSigmaPr, tpcNSigmaPr, float); //! Nsigma proton
DECLARE_SOA_COLUMN(TPCNSigmaHe, tpcNSigmaHe, float); //! Nsigma proton
}
} // namespace dautrack

DECLARE_SOA_TABLE(DauTrackTPCPIDs, "AOD", "DAUTRACKTPCPID", // nsigma table (for analysis)
dautrack::TPCSignal, dautrack::TPCNSigmaEl,
dautrack::TPCNSigmaPi, dautrack::TPCNSigmaKa,
dautrack::TPCSignal, dautrack::TPCNSigmaEl,
dautrack::TPCNSigmaPi, dautrack::TPCNSigmaKa,
dautrack::TPCNSigmaPr, dautrack::TPCNSigmaHe);

namespace v0data
Expand Down
4 changes: 2 additions & 2 deletions PWGLF/DataModel/LFStrangenessTables.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -784,11 +784,11 @@ DECLARE_SOA_EXTENDED_TABLE_USER(TraCascCores, StoredTraCascCores, "TraCascDATAEX

namespace cascdata
{
// For cross-linking all cascade kinds
// For cross-linking all cascade kinds
DECLARE_SOA_INDEX_COLUMN_FULL(TrackedCascade, trackedCascade, int, TraCascCores, "_Refs"); //!
DECLARE_SOA_INDEX_COLUMN_FULL(KFCascade, kfCascade, int, KFCascCores, "_Refs"); //!
DECLARE_SOA_INDEX_COLUMN_FULL(StandardCascade, standardCascade, int, CascCores, "_Refs"); //!
}
} // namespace cascdata

// interlink different cascade types
DECLARE_SOA_TABLE(CascToTraRefs, "AOD", "CASCTOTRAREFS", //! standard -> tracked
Expand Down
21 changes: 10 additions & 11 deletions PWGLF/TableProducer/strangederivedbuilder.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,19 +70,18 @@ struct strangederivedbuilder {
//__________________________________________________
// track extra references
Produces<aod::DauTrackExtras> dauTrackExtras; // daughter track detector properties
Produces<aod::DauTrackTPCPIDs> dauTrackTPCPIDs; // daughter track TPC PID
Produces<aod::DauTrackTPCPIDs> dauTrackTPCPIDs; // daughter track TPC PID
Produces<aod::V0Extras> v0Extras; // references DauTracks from V0s
Produces<aod::CascExtras> cascExtras; // references DauTracks from cascades
Produces<aod::KFCascExtras> kfcascExtras; // references DauTracks from KF cascades
Produces<aod::TraCascExtras> tracascExtras; // references DauTracks from tracked cascades

//__________________________________________________
// cascade interlinks
Produces<aod::CascToTraRefs> cascToTraRefs; // cascades -> tracked
Produces<aod::CascToKFRefs> cascToKFRefs; // cascades -> KF
Produces<aod::TraToCascRefs> traToCascRefs; // tracked -> cascades
Produces<aod::CascToTraRefs> cascToTraRefs; // cascades -> tracked
Produces<aod::CascToKFRefs> cascToKFRefs; // cascades -> KF
Produces<aod::TraToCascRefs> traToCascRefs; // tracked -> cascades
Produces<aod::KFToCascRefs> kfToCascRefs; // KF -> cascades


// histogram registry for bookkeeping
HistogramRegistry histos{"Histos", {}, OutputObjHandlingPolicy::AnalysisObject};
Expand Down Expand Up @@ -343,30 +342,30 @@ struct strangederivedbuilder {

void processCascadeInterlink(interlinkedCascades const& masterCascades, aod::CascIndices const& Cascades, aod::KFCascIndices const& KFCascades, aod::TraCascIndices const& TraCascades)
{
//Standard to tracked
// Standard to tracked
for (auto const& c : Cascades) {
int indexTracked = -1, indexKF = -1;
if(c.has_cascade()){
if (c.has_cascade()) {
auto cascade = c.cascade_as<interlinkedCascades>();
indexTracked = cascade.traCascDataId();
indexKF = cascade.kfCascDataId();
}
cascToTraRefs(indexTracked);
cascToKFRefs(indexKF);
}
//Tracked to standard
// Tracked to standard
for (auto const& c : TraCascades) {
int index = -1;
if(c.has_cascade()){
if (c.has_cascade()) {
auto cascade = c.cascade_as<interlinkedCascades>();
index = cascade.cascDataId();
}
traToCascRefs(index);
}
//Tracked to KF
// Tracked to KF
for (auto const& c : KFCascades) {
int index = -1;
if(c.has_cascade()){
if (c.has_cascade()) {
auto cascade = c.cascade_as<interlinkedCascades>();
index = cascade.cascDataId();
}
Expand Down
Loading