Skip to content
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

EMTF Unpacker Update to Add HMT and Displaced Muon information #37194

Merged
merged 6 commits into from
Mar 18, 2022
Merged

EMTF Unpacker Update to Add HMT and Displaced Muon information #37194

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
64283d7
Implementation of HMT bits and displaced NN output bits to EMTF unpacker
eyigitba Feb 24, 2022
b70350c
Correct the threshold values for nominal and tight showers
eyigitba Feb 24, 2022
8d3798b
Use useHMTBits_ flag to enable HMT bit assignment to shower objects
eyigitba Mar 10, 2022
b895625
Code format
eyigitba Mar 10, 2022
8202f2d
Moved new parameters from being class definition to the unpack method…
eyigitba Mar 14, 2022
637bd92
Code format.
eyigitba Mar 15, 2022
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
16 changes: 16 additions & 0 deletions DataFormats/L1TMuon/interface/EMTF/SP.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,12 @@ namespace l1t {
quality_GMT(-99),
phi_GMT(-99),
bx(-99),
hmt(-99),
mode(-99),
eta_GMT(-99),
pt_GMT(-99),
pt_dxy_GMT(-99),
dxy_GMT(-99),
me1_subsector(-99),
me1_CSC_ID(-99),
me1_stub_num(-99),
Expand All @@ -40,6 +43,7 @@ namespace l1t {
me2_delay(-99),
me3_delay(-99),
me4_delay(-99),
nn_pt_valid(-99),
pt_LUT_addr(-99),
format_errors(0),
dataword(-99){};
Expand All @@ -56,9 +60,12 @@ namespace l1t {
void set_quality_GMT(int bits) { quality_GMT = bits; }
void set_phi_GMT(int bits) { phi_GMT = bits; }
void set_bx(int bits) { bx = bits; }
void set_hmt(int bits) { hmt = bits; }
void set_mode(int bits) { mode = bits; }
void set_eta_GMT(int bits) { eta_GMT = bits; }
void set_pt_GMT(int bits) { pt_GMT = bits; }
void set_pt_dxy_GMT(int bits) { pt_dxy_GMT = bits; }
void set_dxy_GMT(int bits) { dxy_GMT = bits; }
void set_me1_subsector(int bits) { me1_subsector = bits; }
void set_me1_CSC_ID(int bits) { me1_CSC_ID = bits; }
void set_me1_stub_num(int bits) { me1_stub_num = bits; }
Expand All @@ -73,6 +80,7 @@ namespace l1t {
void set_me2_delay(int bits) { me2_delay = bits; }
void set_me3_delay(int bits) { me3_delay = bits; }
void set_me4_delay(int bits) { me4_delay = bits; }
void set_nn_pt_valid(int bits) { nn_pt_valid = bits; }
void set_pt_LUT_addr(unsigned long bits) { pt_LUT_addr = bits; }
void add_format_error() { format_errors += 1; }
void set_dataword(uint64_t bits) { dataword = bits; }
Expand All @@ -90,6 +98,8 @@ namespace l1t {
int Mode() const { return mode; }
int Eta_GMT() const { return eta_GMT; }
int Pt_GMT() const { return pt_GMT; }
int Pt_dxy_GMT() const { return pt_dxy_GMT; }
int Dxy_GMT() const { return dxy_GMT; }
int ME1_subsector() const { return me1_subsector; }
int ME1_CSC_ID() const { return me1_CSC_ID; }
int ME1_stub_num() const { return me1_stub_num; }
Expand All @@ -104,9 +114,11 @@ namespace l1t {
int ME2_delay() const { return me2_delay; }
int ME3_delay() const { return me3_delay; }
int ME4_delay() const { return me4_delay; }
int NN_pt_valid() const { return nn_pt_valid; }
unsigned long Pt_LUT_addr() const { return pt_LUT_addr; }
int Format_errors() const { return format_errors; }
uint64_t Dataword() const { return dataword; }
int HMT() const { return hmt; }

private:
int hl;
Expand All @@ -119,9 +131,12 @@ namespace l1t {
int quality_GMT;
int phi_GMT;
int bx;
int hmt;
int mode;
int eta_GMT;
int pt_GMT;
int pt_dxy_GMT;
int dxy_GMT;
int me1_subsector;
int me1_CSC_ID;
int me1_stub_num;
Expand All @@ -136,6 +151,7 @@ namespace l1t {
int me2_delay;
int me3_delay;
int me4_delay;
int nn_pt_valid;
unsigned long pt_LUT_addr;
int format_errors;
uint64_t dataword;
Expand Down
40 changes: 38 additions & 2 deletions EventFilter/L1TRawToDigi/plugins/implementations_stage2/EMTFBlockSP.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,6 +176,13 @@ namespace l1t {
// payload[0] = bits 0-15, payload[1] = 16-31, payload[3] = 32-47, etc.
auto payload = block.payload();

// FW version is computed as (Year - 2000)*2^9 + Month*2^5 + Day (see Block.cc and EMTFBlockTrailers.cc)
bool useNNBits_ = getAlgoVersion() >= 11098; // FW versions >= 26.10.2021
bool useHMTBits_ = getAlgoVersion() >= 11306; // FW versions >= 10.01.2022

static constexpr int nominalShower_ = 2;
static constexpr int tightShower_ = 3;

// Check Format of Payload
l1t::emtf::SP SP_;
for (int err = 0; err < checkFormat(block); err++)
Expand Down Expand Up @@ -210,6 +217,10 @@ namespace l1t {
res_cand = static_cast<EMTFCollections*>(coll)->getRegionalMuonCands();
RegionalMuonCand mu_(0, 0, 0, 0, 0, 0, 0, tftype::emtf_pos);

RegionalMuonShowerBxCollection* res_shower;
res_shower = static_cast<EMTFCollections*>(coll)->getRegionalMuonShowers();
RegionalMuonShower muShower_(false, false, false, false, false, false);

///////////////////////////////////
// Unpack the SP Output Data Record
///////////////////////////////////
Expand All @@ -226,7 +237,12 @@ namespace l1t {

SP_.set_eta_GMT(TwosCompl(9, GetHexBits(SP1c, 0, 8)));
SP_.set_mode(GetHexBits(SP1c, 9, 12));
SP_.set_bx(GetHexBits(SP1c, 13, 14));

if (useHMTBits_) {
SP_.set_hmt(GetHexBits(SP1c, 13, 14));
} else {
SP_.set_bx(GetHexBits(SP1c, 13, 14));
}

SP_.set_pt_GMT(GetHexBits(SP1d, 0, 8));
SP_.set_me1_stub_num(GetHexBits(SP1d, 9, 9));
Expand All @@ -246,7 +262,13 @@ namespace l1t {
SP_.set_me4_delay(GetHexBits(SP2b, 9, 11));
SP_.set_tbin(GetHexBits(SP2b, 12, 14));

SP_.set_pt_LUT_addr(GetHexBits(SP2c, 0, 14, SP2d, 0, 14));
if (useNNBits_) {
SP_.set_pt_dxy_GMT(GetHexBits(SP2c, 0, 7));
SP_.set_dxy_GMT(GetHexBits(SP2c, 8, 10));
SP_.set_nn_pt_valid(GetHexBits(SP2c, 11, 11));
} else {
SP_.set_pt_LUT_addr(GetHexBits(SP2c, 0, 14, SP2d, 0, 14));
}

// SP_.set_dataword ( uint64_t dataword );

Expand All @@ -271,6 +293,10 @@ namespace l1t {
mu_.setHwEta(SP_.Eta_GMT());
mu_.setHwPhi(SP_.Phi_GMT());
mu_.setHwPt(SP_.Pt_GMT());
if (useNNBits_) {
mu_.setHwPtUnconstrained(SP_.Pt_dxy_GMT());
mu_.setHwDXY(SP_.Dxy_GMT());
}
mu_.setTFIdentifiers(Track_.Sector() - 1, (Track_.Endcap() == 1) ? emtf_pos : emtf_neg);
mu_.setTrackSubAddress(RegionalMuonCand::kTrkNum, Track_.Track_num());
// Truncated to 11 bits and offset by 25 from global event BX in EMTF firmware
Expand All @@ -281,6 +307,13 @@ namespace l1t {
// mu_.set_dataword ( SP_.Dataword() );
// Track_.set_GMT(mu_);

// Set Regional Muon Showers
if (useHMTBits_) {
muShower_.setTFIdentifiers(Track_.Sector() - 1, (Track_.Endcap() == 1) ? emtf_pos : emtf_neg);
muShower_.setOneNominalInTime(SP_.HMT() == nominalShower_ ? true : false);
muShower_.setOneTightInTime(SP_.HMT() == tightShower_ ? true : false);
}

///////////////////////
// Match hits to tracks
///////////////////////
Expand Down Expand Up @@ -552,6 +585,9 @@ namespace l1t {
res_cand->setBXRange(-3, 4);
res_cand->push_back(SP_.TBIN() - 3, mu_);

res_shower->setBXRange(-3, 4);
res_shower->push_back(SP_.TBIN() - 3, muShower_);

// Finished with unpacking one SP Output Data Record
return true;

Expand Down
1 change: 1 addition & 0 deletions EventFilter/L1TRawToDigi/plugins/implementations_stage2/EMTFCollections.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ namespace l1t {
// }

event_.put(std::move(regionalMuonCands_));
event_.put(std::move(regionalMuonShowers_));
event_.put(std::move(EMTFDaqOuts_));
event_.put(std::move(EMTFHits_ZS_));
event_.put(std::move(EMTFTracks_));
Expand Down
4 changes: 4 additions & 0 deletions EventFilter/L1TRawToDigi/plugins/implementations_stage2/EMTFCollections.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
#include <iomanip> // For things like std::setw

#include "DataFormats/L1TMuon/interface/RegionalMuonCand.h"
#include "DataFormats/L1TMuon/interface/RegionalMuonShower.h"
#include "DataFormats/L1TMuon/interface/EMTFDaqOut.h"
#include "DataFormats/L1TMuon/interface/EMTFHit.h"
#include "DataFormats/L1TMuon/interface/EMTFTrack.h"
Expand All @@ -27,6 +28,7 @@ namespace l1t {
EMTFCollections(edm::Event& e)
: UnpackerCollections(e), // What are these? - AWB 27.01.16
regionalMuonCands_(new RegionalMuonCandBxCollection()),
regionalMuonShowers_(new RegionalMuonShowerBxCollection()),
EMTFDaqOuts_(new EMTFDaqOutCollection()),
EMTFHits_(new EMTFHitCollection()),
EMTFHits_ZS_(new EMTFHitCollection()),
Expand All @@ -40,6 +42,7 @@ namespace l1t {
~EMTFCollections() override;

inline RegionalMuonCandBxCollection* getRegionalMuonCands() { return regionalMuonCands_.get(); }
inline RegionalMuonShowerBxCollection* getRegionalMuonShowers() { return regionalMuonShowers_.get(); }
inline EMTFDaqOutCollection* getEMTFDaqOuts() { return EMTFDaqOuts_.get(); }
inline EMTFHitCollection* getEMTFHits() { return EMTFHits_.get(); }
inline EMTFHitCollection* getEMTFHits_ZS() { return EMTFHits_ZS_.get(); }
Expand All @@ -52,6 +55,7 @@ namespace l1t {

private:
std::unique_ptr<RegionalMuonCandBxCollection> regionalMuonCands_;
std::unique_ptr<RegionalMuonShowerBxCollection> regionalMuonShowers_;
std::unique_ptr<EMTFDaqOutCollection> EMTFDaqOuts_;
std::unique_ptr<EMTFHitCollection> EMTFHits_;
std::unique_ptr<EMTFHitCollection> EMTFHits_ZS_;
Expand Down
4 changes: 3 additions & 1 deletion EventFilter/L1TRawToDigi/plugins/implementations_stage2/EMTFSetup.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ namespace l1t {

void EMTFSetup::registerProducts(edm::ProducesCollector prod) {
prod.produces<RegionalMuonCandBxCollection>();
prod.produces<RegionalMuonShowerBxCollection>();
prod.produces<EMTFDaqOutCollection>();
prod.produces<EMTFHitCollection>();
prod.produces<EMTFTrackCollection>();
Expand Down Expand Up @@ -69,8 +70,9 @@ namespace l1t {
auto emtf_trailers_unp =
UnpackerFactory::get()->make("stage2::emtf::TrailersBlockUnpacker"); // Unpack "Event Record Trailer"

// Currently only the CSC LCT unpacking needs the firmware version, can add others as needed - AWB 09.04.18
// Currently only the CSC LCT unpacking and SP unpacking need the firmware version, can add others as needed - AWB 09.04.18 + EY 01.02.22
emtf_me_unp->setAlgoVersion(fw);
emtf_sp_unp->setAlgoVersion(fw);

// Index of res is block->header().getID(), matching block_patterns_ in src/Block.cc
res[l1t::mtf7::EvHd] = emtf_headers_unp;
Expand Down
1 change: 1 addition & 0 deletions EventFilter/L1TRawToDigi/plugins/implementations_stage2/EMTFTokens.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ namespace l1t {
auto tag = cfg.getParameter<edm::InputTag>("InputLabel");

regionalMuonCandToken_ = cc.consumes<RegionalMuonCandBxCollection>(tag);
regionalMuonShowerToken_ = cc.consumes<RegionalMuonShowerBxCollection>(tag);
EMTFDaqOutToken_ = cc.consumes<EMTFDaqOutCollection>(tag);
EMTFHitToken_ = cc.consumes<EMTFHitCollection>(tag);
EMTFTrackToken_ = cc.consumes<EMTFTrackCollection>(tag);
Expand Down
5 changes: 5 additions & 0 deletions EventFilter/L1TRawToDigi/plugins/implementations_stage2/EMTFTokens.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
#define EventFilter_L1TRawToDigi_EMTFTokens_h

#include "DataFormats/L1TMuon/interface/RegionalMuonCand.h"
#include "DataFormats/L1TMuon/interface/RegionalMuonShower.h"
#include "DataFormats/L1TMuon/interface/EMTFDaqOut.h"
#include "DataFormats/L1TMuon/interface/EMTFHit.h"
#include "DataFormats/L1TMuon/interface/EMTFTrack.h"
Expand All @@ -20,6 +21,9 @@ namespace l1t {
inline const edm::EDGetTokenT<RegionalMuonCandBxCollection>& getRegionalMuonCandToken() const {
return regionalMuonCandToken_;
}
inline const edm::EDGetTokenT<RegionalMuonShowerBxCollection>& getRegionalMuonShowerToken() const {
return regionalMuonShowerToken_;
}
inline const edm::EDGetTokenT<EMTFDaqOutCollection>& getEMTFDaqOutToken() const { return EMTFDaqOutToken_; }
inline const edm::EDGetTokenT<EMTFHitCollection>& getEMTFHitToken() const { return EMTFHitToken_; }
inline const edm::EDGetTokenT<EMTFTrackCollection>& getEMTFTrackToken() const { return EMTFTrackToken_; }
Expand All @@ -31,6 +35,7 @@ namespace l1t {

private:
edm::EDGetTokenT<RegionalMuonCandBxCollection> regionalMuonCandToken_;
edm::EDGetTokenT<RegionalMuonShowerBxCollection> regionalMuonShowerToken_;
edm::EDGetTokenT<EMTFDaqOutCollection> EMTFDaqOutToken_;
edm::EDGetTokenT<EMTFHitCollection> EMTFHitToken_;
edm::EDGetTokenT<EMTFTrackCollection> EMTFTrackToken_;
Expand Down