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

Run3-sim118F Use token in getting collection and tfileservice for histograms in SimCalorimetry/EcalTrigPrimProducers #37882

Merged

cmsbuild merged 3 commits into cms-sw:master from bsunanda:Run3-sim118F

May 11, 2022

Contributor

bsunanda commented May 10, 2022

PR description:

Use token in getting collection and tfileservice for histograms in SimCalorimetry/EcalTrigPrimProducers

PR validation:

Use the runTheMatrix test workflows

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

Nothing special


          Use token in getting collection and tfileservice for histograms in Si…

7d49b9d

…mCalorimetry/EcalTrigPrimProducers

cmsbuild added this to the CMSSW_12_4_X milestone

cmsbuild added code-checks-pending l1-pending orp-pending pending-signatures tests-pending labels

Contributor

cmsbuild commented May 10, 2022

-code-checks

Logs: https://cmssdt.cern.ch/SDT/code-checks/cms-sw-PR-37882/29866

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-37882/29866/code-format.patch
e.g. curl -k https://cmssdt.cern.ch/SDT/code-checks/cms-sw-PR-37882/29866/code-format.patch | patch -p1
You can also run scram build code-format to apply code format directly

cmsbuild added code-checks-rejected and removed code-checks-pending labels


          Code check

6c467ff

cmsbuild added code-checks-pending and removed code-checks-rejected labels

Contributor Author

bsunanda commented May 10, 2022

@cmsbuild Please test

cmsbuild added tests-started and removed tests-pending labels

Contributor

cmsbuild commented May 10, 2022

+code-checks

Logs: https://cmssdt.cern.ch/SDT/code-checks/cms-sw-PR-37882/29867

This PR adds an extra 16KB to repository

cmsbuild added code-checks-approved and removed code-checks-pending labels

Contributor

cmsbuild commented May 10, 2022

A new Pull Request was created by @bsunanda (Sunanda Banerjee) for master.

It involves the following packages:

SimCalorimetry/EcalTrigPrimProducers (l1)

@epalencia, @rekovic, @cecilecaillol can you please review it and eventually sign? Thanks.
@rchatter, @valsdav, @rovere, @argiro, @thomreis, @simonepigazzini 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

cmsbuild added tests-rejected and removed tests-started labels

Contributor

cmsbuild commented May 10, 2022

-1

Failed Tests: ClangBuild
Summary: https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-bd78a8/24570/summary.html
COMMIT: 6c467ff
CMSSW: CMSSW_12_4_X_2022-05-09-2300/slc7_amd64_gcc10
User test area: For local testing, you can use /cvmfs/cms-ci.cern.ch/week0/cms-sw/cmssw/37882/24570/install.sh to create a dev area with all the needed externals and cmssw changes.

Clang Build

I found compilation warning 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'

See details on the summary page.

thomreis reviewed

View reviewed changes

SimCalorimetry/EcalTrigPrimProducers/plugins/EcalTrigPrimAnalyzer.cc Outdated

-                edm::Handle<EcalRecHitCollection> rechit_EE_col;
-                iEvent.getByLabel(rechits_labelEE_, rechit_EE_col);
+                const edm::Handle<EcalRecHitCollection> &rechit_EB_col = iEvent.getHandle(ebToken_);
+                const edm::Handle<EcalRecHitCollection> &rechit_EE_col = iEvent.getHandle(eeToken_);

Contributor

thomreis May 10, 2022

The Handle is not really needed here as far as I can see. Event::get should work as well and is recommended.

Contributor Author

bsunanda May 10, 2022

done

SimCalorimetry/EcalTrigPrimProducers/plugins/EcalTrigPrimAnalyzer.cc Outdated

-                edm::ESHandle<CaloGeometry> theGeometry = iSetup.getHandle(geomToken_);
-                edm::ESHandle<CaloSubdetectorGeometry> theBarrelGeometry_handle = iSetup.getHandle(barrelGeomToken_);
-                edm::ESHandle<CaloSubdetectorGeometry> theEndcapGeometry_handle = iSetup.getHandle(endcapGeomToken_);
+                const edm::ESHandle<CaloGeometry> &theGeometry = iSetup.getHandle(geomToken_);

Contributor

thomreis May 10, 2022

theGeometry seems unused.

Contributor Author

bsunanda May 10, 2022

removed

SimCalorimetry/EcalTrigPrimProducers/plugins/EcalTrigPrimAnalyzer.cc Outdated

Comment on lines 106 to 110

+                const edm::ESHandle<CaloSubdetectorGeometry> &theBarrelGeometry_handle = iSetup.getHandle(barrelGeomToken_);
+                const edm::ESHandle<CaloSubdetectorGeometry> &theEndcapGeometry_handle = iSetup.getHandle(endcapGeomToken_);
                 const CaloSubdetectorGeometry *theEndcapGeometry = theEndcapGeometry_handle.product();
                 const CaloSubdetectorGeometry *theBarrelGeometry = theBarrelGeometry_handle.product();

Contributor

thomreis May 10, 2022

Suggested change

      
              const edm::ESHandle<CaloSubdetectorGeometry> &theBarrelGeometry_handle = iSetup.getHandle(barrelGeomToken_);
          
              const edm::ESHandle<CaloSubdetectorGeometry> &theEndcapGeometry_handle = iSetup.getHandle(endcapGeomToken_);
          
              const CaloSubdetectorGeometry *theEndcapGeometry = theEndcapGeometry_handle.product();
          
              const CaloSubdetectorGeometry *theBarrelGeometry = theBarrelGeometry_handle.product();
          
              const auto &theBarrelGeometry = iSetup.getData(barrelGeomToken_);
          
              const auto &theEndcapGeometry = iSetup.getData(endcapGeomToken_);

Contributor Author

bsunanda May 10, 2022

taken care of

SimCalorimetry/EcalTrigPrimProducers/plugins/EcalTrigPrimAnalyzer.cc Outdated

                 const CaloSubdetectorGeometry *theEndcapGeometry = theEndcapGeometry_handle.product();
                 const CaloSubdetectorGeometry *theBarrelGeometry = theBarrelGeometry_handle.product();
-                edm::ESHandle<EcalTrigTowerConstituentsMap> eTTmap_ = iSetup.getHandle(eTTmapToken_);
+                const edm::ESHandle<EcalTrigTowerConstituentsMap> &eTTmap_ = iSetup.getHandle(eTTmapToken_);

Contributor

thomreis May 10, 2022

Suggested change

      
              const edm::ESHandle<EcalTrigTowerConstituentsMap> &eTTmap_ = iSetup.getHandle(eTTmapToken_);
          
              const auto &eTTmap = iSetup.getData(eTTmapToken_);

Contributor Author

bsunanda May 10, 2022

taken care of

SimCalorimetry/EcalTrigPrimProducers/plugins/EcalTrigPrimAnalyzer.cc Outdated

                 // Get input
-                edm::Handle<EcalTrigPrimDigiCollection> tp;
-                iEvent.getByLabel(label_, tp);
+                const edm::Handle<EcalTrigPrimDigiCollection> &tp = iEvent.getHandle(tpToken_);

Contributor

thomreis May 10, 2022

Suggested change

      
              const edm::Handle<EcalTrigPrimDigiCollection> &tp = iEvent.getHandle(tpToken_);
          
              const auto &tp = iEvent.get(tpToken_);

The Handle is not really needed here as far as I can see. Event::get should work as well and is recommended.

Contributor Author

bsunanda May 10, 2022

done


          take care of commnents

3e818c5

cmsbuild added code-checks-pending tests-pending and removed tests-rejected code-checks-approved labels

Contributor

cmsbuild commented May 10, 2022

+code-checks

Logs: https://cmssdt.cern.ch/SDT/code-checks/cms-sw-PR-37882/29868

This PR adds an extra 20KB to repository

cmsbuild added code-checks-approved and removed code-checks-pending labels

Contributor

cmsbuild commented May 10, 2022

Pull request #37882 was updated. @epalencia, @cmsbuild, @cecilecaillol, @rekovic can you please check and sign again.

Contributor Author

bsunanda commented May 10, 2022

@cmsbuild Please test

cmsbuild added tests-started and removed tests-pending labels

Contributor

cmsbuild commented May 10, 2022

+1

Summary: https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-bd78a8/24575/summary.html
COMMIT: 3e818c5
CMSSW: CMSSW_12_4_X_2022-05-10-1100/slc7_amd64_gcc10
User test area: For local testing, you can use /cvmfs/cms-ci.cern.ch/week0/cms-sw/cmssw/37882/24575/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: 49
DQMHistoTests: Total histograms compared: 3696633
DQMHistoTests: Total failures: 7
DQMHistoTests: Total nulls: 1
DQMHistoTests: Total successes: 3696603
DQMHistoTests: Total skipped: 22
DQMHistoTests: Total Missing objects: 0
DQMHistoSizes: Histogram memory added: 0.004 KiB( 48 files compared)
DQMHistoSizes: changed ( 312.0 ): 0.004 KiB MessageLogger/Warnings
Checked 206 log files, 45 edm output root files, 49 DQM output files
TriggerResults: no differences found

cmsbuild added tests-approved and removed tests-started labels

Contributor

cecilecaillol commented May 11, 2022

+l1

cmsbuild added fully-signed l1-approved and removed l1-pending pending-signatures labels

Contributor

cmsbuild commented May 11, 2022

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)

Contributor

perrotta commented May 11, 2022

+1

cmsbuild added orp-approved and removed orp-pending labels

cmsbuild merged commit 023fd65 into cms-sw:master

This was referenced May 11, 2022

DeepSC algorithm for ECAL SuperClusters #37115

Merged

Changes to enable new DeepTauId trainig #37892

Merged

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment