Skip to content

PWGHF: PreSelection Changes #4873

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

Merged
jgrosseo merged 1 commit into from
Dec 2, 2020
Merged

PWGHF: PreSelection Changes #4873

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
2 changes: 2 additions & 0 deletions Analysis/Core/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ o2_add_library(AnalysisCore
src/AnalysisCut.cxx
src/AnalysisCompositeCut.cxx
src/TriggerAliases.cxx
src/HFConfigurables.cxx
PUBLIC_LINK_LIBRARIES O2::Framework O2::AnalysisDataModel O2::AnalysisTools)

o2_target_root_dictionary(AnalysisCore
Expand All @@ -28,6 +29,7 @@ o2_target_root_dictionary(AnalysisCore
include/Analysis/AnalysisCompositeCut.h
include/Analysis/TriggerAliases.h
include/Analysis/MC.h
include/Analysis/HFConfigurables.h
LINKDEF src/AnalysisCoreLinkDef.h)

if(FastJet_FOUND)
Expand Down
61 changes: 61 additions & 0 deletions Analysis/Core/include/Analysis/HFConfigurables.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,61 @@
// Copyright CERN and copyright holders of ALICE O2. This software is
Copy link
Collaborator

@ginnocen ginnocen Nov 21, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hi @nzardosh, to make sure I understand the goal of this HFConfigurables.h. This .h will contain all the default parameters of the preselection cuts, which were previously set directly inside the task. They will be overwritten if a proper JSON file is given to the task. Do I understand it right?

Copy link
Contributor Author

@nzardosh nzardosh Nov 24, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yes indeed this is correct

// 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.

// HF Configurable Classes
//
// Authors: Nima Zardoshti

#ifndef O2_ANALYSIS_HFCONFIGURABLES_H
#define O2_ANALYSIS_HFCONFIGURABLES_H

#include <TMath.h>

class HFTrackIndexSkimsCreatorConfigs
{
public:
HFTrackIndexSkimsCreatorConfigs() = default;
~HFTrackIndexSkimsCreatorConfigs() = default;

// 2-prong cuts D0
double mPtD0Min = 0.;
double mInvMassD0Min = 1.46;
double mInvMassD0Max = 2.26;
double mCPAD0Min = 0.75;
double mImpParProductD0Max = -0.00005;
// 2-prong cuts Jpsi
double mPtJpsiMin = 0.;
double mInvMassJpsiMin = 2.5;
double mInvMassJpsiMax = 4.1;
double mCPAJpsiMin = -2;
double mImpParProductJpsiMax = 1000.;
// 3-prong cuts - D+
double mPtDPlusMin = 0.;
double mInvMassDPlusMin = 1.7;
double mInvMassDPlusMax = 2.05;
double mCPADPlusMin = 0.5;
double mDecLenDPlusMin = 0.;
// 3-prong cuts - Lc
double mPtLcMin = 0.;
double mInvMassLcMin = 2.1;
double mInvMassLcMax = 2.5;
double mCPALcMin = 0.5;
double mDecLenLcMin = 0.;
// 3-prong cuts - Ds
double mPtDsMin = 0.;
double mInvMassDsMin = 1.7;
double mInvMassDsMax = 2.2;
double mCPADsMin = 0.5;
double mDecLenDsMin = 0.;

private:
ClassDef(HFTrackIndexSkimsCreatorConfigs, 1);
};

#endif
1 change: 1 addition & 0 deletions Analysis/Core/src/AnalysisCoreLinkDef.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,3 +20,4 @@
#pragma link C++ class HistogramManager + ;
#pragma link C++ class AnalysisCut + ;
#pragma link C++ class AnalysisCompositeCut + ;
#pragma link C++ class HFTrackIndexSkimsCreatorConfigs + ;
14 changes: 14 additions & 0 deletions Analysis/Core/src/HFConfigurables.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.

// HF Configurable Classes
//
// Authors: Nima Zardoshti
#include "Analysis/HFConfigurables.h"
22 changes: 18 additions & 4 deletions Analysis/DataModel/include/Analysis/HFSecondaryVertex.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,15 +25,13 @@ namespace o2::aod
{
namespace hf_seltrack
{
DECLARE_SOA_COLUMN(IsSel2Prong, isSel2Prong, int);
DECLARE_SOA_COLUMN(IsSel3Prong, isSel3Prong, int);
DECLARE_SOA_COLUMN(IsSelProng, isSelProng, int);
DECLARE_SOA_COLUMN(DCAPrim0, dcaPrim0, float);
DECLARE_SOA_COLUMN(DCAPrim1, dcaPrim1, float);
} // namespace hf_seltrack

DECLARE_SOA_TABLE(HFSelTrack, "AOD", "HFSELTRACK",
hf_seltrack::IsSel2Prong,
hf_seltrack::IsSel3Prong,
hf_seltrack::IsSelProng,
hf_seltrack::DCAPrim0,
hf_seltrack::DCAPrim1);

Expand All @@ -50,19 +48,35 @@ DECLARE_SOA_INDEX_COLUMN_FULL(Index1, index1, int, BigTracks, "fIndex1");
DECLARE_SOA_INDEX_COLUMN_FULL(Index2, index2, int, BigTracks, "fIndex2");
DECLARE_SOA_INDEX_COLUMN_FULL(Index3, index3, int, BigTracks, "fIndex3");
DECLARE_SOA_COLUMN(HFflag, hfflag, uint8_t);

DECLARE_SOA_COLUMN(D0ToKPiFlag, d0ToKPiFlag, uint8_t);
DECLARE_SOA_COLUMN(JpsiToEEFlag, jpsiToEEFlag, uint8_t);

DECLARE_SOA_COLUMN(DPlusPiKPiFlag, dPlusPiKPiFlag, uint8_t);
DECLARE_SOA_COLUMN(LcPKPiFlag, lcPKPiFlag, uint8_t);
DECLARE_SOA_COLUMN(DsKKPiFlag, dsKKPiFlag, uint8_t);
} // namespace hf_track_index

DECLARE_SOA_TABLE(HfTrackIndexProng2, "AOD", "HFTRACKIDXP2",
hf_track_index::Index0Id,
hf_track_index::Index1Id,
hf_track_index::HFflag);

DECLARE_SOA_TABLE(HfCutStatusProng2, "AOD", "HFCUTSTATUSP2",
hf_track_index::D0ToKPiFlag,
hf_track_index::JpsiToEEFlag);

DECLARE_SOA_TABLE(HfTrackIndexProng3, "AOD", "HFTRACKIDXP3",
hf_track_index::Index0Id,
hf_track_index::Index1Id,
hf_track_index::Index2Id,
hf_track_index::HFflag);

DECLARE_SOA_TABLE(HfCutStatusProng3, "AOD", "HFCUTSTATUSP3",
hf_track_index::DPlusPiKPiFlag,
hf_track_index::LcPKPiFlag,
hf_track_index::DsKKPiFlag);

// general decay properties
namespace hf_cand
{
Expand Down
Loading