Merge pull request #39417 from cecilecaillol/l1t-1031backport

[12_5_X][L1T] Backport of: Phase-2, correlator developments
cms-sw · Oct 4, 2022 · 03c69b9 · 03c69b9
2 parents e7236db + f92499f
commit 03c69b9
Show file tree

Hide file tree

Showing 41 changed files with 945 additions and 3,454 deletions.
diff --git a/L1Trigger/Phase2L1GMT/plugins/Phase2L1TGMTSAMuonProducer.cc b/L1Trigger/Phase2L1GMT/plugins/Phase2L1TGMTSAMuonProducer.cc
@@ -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);

diff --git a/L1Trigger/Phase2L1ParticleFlow/BuildFile.xml b/L1Trigger/Phase2L1ParticleFlow/BuildFile.xml
@@ -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"/>
 <use name="PhysicsTools/TensorFlow"/>
 <use name="tensorflow"/>
 <use name="roottmva"/>

diff --git a/L1Trigger/Phase2L1ParticleFlow/interface/DiscretePFInputs.h b/L1Trigger/Phase2L1ParticleFlow/interface/DiscretePFInputs.h