PPS: rename directories with misleading names #29137

silviodonato · 2020-03-06T16:28:03Z

Copy of #29037 (ie. revert of revert #29093) by @jan-kaspar

PR description:

There were two instances of directories with misleading names in the (CT)PPS code tree:

CondFormats/CTPPSReadoutObjects: contained all PPS cond-formats, not just readout,
RecoCTPPS/TotemRPLocal: beyond the code for Si strip detectors (from TOTEM), contained also the code for diamond and UFSD sensors.

We profit from this renaming, to replace CTPPS with PPS in the affected directory names.

In RecoPPS, we put all the local-reconstruction (within a single RP) into a single directory "Local".

This is a technical RP, no changes in the results are expected.

PR validation:

Running

runTheMatrix.py -l limited -j 10 --ibeos

gave

34 33 32 26 16 4 1 1 1 tests passed, 0 0 0 0 0 0 0 0 0 failed

The plots below compare proton reconstruction with CMSSW_11_1_0_pre3 (blue) and this PR (red dashed) - there is no difference as expected.

cmsbuild · 2020-03-06T16:28:33Z

The code-checks are being triggered in jenkins.

cmsbuild · 2020-03-06T16:34:02Z

+code-checks

Logs: https://cmssdt.cern.ch/SDT/code-checks/cms-sw-PR-29137/14059

This PR adds an extra 8KB to repository
There are other open Pull requests which might conflict with changes you have proposed:
- File Configuration/EventContent/python/EventContent_cff.py modified in PR(s): [HGCAL] TICL in reconstruction #29081
- File Configuration/StandardSequences/python/Reconstruction_cff.py modified in PR(s): Squash all Patatrack developments on top of CMSSW_11_3_0_pre5 #27983, [HGCAL] TICL in reconstruction #29081
- File PhysicsTools/PatAlgos/python/slimming/miniAOD_tools.py modified in PR(s): PUPPI jets in RECO #28936, New Tau ID data format #28417

cmsbuild · 2020-03-06T16:34:33Z

A new Pull Request was created by @silviodonato (Silvio Donato) for master.

It involves the following packages:

CalibPPS/ESProducers
CondCore/CTPPSPlugins
CondCore/Utilities
CondFormats/CTPPSReadoutObjects
CondFormats/PPSObjects
CondTools/CTPPS
Configuration/EventContent
Configuration/StandardSequences
DQM/CTPPS
DQM/Integration
EventFilter/CTPPSRawToDigi
Geometry/VeryForwardGeometry
Geometry/VeryForwardGeometryBuilder
IOMC/EventVertexGenerators
PhysicsTools/PatAlgos
RecoCTPPS/Configuration
RecoCTPPS/PixelLocal
RecoCTPPS/TotemRPLocal
RecoPPS/Configuration
RecoPPS/Local
RecoPPS/ProtonReconstruction
SimPPS/PPSPixelDigiProducer
SimPPS/RPDigiProducer
Validation/CTPPS

The following packages do not have a category, yet:

CondFormats/PPSObjects
RecoPPS/Configuration
RecoPPS/Local
RecoPPS/ProtonReconstruction
Please create a PR for https://github.com/cms-sw/cms-bot/blob/master/categories_map.py to assign category

@andrius-k, @schneiml, @ianna, @fioriNTU, @tlampen, @pohsun, @santocch, @perrotta, @civanch, @makortel, @cmsbuild, @davidlange6, @Dr15Jones, @cvuosalo, @mdhildreth, @jfernan2, @tocheng, @slava77, @ggovi, @fabiocos, @kmaeshima, @christopheralanwest, @silviodonato, @franzoni can you please review it and eventually sign? Thanks.
@rappoccio, @gouskos, @felicepantaleo, @forthommel, @hatakeyamak, @emilbols, @Martin-Grunewald, @ahinzmann, @threus, @peruzzim, @seemasharmafnal, @mmarionncern, @makortel, @smoortga, @jdolen, @ferencek, @GiacomoSguazzoni, @rovere, @VinInn, @jdamgov, @nhanvtran, @gkasieczka, @tocheng, @schoef, @mmusich, @dgulhan, @clelange, @batinkov, @riga, @jan-kaspar, @JyothsnaKomaragiri, @mverzett, @lecriste, @gpetruc, @mariadalfonso, @andrzejnovak this is something you requested to watch as well.
@davidlange6, @silviodonato, @fabiocos you are the release manager for this.

cms-bot commands are listed here

perrotta · 2020-03-06T16:49:39Z

please test

cmsbuild · 2020-03-06T16:50:12Z

The tests are being triggered in jenkins.
https://cmssdt.cern.ch/jenkins/job/ib-run-pr-tests/5041/console Started: 2020/03/06 17:52

cmsbuild · 2020-03-06T20:46:58Z

-1

Tested at: ab43201

CMSSW: CMSSW_11_1_X_2020-03-05-2300
SCRAM_ARCH: slc7_amd64_gcc820

The following merge commits were also included on top of IB + this PR after doing git cms-merge-topic:

Convert TrackingMonitor to be a DQMEDAnalyzer #29127 @Dr15Jones: Convert TrackingMonitor to be a DQMEDAnalyzer
Make function local static const in StaticReader #29088 @Dr15Jones: Make function local static const in StaticReader
Change shared HandleExceptionFactory to be const #29089 @Dr15Jones: Change shared HandleExceptionFactory to be const
Change HitPixelLayersTPSelection to use ObjectSelectorStream #29099 @Dr15Jones: Change HitPixelLayersTPSelection to use ObjectSelectorStream
Make modules in HLTriggerOffline/Tau global modules #29101 @Dr15Jones: Make modules in HLTriggerOffline/Tau global modules
Make HiGenCleaner a global module #29102 @Dr15Jones: Make HiGenCleaner a global module
[ROOT] Add explicitely missing headers in DQM and Fireworks #29084 @mrodozov: [ROOT] Add explicitely missing headers in DQM and Fireworks
Change globals in BasicHepMCValidation to constexpr #29085 @Dr15Jones: Change globals in BasicHepMCValidation to constexpr

You can see more details here:
https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-b54ba9/5041/git-log-recent-commits
https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-b54ba9/5041/git-merge-result

You can see the results of the tests here:
https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-b54ba9/5041/summary.html

I found follow errors while testing this PR

Failed tests: UnitTests

Unit Tests:

I found errors in the following unit tests:

---> test TestFWCoreIntegrationStandalone had ERRORS
---> test unitTestsGroup_4 had ERRORS
---> test unitTestsGroup_1 had ERRORS
---> test testDDCompactView had ERRORS
---> test dumpDDExpandedView had ERRORS
---> test dumpDDCompactView had ERRORS

The following merge commits were also included on top of IB + this PR after doing git cms-merge-topic:

Convert TrackingMonitor to be a DQMEDAnalyzer #29127 @Dr15Jones: Convert TrackingMonitor to be a DQMEDAnalyzer
Make function local static const in StaticReader #29088 @Dr15Jones: Make function local static const in StaticReader
Change shared HandleExceptionFactory to be const #29089 @Dr15Jones: Change shared HandleExceptionFactory to be const
Change HitPixelLayersTPSelection to use ObjectSelectorStream #29099 @Dr15Jones: Change HitPixelLayersTPSelection to use ObjectSelectorStream
Make modules in HLTriggerOffline/Tau global modules #29101 @Dr15Jones: Make modules in HLTriggerOffline/Tau global modules
Make HiGenCleaner a global module #29102 @Dr15Jones: Make HiGenCleaner a global module
[ROOT] Add explicitely missing headers in DQM and Fireworks #29084 @mrodozov: [ROOT] Add explicitely missing headers in DQM and Fireworks
Change globals in BasicHepMCValidation to constexpr #29085 @Dr15Jones: Change globals in BasicHepMCValidation to constexpr

You can see more details here:
https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-b54ba9/5041/git-log-recent-commits
https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-b54ba9/5041/git-merge-result

cmsbuild · 2020-03-06T20:47:00Z

Comparison job queued.

jfernan2 · 2020-03-09T08:26:30Z

+1

tlampen · 2020-03-09T08:34:15Z

+1

perrotta · 2020-03-09T08:39:23Z

+1

Identical to PPS: rename directories with misleading names #29037, merged first and then reverted
The migration only consists in renaming more appropriately a few directories.
It is propagated correctly whenever they are addressed in CMSSW
Jenkins tests pass, and show no differences
Warning reports about duplicate plugins and libraries are expected to disappear once the change is merged in the release, and a full build follows

perrotta · 2020-03-09T08:40:11Z

PR cms-sw/cms-bot#1271 was created to update the category maps with the new (i.e. renamed) packages

silviodonato · 2020-03-09T09:34:22Z

+operations

silviodonato · 2020-03-09T09:36:37Z

@smuzaffar @mrodozov could you add new packages in https://github.com/cms-sw/cms-bot/blob/master/categories_map.py? They should be a trivial rename "CTPPS" -> "PPS"

mrodozov · 2020-03-09T10:43:01Z

@perrotta already did in cms-sw/cms-bot#1271 (right?)

perrotta · 2020-03-09T11:14:20Z

@perrotta already did in cms-sw/cms-bot#1271 (right?)

Yes., also merged now. Thank you @mrodozov

santocch · 2020-03-09T18:01:49Z

+1

cmsbuild · 2020-03-09T18:02:23Z

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. @davidlange6, @silviodonato, @fabiocos (and backports should be raised in the release meeting by the corresponding L2)

silviodonato · 2020-03-09T21:47:21Z

+1

Revert "Revert "PPS: rename directories with misleading names""

ab43201

cmsbuild added this to the CMSSW_11_1_X milestone Mar 6, 2020

cmsbuild added alca-pending analysis-pending code-checks-pending comparison-pending db-pending dqm-pending geometry-pending new-package-pending operations-pending orp-pending pending-signatures reconstruction-pending simulation-pending tests-pending labels Mar 6, 2020

cmsbuild added code-checks-approved and removed code-checks-pending labels Mar 6, 2020

cmsbuild added tests-started and removed tests-pending labels Mar 6, 2020

cmsbuild mentioned this pull request Mar 6, 2020

PUPPI jets in RECO #28936

Merged

cmsbuild added tests-rejected and removed tests-started labels Mar 6, 2020

cmsbuild added the simulation-approved label Mar 9, 2020

cmsbuild added dqm-approved and removed dqm-pending labels Mar 9, 2020

cmsbuild added alca-approved and removed alca-pending labels Mar 9, 2020

cmsbuild added reconstruction-approved and removed reconstruction-pending labels Mar 9, 2020

cmsbuild added operations-approved and removed operations-pending labels Mar 9, 2020

cmsbuild mentioned this pull request Mar 9, 2020

New EDProducer emulating the Stub processing of the Phase 2 Outer Tracker DTC board #29151

Merged

cmsbuild removed the new-package-pending label Mar 9, 2020

cmsbuild added analysis-approved fully-signed and removed analysis-pending pending-signatures labels Mar 9, 2020

cmsbuild added orp-approved and removed orp-pending labels Mar 9, 2020

cmsbuild merged commit ec99fb8 into master Mar 9, 2020

smuzaffar deleted the revert-29093-revert-29037-pps_rename branch June 13, 2020 17:27

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

PPS: rename directories with misleading names #29137

PPS: rename directories with misleading names #29137

silviodonato commented Mar 6, 2020

cmsbuild commented Mar 6, 2020

cmsbuild commented Mar 6, 2020

cmsbuild commented Mar 6, 2020

perrotta commented Mar 6, 2020

cmsbuild commented Mar 6, 2020 •

edited

cmsbuild commented Mar 6, 2020

cmsbuild commented Mar 6, 2020

jfernan2 commented Mar 9, 2020

tlampen commented Mar 9, 2020

perrotta commented Mar 9, 2020

perrotta commented Mar 9, 2020

silviodonato commented Mar 9, 2020

silviodonato commented Mar 9, 2020

mrodozov commented Mar 9, 2020

perrotta commented Mar 9, 2020 •

edited

santocch commented Mar 9, 2020

cmsbuild commented Mar 9, 2020

silviodonato commented Mar 9, 2020

PPS: rename directories with misleading names #29137

PPS: rename directories with misleading names #29137

Conversation

silviodonato commented Mar 6, 2020

PR description:

PR validation:

cmsbuild commented Mar 6, 2020

cmsbuild commented Mar 6, 2020

cmsbuild commented Mar 6, 2020

perrotta commented Mar 6, 2020

cmsbuild commented Mar 6, 2020 • edited

cmsbuild commented Mar 6, 2020

cmsbuild commented Mar 6, 2020

jfernan2 commented Mar 9, 2020

tlampen commented Mar 9, 2020

perrotta commented Mar 9, 2020

perrotta commented Mar 9, 2020

silviodonato commented Mar 9, 2020

silviodonato commented Mar 9, 2020

mrodozov commented Mar 9, 2020

perrotta commented Mar 9, 2020 • edited

santocch commented Mar 9, 2020

cmsbuild commented Mar 9, 2020

silviodonato commented Mar 9, 2020

cmsbuild commented Mar 6, 2020 •

edited

perrotta commented Mar 9, 2020 •

edited