Skip to content

[PWGEM,Photon] move remaining CCDB fetches to CCDB columns #18038

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

Draft
mhemmer-cern wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

[PWGEM,Photon] move remaining CCDB fetches to CCDB columns #18038

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
7 changes: 0 additions & 7 deletions PWGEM/PhotonMeson/Core/Pi0EtaToGammaGamma.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@
#include "Common/DataModel/Centrality.h"
#include "Common/DataModel/EventSelection.h"

#include <CCDB/BasicCCDBManager.h>
#include <CCDB/CcdbApi.h>
#include <CommonConstants/MathConstants.h>
#include <CommonConstants/PhysicsConstants.h>
Expand Down Expand Up @@ -296,7 +295,6 @@ struct Pi0EtaToGammaGamma {
std::vector<float> occ_bin_edges;

o2::ccdb::CcdbApi ccdbApi;
o2::framework::Service<o2::ccdb::BasicCCDBManager> ccdb{};
int mRunNumber = -1;
float d_bz = 0;
o2::emcal::Geometry* emcalGeom = nullptr;
Expand Down Expand Up @@ -445,11 +443,6 @@ struct Pi0EtaToGammaGamma {

mRunNumber = 0;
d_bz = 0;

ccdb->setURL(ccdburl);
ccdb->setCaching(true);
ccdb->setLocalObjectValidityChecking();
ccdb->setFatalWhenNull(false);
}

template <o2::soa::is_iterator TCollision>
Expand Down
7 changes: 0 additions & 7 deletions PWGEM/PhotonMeson/Core/Pi0EtaToGammaGammaMC.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@
#include "Common/DataModel/Centrality.h"
#include "Common/DataModel/EventSelection.h"

#include <CCDB/BasicCCDBManager.h>
#include <CCDB/CcdbApi.h>
#include <CommonConstants/PhysicsConstants.h>
#include <DataFormatsParameters/GRPMagField.h>
Expand Down Expand Up @@ -268,7 +267,6 @@ struct Pi0EtaToGammaGammaMC {
static constexpr std::array<std::string_view, 2> kParnames = {"Pi0/", "Eta/"};

o2::ccdb::CcdbApi ccdbApi;
o2::framework::Service<o2::ccdb::BasicCCDBManager> ccdb{};
int mRunNumber = 0;
float d_bz = 0;

Expand Down Expand Up @@ -300,11 +298,6 @@ struct Pi0EtaToGammaGammaMC {

mRunNumber = 0;
d_bz = 0;

ccdb->setURL(ccdburl);
ccdb->setCaching(true);
ccdb->setLocalObjectValidityChecking();
ccdb->setFatalWhenNull(false);
}

template <o2::soa::is_iterator TCollision>
Expand Down
8 changes: 0 additions & 8 deletions PWGEM/PhotonMeson/Core/TaggingPi0.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@
#include "Common/DataModel/EventSelection.h"
#include "Common/DataModel/PIDResponseTPC.h"

#include <CCDB/BasicCCDBManager.h>
#include <CCDB/CcdbApi.h>
#include <CommonConstants/MathConstants.h>
#include <CommonConstants/PhysicsConstants.h>
Expand Down Expand Up @@ -87,7 +86,6 @@ using MyEMCCluster = MyEMCClusters::iterator;

template <o2::aod::pwgem::photonmeson::photonpair::PairType pairtype, typename... Types>
struct TaggingPi0 {
o2::framework::Configurable<std::string> ccdburl{"ccdb-url", "http://alice-ccdb.cern.ch", "url of the ccdb repository"};
o2::framework::Configurable<float> d_bz_input{"d_bz_input", -999, "bz field in kG, -999 is automatic"};
o2::framework::Configurable<uint64_t> ndiff_bc_mix{"ndiff_bc_mix", 594, "difference in global BC required in mixed events"};

Expand Down Expand Up @@ -222,7 +220,6 @@ struct TaggingPi0 {
std::vector<float> occ_bin_edges;

o2::ccdb::CcdbApi ccdbApi;
o2::framework::Service<o2::ccdb::BasicCCDBManager> ccdb{};
int mRunNumber = 0;
float d_bz = 0;

Expand Down Expand Up @@ -255,11 +252,6 @@ struct TaggingPi0 {

mRunNumber = 0;
d_bz = 0;

ccdb->setURL(ccdburl);
ccdb->setCaching(true);
ccdb->setLocalObjectValidityChecking();
ccdb->setFatalWhenNull(false);
}

template <o2::soa::is_iterator TCollision>
Expand Down
8 changes: 0 additions & 8 deletions PWGEM/PhotonMeson/Core/TaggingPi0MC.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@
#include "Common/DataModel/EventSelection.h"
#include "Common/DataModel/PIDResponseTPC.h"

#include <CCDB/BasicCCDBManager.h>
#include <CCDB/CcdbApi.h>
#include <CommonConstants/MathConstants.h>
#include <CommonConstants/PhysicsConstants.h>
Expand Down Expand Up @@ -91,7 +90,6 @@ using MyMCElectron = MyMCElectrons::iterator;

template <o2::aod::pwgem::photonmeson::photonpair::PairType pairtype, typename... Types>
struct TaggingPi0MC {
o2::framework::Configurable<std::string> ccdburl{"ccdb-url", "http://alice-ccdb.cern.ch", "url of the ccdb repository"};
o2::framework::Configurable<float> d_bz_input{"d_bz_input", -999, "bz field in kG, -999 is automatic"};

o2::framework::Configurable<int> cfgQvecEstimator{"cfgQvecEstimator", 0, "FT0M:0, FT0A:1, FT0C:2"};
Expand Down Expand Up @@ -214,7 +212,6 @@ struct TaggingPi0MC {
static constexpr std::array<std::string_view, 2> parnames = {"Pi0/", "Eta/"};

o2::ccdb::CcdbApi ccdbApi;
o2::framework::Service<o2::ccdb::BasicCCDBManager> ccdb{};
int mRunNumber = 0;
float d_bz = 0;
TF1* f1fd_k0s_to_pi0 = nullptr;
Expand All @@ -232,11 +229,6 @@ struct TaggingPi0MC {
mRunNumber = 0;
d_bz = 0;
f1fd_k0s_to_pi0 = new TF1("f1fd_k0s_to_pi0", TString(fd_k0s_to_pi0), 0.f, 100.f);

ccdb->setURL(ccdburl);
ccdb->setCaching(true);
ccdb->setLocalObjectValidityChecking();
ccdb->setFatalWhenNull(false);
}

template <o2::soa::is_iterator TCollision>
Expand Down
6 changes: 6 additions & 0 deletions PWGEM/PhotonMeson/DataModel/EventTables.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@

#include "Common/CCDB/EventSelectionParams.h"
#include "Common/DataModel/EventSelection.h"
#include "Common/DataModel/TpcCCDBObjects.h"

#include <DataFormatsParameters/GRPMagField.h>
#include <EMCALCalib/BadChannelMap.h>
Expand Down Expand Up @@ -118,6 +119,11 @@ DECLARE_SOA_CCDB_COLUMN(BadChannelMap, badChannelMap, o2::emcal::BadChannelMap,
DECLARE_SOA_TIMESTAMPED_TABLE(EmEmcalObjects, aod::PMEvents, o2::aod::timestamp::Timestamp, 0, "EMEMCALOBJECTS", //!
em::ccdbEmcal::BadChannelMap);

/// TPC drift velocity for EmEvents. Reuses the shared column (same label and path).
/// Timestamp-uniform since the drift velocity changes within a run.
DECLARE_SOA_TIMESTAMPED_TABLE(EmTpcObjects, aod::PMEvents, o2::aod::timestamp::Timestamp, 0, "EMTPCOBJECTS", //!
ccdbTpc::VDriftTgl);

} // namespace o2::aod

#endif // PWGEM_PHOTONMESON_DATAMODEL_EVENTTABLES_H_
Loading
Loading