Skip to content

Please consider the following formatting changes to #3686 #179

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
ddobrigk merged 1 commit into from
Oct 24, 2023
Merged

Please consider the following formatting changes to #3686 #179

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: 1 addition & 1 deletion Common/DataModel/Multiplicity.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ DECLARE_SOA_COLUMN(MultBCTVX, multBCTVX, bool); //!
DECLARE_SOA_COLUMN(MultBCFV0OrA, multBCFV0OrA, bool); //!
DECLARE_SOA_COLUMN(MultBCV0triggerBits, multBCV0triggerBits, uint8_t); //!
DECLARE_SOA_COLUMN(MultBCTriggerMask, multBCTriggerMask, uint64_t); //! CTP trigger mask
DECLARE_SOA_COLUMN(MultBCColliding, multBCColliding, bool); //! CTP trigger mask
DECLARE_SOA_COLUMN(MultBCColliding, multBCColliding, bool); //! CTP trigger mask
} // namespace multDebug
DECLARE_SOA_TABLE(MultsBC, "AOD", "MULTBC", //!
multBC::MultBCFT0A,
Expand Down
34 changes: 17 additions & 17 deletions Common/TableProducer/multiplicityExtraTable.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,26 +65,26 @@ struct MultiplicityExtraTable {
int localBC = bc.globalBC() % nBCsPerOrbit;

if (newRunNumber != oldRunNumber) {
uint64_t ts{};
std::map<string, string> metadataRCT, headers;
headers = ccdbApi.retrieveHeaders(Form("RCT/Info/RunInformation/%i", newRunNumber), metadataRCT, -1);
ts = atol(headers["SOR"].c_str());

LOG(info) << " newRunNumber " << newRunNumber << " time stamp " << ts;
oldRunNumber = newRunNumber;
std::map<std::string, std::string> mapMetadata;
std::map<std::string, std::string> mapHeader;
auto grplhcif = ccdb->getForTimeStamp<o2::parameters::GRPLHCIFData>("GLO/Config/GRPLHCIF", ts);
CollidingBunch = grplhcif->getBunchFilling().getBCPattern();
for (int i = 0; i < (int)CollidingBunch.size(); i++) {
if (CollidingBunch.test(i)) {
LOG(info) << i << " ";
}
uint64_t ts{};
std::map<string, string> metadataRCT, headers;
headers = ccdbApi.retrieveHeaders(Form("RCT/Info/RunInformation/%i", newRunNumber), metadataRCT, -1);
ts = atol(headers["SOR"].c_str());

LOG(info) << " newRunNumber " << newRunNumber << " time stamp " << ts;
oldRunNumber = newRunNumber;
std::map<std::string, std::string> mapMetadata;
std::map<std::string, std::string> mapHeader;
auto grplhcif = ccdb->getForTimeStamp<o2::parameters::GRPLHCIFData>("GLO/Config/GRPLHCIF", ts);
CollidingBunch = grplhcif->getBunchFilling().getBCPattern();
for (int i = 0; i < (int)CollidingBunch.size(); i++) {
if (CollidingBunch.test(i)) {
LOG(info) << i << " ";
}
}
} // new run number

bool collidingBC = CollidingBunch.test(localBC);
bool collidingBC = CollidingBunch.test(localBC);

if (bc.has_ft0()) {
auto ft0 = bc.ft0();
std::bitset<8> triggers = ft0.triggerMask();
Expand Down