L1T: fix duplicate dictionary problems in #33978 #34094

cecilecaillol · 2021-06-11T10:10:25Z

PR description:

This is a fix addressing the comments from @makortel on #33978

PR validation:

if this PR is a backport please specify the original PR and why you need to backport that PR:

cmsbuild · 2021-06-11T10:40:05Z

-code-checks

Logs: https://cmssdt.cern.ch/SDT/code-checks/cms-sw-PR-34094/23274

This PR adds an extra 16KB to repository

Code check has found code style and quality issues which could be resolved by applying following patch(s)

code-format:
https://cmssdt.cern.ch/SDT/code-checks/cms-sw-PR-34094/23274/code-format.patch
e.g. curl https://cmssdt.cern.ch/SDT/code-checks/cms-sw-PR-34094/23274/code-format.patch | patch -p1
You can also run scram build code-format to apply code format directly

cmsbuild · 2021-06-11T11:00:13Z

+code-checks

Logs: https://cmssdt.cern.ch/SDT/code-checks/cms-sw-PR-34094/23276

This PR adds an extra 20KB to repository

cmsbuild · 2021-06-11T11:00:39Z

A new Pull Request was created by @cecilecaillol for master.

It involves the following packages:

DataFormats/DetId
L1Trigger/VertexFinder
SimDataFormats/TrackingAnalysis

@cmsbuild, @rekovic, @civanch, @cecilecaillol, @mdhildreth can you please review it and eventually sign? Thanks.
@HuguesBrun, @apsallid, @makortel, @trocino, @abbiendi, @JanFSchulte, @Fedespring, @Martin-Grunewald, @calderona, @sscruz, @jhgoh, @lecriste, @mtosi, @ebrondol, @rovere, @fabiocos, @cericeci this is something you requested to watch as well.
@silviodonato, @dpiparo, @qliphy you are the release manager for this.

cms-bot commands are listed here

cecilecaillol · 2021-06-11T11:01:22Z

please test

makortel · 2021-06-11T14:32:12Z

L1Trigger/VertexFinder/src/classes.h

+  edm::Wrapper<std::vector<l1tVertexFinder::Stub>> wvs;
+  edm::Wrapper<std::vector<l1tVertexFinder::TP>> wvtp;
+  edm::Wrapper<std::vector<l1tVertexFinder::Vertex>> wvvtx;
+  edm::Wrapper<l1tVertexFinder::InputData> wid;


I mean that the contents of the struct (and the namespace) can be removed.

makortel · 2021-06-11T14:34:51Z

L1Trigger/VertexFinder/src/classes_def.xml

These should actually be

Suggested change

<class name="l1tVertexFinder::InputData" transient="true"/>

<class name="l1tVertexFinder::InputData" persistent="false"/>

makortel · 2021-06-11T14:36:24Z

SimDataFormats/TrackingAnalysis/src/classes_def.xml

@@ -23,6 +23,8 @@

  <class name="TrackingParticleRefVector" />
  <class name="edm::Wrapper<TrackingParticleRefVector>"/>
+
+  <class name="std::map<edm::Ptr<TrackingParticle>,edm::RefToBase<TrackingParticle> >"/>


I'm still curious why RefToBase<TrackingParticle> is needed. I don't see anything inheriting from TrackingParticle, so a polymorphic reference is not really needed (i.e. edm::Ref would suffice), and for any new use for polymorphic Refs the edm::Ptr is strongly preferred.

cmsbuild · 2021-06-15T13:35:44Z

+code-checks

Logs: https://cmssdt.cern.ch/SDT/code-checks/cms-sw-PR-34094/23329

This PR adds an extra 16KB to repository
There are other open Pull requests which might conflict with changes you have proposed:
- File Utilities/ReleaseScripts/scripts/duplicateReflexLibrarySearch.py modified in PR(s): Remove PhysicsTools/ParallelAnalysis package #34070

cmsbuild · 2021-06-15T13:36:08Z

Pull request #34094 was updated. @smuzaffar, @civanch, @Dr15Jones, @makortel, @mdhildreth, @cmsbuild, @rekovic, @cecilecaillol can you please check and sign again.

cecilecaillol · 2021-06-15T13:36:32Z

please test

cmsbuild · 2021-06-15T19:28:33Z

+1

Summary: https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-cb8298/15966/summary.html
COMMIT: 4487cc2
CMSSW: CMSSW_12_0_X_2021-06-15-1100/slc7_amd64_gcc900
User test area: For local testing, you can use /cvmfs/cms-ci.cern.ch/week1/cms-sw/cmssw/34094/15966/install.sh to create a dev area with all the needed externals and cmssw changes.

Comparison Summary

Summary:

No significant changes to the logs found
Reco comparison results: 2 differences found in the comparisons
DQMHistoTests: Total files compared: 38
DQMHistoTests: Total histograms compared: 2862520
DQMHistoTests: Total failures: 7
DQMHistoTests: Total nulls: 0
DQMHistoTests: Total successes: 2862491
DQMHistoTests: Total skipped: 22
DQMHistoTests: Total Missing objects: 0
DQMHistoSizes: Histogram memory added: 0.0 KiB( 37 files compared)
Checked 160 log files, 37 edm output root files, 38 DQM output files
TriggerResults: no differences found

smuzaffar · 2021-06-15T19:33:13Z

+core
thanks @cecilecaillol for the fix
FYI @mrodozov

cecilecaillol · 2021-06-15T19:54:12Z

+l1

civanch · 2021-06-16T08:32:51Z

+1

cmsbuild · 2021-06-16T08:33:09Z

This pull request is fully signed and it will be integrated in one of the next master IBs (tests are also fine). This pull request will now be reviewed by the release team before it's merged. @silviodonato, @dpiparo, @qliphy (and backports should be raised in the release meeting by the corresponding L2)

qliphy · 2021-06-16T09:10:56Z

+1

apply makortel's comments

c48dfdf

cmsbuild added this to the CMSSW_12_0_X milestone Jun 11, 2021

cmsbuild added code-checks-pending l1-pending orp-pending pending-signatures simulation-pending tests-pending labels Jun 11, 2021

cecilecaillol mentioned this pull request Jun 11, 2021

L1T phase-2: Update VertexFinder and remove the old L1TkPrimaryVertexProducer #33978

Merged

cmsbuild added code-checks-rejected and removed code-checks-pending labels Jun 11, 2021

code format

a224e72

cmsbuild added code-checks-pending and removed code-checks-rejected labels Jun 11, 2021

cmsbuild added code-checks-approved and removed code-checks-pending labels Jun 11, 2021

cmsbuild added tests-started and removed tests-pending labels Jun 11, 2021

makortel reviewed Jun 11, 2021

View reviewed changes

more fixes

0a36694

cmsbuild added code-checks-pending tests-pending and removed code-checks-approved tests-started labels Jun 11, 2021

cmsbuild added code-checks-pending tests-pending and removed tests-started labels Jun 15, 2021

cmsbuild added code-checks-approved and removed code-checks-pending labels Jun 15, 2021

cmsbuild added tests-started and removed tests-pending labels Jun 15, 2021

cmsbuild added tests-approved and removed tests-started labels Jun 15, 2021

cmsbuild added core-approved and removed core-pending labels Jun 15, 2021

cmsbuild added l1-approved and removed l1-pending labels Jun 15, 2021

cmsbuild added fully-signed simulation-approved and removed pending-signatures simulation-pending labels Jun 16, 2021

cmsbuild added orp-approved and removed orp-pending labels Jun 16, 2021

cmsbuild merged commit 35a483c into cms-sw:master Jun 16, 2021

cmsbuild mentioned this pull request Jun 16, 2021

Fix use of EDAlias on 'source' #34161

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

L1T: fix duplicate dictionary problems in #33978 #34094

L1T: fix duplicate dictionary problems in #33978 #34094

cecilecaillol commented Jun 11, 2021

cmsbuild commented Jun 11, 2021

cmsbuild commented Jun 11, 2021

cmsbuild commented Jun 11, 2021

cecilecaillol commented Jun 11, 2021

makortel Jun 11, 2021

makortel Jun 11, 2021

makortel Jun 11, 2021 •

edited

Loading

cmsbuild commented Jun 15, 2021

cmsbuild commented Jun 15, 2021

cecilecaillol commented Jun 15, 2021

cmsbuild commented Jun 15, 2021

smuzaffar commented Jun 15, 2021

cecilecaillol commented Jun 15, 2021

civanch commented Jun 16, 2021

cmsbuild commented Jun 16, 2021

qliphy commented Jun 16, 2021

	<class name="l1tVertexFinder::InputData" transient="true"/>
	<class name="l1tVertexFinder::InputData" persistent="false"/>

L1T: fix duplicate dictionary problems in #33978 #34094

L1T: fix duplicate dictionary problems in #33978 #34094

Conversation

cecilecaillol commented Jun 11, 2021

PR description:

PR validation:

if this PR is a backport please specify the original PR and why you need to backport that PR:

cmsbuild commented Jun 11, 2021

cmsbuild commented Jun 11, 2021

cmsbuild commented Jun 11, 2021

cecilecaillol commented Jun 11, 2021

makortel Jun 11, 2021

Choose a reason for hiding this comment

makortel Jun 11, 2021

Choose a reason for hiding this comment

makortel Jun 11, 2021 • edited Loading

Choose a reason for hiding this comment

cmsbuild commented Jun 15, 2021

cmsbuild commented Jun 15, 2021

cecilecaillol commented Jun 15, 2021

cmsbuild commented Jun 15, 2021

Comparison Summary

smuzaffar commented Jun 15, 2021

cecilecaillol commented Jun 15, 2021

civanch commented Jun 16, 2021

cmsbuild commented Jun 16, 2021

qliphy commented Jun 16, 2021

makortel Jun 11, 2021 •

edited

Loading