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
12 changes: 6 additions & 6 deletions PWGHF/TableProducer/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -37,12 +37,12 @@ o2physics_add_dpl_workflow(mc-pid-tof

o2physics_add_dpl_workflow(candidate-creator-2prong
SOURCES candidateCreator2Prong.cxx
PUBLIC_LINK_LIBRARIES O2Physics::AnalysisCore O2::DCAFitter KFParticle::KFParticle O2Physics::SGCutParHolder
PUBLIC_LINK_LIBRARIES O2Physics::AnalysisCore O2::DCAFitter KFParticle::KFParticle O2Physics::SGCutParHolder O2Physics::AnalysisCCDB
COMPONENT_NAME Analysis)

o2physics_add_dpl_workflow(candidate-creator-3prong
SOURCES candidateCreator3Prong.cxx
PUBLIC_LINK_LIBRARIES O2Physics::AnalysisCore O2::DCAFitter KFParticle::KFParticle O2Physics::SGCutParHolder
PUBLIC_LINK_LIBRARIES O2Physics::AnalysisCore O2::DCAFitter KFParticle::KFParticle O2Physics::SGCutParHolder O2Physics::AnalysisCCDB
COMPONENT_NAME Analysis)

o2physics_add_dpl_workflow(candidate-creator-b0
Expand All @@ -62,12 +62,12 @@ o2physics_add_dpl_workflow(candidate-creator-bs

o2physics_add_dpl_workflow(candidate-creator-cascade
SOURCES candidateCreatorCascade.cxx
PUBLIC_LINK_LIBRARIES O2Physics::AnalysisCore O2::DCAFitter
PUBLIC_LINK_LIBRARIES O2Physics::AnalysisCore O2::DCAFitter O2Physics::AnalysisCCDB
COMPONENT_NAME Analysis)

o2physics_add_dpl_workflow(candidate-creator-dstar
SOURCES candidateCreatorDstar.cxx
PUBLIC_LINK_LIBRARIES O2Physics::AnalysisCore
PUBLIC_LINK_LIBRARIES O2Physics::AnalysisCore O2Physics::AnalysisCCDB
COMPONENT_NAME Analysis)

o2physics_add_dpl_workflow(candidate-creator-lb
Expand All @@ -87,12 +87,12 @@ o2physics_add_dpl_workflow(candidate-creator-sigmac0plusplus-cascade

o2physics_add_dpl_workflow(candidate-creator-xic0-omegac0
SOURCES candidateCreatorXic0Omegac0.cxx
PUBLIC_LINK_LIBRARIES O2Physics::AnalysisCore O2::DCAFitter KFParticle::KFParticle
PUBLIC_LINK_LIBRARIES O2Physics::AnalysisCore O2::DCAFitter KFParticle::KFParticle O2Physics::AnalysisCCDB
COMPONENT_NAME Analysis)

o2physics_add_dpl_workflow(candidate-creator-xic-to-xi-pi-pi
SOURCES candidateCreatorXicToXiPiPi.cxx
PUBLIC_LINK_LIBRARIES O2Physics::AnalysisCore O2::DCAFitter KFParticle::KFParticle
PUBLIC_LINK_LIBRARIES O2Physics::AnalysisCore O2::DCAFitter KFParticle::KFParticle O2Physics::AnalysisCCDB
COMPONENT_NAME Analysis)

o2physics_add_dpl_workflow(candidate-creator-xicc
Expand Down
23 changes: 15 additions & 8 deletions PWGHF/TableProducer/candidateCreator2Prong.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@
#include "PWGHF/Utils/utilsTrkCandHf.h"
#include "PWGLF/DataModel/mcCentrality.h"

#include "Common/CCDB/ctpRateFetcher.h"
#include "Common/Core/RecoDecay.h"
#include "Common/Core/trackUtilities.h"
#include "Common/DataModel/Centrality.h"
Expand Down Expand Up @@ -112,10 +113,12 @@ struct HfCandidateCreator2Prong {
Configurable<std::string> ccdbUrl{"ccdbUrl", "http://alice-ccdb.cern.ch", "url of the ccdb repository"};
Configurable<std::string> ccdbPathGrp{"ccdbPathGrp", "GLO/GRP/GRP", "Path of the grp file (Run 2)"};
Configurable<std::string> ccdbPathGrpMag{"ccdbPathGrpMag", "GLO/Config/GRPMagField", "CCDB path of the GRPMagField object (Run 3)"};
Configurable<std::string> irSource{"irSource", "ZNC hadronic", "Estimator of the interaction rate (Recommended: pp --> T0VTX, Pb-Pb --> ZNC hadronic)"};

HfEventSelection hfEvSel; // event selection and monitoring
o2::vertexing::DCAFitterN<2> df; // 2-prong vertex fitter
Service<o2::ccdb::BasicCCDBManager> ccdb;
ctpRateFetcher mRateFetcher;

int runNumber{0};
double bz{0.};
Expand Down Expand Up @@ -742,9 +745,10 @@ struct HfCandidateCreator2Prong {
float centrality{-1.f};
const auto occupancy = o2::hf_occupancy::getOccupancyColl(collision, hfEvSel.occEstimator);
const auto rejectionMask = hfEvSel.getHfCollisionRejectionMask<true, CentralityEstimator::None, aod::BCsWithTimestamps>(collision, centrality, ccdb, registry);

const auto bc = collision.template foundBC_as<aod::BCsWithTimestamps>();
const auto ir = mRateFetcher.fetch(ccdb.service, bc.timestamp(), bc.runNumber(), irSource, true); // Hz
/// monitor the satisfied event selections
hfEvSel.fillHistograms(collision, rejectionMask, centrality, occupancy);
hfEvSel.fillHistograms(collision, rejectionMask, centrality, occupancy, ir);

} /// end loop over collisions
}
Expand All @@ -760,9 +764,10 @@ struct HfCandidateCreator2Prong {
float centrality{-1.f};
const auto occupancy = o2::hf_occupancy::getOccupancyColl(collision, hfEvSel.occEstimator);
const auto rejectionMask = hfEvSel.getHfCollisionRejectionMask<true, CentralityEstimator::FT0C, aod::BCsWithTimestamps>(collision, centrality, ccdb, registry);

const auto bc = collision.template foundBC_as<aod::BCsWithTimestamps>();
const auto ir = mRateFetcher.fetch(ccdb.service, bc.timestamp(), bc.runNumber(), irSource, true); // Hz
/// monitor the satisfied event selections
hfEvSel.fillHistograms(collision, rejectionMask, centrality, occupancy);
hfEvSel.fillHistograms(collision, rejectionMask, centrality, occupancy, ir);

} /// end loop over collisions
}
Expand All @@ -778,9 +783,10 @@ struct HfCandidateCreator2Prong {
float centrality{-1.f};
const auto occupancy = o2::hf_occupancy::getOccupancyColl(collision, hfEvSel.occEstimator);
const auto rejectionMask = hfEvSel.getHfCollisionRejectionMask<true, CentralityEstimator::FT0M, aod::BCsWithTimestamps>(collision, centrality, ccdb, registry);

const auto bc = collision.template foundBC_as<aod::BCsWithTimestamps>();
const auto ir = mRateFetcher.fetch(ccdb.service, bc.timestamp(), bc.runNumber(), irSource, true); // Hz
/// monitor the satisfied event selections
hfEvSel.fillHistograms(collision, rejectionMask, centrality, occupancy);
hfEvSel.fillHistograms(collision, rejectionMask, centrality, occupancy, ir);

} /// end loop over collisions
}
Expand All @@ -801,9 +807,10 @@ struct HfCandidateCreator2Prong {
float centrality{-1.f};
const auto occupancy = o2::hf_occupancy::getOccupancyColl(collision, hfEvSel.occEstimator);
const auto rejectionMask = hfEvSel.getHfCollisionRejectionMaskWithUpc<true, CentralityEstimator::None, aod::BcFullInfos>(collision, centrality, ccdb, registry, bcs);

const auto bc = collision.template foundBC_as<aod::BcFullInfos>();
const auto ir = mRateFetcher.fetch(ccdb.service, bc.timestamp(), bc.runNumber(), irSource, true); // Hz
/// monitor the satisfied event selections
hfEvSel.fillHistograms(collision, rejectionMask, centrality, occupancy);
hfEvSel.fillHistograms(collision, rejectionMask, centrality, occupancy, ir);

} /// end loop over collisions
}
Expand Down
23 changes: 15 additions & 8 deletions PWGHF/TableProducer/candidateCreator3Prong.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@
#include "PWGHF/Utils/utilsTrkCandHf.h"
#include "PWGLF/DataModel/mcCentrality.h"

#include "Common/CCDB/ctpRateFetcher.h"
#include "Common/Core/RecoDecay.h"
#include "Common/Core/trackUtilities.h"
#include "Common/DataModel/Centrality.h"
Expand Down Expand Up @@ -120,6 +121,7 @@ struct HfCandidateCreator3Prong {
Configurable<std::string> ccdbUrl{"ccdbUrl", "http://alice-ccdb.cern.ch", "url of the ccdb repository"};
Configurable<std::string> ccdbPathGrp{"ccdbPathGrp", "GLO/GRP/GRP", "Path of the grp file (Run 2)"};
Configurable<std::string> ccdbPathGrpMag{"ccdbPathGrpMag", "GLO/Config/GRPMagField", "CCDB path of the GRPMagField object (Run 3)"};
Configurable<std::string> irSource{"irSource", "ZNC hadronic", "Estimator of the interaction rate (Recommended: pp --> T0VTX, Pb-Pb --> ZNC hadronic)"};
// flags to enable creation for different particle species separately
Configurable<bool> createDplus{"createDplus", false, "enable D+/- candidate creation"};
Configurable<bool> createDs{"createDs", false, "enable Ds+/- candidate creation"};
Expand All @@ -133,6 +135,7 @@ struct HfCandidateCreator3Prong {
HfEventSelection hfEvSel; // event selection and monitoring
o2::vertexing::DCAFitterN<3> df; // 3-prong vertex fitter
Service<o2::ccdb::BasicCCDBManager> ccdb;
ctpRateFetcher mRateFetcher;

int runNumber{0};
double bz{0.};
Expand Down Expand Up @@ -899,9 +902,10 @@ struct HfCandidateCreator3Prong {
float centrality{-1.f};
const auto occupancy = o2::hf_occupancy::getOccupancyColl(collision, hfEvSel.occEstimator);
const auto rejectionMask = hfEvSel.getHfCollisionRejectionMask<true, CentralityEstimator::None, aod::BCsWithTimestamps>(collision, centrality, ccdb, registry);

const auto bc = collision.template foundBC_as<aod::BCsWithTimestamps>();
const auto ir = mRateFetcher.fetch(ccdb.service, bc.timestamp(), bc.runNumber(), irSource, true); // Hz
/// monitor the satisfied event selections
hfEvSel.fillHistograms(collision, rejectionMask, centrality, occupancy);
hfEvSel.fillHistograms(collision, rejectionMask, centrality, occupancy, ir);

} /// end loop over collisions
}
Expand All @@ -917,9 +921,10 @@ struct HfCandidateCreator3Prong {
float centrality{-1.f};
const auto occupancy = o2::hf_occupancy::getOccupancyColl(collision, hfEvSel.occEstimator);
const auto rejectionMask = hfEvSel.getHfCollisionRejectionMask<true, CentralityEstimator::FT0C, aod::BCsWithTimestamps>(collision, centrality, ccdb, registry);

const auto bc = collision.template foundBC_as<aod::BCsWithTimestamps>();
const auto ir = mRateFetcher.fetch(ccdb.service, bc.timestamp(), bc.runNumber(), irSource, true); // Hz
/// monitor the satisfied event selections
hfEvSel.fillHistograms(collision, rejectionMask, centrality, occupancy);
hfEvSel.fillHistograms(collision, rejectionMask, centrality, occupancy, ir);

} /// end loop over collisions
}
Expand All @@ -935,9 +940,10 @@ struct HfCandidateCreator3Prong {
float centrality{-1.f};
const auto occupancy = o2::hf_occupancy::getOccupancyColl(collision, hfEvSel.occEstimator);
const auto rejectionMask = hfEvSel.getHfCollisionRejectionMask<true, CentralityEstimator::FT0M, aod::BCsWithTimestamps>(collision, centrality, ccdb, registry);

const auto bc = collision.template foundBC_as<aod::BCsWithTimestamps>();
const auto ir = mRateFetcher.fetch(ccdb.service, bc.timestamp(), bc.runNumber(), irSource, true); // Hz
/// monitor the satisfied event selections
hfEvSel.fillHistograms(collision, rejectionMask, centrality, occupancy);
hfEvSel.fillHistograms(collision, rejectionMask, centrality, occupancy, ir);

} /// end loop over collisions
}
Expand All @@ -958,9 +964,10 @@ struct HfCandidateCreator3Prong {
float centrality{-1.f};
const auto occupancy = o2::hf_occupancy::getOccupancyColl(collision, hfEvSel.occEstimator);
const auto rejectionMask = hfEvSel.getHfCollisionRejectionMaskWithUpc<true, CentralityEstimator::None, aod::BcFullInfos>(collision, centrality, ccdb, registry, bcs);

const auto bc = collision.template foundBC_as<aod::BcFullInfos>();
const auto ir = mRateFetcher.fetch(ccdb.service, bc.timestamp(), bc.runNumber(), irSource, true); // Hz
/// monitor the satisfied event selections
hfEvSel.fillHistograms(collision, rejectionMask, centrality, occupancy);
hfEvSel.fillHistograms(collision, rejectionMask, centrality, occupancy, ir);

} /// end loop over collisions
}
Expand Down
21 changes: 15 additions & 6 deletions PWGHF/TableProducer/candidateCreatorCascade.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
#include "PWGLF/DataModel/LFStrangenessTables.h"
#include "PWGLF/DataModel/mcCentrality.h"

#include "Common/CCDB/ctpRateFetcher.h"
#include "Common/Core/RecoDecay.h"
#include "Common/Core/trackUtilities.h"
#include "Common/DataModel/Centrality.h"
Expand Down Expand Up @@ -88,12 +89,14 @@ struct HfCandidateCreatorCascade {
Configurable<std::string> ccdbPathLut{"ccdbPathLut", "GLO/Param/MatLUT", "Path for LUT parametrization"};
Configurable<std::string> ccdbPathGrp{"ccdbPathGrp", "GLO/GRP/GRP", "Path of the grp file (Run 2)"};
Configurable<std::string> ccdbPathGrpMag{"ccdbPathGrpMag", "GLO/Config/GRPMagField", "CCDB path of the GRPMagField object (Run 3)"};
Configurable<std::string> irSource{"irSource", "ZNC hadronic", "Estimator of the interaction rate (Recommended: pp --> T0VTX, Pb-Pb --> ZNC hadronic)"};

HfEventSelection hfEvSel; // event selection and monitoring
o2::vertexing::DCAFitterN<2> df; // 2-prong vertex fitter
Service<o2::ccdb::BasicCCDBManager> ccdb;
o2::base::MatLayerCylSet* lut{};
o2::base::Propagator::MatCorrType matCorr = o2::base::Propagator::MatCorrType::USEMatCorrLUT;
ctpRateFetcher mRateFetcher;

int runNumber{0};
double massP{0.};
Expand Down Expand Up @@ -378,10 +381,12 @@ struct HfCandidateCreatorCascade {

/// bitmask with event. selection info
float centrality{-1.f};
const auto occupancy = o2::hf_occupancy::getOccupancyColl(collision, hfEvSel.occEstimator);
const auto rejectionMask = hfEvSel.getHfCollisionRejectionMask<true, CentralityEstimator::None, aod::BCsWithTimestamps>(collision, centrality, ccdb, registry);

const auto bc = collision.template foundBC_as<aod::BCsWithTimestamps>();
const auto ir = mRateFetcher.fetch(ccdb.service, bc.timestamp(), bc.runNumber(), irSource, true); // Hz
/// monitor the satisfied event selections
hfEvSel.fillHistograms(collision, rejectionMask, centrality);
hfEvSel.fillHistograms(collision, rejectionMask, centrality, occupancy, ir);

} /// end loop over collisions
}
Expand All @@ -395,10 +400,12 @@ struct HfCandidateCreatorCascade {

/// bitmask with event. selection info
float centrality{-1.f};
const auto occupancy = o2::hf_occupancy::getOccupancyColl(collision, hfEvSel.occEstimator);
const auto rejectionMask = hfEvSel.getHfCollisionRejectionMask<true, CentralityEstimator::FT0C, aod::BCsWithTimestamps>(collision, centrality, ccdb, registry);

const auto bc = collision.template foundBC_as<aod::BCsWithTimestamps>();
const auto ir = mRateFetcher.fetch(ccdb.service, bc.timestamp(), bc.runNumber(), irSource, true); // Hz
/// monitor the satisfied event selections
hfEvSel.fillHistograms(collision, rejectionMask, centrality);
hfEvSel.fillHistograms(collision, rejectionMask, centrality, occupancy, ir);

} /// end loop over collisions
}
Expand All @@ -412,10 +419,12 @@ struct HfCandidateCreatorCascade {

/// bitmask with event. selection info
float centrality{-1.f};
const auto occupancy = o2::hf_occupancy::getOccupancyColl(collision, hfEvSel.occEstimator);
const auto rejectionMask = hfEvSel.getHfCollisionRejectionMask<true, CentralityEstimator::FT0M, aod::BCsWithTimestamps>(collision, centrality, ccdb, registry);

const auto bc = collision.template foundBC_as<aod::BCsWithTimestamps>();
const auto ir = mRateFetcher.fetch(ccdb.service, bc.timestamp(), bc.runNumber(), irSource, true); // Hz
/// monitor the satisfied event selections
hfEvSel.fillHistograms(collision, rejectionMask, centrality);
hfEvSel.fillHistograms(collision, rejectionMask, centrality, occupancy, ir);

} /// end loop over collisions
}
Expand Down
21 changes: 15 additions & 6 deletions PWGHF/TableProducer/candidateCreatorDstar.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
#include "PWGHF/Utils/utilsTrkCandHf.h"
#include "PWGLF/DataModel/mcCentrality.h"

#include "Common/CCDB/ctpRateFetcher.h"
#include "Common/Core/RecoDecay.h"
#include "Common/Core/trackUtilities.h"
#include "Common/DataModel/Centrality.h"
Expand Down Expand Up @@ -94,6 +95,7 @@ struct HfCandidateCreatorDstar {
Configurable<bool> isRun2{"isRun2", false, "enable Run 2 or Run 3 GRP objects for magnetic field"};
Configurable<std::string> ccdbPathGrp{"ccdbPathGrp", "GLO/GRP/GRP", "Path of the grp file (Run 2)"};
Configurable<std::string> ccdbPathGrpMag{"ccdbPathGrpMag", "GLO/Config/GRPMagField", "CCDB path of the GRPMagField object (Run 3)"};
Configurable<std::string> irSource{"irSource", "ZNC hadronic", "Estimator of the interaction rate (Recommended: pp --> T0VTX, Pb-Pb --> ZNC hadronic)"};

// vertexing
Configurable<bool> propagateToPCA{"propagateToPCA", true, "create tracks version propagated to PCA"};
Expand All @@ -107,6 +109,7 @@ struct HfCandidateCreatorDstar {
HfEventSelection hfEvSel; // event selection and monitoring
Service<o2::ccdb::BasicCCDBManager> ccdb; // From utilsBfieldCCDB.h
o2::base::Propagator::MatCorrType noMatCorr = o2::base::Propagator::MatCorrType::USEMatCorrNONE;
ctpRateFetcher mRateFetcher;
// D0-prong vertex fitter
o2::vertexing::DCAFitterN<2> df;
int runNumber{};
Expand Down Expand Up @@ -498,10 +501,12 @@ struct HfCandidateCreatorDstar {

/// bitmask with event. selection info
float centrality{-1.f};
const auto occupancy = o2::hf_occupancy::getOccupancyColl(collision, hfEvSel.occEstimator);
const auto rejectionMask = hfEvSel.getHfCollisionRejectionMask<true, CentralityEstimator::None, aod::BCsWithTimestamps>(collision, centrality, ccdb, registry);

const auto bc = collision.template foundBC_as<aod::BCsWithTimestamps>();
const auto ir = mRateFetcher.fetch(ccdb.service, bc.timestamp(), bc.runNumber(), irSource, true); // Hz
/// monitor the satisfied event selections
hfEvSel.fillHistograms(collision, rejectionMask, centrality);
hfEvSel.fillHistograms(collision, rejectionMask, centrality, occupancy, ir);

} /// end loop over collisions
}
Expand All @@ -515,10 +520,12 @@ struct HfCandidateCreatorDstar {

/// bitmask with event. selection info
float centrality{-1.f};
const auto occupancy = o2::hf_occupancy::getOccupancyColl(collision, hfEvSel.occEstimator);
const auto rejectionMask = hfEvSel.getHfCollisionRejectionMask<true, CentralityEstimator::FT0C, aod::BCsWithTimestamps>(collision, centrality, ccdb, registry);

const auto bc = collision.template foundBC_as<aod::BCsWithTimestamps>();
const auto ir = mRateFetcher.fetch(ccdb.service, bc.timestamp(), bc.runNumber(), irSource, true); // Hz
/// monitor the satisfied event selections
hfEvSel.fillHistograms(collision, rejectionMask, centrality);
hfEvSel.fillHistograms(collision, rejectionMask, centrality, occupancy, ir);

} /// end loop over collisions
}
Expand All @@ -532,10 +539,12 @@ struct HfCandidateCreatorDstar {

/// bitmask with event. selection info
float centrality{-1.f};
const auto occupancy = o2::hf_occupancy::getOccupancyColl(collision, hfEvSel.occEstimator);
const auto rejectionMask = hfEvSel.getHfCollisionRejectionMask<true, CentralityEstimator::FT0M, aod::BCsWithTimestamps>(collision, centrality, ccdb, registry);

const auto bc = collision.template foundBC_as<aod::BCsWithTimestamps>();
const auto ir = mRateFetcher.fetch(ccdb.service, bc.timestamp(), bc.runNumber(), irSource, true); // Hz
/// monitor the satisfied event selections
hfEvSel.fillHistograms(collision, rejectionMask, centrality);
hfEvSel.fillHistograms(collision, rejectionMask, centrality, occupancy, ir);

} /// end loop over collisions
}
Expand Down
Loading
Loading