Skip to content

Commit f36391d

Browse files
committed
New methods to query AggregatedRunInfo for MC
This commit is * slightly changing BasicCCDBManager to be able to - retrieve meta information headers - retrieve the underlying CCDB api for reuse * offering an API to build AggregatedRunInfo with values overwritten from specific MC production settings - This could be used from the analysis side. Analysis needs to identify if AOD is from MC, and use the MC production tag (lpm_prod_tag) in the query. This needs separate upload of MCProdInfo meta-information to CCDB.
1 parent 73bc03d commit f36391d

File tree

3 files changed

+67
-7
lines changed

3 files changed

+67
-7
lines changed

CCDB/include/CCDB/BasicCCDBManager.h

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -108,16 +108,20 @@ class CCDBManagerInstance
108108

109109
/// retrieve an object of type T from CCDB as stored under path, timestamp and metaData
110110
template <typename T>
111-
T* getSpecific(std::string const& path, long timestamp = -1, MD metaData = MD())
111+
T* getSpecific(std::string const& path, long timestamp = -1, MD metaData = MD(), std::map<std::string, std::string>* headers = nullptr)
112112
{
113113
// TODO: add some error info/handling when failing
114114
mMetaData = metaData;
115-
return getForTimeStamp<T>(path, timestamp);
115+
auto obj = getForTimeStamp<T>(path, timestamp);
116+
if (headers) {
117+
*headers = mHeaders;
118+
}
119+
return obj;
116120
}
117121

118122
/// retrieve an object of type T from CCDB as stored under path and using the timestamp in the middle of the run + metadata. The run number is provided separately to conform to typical analysis use (in which case metadata does not include runNumber)
119123
template <typename T>
120-
T* getSpecificForRun(std::string const& path, int runNumber, MD metaData = MD());
124+
T* getSpecificForRun(std::string const& path, int runNumber, MD const& metaData = MD());
121125

122126
/// detect online processing modes (i.e. CCDB objects may be updated in the lifetime of the manager)
123127
bool isOnline() const { return mDeplMode == o2::framework::DeploymentMode::OnlineAUX || mDeplMode == o2::framework::DeploymentMode::OnlineDDS || mDeplMode == o2::framework::DeploymentMode::OnlineECS; }
@@ -129,6 +133,9 @@ class CCDBManagerInstance
129133
return getForTimeStamp<T>(path, mTimestamp);
130134
}
131135

136+
// gain access to underlaying CCDB layer (to allow for more complex queries without need to reinit another API)
137+
CcdbApi& getCCDBAccessor() { return mCCDBAccessor; }
138+
132139
bool isHostReachable() const { return mCCDBAccessor.isHostReachable(); }
133140

134141
/// clear all entries in the cache
@@ -230,11 +237,12 @@ class CCDBManagerInstance
230237
template <typename T>
231238
T* CCDBManagerInstance::getForTimeStamp(std::string const& path, long timestamp)
232239
{
240+
mHeaders.clear(); // we clear at the beginning; to allow to retrieve the header information in a subsequent call
233241
T* ptr = nullptr;
234242
mQueries++;
235243
auto start = std::chrono::system_clock::now();
236244
if (!isCachingEnabled()) {
237-
ptr = mCCDBAccessor.retrieveFromTFileAny<T>(path, mMetaData, timestamp, nullptr, "",
245+
ptr = mCCDBAccessor.retrieveFromTFileAny<T>(path, mMetaData, timestamp, &mHeaders, "",
238246
mCreatedNotAfter ? std::to_string(mCreatedNotAfter) : "",
239247
mCreatedNotBefore ? std::to_string(mCreatedNotBefore) : "");
240248
if (!ptr) {
@@ -305,7 +313,6 @@ T* CCDBManagerInstance::getForTimeStamp(std::string const& path, long timestamp)
305313
} else {
306314
cached.cacheValidUntil = -1;
307315
}
308-
mHeaders.clear();
309316
mMetaData.clear();
310317
if (!ptr) {
311318
if (mFatalWhenNull) {
@@ -328,7 +335,7 @@ T* CCDBManagerInstance::getForRun(std::string const& path, int runNumber, bool s
328335
}
329336

330337
template <typename T>
331-
T* CCDBManagerInstance::getSpecificForRun(std::string const& path, int runNumber, MD metaData)
338+
T* CCDBManagerInstance::getSpecificForRun(std::string const& path, int runNumber, MD const& metaData)
332339
{
333340
auto [start, stop] = getRunDuration(runNumber, mFatalWhenNull);
334341
if (start < 0 || stop < 0) {

DataFormats/Parameters/include/DataFormatsParameters/AggregatedRunInfo.h

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ struct AggregatedRunInfo {
3232
int runNumber = 0; // run number
3333
int64_t sor = 0; // best known timestamp for the start of run
3434
int64_t eor = 0; // best known timestamp for end of run
35-
int64_t orbitsPerTF = 0; // number of orbits per TF
35+
int64_t orbitsPerTF = 0; // number of orbits per TF (takes precedence over that in GRPECS)
3636
int64_t orbitReset = 0; // timestamp of orbit reset before run
3737
int64_t orbitSOR = 0; // orbit when run starts after orbit reset
3838
int64_t orbitEOR = 0; // orbit when run ends after orbit reset
@@ -43,6 +43,13 @@ struct AggregatedRunInfo {
4343
// fills and returns AggregatedRunInfo for a given run number.
4444
static AggregatedRunInfo buildAggregatedRunInfo(o2::ccdb::CCDBManagerInstance& ccdb, int runnumber);
4545
static AggregatedRunInfo buildAggregatedRunInfo(int runnumber, long sorMS, long eorMS, long orbitResetMUS, const o2::parameters::GRPECSObject* grpecs, const std::vector<Long64_t>* ctfFirstRunOrbitVec);
46+
47+
// Special method for MC because MC may use extra settings or different values.
48+
// Will construct AggregatedRunInfo as in data but override certain values (OrbitsPerTF) if appropriate.
49+
// Needs to be given an lpm production tag as identifier and optionally the username who performed MC.
50+
static AggregatedRunInfo buildAggregatedRunInfo_MC(o2::ccdb::CCDBManagerInstance& ccdb, int run_number, std::string const& lpm_prod_tag, std::string const& username = "aliprod");
51+
52+
ClassDefNV(AggregatedRunInfo, 1);
4653
};
4754

4855
} // namespace o2::parameters

DataFormats/Parameters/src/AggregatedRunInfo.cxx

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,3 +83,49 @@ o2::parameters::AggregatedRunInfo AggregatedRunInfo::buildAggregatedRunInfo(int
8383
}
8484
return AggregatedRunInfo{runnumber, sorMS, eorMS, nOrbitsPerTF, orbitResetMUS, orbitSOR, orbitEOR, grpecs};
8585
}
86+
87+
namespace
88+
{
89+
90+
// get path where to find MC production info
91+
std::string getFullPath_MC(std::string const& username, std::string const& lpm_prod_tag)
92+
{
93+
// construct the path where to lookup
94+
std::string path = "/Users/" + std::string(1, username[0]) + "/" + username;
95+
std::string fullpath = path + "/" + "MCProdInfo/" + lpm_prod_tag;
96+
return fullpath;
97+
}
98+
99+
} // namespace
100+
101+
AggregatedRunInfo AggregatedRunInfo::buildAggregatedRunInfo_MC(o2::ccdb::CCDBManagerInstance& ccdb, int run_number, std::string const& lpm_prod_tag, std::string const& username)
102+
{
103+
// (a) lookup the AggregatedRunInfo for the run
104+
// (b) modify/overwrite the info object with MC specific settings (if available)
105+
106+
// For now just the timeframe length is overwritten. We can consider
107+
// to return the full MCProdInfo meta-data to the caller as well.
108+
109+
auto original_info = buildAggregatedRunInfo(ccdb, run_number);
110+
111+
std::map<std::string, std::string> metaDataFilter;
112+
metaDataFilter["lpm_prod_tag"] = lpm_prod_tag;
113+
114+
// fetch the meta information for MC productions
115+
auto header_data = ccdb.getCCDBAccessor().retrieveHeaders(getFullPath_MC(username, lpm_prod_tag), metaDataFilter, run_number);
116+
117+
// adjust timeframe length if we find entry for MC production
118+
auto iter = header_data.find("OrbitsPerTF");
119+
if (iter != header_data.end()) {
120+
auto mc_orbitsPerTF = std::stoi(iter->second);
121+
if (mc_orbitsPerTF != original_info.orbitsPerTF) {
122+
LOG(info) << "Adjusting OrbitsPerTF from " << original_info.orbitsPerTF << " to " << mc_orbitsPerTF << " based on differing MC info";
123+
original_info.orbitsPerTF = mc_orbitsPerTF;
124+
}
125+
}
126+
else {
127+
LOG(warn) << "No OrbitsPerTF information found for MC production " << lpm_prod_tag << " and run number " << run_number;
128+
}
129+
130+
return original_info;
131+
}

0 commit comments

Comments
 (0)