Skip to content

Commit 90f1f0f

Browse files
omiguelcomiguelc
committed
Implemented various changes suggested. Mainly focused on EMTF side, ME0 comments pending.
1 parent 8d80122 commit 90f1f0f

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

65 files changed

+574
-718
lines changed

‎DataFormats/L1TMuonPhase2/BuildFile.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<export>
2-
<lib name="1"/>
2+
<lib name="1"/>
33
</export>
44
<use name="DataFormats/CLHEP"/>
55
<use name="DataFormats/Common"/>

‎DataFormats/L1TMuonPhase2/interface/EMTFHit.h‎

Lines changed: 2 additions & 64 deletions
Original file line numberDiff line numberDiff line change
@@ -10,70 +10,8 @@ namespace l1t::phase2 {
1010

1111
class EMTFHit {
1212
public:
13-
EMTFHit()
14-
: id_(0),
15-
16-
raw_det_id_(0),
17-
subsystem_(0),
18-
endcap_(0),
19-
sector_(0),
20-
subsector_(0),
21-
station_(0),
22-
ring_(0),
23-
roll_(0),
24-
layer_(0),
25-
chamber_(0),
26-
27-
csc_id_(0),
28-
csc_fr_(0),
29-
30-
strip_(0),
31-
strip_lo_(0),
32-
strip_hi_(0),
33-
strip_quart_(0), // Run 3
34-
strip_eighth_(0), // Run 3
35-
strip_quart_bit_(0), // Run 3
36-
strip_eighth_bit_(0), // Run 3
37-
38-
wire1_(0),
39-
wire2_(0),
40-
41-
bx_(0),
42-
subbx_(0),
43-
44-
quality_(0),
45-
pattern_(0),
46-
47-
glob_phi_(0),
48-
glob_theta_(0),
49-
glob_perp_(0),
50-
glob_z_(0),
51-
glob_time_(0),
52-
53-
emtf_chamber_(0),
54-
emtf_segment_(0),
55-
emtf_phi_(0),
56-
emtf_bend_(0),
57-
emtf_slope_(0),
58-
emtf_theta1_(0),
59-
emtf_theta2_(0),
60-
emtf_qual1_(0),
61-
emtf_qual2_(0),
62-
emtf_time_(0),
63-
emtf_site_(0),
64-
emtf_host_(0),
65-
emtf_zones_(0),
66-
emtf_timezones_(0),
67-
68-
flag_neighbor_(false),
69-
flag_substitute_(false),
70-
flag_valid_(false) {
71-
// Do Nothing
72-
}
73-
74-
~EMTFHit() {
75-
// Do Nothing
76-
}
13+
EMTFHit();
14+
~EMTFHit() = default;
7715

7816
// Setters
7917
void setId(uint16_t aId) { id_ = aId; }

‎DataFormats/L1TMuonPhase2/interface/EMTFInput.h‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,8 @@ namespace l1t::phase2 {
1313
typedef std::vector<uint16_t> hits_t;
1414
typedef std::vector<uint16_t> segs_t;
1515

16-
EMTFInput() : endcap_(0), sector_(0), bx_(0), hits_{}, segs_{} {
17-
// Do Nothing
18-
}
19-
20-
~EMTFInput() {
21-
// Do Nothing
22-
}
16+
EMTFInput() : endcap_(0), sector_(0), bx_(0), hits_{}, segs_{} {}
17+
~EMTFInput() = default;
2318

2419
// Setters
2520
void setEndcap(int16_t aEndcap) { endcap_ = aEndcap; }

‎DataFormats/L1TMuonPhase2/interface/EMTFTrack.h‎

Lines changed: 2 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -14,36 +14,8 @@ namespace l1t::phase2 {
1414
typedef std::vector<uint16_t> site_segs_t;
1515
typedef std::vector<uint8_t> site_mask_t;
1616

17-
EMTFTrack()
18-
: endcap_(0),
19-
sector_(0),
20-
bx_(0),
21-
unconstrained_(false),
22-
valid_(false),
23-
model_pt_address_(0),
24-
model_dxy_address_(0),
25-
model_pattern_(0),
26-
model_qual_(0),
27-
model_phi_(0),
28-
model_eta_(0),
29-
model_features_{},
30-
emtf_q_(0),
31-
emtf_pt_(0),
32-
emtf_d0_(0),
33-
emtf_z0_(0),
34-
emtf_beta_(0),
35-
emtf_mode_v1_(0),
36-
emtf_mode_v2_(0),
37-
site_hits_{},
38-
site_segs_{},
39-
site_mask_{},
40-
site_rm_mask_{} {
41-
// Do Nothing
42-
}
43-
44-
~EMTFTrack() {
45-
// Do Nothing
46-
}
17+
EMTFTrack();
18+
~EMTFTrack() = default;
4719

4820
// Setters
4921
void setEndcap(int16_t aEndcap) { endcap_ = aEndcap; }

‎DataFormats/L1TMuonPhase2/src/EMTFHit.cc‎

Lines changed: 61 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,64 @@
11
#include "DataFormats/L1TMuonPhase2/interface/EMTFHit.h"
22

33
using namespace l1t::phase2;
4+
5+
EMTFHit::EMTFHit()
6+
: id_(0),
7+
8+
raw_det_id_(0),
9+
subsystem_(0),
10+
endcap_(0),
11+
sector_(0),
12+
subsector_(0),
13+
station_(0),
14+
ring_(0),
15+
roll_(0),
16+
layer_(0),
17+
chamber_(0),
18+
19+
csc_id_(0),
20+
csc_fr_(0),
21+
22+
strip_(0),
23+
strip_lo_(0),
24+
strip_hi_(0),
25+
strip_quart_(0), // Run 3
26+
strip_eighth_(0), // Run 3
27+
strip_quart_bit_(0), // Run 3
28+
strip_eighth_bit_(0), // Run 3
29+
30+
wire1_(0),
31+
wire2_(0),
32+
33+
bx_(0),
34+
subbx_(0),
35+
36+
quality_(0),
37+
pattern_(0),
38+
39+
glob_phi_(0),
40+
glob_theta_(0),
41+
glob_perp_(0),
42+
glob_z_(0),
43+
glob_time_(0),
44+
45+
emtf_chamber_(0),
46+
emtf_segment_(0),
47+
emtf_phi_(0),
48+
emtf_bend_(0),
49+
emtf_slope_(0),
50+
emtf_theta1_(0),
51+
emtf_theta2_(0),
52+
emtf_qual1_(0),
53+
emtf_qual2_(0),
54+
emtf_time_(0),
55+
emtf_site_(0),
56+
emtf_host_(0),
57+
emtf_zones_(0),
58+
emtf_timezones_(0),
59+
60+
flag_neighbor_(false),
61+
flag_substitute_(false),
62+
flag_valid_(false) {
63+
// Do Nothing
64+
}

‎DataFormats/L1TMuonPhase2/src/EMTFTrack.cc‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,30 @@
11
#include "DataFormats/L1TMuonPhase2/interface/EMTFTrack.h"
22

33
using namespace l1t::phase2;
4+
5+
EMTFTrack::EMTFTrack()
6+
: endcap_(0),
7+
sector_(0),
8+
bx_(0),
9+
unconstrained_(false),
10+
valid_(false),
11+
model_pt_address_(0),
12+
model_dxy_address_(0),
13+
model_pattern_(0),
14+
model_qual_(0),
15+
model_phi_(0),
16+
model_eta_(0),
17+
model_features_{},
18+
emtf_q_(0),
19+
emtf_pt_(0),
20+
emtf_d0_(0),
21+
emtf_z0_(0),
22+
emtf_beta_(0),
23+
emtf_mode_v1_(0),
24+
emtf_mode_v2_(0),
25+
site_hits_{},
26+
site_segs_{},
27+
site_mask_{},
28+
site_rm_mask_{} {
29+
// Do Nothing
30+
}

‎DataFormats/L1TMuonPhase2/src/classes_def.xml‎

Lines changed: 31 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,36 @@
11
<lcgdict>
2-
<selection>
3-
<class name="l1t::MuonStub" ClassVersion="3">
4-
<version ClassVersion="3" checksum="1164456369"/>
5-
</class>
6-
<class name="std::vector<l1t::MuonStub>"/>
7-
<class name="edm::Wrapper<std::vector<l1t::MuonStub > >"/>
8-
<class name="edm::Ref<l1t::MuonStubCollection>" splitLevel="0"/>
2+
<selection>
3+
<class name="l1t::MuonStub" ClassVersion="3">
4+
<version ClassVersion="3" checksum="1164456369"/>
5+
</class>
6+
<class name="std::vector<l1t::MuonStub>"/>
7+
<class name="edm::Wrapper<std::vector<l1t::MuonStub > >"/>
8+
<class name="edm::Ref<l1t::MuonStubCollection>" splitLevel="0"/>
99

10-
<class name="l1t::TrackerMuon" ClassVersion="4">
11-
<version ClassVersion="4" checksum="3437073036"/>
12-
<version ClassVersion="3" checksum="2397458791"/>
13-
</class>
14-
<class name="std::vector<l1t::TrackerMuon>"/>
15-
<class name="edm::Wrapper<std::vector<l1t::TrackerMuon > >"/>
16-
<class name="edm::Ref<l1t::TrackerMuonCollection>" splitLevel="0"/>
17-
<class name="std::vector<edm::Ref<l1t::TrackerMuonCollection> >"/>
10+
<class name="l1t::TrackerMuon" ClassVersion="4">
11+
<version ClassVersion="4" checksum="3437073036"/>
12+
<version ClassVersion="3" checksum="2397458791"/>
13+
</class>
14+
<class name="std::vector<l1t::TrackerMuon>"/>
15+
<class name="edm::Wrapper<std::vector<l1t::TrackerMuon > >"/>
16+
<class name="edm::Ref<l1t::TrackerMuonCollection>" splitLevel="0"/>
17+
<class name="std::vector<edm::Ref<l1t::TrackerMuonCollection> >"/>
1818

19-
<class name="l1t::SAMuon" ClassVersion="3">
20-
<version ClassVersion="3" checksum="3294978731"/>
21-
</class>
22-
<class name="std::vector<l1t::SAMuon>"/>
23-
<class name="edm::Wrapper<std::vector<l1t::SAMuon > >"/>
24-
<class name="edm::Ref<l1t::SAMuonCollection>" splitLevel="0"/>
19+
<class name="l1t::SAMuon" ClassVersion="3">
20+
<version ClassVersion="3" checksum="3294978731"/>
21+
</class>
22+
<class name="std::vector<l1t::SAMuon>"/>
23+
<class name="edm::Wrapper<std::vector<l1t::SAMuon > >"/>
24+
<class name="edm::Ref<l1t::SAMuonCollection>" splitLevel="0"/>
2525

26-
<class name="l1t::phase2::EMTFHit"/>
27-
<class name="l1t::phase2::EMTFHitCollection"/>
28-
<class name="edm::Wrapper<l1t::phase2::EMTFHitCollection>"/>
29-
<class name="l1t::phase2::EMTFTrack"/>
30-
<class name="l1t::phase2::EMTFTrackCollection"/>
31-
<class name="edm::Wrapper<l1t::phase2::EMTFTrackCollection>"/>
32-
<class name="l1t::phase2::EMTFInput"/>
33-
<class name="l1t::phase2::EMTFInputCollection"/>
34-
<class name="edm::Wrapper<l1t::phase2::EMTFInputCollection>"/>
35-
</selection>
26+
<class name="l1t::phase2::EMTFHit"/>
27+
<class name="l1t::phase2::EMTFHitCollection"/>
28+
<class name="edm::Wrapper<l1t::phase2::EMTFHitCollection>"/>
29+
<class name="l1t::phase2::EMTFTrack"/>
30+
<class name="l1t::phase2::EMTFTrackCollection"/>
31+
<class name="edm::Wrapper<l1t::phase2::EMTFTrackCollection>"/>
32+
<class name="l1t::phase2::EMTFInput"/>
33+
<class name="l1t::phase2::EMTFInputCollection"/>
34+
<class name="edm::Wrapper<l1t::phase2::EMTFInputCollection>"/>
35+
</selection>
3636
</lcgdict>

‎L1Trigger/L1TGEM/plugins/GE0TriggerPseudoProducer.cc‎

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ class GE0TriggerPseudoBuilder;
2929
class GE0TriggerPseudoProducer : public edm::global::EDProducer<> {
3030
public:
3131
explicit GE0TriggerPseudoProducer(const edm::ParameterSet&);
32-
~GE0TriggerPseudoProducer() override;
32+
~GE0TriggerPseudoProducer() override = default;
3333

3434
void produce(edm::StreamID, edm::Event&, const edm::EventSetup&) const override;
3535

@@ -40,18 +40,15 @@ class GE0TriggerPseudoProducer : public edm::global::EDProducer<> {
4040
edm::ParameterSet config_;
4141
};
4242

43-
GE0TriggerPseudoProducer::GE0TriggerPseudoProducer(const edm::ParameterSet& conf) {
44-
me0segmentProducer_ = conf.getParameter<edm::InputTag>("ME0SegmentProducer");
45-
me0segment_token_ = consumes<GEMSegmentCollection>(me0segmentProducer_);
46-
me0_geom_token_ = esConsumes<GEMGeometry, MuonGeometryRecord>();
47-
config_ = conf;
48-
43+
GE0TriggerPseudoProducer::GE0TriggerPseudoProducer(const edm::ParameterSet& conf)
44+
: me0segmentProducer_(conf.getParameter<edm::InputTag>("ME0SegmentProducer")),
45+
me0segment_token_(consumes<GEMSegmentCollection>(me0segmentProducer_)),
46+
me0_geom_token_(esConsumes<GEMGeometry, MuonGeometryRecord>()),
47+
config_(conf) {
4948
// register what this produces
5049
produces<GE0TriggerDigiCollection>();
5150
}
5251

53-
GE0TriggerPseudoProducer::~GE0TriggerPseudoProducer() {}
54-
5552
void GE0TriggerPseudoProducer::produce(edm::StreamID, edm::Event& ev, const edm::EventSetup& setup) const {
5653
edm::ESHandle<GEMGeometry> h_me0 = setup.getHandle(me0_geom_token_);
5754

‎L1Trigger/L1TGEM/python/me0TriggerDigis_cff.py‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,5 @@
99
me0TriggerAllDigiTask = cms.Task(me0TriggerRealDigiTask, me0TriggerPseudoDigiTask)
1010
ge0TriggerAllDigiTask = cms.Task(me0TriggerRealDigiTask, ge0TriggerPseudoDigiTask)
1111

12-
## in scenarios with GE0, remove the pseudo digis
13-
# phase2_GE0.toReplaceWith(me0TriggerAllDigiTask, me0TriggerAllDigiTask.copyAndExclude([me0TriggerPseudoDigiTask]))
12+
# in scenarios with GE0, remove the pseudo digis
1413
phase2_GE0.toReplaceWith(me0TriggerAllDigiTask, ge0TriggerAllDigiTask)

‎L1Trigger/L1TGEM/src/GE0TriggerPseudoBuilder.cc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ ME0TriggerDigi GE0TriggerPseudoBuilder::segmentConversion(const GEMSegment segme
102102
if (phiposition > totstrip)
103103
LogTrace("L1ME0Trigger") << " ME0 segment strip number is " << phiposition << " larger than nstrip " << totstrip
104104
<< " !!! \n";
105-
float phi_resolution = 0.5; //halfstrip
105+
constexpr float phi_resolution = 0.5; //halfstrip
106106
int phiposition2 = (static_cast<int>((strip - phiposition) / phi_resolution) & 1); // half-strip resolution
107107
phiposition = (phiposition << 1) | phiposition2;
108108

0 commit comments

Comments
 (0)