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

Jump to bottom

[12_5_X][L1T] Backport of: Phase-2, correlator developments #39417

Merged
merged 5 commits into from Oct 4, 2022
+945 −3,454
Merged

[12_5_X][L1T] Backport of: Phase-2, correlator developments #39417

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
01fd878
L1T correlator developments phase-2
Jul 28, 2022
4739797
fix BuildFile
Sep 15, 2022
fc351a4
fix loops and l1t module names
Sep 15, 2022
e78788f
upgrade's comments
Sep 28, 2022
f92499f
fix buildfile
Oct 3, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions L1Trigger/Phase2L1GMT/plugins/Phase2L1TGMTSAMuonProducer.cc
View file
Open in desktop
Expand Up @@ -141,6 +141,7 @@ SAMuon Phase2L1TGMTSAMuonProducer::Convertl1tMuon(const l1t::Muon& mu, const int

int bstart = 0;
wordtype word(0);
bstart = wordconcat<wordtype>(word, bstart, pt > 0, 1);
bstart = wordconcat<wordtype>(word, bstart, pt, BITSGTPT);
bstart = wordconcat<wordtype>(word, bstart, phi, BITSGTPHI);
bstart = wordconcat<wordtype>(word, bstart, eta, BITSGTETA);
Expand Down
5 changes: 2 additions & 3 deletions L1Trigger/Phase2L1ParticleFlow/BuildFile.xml
View file
Open in desktop
@@ -1,15 +1,14 @@
<use name="FWCore/Framework"/>
<use name="FWCore/ParameterSet"/>
<use name="FWCore/Utilities"/>
<use name="L1Trigger/L1THGCal"/>
<use name="DataFormats/L1TParticleFlow"/>
<use name="DataFormats/L1TCorrelator"/>
<use name="CommonTools/BaseParticlePropagator"/>
<use name="FastSimulation/Particle"/>
<use name="DataFormats/ParticleFlowReco"/>
<use name="L1Trigger/L1THGCal"/>
<use name="L1Trigger/DemonstratorTools"/>
<use name="CommonTools/Utils"/>
<use name="CommonTools/MVAUtils"/>
<use name="L1Trigger/DemonstratorTools"/>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It looks like it was already there, a couple of lines above...

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed

<use name="PhysicsTools/TensorFlow"/>
<use name="tensorflow"/>
<use name="roottmva"/>
Expand Down
338 changes: 0 additions & 338 deletions L1Trigger/Phase2L1ParticleFlow/interface/DiscretePFInputs.h
View file
Open in desktop

This file was deleted.