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

addressing your comments on L1T PF PR #1

Open
wants to merge 6 commits into
base: l1t-squashedpf
Choose a base branch
from
Open

addressing your comments on L1T PF PR #1

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
5fe05c1
Merged l1t-squashedpf from repository cecilecaillol with cms-merge-topic
May 31, 2022
16d0e52
apply comments
May 31, 2022
7e77d9b
update phase-2 DQM
May 31, 2022
f9f7713
remove obsolete files
May 31, 2022
6a2819f
add file needed for unit tests
Jun 2, 2022
686dea4
fix unit tests
Jun 2, 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
4 changes: 2 additions & 2 deletions DQMOffline/L1Trigger/python/L1TPhase2Offline_cfi.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,9 +93,9 @@
genParticlesInputTag = cms.untracked.InputTag("genParticles"),
isParticleGun = cms.bool(False),
objects = cms.PSet(
L1PF = cms.VInputTag("l1pfCandidates:PF",),
L1PF = cms.VInputTag("l1ctLayer1:PF",),
L1PF_sel = cms.string("pt > 0"),
L1Puppi = cms.VInputTag("l1pfCandidates:Puppi",),
L1Puppi = cms.VInputTag("l1ctLayer1:Puppi",),
L1Puppi_sel = cms.string("pt > 0"),
),

Expand Down
5 changes: 5 additions & 0 deletions L1Trigger/Configuration/python/L1Trigger_EventContent_cff.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -207,6 +207,11 @@ def _appendPhase2Digis(obj):
'keep *_ak4PFL1PuppiCorrected_*_*',
'keep *_Phase1L1TJetProducer_*_*',
'keep *_Phase1L1TJetCalibrator_*_*',
'keep *_l1ctLayer1Barrel_*_*',
'keep *_l1ctLayer1HGCal_*_*',
'keep *_l1ctLayer1HGCalNoTK_*_*',
'keep *_l1ctLayer1HF_*_*',
'keep *_l1ctLayer1_*_*',
'keep *_l1PFMetCalo_*_*',
'keep *_l1PFMetPF_*_*',
'keep *_l1PFMetPuppi_*_*',
Expand Down
4 changes: 2 additions & 2 deletions L1Trigger/Configuration/python/SimL1Emulator_cff.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,8 +135,8 @@
from L1Trigger.Phase2L1ParticleFlow.l1pfJetMet_cff import *
# Describe here l1PFMets Task
# ###############################
l1PFMetsTask = cms.Task(l1PFMetCalo , l1PFMetPF , l1PFMetPuppi)
_phase2_siml1emulator.add(l1PFMetsTask)
#l1PFMetsTask = cms.Task(l1PFMetCalo , l1PFMetPF , l1PFMetPuppi)
#_phase2_siml1emulator.add(l1PFMetsTask)

# NNTaus
# ########################################################################
Expand Down
33 changes: 0 additions & 33 deletions L1Trigger/Phase2L1ParticleFlow/interface/LinearizedPuppiAlgo.h
View file
Open in desktop

This file was deleted.

45 changes: 0 additions & 45 deletions L1Trigger/Phase2L1ParticleFlow/interface/PUAlgoBase.h
View file
Open in desktop

This file was deleted.

39 changes: 0 additions & 39 deletions L1Trigger/Phase2L1ParticleFlow/interface/PuppiAlgo.h
View file
Open in desktop

This file was deleted.

6 changes: 3 additions & 3 deletions L1Trigger/Phase2L1ParticleFlow/interface/common/bitonic_sort_ref.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,8 @@ void bitonicMerge(T in[], int InSize, T out[], int OutSize, bool dir) {
int LowerSize = PowerOf2LessThan(InSize); //-- LowerSize >= Size / 2
int UpperSize = InSize - LowerSize; //-- UpperSize < LowerSiz

if (LowerSize < UpperSize)
dbgCout() << "[ERROR]" << __FUNCTION__ << " LowerSize (" << LowerSize << ") not > of UpperSize (" << UpperSize
<< ")" << std::endl;
assert(UpperSize >= 0);
assert(UpperSize <= LowerSize);

for (int i = 0; i < UpperSize; ++i) {
if ((in[i] > in[i + LowerSize]) == dir) {
Expand Down Expand Up @@ -96,6 +95,7 @@ void bitonicMerge(T in[], int InSize, T out[], int OutSize, bool dir) {

template <typename T>
void bitonicSort(const T in[], int Start, int InSize, T out[], int OutSize, bool dir) {
assert(OutSize > 0);
if (InSize <= 1) // copy in-> out and exit
{
for (int i = 0; i < std::min(InSize, OutSize); ++i)
Expand Down
1 change: 0 additions & 1 deletion L1Trigger/Phase2L1ParticleFlow/plugins/L1TCorrelatorLayer1Producer.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -353,7 +353,6 @@ void L1TCorrelatorLayer1Producer::produce(edm::Event &iEvent, const edm::EventSe
ptsums.push_back(std::pair<float, float>(vtx.pt(), vtx.z0()));
if (ptsum == 0 || vtx.pt() > ptsum) {
ptsum = vtx.pt();
z0 = vtx.z0();
pvwd = vtx;
}
}
Expand Down
Loading