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

Pixel local reco: reduce code duplication between SiPixelDigiErrorsFromSoA and SiPixelRawToDigi #33526

Merged

Conversation

czangela
Copy link
Contributor

PR description:

This PR reduces code duplication between SiPixelDigiErrorsFromSoA and SiPixelRawToDigi (see #32483).

The FED errors are sorted into different collections for later usage, this part of the code was implemented by both of the classes above. Now it has been moved to PixelDataFormatter and is accessible through a member function unpackFEDErrors(...).

Also there is some (harmless ?) cleanup done in SiPixelRawToDigi and PixelDataFormatter.

PR validation:

The code compiles and runs on the workflows 136.8855 and 136.885502 (phase 1) without any error.

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

@cmsbuild
Copy link
Contributor

+code-checks

Logs: https://cmssdt.cern.ch/SDT/code-checks/cms-sw-PR-33526/22288

  • This PR adds an extra 32KB to repository

@cmsbuild
Copy link
Contributor

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

It involves the following packages:

EventFilter/SiPixelRawToDigi

@perrotta, @jpata, @cmsbuild, @slava77 can you please review it and eventually sign? Thanks.
@OzAmram, @makortel, @VinInn, @Martin-Grunewald, @dkotlins, @ferencek, @tvami 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

@slava77
Copy link
Contributor

slava77 commented Apr 26, 2021

@cmsbuild please test

@cmsbuild
Copy link
Contributor

-1

Failed Tests: RelVals RelVals-INPUT AddOn
Summary: https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-fa1837/14578/summary.html
COMMIT: 1379504
CMSSW: CMSSW_12_0_X_2021-04-26-1100/slc7_amd64_gcc900
User test area: For local testing, you can use /cvmfs/cms-ci.cern.ch/week0/cms-sw/cmssw/33526/14578/install.sh to create a dev area with all the needed externals and cmssw changes.

RelVals

----- Begin Fatal Exception 26-Apr-2021 15:56:30 CEST-----------------------
An exception of category 'Configuration' occurred while
   [0] Constructing the EventProcessor
   [1] Validating configuration of module: class=SiPixelRawToDigi label='hltSiPixelDigis'
Exception Message:
Illegal parameter found in configuration.  The parameter is named:
 'Timing'
You could be trying to use a parameter name that is not
allowed for this plugin or it could be misspelled.
----- End Fatal Exception -------------------------------------------------
----- Begin Fatal Exception 26-Apr-2021 15:57:18 CEST-----------------------
An exception of category 'Configuration' occurred while
   [0] Constructing the EventProcessor
   [1] Validating configuration of module: class=SiPixelRawToDigi label='hltSiPixelDigis'
Exception Message:
Illegal parameter found in configuration.  The parameter is named:
 'Timing'
You could be trying to use a parameter name that is not
allowed for this plugin or it could be misspelled.
----- End Fatal Exception -------------------------------------------------
----- Begin Fatal Exception 26-Apr-2021 15:57:35 CEST-----------------------
An exception of category 'Configuration' occurred while
   [0] Constructing the EventProcessor
   [1] Validating configuration of module: class=SiPixelRawToDigi label='hltSiPixelDigis'
Exception Message:
Illegal parameter found in configuration.  The parameter is named:
 'Timing'
You could be trying to use a parameter name that is not
allowed for this plugin or it could be misspelled.
----- End Fatal Exception -------------------------------------------------

RelVals-INPUT

  • 158.2158.2_PhotonJets_Pt_10_13_HI+PhotonJets_Pt_10_13_HIINPUT+DIGIHI2018PPRECO+RECOHI2018PPRECO+HARVESTHI2018PPRECO/step2_PhotonJets_Pt_10_13_HI+PhotonJets_Pt_10_13_HIINPUT+DIGIHI2018PPRECO+RECOHI2018PPRECO+HARVESTHI2018PPRECO.log
  • 158.1158.1_QCD_Pt_80_120_13_HI+QCD_Pt_80_120_13_HIINPUT+DIGIHI2018PPRECO+RECOHI2018PPRECO+HARVESTHI2018PPRECO/step2_QCD_Pt_80_120_13_HI+QCD_Pt_80_120_13_HIINPUT+DIGIHI2018PPRECO+RECOHI2018PPRECO+HARVESTHI2018PPRECO.log
  • 158.3158.3_ZEEMM_13_HI+ZEEMM_13_HIINPUT+DIGIHI2018PPRECO+RECOHI2018PPRECO+HARVESTHI2018PPRECO/step2_ZEEMM_13_HI+ZEEMM_13_HIINPUT+DIGIHI2018PPRECO+RECOHI2018PPRECO+HARVESTHI2018PPRECO.log
Expand to see more relval errors ...

AddOn Tests

----- Begin Fatal Exception 26-Apr-2021 15:41:32 CEST-----------------------
An exception of category 'Configuration' occurred while
   [0] Constructing the EventProcessor
   [1] Validating configuration of module: class=SiPixelRawToDigi label='hltSiPixelDigis'
Exception Message:
Illegal parameter found in configuration.  The parameter is named:
 'Timing'
You could be trying to use a parameter name that is not
allowed for this plugin or it could be misspelled.
----- End Fatal Exception -------------------------------------------------
----- Begin Fatal Exception 26-Apr-2021 15:41:19 CEST-----------------------
An exception of category 'Configuration' occurred while
   [0] Constructing the EventProcessor
   [1] Validating configuration of module: class=SiPixelRawToDigi label='hltSiPixelDigis'
Exception Message:
Illegal parameter found in configuration.  The parameter is named:
 'Timing'
You could be trying to use a parameter name that is not
allowed for this plugin or it could be misspelled.
----- End Fatal Exception -------------------------------------------------
----- Begin Fatal Exception 26-Apr-2021 15:42:12 CEST-----------------------
An exception of category 'Configuration' occurred while
   [0] Constructing the EventProcessor
   [1] Validating configuration of module: class=SiPixelRawToDigi label='hltSiPixelDigis'
Exception Message:
Illegal parameter found in configuration.  The parameter is named:
 'Timing'
You could be trying to use a parameter name that is not
allowed for this plugin or it could be misspelled.
----- End Fatal Exception -------------------------------------------------
Expand to see more addon errors ...

@cmsbuild
Copy link
Contributor

+code-checks

Logs: https://cmssdt.cern.ch/SDT/code-checks/cms-sw-PR-33526/22291

  • This PR adds an extra 16KB to repository

@cmsbuild
Copy link
Contributor

Pull request #33526 was updated. @perrotta, @jpata, @cmsbuild, @slava77 can you please check and sign again.

@slava77
Copy link
Contributor

slava77 commented Apr 26, 2021

enable gpu

@slava77
Copy link
Contributor

slava77 commented Apr 26, 2021

@cmsbuild please test

@cmsbuild
Copy link
Contributor

-1

Failed Tests: RelVals RelVals-INPUT AddOn
Summary: https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-fa1837/14583/summary.html
COMMIT: ac54098
CMSSW: CMSSW_12_0_X_2021-04-26-1100/slc7_amd64_gcc900
Additional Tests: GPU
User test area: For local testing, you can use /cvmfs/cms-ci.cern.ch/week0/cms-sw/cmssw/33526/14583/install.sh to create a dev area with all the needed externals and cmssw changes.

RelVals

----- Begin Fatal Exception 26-Apr-2021 17:53:22 CEST-----------------------
An exception of category 'Configuration' occurred while
   [0] Constructing the EventProcessor
   [1] Validating configuration of module: class=SiPixelRawToDigi label='hltSiPixelDigis'
Exception Message:
In the configuration, parameter "Timing" is defined as an untracked bool.
It should be tracked.
----- End Fatal Exception -------------------------------------------------
----- Begin Fatal Exception 26-Apr-2021 17:53:55 CEST-----------------------
An exception of category 'Configuration' occurred while
   [0] Constructing the EventProcessor
   [1] Validating configuration of module: class=SiPixelRawToDigi label='hltSiPixelDigis'
Exception Message:
In the configuration, parameter "Timing" is defined as an untracked bool.
It should be tracked.
----- End Fatal Exception -------------------------------------------------
----- Begin Fatal Exception 26-Apr-2021 17:54:11 CEST-----------------------
An exception of category 'Configuration' occurred while
   [0] Constructing the EventProcessor
   [1] Validating configuration of module: class=SiPixelRawToDigi label='hltSiPixelDigis'
Exception Message:
In the configuration, parameter "Timing" is defined as an untracked bool.
It should be tracked.
----- End Fatal Exception -------------------------------------------------

RelVals-INPUT

  • 158.1158.1_QCD_Pt_80_120_13_HI+QCD_Pt_80_120_13_HIINPUT+DIGIHI2018PPRECO+RECOHI2018PPRECO+HARVESTHI2018PPRECO/step2_QCD_Pt_80_120_13_HI+QCD_Pt_80_120_13_HIINPUT+DIGIHI2018PPRECO+RECOHI2018PPRECO+HARVESTHI2018PPRECO.log
  • 158.2158.2_PhotonJets_Pt_10_13_HI+PhotonJets_Pt_10_13_HIINPUT+DIGIHI2018PPRECO+RECOHI2018PPRECO+HARVESTHI2018PPRECO/step2_PhotonJets_Pt_10_13_HI+PhotonJets_Pt_10_13_HIINPUT+DIGIHI2018PPRECO+RECOHI2018PPRECO+HARVESTHI2018PPRECO.log
  • 158.3158.3_ZEEMM_13_HI+ZEEMM_13_HIINPUT+DIGIHI2018PPRECO+RECOHI2018PPRECO+HARVESTHI2018PPRECO/step2_ZEEMM_13_HI+ZEEMM_13_HIINPUT+DIGIHI2018PPRECO+RECOHI2018PPRECO+HARVESTHI2018PPRECO.log
Expand to see more relval errors ...

AddOn Tests

----- Begin Fatal Exception 26-Apr-2021 17:40:37 CEST-----------------------
An exception of category 'Configuration' occurred while
   [0] Constructing the EventProcessor
   [1] Validating configuration of module: class=SiPixelRawToDigi label='hltSiPixelDigis'
Exception Message:
In the configuration, parameter "Timing" is defined as an untracked bool.
It should be tracked.
----- End Fatal Exception -------------------------------------------------
----- Begin Fatal Exception 26-Apr-2021 17:37:23 CEST-----------------------
An exception of category 'Configuration' occurred while
   [0] Constructing the EventProcessor
   [1] Validating configuration of module: class=SiPixelRawToDigi label='hltSiPixelDigis'
Exception Message:
In the configuration, parameter "Timing" is defined as an untracked bool.
It should be tracked.
----- End Fatal Exception -------------------------------------------------
----- Begin Fatal Exception 26-Apr-2021 17:40:42 CEST-----------------------
An exception of category 'Configuration' occurred while
   [0] Constructing the EventProcessor
   [1] Validating configuration of module: class=SiPixelRawToDigi label='hltSiPixelDigis'
Exception Message:
In the configuration, parameter "Timing" is defined as an untracked bool.
It should be tracked.
----- End Fatal Exception -------------------------------------------------
Expand to see more addon errors ...

GPU Comparison Summary

Summary:

  • No significant changes to the logs found
  • Reco comparison results: 0 differences found in the comparisons
  • DQMHistoTests: Total files compared: 4
  • DQMHistoTests: Total histograms compared: 9559
  • DQMHistoTests: Total failures: 0
  • DQMHistoTests: Total nulls: 0
  • DQMHistoTests: Total successes: 9559
  • DQMHistoTests: Total skipped: 0
  • DQMHistoTests: Total Missing objects: 0
  • DQMHistoSizes: Histogram memory added: 0.0 KiB( 3 files compared)
  • Checked 12 log files, 9 edm output root files, 4 DQM output files
  • TriggerResults: no differences found

@czangela
Copy link
Contributor Author

@cmsbuild please test
-- had to rebase due to a conflict

@cmsbuild
Copy link
Contributor

+1

Summary: https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-fa1837/14747/summary.html
COMMIT: 64d828b
CMSSW: CMSSW_12_0_X_2021-04-29-2300/slc7_amd64_gcc900
Additional Tests: GPU
User test area: For local testing, you can use /cvmfs/cms-ci.cern.ch/week0/cms-sw/cmssw/33526/14747/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-fa1837/14747/git-recent-commits.json
https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-fa1837/14747/git-merge-result

GPU Comparison Summary

Summary:

  • No significant changes to the logs found
  • Reco comparison results: 0 differences found in the comparisons
  • DQMHistoTests: Total files compared: 4
  • DQMHistoTests: Total histograms compared: 9559
  • DQMHistoTests: Total failures: 0
  • DQMHistoTests: Total nulls: 0
  • DQMHistoTests: Total successes: 9559
  • DQMHistoTests: Total skipped: 0
  • DQMHistoTests: Total Missing objects: 0
  • DQMHistoSizes: Histogram memory added: 0.0 KiB( 3 files compared)
  • Checked 12 log files, 9 edm output root files, 4 DQM output files
  • TriggerResults: no differences found

Comparison Summary

Summary:

  • No significant changes to the logs found
  • Reco comparison results: 1014 differences found in the comparisons
  • DQMHistoTests: Total files compared: 37
  • DQMHistoTests: Total histograms compared: 2662646
  • DQMHistoTests: Total failures: 1155
  • DQMHistoTests: Total nulls: 1
  • DQMHistoTests: Total successes: 2661468
  • DQMHistoTests: Total skipped: 22
  • DQMHistoTests: Total Missing objects: 0
  • DQMHistoSizes: Histogram memory added: -0.016 KiB( 36 files compared)
  • DQMHistoSizes: changed ( 136.874 ): -0.016 KiB JetMET/SUSYDQM
  • Checked 155 log files, 37 edm output root files, 37 DQM output files
  • TriggerResults: no differences found

@slava77
Copy link
Contributor

slava77 commented May 1, 2021

@cmsbuild please test

to get a cleaner set (even though 30-2300 is not out yet; advancing to 30-1100 should be enough to get rid of differences in reco)

@cmsbuild
Copy link
Contributor

cmsbuild commented May 1, 2021

+1

Summary: https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-fa1837/14770/summary.html
COMMIT: 64d828b
CMSSW: CMSSW_12_0_X_2021-04-30-1100/slc7_amd64_gcc900
Additional Tests: GPU
User test area: For local testing, you can use /cvmfs/cms-ci.cern.ch/week0/cms-sw/cmssw/33526/14770/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-fa1837/14770/git-recent-commits.json
https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-fa1837/14770/git-merge-result

GPU Comparison Summary

Summary:

  • No significant changes to the logs found
  • Reco comparison results: 0 differences found in the comparisons
  • DQMHistoTests: Total files compared: 4
  • DQMHistoTests: Total histograms compared: 9559
  • DQMHistoTests: Total failures: 0
  • DQMHistoTests: Total nulls: 0
  • DQMHistoTests: Total successes: 9559
  • DQMHistoTests: Total skipped: 0
  • DQMHistoTests: Total Missing objects: 0
  • DQMHistoSizes: Histogram memory added: 0.0 KiB( 3 files compared)
  • Checked 12 log files, 9 edm output root files, 4 DQM output files
  • TriggerResults: no differences found

Comparison Summary

Summary:

  • No significant changes to the logs found
  • Reco comparison results: 0 differences found in the comparisons
  • DQMHistoTests: Total files compared: 37
  • DQMHistoTests: Total histograms compared: 2662646
  • DQMHistoTests: Total failures: 1
  • DQMHistoTests: Total nulls: 0
  • DQMHistoTests: Total successes: 2662623
  • DQMHistoTests: Total skipped: 22
  • DQMHistoTests: Total Missing objects: 0
  • DQMHistoSizes: Histogram memory added: 0.0 KiB( 36 files compared)
  • Checked 155 log files, 37 edm output root files, 37 DQM output files
  • TriggerResults: no differences found

@mmusich
Copy link
Contributor

mmusich commented May 3, 2021

It should be now good to go from the DPG perspective.

@slava77
Copy link
Contributor

slava77 commented May 3, 2021

+reconstruction

for #33526 64d828b

  • code changes are in line with the PR description and the follow up review
  • jenkins tests pass and comparisons with the baseline show no differences

@Martin-Grunewald
Copy link
Contributor

+1

@cmsbuild
Copy link
Contributor

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

@qliphy
Copy link
Contributor

qliphy commented May 3, 2021

+1

@makortel
Copy link
Contributor

makortel commented May 4, 2021

Seems that this PR caused a test failure in the IBs, see #33623

@mmusich
Copy link
Contributor

mmusich commented May 4, 2021

Issue is addressed at #33625

@czangela there some other occurrences of this parameters in other (untested) files:

https://cmssdt.cern.ch/dxr/CMSSW/search?q=siPixelDigis.Timing&case=true&redirect=true

perhaps you can clean those up to in a follow-up PR.

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.

9 participants