Navigation Menu

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.

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

Modernize CondTools/SiPixel #35495

Merged
merged 11 commits into from Oct 2, 2021
Merged

Conversation

mmusich
Copy link
Contributor

@mmusich mmusich commented Sep 30, 2021

PR description:

Folllow-up to #35421:

  • moved plugin modules from test to plugins folder;
  • migrate away from deprecated edm::EDAnalyzer ;
  • migrate to esConsumes;
  • clean-up of some unused methods;
  • removal of SealModules file
  • remove couts in favour of MessageLogger

Still possible improvements:

  • merge of header files within the implementation file;
  • introduce more unit test to cover the plugins;

PR validation:

It compiles.

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

N/A

@cmsbuild
Copy link
Contributor

+code-checks

Logs: https://cmssdt.cern.ch/SDT/code-checks/cms-sw-PR-35495/25665

  • This PR adds an extra 212KB to repository

  • Found files with invalid states:

    • CondTools/SiPixel/plugins/SealModules.cc:

@cmsbuild
Copy link
Contributor

A new Pull Request was created by @mmusich (Marco Musich) for master.

It involves the following packages:

  • CondTools/SiPixel (db)

@ggovi, @malbouis, @cmsbuild, @tvami, @francescobrivio can you please review it and eventually sign? Thanks.
@VinInn, @OzAmram, @ferencek, @mmusich, @dkotlins, @tvami this is something you requested to watch as well.
@perrotta, @dpiparo, @qliphy you are the release manager for this.

cms-bot commands are listed here

@mmusich
Copy link
Contributor Author

mmusich commented Sep 30, 2021

@cmsbuild, please test

@cmsbuild
Copy link
Contributor

-1

Failed Tests: Build
Summary: https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-54096c/19297/summary.html
COMMIT: 1e90ff6
CMSSW: CMSSW_12_1_X_2021-09-30-1100/slc7_amd64_gcc900
User test area: For local testing, you can use /cvmfs/cms-ci.cern.ch/week0/cms-sw/cmssw/35495/19297/install.sh to create a dev area with all the needed externals and cmssw changes.

CMS StaticAnalyzer warnings: There are 1 EventSetupRecord::get warnings. See https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-54096c/19297/llvm-analysis/esrget-sa.txt for details.
CMS StaticAnalyzer warnings: There are 1 inherits from legacy modules warnings. See https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-54096c/19297/llvm-analysis/legacy-mod-sa.txt for details.

Build

I found compilation error when building:

>> Compiling edm plugin /data/cmsbld/jenkins/workspace/ib-run-pr-tests/CMSSW_12_1_X_2021-09-30-1100/src/CondTools/SiPixel/plugins/SiPixelTemplateDBObjectReader.cc
>> Compiling edm plugin /data/cmsbld/jenkins/workspace/ib-run-pr-tests/CMSSW_12_1_X_2021-09-30-1100/src/CondTools/SiPixel/plugins/SiPixelVCalDB.cc
>> Compiling edm plugin /data/cmsbld/jenkins/workspace/ib-run-pr-tests/CMSSW_12_1_X_2021-09-30-1100/src/CondTools/SiPixel/plugins/SiPixelVCalReader.cc
In file included from /data/cmsbld/jenkins/workspace/ib-run-pr-tests/CMSSW_12_1_X_2021-09-30-1100/src/CondTools/SiPixel/plugins/SiPixelVCalReader.h:35,
                 from /data/cmsbld/jenkins/workspace/ib-run-pr-tests/CMSSW_12_1_X_2021-09-30-1100/src/CondTools/SiPixel/plugins/SiPixelVCalReader.cc:1:
/data/cmsbld/jenkins/workspace/ib-run-pr-tests/CMSSW_12_1_X_2021-09-30-1100/poison/CondTools/SiPixel/test/SiPixelVCalDB.h:1:2: error: #error THIS FILE HAS BEEN REMOVED FROM THE PACKAGE.
    1 | #error THIS FILE HAS BEEN REMOVED FROM THE PACKAGE.
      |  ^~~~~
In file included from /data/cmsbld/jenkins/workspace/ib-run-pr-tests/CMSSW_12_1_X_2021-09-30-1100/src/CondTools/SiPixel/plugins/SiPixelVCalReader.cc:1:
/data/cmsbld/jenkins/workspace/ib-run-pr-tests/CMSSW_12_1_X_2021-09-30-1100/src/CondTools/SiPixel/plugins/SiPixelVCalReader.h:47:19: error: 'TrackerGeometry' was not declared in this scope
   47 |   edm::ESGetToken tkGeomToken_;


@tvami
Copy link
Contributor

tvami commented Sep 30, 2021

I'd add to the todo list of the upcoming PR that unit tests should be added to ensure that these are running fine

@tvami
Copy link
Contributor

tvami commented Sep 30, 2021

FYI @SanjanaSekhar

@cmsbuild
Copy link
Contributor

+code-checks

Logs: https://cmssdt.cern.ch/SDT/code-checks/cms-sw-PR-35495/25672

  • This PR adds an extra 72KB to repository

@cmsbuild
Copy link
Contributor

Pull request #35495 was updated. @ggovi, @malbouis, @cmsbuild, @tvami, @francescobrivio can you please check and sign again.

@mmusich
Copy link
Contributor Author

mmusich commented Sep 30, 2021

I found compilation error when building:

actually not sure why this happened. Locally it compiles.

@mmusich
Copy link
Contributor Author

mmusich commented Sep 30, 2021

I can reproduce with:

cmsrel CMSSW_12_1_X_2021-09-30-1100/
cd CMSSW_12_1_X_2021-09-30-1100/src/
cmsenv
git cms-merge-topic 35495
scramv1 b -j 20

how does one get rid of the poisoned files?

@smuzaffar
Copy link
Contributor

smuzaffar commented Sep 30, 2021

@mmusich , one of the file still use the deleted header

./CondTools/SiPixel/plugins/SiPixelVCalReader.h:#include "CondTools/SiPixel/test/SiPixelVCalDB.h"

@cmsbuild
Copy link
Contributor

cmsbuild commented Oct 2, 2021

Pull request #35495 was updated. @ggovi, @malbouis, @cmsbuild, @tvami, @francescobrivio can you please check and sign again.

@mmusich
Copy link
Contributor Author

mmusich commented Oct 2, 2021

@perrotta all review comments have been addressed.

@tvami's #35495 (comment) about unexpected printouts in TESTING SiPixelLorentzAngle DB codes is addressed at e1de205

@cmsbuild
Copy link
Contributor

cmsbuild commented Oct 2, 2021

+code-checks

Logs: https://cmssdt.cern.ch/SDT/code-checks/cms-sw-PR-35495/25716

  • This PR adds an extra 208KB to repository

@cmsbuild
Copy link
Contributor

cmsbuild commented Oct 2, 2021

Pull request #35495 was updated. @ggovi, @malbouis, @cmsbuild, @tvami, @francescobrivio can you please check and sign again.

@mmusich
Copy link
Contributor Author

mmusich commented Oct 2, 2021

@cmsbuild, please test

@cmsbuild
Copy link
Contributor

cmsbuild commented Oct 2, 2021

+1

Summary: https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-54096c/19339/summary.html
COMMIT: d8fac6d
CMSSW: CMSSW_12_1_X_2021-10-02-1100/slc7_amd64_gcc900
User test area: For local testing, you can use /cvmfs/cms-ci.cern.ch/week0/cms-sw/cmssw/35495/19339/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: 0 differences found in the comparisons
  • DQMHistoTests: Total files compared: 40
  • DQMHistoTests: Total histograms compared: 3219394
  • DQMHistoTests: Total failures: 0
  • DQMHistoTests: Total nulls: 0
  • DQMHistoTests: Total successes: 3219372
  • DQMHistoTests: Total skipped: 22
  • DQMHistoTests: Total Missing objects: 0
  • DQMHistoSizes: Histogram memory added: 0.0 KiB( 39 files compared)
  • Checked 169 log files, 37 edm output root files, 40 DQM output files
  • TriggerResults: no differences found

@tvami
Copy link
Contributor

tvami commented Oct 2, 2021

+db

@cmsbuild
Copy link
Contributor

cmsbuild commented Oct 2, 2021

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

@perrotta
Copy link
Contributor

perrotta commented Oct 2, 2021

+1

@cmsbuild cmsbuild merged commit 5ad2e26 into cms-sw:master Oct 2, 2021
@mmusich mmusich deleted the moderizeCondToolsSiPixel branch October 2, 2021 17:29
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

6 participants