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

Jump to bottom

modernize RecoVertex/BeamSpotProducer #35236

Merged
merged 1 commit into from Sep 17, 2021
Merged

modernize RecoVertex/BeamSpotProducer #35236

merged 1 commit into from Sep 17, 2021

Conversation

mmusich
Copy link
Contributor

@mmusich mmusich commented Sep 11, 2021

fixes cms-AlCaDB/AlCaTools#24

PR description:

Modernize RecoVertex/BeamSpotProducer:

  • merge headers with plugin implementation
  • transformed legacy EDAnalyzers into edm::one::EDAnalyzers
  • move cout to thread-safe MessageLogger instructions
  • remove commented out code
  • add fillDescriptions methods

PR validation:

It compiles, also tested with unit tests.

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

N/A

@cmsbuild cmsbuild added this to the CMSSW_12_1_X milestone Sep 11, 2021
@cmsbuild
Copy link
Contributor

+code-checks

Logs: https://cmssdt.cern.ch/SDT/code-checks/cms-sw-PR-35236/25201

  • This PR adds an extra 16KB to repository

@cmsbuild
Copy link
Contributor

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

It involves the following packages:

  • RecoVertex/BeamSpotProducer (reconstruction, alca)

@malbouis, @yuanchao, @cmsbuild, @slava77, @jpata, @francescobrivio, @tvami can you please review it and eventually sign? Thanks.
@GiacomoSguazzoni, @JanFSchulte, @rovere, @VinInn, @tocheng, @mmusich, @mtosi, @dgulhan 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 11, 2021

@cmsbuild, please test

@cmsbuild
Copy link
Contributor

-1

Failed Tests: Build ClangBuild
Summary: https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-ff47c6/18519/summary.html
COMMIT: f7e4261
CMSSW: CMSSW_12_1_X_2021-09-10-1100/slc7_amd64_gcc900
User test area: For local testing, you can use /cvmfs/cms-ci.cern.ch/week1/cms-sw/cmssw/35236/18519/install.sh to create a dev area with all the needed externals and cmssw changes.

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

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

Build

I found compilation error when building:

>> Compiling edm plugin /data/cmsbld/jenkins/workspace/ib-run-pr-tests/CMSSW_12_1_X_2021-09-10-1100/src/RecoTracker/MkFit/plugins/MkFitSeedConverter.cc
>> Compiling edm plugin /data/cmsbld/jenkins/workspace/ib-run-pr-tests/CMSSW_12_1_X_2021-09-10-1100/src/RecoTracker/MkFit/plugins/MkFitSiPixelHitConverter.cc
>> Compiling edm plugin /data/cmsbld/jenkins/workspace/ib-run-pr-tests/CMSSW_12_1_X_2021-09-10-1100/src/RecoTracker/MkFit/plugins/MkFitSiStripHitConverter.cc
>> Compiling edm plugin /data/cmsbld/jenkins/workspace/ib-run-pr-tests/CMSSW_12_1_X_2021-09-10-1100/src/RecoTracker/MkFit/plugins/createPhase1TrackerGeometry.cc
/data/cmsbld/jenkins/workspace/ib-run-pr-tests/CMSSW_12_1_X_2021-09-10-1100/src/RecoTracker/MkFit/plugins/createPhase1TrackerGeometry.cc: In function 'void {anonymous}::setupSteeringParamsIter0(mkfit::IterationConfig&)':
/data/cmsbld/jenkins/workspace/ib-run-pr-tests/CMSSW_12_1_X_2021-09-10-1100/src/RecoTracker/MkFit/plugins/createPhase1TrackerGeometry.cc:35:10: error: 'class mkfit::SteeringParams' has no member named 'set_iterator_limits'
   35 |       sp.set_iterator_limits(2, 0);
      |          ^~~~~~~~~~~~~~~~~~~
/data/cmsbld/jenkins/workspace/ib-run-pr-tests/CMSSW_12_1_X_2021-09-10-1100/src/RecoTracker/MkFit/plugins/createPhase1TrackerGeometry.cc:50:10: error: 'class mkfit::SteeringParams' has no member named 'set_iterator_limits'
   50 |       sp.set_iterator_limits(2, 0);
      |          ^~~~~~~~~~~~~~~~~~~

Clang Build

I found compilation error while trying to compile with clang. Command used:

USER_CUDA_FLAGS='--expt-relaxed-constexpr' USER_CXXFLAGS='-Wno-register -fsyntax-only' scram build -k -j 32 COMPILER='llvm compile'


>> Compiling edm plugin /data/cmsbld/jenkins/workspace/ib-run-pr-tests/CMSSW_12_1_X_2021-09-10-1100/src/RecoTracker/MkFit/plugins/MkFitGeometryESProducer.cc
>> Compiling edm plugin /data/cmsbld/jenkins/workspace/ib-run-pr-tests/CMSSW_12_1_X_2021-09-10-1100/src/RecoTracker/MkFit/plugins/MkFitSeedConverter.cc
>> Compiling edm plugin /data/cmsbld/jenkins/workspace/ib-run-pr-tests/CMSSW_12_1_X_2021-09-10-1100/src/RecoTracker/MkFit/plugins/createPhase1TrackerGeometry.cc
>> Compiling edm plugin /data/cmsbld/jenkins/workspace/ib-run-pr-tests/CMSSW_12_1_X_2021-09-10-1100/src/RecoTracker/MkFit/plugins/MkFitSiPixelHitConverter.cc
>> Compiling edm plugin /data/cmsbld/jenkins/workspace/ib-run-pr-tests/CMSSW_12_1_X_2021-09-10-1100/src/RecoTracker/MkFit/plugins/MkFitSiStripHitConverter.cc
/data/cmsbld/jenkins/workspace/ib-run-pr-tests/CMSSW_12_1_X_2021-09-10-1100/src/RecoTracker/MkFit/plugins/createPhase1TrackerGeometry.cc:35:10: error: no member named 'set_iterator_limits' in 'mkfit::SteeringParams'
      sp.set_iterator_limits(2, 0);
      ~~ ^
/data/cmsbld/jenkins/workspace/ib-run-pr-tests/CMSSW_12_1_X_2021-09-10-1100/src/RecoTracker/MkFit/plugins/createPhase1TrackerGeometry.cc:50:10: error: no member named 'set_iterator_limits' in 'mkfit::SteeringParams'
      sp.set_iterator_limits(2, 0);
      ~~ ^

@slava77
Copy link
Contributor

slava77 commented Sep 11, 2021

@cmsbuild please test

CMSSW_12_1_X_2021-09-11-1100 is out now (10-1100 was too old for this PR)

@cmsbuild
Copy link
Contributor

+1

Summary: https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-ff47c6/18522/summary.html
COMMIT: f7e4261
CMSSW: CMSSW_12_1_X_2021-09-11-1100/slc7_amd64_gcc900
User test area: For local testing, you can use /cvmfs/cms-ci.cern.ch/week1/cms-sw/cmssw/35236/18522/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: 8 differences found in the comparisons
  • DQMHistoTests: Total files compared: 39
  • DQMHistoTests: Total histograms compared: 3001001
  • DQMHistoTests: Total failures: 11
  • DQMHistoTests: Total nulls: 1
  • DQMHistoTests: Total successes: 3000967
  • DQMHistoTests: Total skipped: 22
  • DQMHistoTests: Total Missing objects: 0
  • DQMHistoSizes: Histogram memory added: -0.004 KiB( 38 files compared)
  • DQMHistoSizes: changed ( 312.0 ): -0.004 KiB MessageLogger/Warnings
  • Checked 165 log files, 37 edm output root files, 39 DQM output files
  • TriggerResults: no differences found

@cmsbuild
Copy link
Contributor

Pull request #35236 was updated. @malbouis, @yuanchao, @cmsbuild, @slava77, @jpata, @francescobrivio, @tvami can you please check and sign again.

@mmusich
Copy link
Contributor Author

mmusich commented Sep 12, 2021

@cmsbuild, please test

@cmsbuild
Copy link
Contributor

+1

Summary: https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-ff47c6/18526/summary.html
COMMIT: 993a9a6
CMSSW: CMSSW_12_1_X_2021-09-11-1100/slc7_amd64_gcc900
User test area: For local testing, you can use /cvmfs/cms-ci.cern.ch/week1/cms-sw/cmssw/35236/18526/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: 4 differences found in the comparisons
  • DQMHistoTests: Total files compared: 39
  • DQMHistoTests: Total histograms compared: 3001001
  • DQMHistoTests: Total failures: 6
  • DQMHistoTests: Total nulls: 0
  • DQMHistoTests: Total successes: 3000973
  • DQMHistoTests: Total skipped: 22
  • DQMHistoTests: Total Missing objects: 0
  • DQMHistoSizes: Histogram memory added: 0.0 KiB( 38 files compared)
  • Checked 165 log files, 37 edm output root files, 39 DQM output files
  • TriggerResults: no differences found

@tvami
Copy link
Contributor

tvami commented Sep 12, 2021

+alca

@mmusich mmusich changed the title moderninze RecoVertex/BeamSpotProducer modernize RecoVertex/BeamSpotProducer Sep 13, 2021
jpata
jpata reviewed Sep 16, 2021
View reviewed changes
Copy link
Contributor

@jpata jpata left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

perhaps some more commented-out code can be removed here?

RecoVertex/BeamSpotProducer/plugins/BeamSpotAnalyzer.cc
edm::LogPrint("BeamSpotAnalyzer") << "for lumis " << beginLumiOfBSFit_ << " - " << endLumiOfBSFit_ << std::endl
<< "number of selected tracks = " << theBeamFitter->getNTracks();
edm::LogPrint("BeamSpotAnalyzer") << "number of selected PVs = " << theBeamFitter->getNPVs();
//edm::LogPrint("BeamSpotAnalyzer") << "number of selected PVs per bx: " << theBeamFitter->getNPVsperBX() std::endl;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
//edm::LogPrint("BeamSpotAnalyzer") << "number of selected PVs per bx: " << theBeamFitter->getNPVsperBX() std::endl;

RecoVertex/BeamSpotProducer/plugins/BeamSpotAnalyzer.cc
edm::LogPrint("BeamSpotAnalyzer") << bs;
edm::LogPrint("BeamSpotAnalyzer") << "[BeamFitter] fit failed \n";
// accumulate more events
// disable this for the moment
//resetFitNLumi_ += 1;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

should this be removed?

RecoVertex/BeamSpotProducer/plugins/BeamSpotAnalyzer.cc
//resetFitNLumi_ += 1;
//std::cout << "reset fitNLumi " << resetFitNLumi_ << std::endl;
//edm::LogPrint("BeamSpotAnalyzer") << "reset fitNLumi " << resetFitNLumi_ ;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
//edm::LogPrint("BeamSpotAnalyzer") << "reset fitNLumi " << resetFitNLumi_ ;

RecoVertex/BeamSpotProducer/plugins/BeamSpotFromDB.cc
Comment on lines +43 to +44
//edm::LogPrint("BeamSpotFromDB") << iEvent.getRun().beginTime().value();
//edm::LogPrint("BeamSpotFromDB") << iEvent.time().value();
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
//edm::LogPrint("BeamSpotFromDB") << iEvent.getRun().beginTime().value();
//edm::LogPrint("BeamSpotFromDB") << iEvent.time().value();

@mmusich
Copy link
Contributor Author

mmusich commented Sep 16, 2021

@jpata I am not going to remove the commented lines as I am not the original author (nor the long term maintainer) of the code.

@jpata
Copy link
Contributor

jpata commented Sep 17, 2021

+reconstruction

  • for 993a9a6
  • no changes in reco, code changes are minimal

@cmsbuild
Copy link
Contributor

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

+1

@cmsbuild cmsbuild merged commit fc2c6b7 into cms-sw:master Sep 17, 2021
@mmusich mmusich deleted the modernizeRecoVertexBeamSpotProducer branch September 17, 2021 18:45
@cmsbuild cmsbuild mentioned this pull request Sep 20, 2021
Merged
This was referenced Feb 28, 2022
Merged
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jpata jpata jpata left review comments

@perrotta perrotta perrotta left review comments

@tvami tvami tvami left review comments

Assignees
No one assigned
Labels
alca-approved code-checks-approved fully-signed orp-approved reconstruction-approved tests-approved
Projects
None yet
Milestone
CMSSW_12_1_X
Development

Successfully merging this pull request may close these issues.

Deprecated EDAnalyzer in BeamSpotProducer
6 participants
@mmusich @cmsbuild @slava77 @tvami @jpata @perrotta