Skip to content
Snippets Groups Projects
Commit ba1be8cd authored by Jean-Baptiste De Vivie De Regie's avatar Jean-Baptiste De Vivie De Regie
Browse files

Merge branch 'addPackageIndexToMMTPVars' into '24.0'

add package index to the MM variables of the NSWTP

See merge request !75439
parents 5f8df848 689c7a96
No related branches found
No related tags found
3 merge requests!756432024-11-06: merge of 24.0 into main,!75439add package index to the MM variables of the NSWTP,!75127Draft: Seeder types rebase2 grid fix
......@@ -46,6 +46,9 @@ namespace xAOD {
auxid_t auxid_NSWTP_mm_segments = getAuxID("NSWTP_mm_segments", NSWTP_mm_segments);
regAuxVar(auxid_NSWTP_mm_segments, "NSWTP_mm_segments", NSWTP_mm_segments);
auxid_t auxid_NSWTP_mm_candidateNumber = getAuxID("NSWTP_mm_candidateNumber", NSWTP_mm_candidateNumber);
regAuxVar(auxid_NSWTP_mm_candidateNumber, "NSWTP_mm_candidateNumber", NSWTP_mm_candidateNumber);
auxid_t auxid_NSWTP_mm_BCID = getAuxID("NSWTP_mm_BCID", NSWTP_mm_BCID);
regAuxVar(auxid_NSWTP_mm_BCID, "NSWTP_mm_BCID", NSWTP_mm_BCID);
......
......@@ -64,6 +64,16 @@ std::vector<uint32_t>& NSWTPRDO_v1::NSWTP_mm_segments() {
return dec(*this);
}
const std::vector<uint8_t>& NSWTPRDO_v1::NSWTP_mm_candidateNumber() const {
static const SG::AuxElement::Accessor<std::vector<uint8_t>> dec{"NSWTP_mm_candidateNumber"};
return dec(*this);
}
std::vector<uint8_t>& NSWTPRDO_v1::NSWTP_mm_candidateNumber() {
static const SG::AuxElement::Accessor<std::vector<uint8_t>> dec{"NSWTP_mm_candidateNumber"};
return dec(*this);
}
const std::vector<uint32_t>& NSWTPRDO_v1::NSWTP_mm_BCID() const {
static const SG::AuxElement::Accessor<std::vector<uint32_t>> dec{"NSWTP_mm_BCID"};
return dec(*this);
......
......@@ -57,6 +57,8 @@ namespace xAOD {
std::vector<std::vector<uint8_t> > merge_candidateNumber{};
std::vector<std::vector<uint32_t> > NSWTP_mm_segments{};
std::vector<std::vector<uint8_t> > NSWTP_mm_candidateNumber{};
std::vector<std::vector<uint32_t> > NSWTP_mm_BCID{};
std::vector<std::vector<uint8_t> > NSWTP_strip_bands_bandID{};
......
......@@ -72,6 +72,9 @@ namespace xAOD {
const std::vector<uint32_t>& NSWTP_mm_segments() const;
std::vector<uint32_t>& NSWTP_mm_segments();
const std::vector<uint8_t>& NSWTP_mm_candidateNumber() const;
std::vector<uint8_t>& NSWTP_mm_candidateNumber();
const std::vector<uint32_t>& NSWTP_mm_BCID() const;
std::vector<uint32_t>& NSWTP_mm_BCID();
......
......@@ -172,9 +172,11 @@ StatusCode NSWTP_ROD_Decoder::fillCollection(const OFFLINE_FRAGMENTS_NAMESPACE::
encodeSegmentProperty(MergedSegmentProperty::dTheta, payload.dTheta,word);
encodeSegmentProperty(MergedSegmentProperty::phiID, payload.phiID,word);
encodeSegmentProperty(MergedSegmentProperty::rIndex, payload.rIndex ,word);
uint8_t candidateNumber = (i_packetIndex<<4) | i_candidateIndex;
++i_candidateIndex;
rdo->NSWTP_mm_segments().push_back(word);
rdo->NSWTP_mm_candidateNumber().push_back(candidateNumber);
}
// the first 12 bit are used for the bcid and the last 4 for sector ID
rdo->NSWTP_mm_BCID().push_back(mm_packet.BCID());
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment