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

Refactor SiPixel Charge Reweighting code #40349

Merged
merged 1 commit into from Dec 20, 2022

Conversation

tvami
Copy link
Contributor

@tvami tvami commented Dec 16, 2022

PR description:

  • Refactoring Charge Reweighting code so it can be used in a follow-up PR in the Phase-2 simulations.
  • Changes to obey some of the coding rules that I came accross in these codes, like 2.7 and 4.1, 6.1
  • Ran code-checks and code-format
    For now this should lead to no changes.

PR validation:

Tested a Phase-1 and a Phase-2 wf:

12034.0_TTbar_14TeV+2021Design Step0-PASSED Step1-PASSED Step2-PASSED Step3-PASSED  - time date Fri Dec 16 18:51:23 2022-date Fri Dec 16 18:36:24 2022; exit: 0 0 0 0
20834.0_TTbar_14TeV+2026D88 Step0-PASSED Step1-PASSED Step2-PASSED Step3-PASSED Step4-PASSED  - time date Fri Dec 16 18:59:10 2022-date Fri Dec 16 18:36:25 2022; exit: 0 0 0 0 0
2 2 2 2 1 tests passed, 0 0 0 0 0 failed

If this PR is a backport please specify the original PR and why you need to backport that PR. If this PR will be backported please specify to which release cycle the backport is meant for:

Not a backport and no backport is needed

@tvami tvami changed the title Refactor Charge Reweighting code Refactor SiPixelCharge Reweighting code Dec 16, 2022
@cmsbuild cmsbuild added this to the CMSSW_13_0_X milestone Dec 16, 2022
@tvami tvami changed the title Refactor SiPixelCharge Reweighting code Refactor SiPixel Charge Reweighting code Dec 16, 2022
@cmsbuild
Copy link
Contributor

-code-checks

Logs: https://cmssdt.cern.ch/SDT/code-checks/cms-sw-PR-40349/33438

ERROR: Build errors found during clang-tidy run.

Suppressed 390 warnings (389 in non-user code, 1 with check filters).
--
SimTracker/SiPhase2Digitizer/plugins/Phase2TrackerDigitizerAlgorithm.h:16:10: error: 'SimTracker/Common/interface/DigitizerUtility.h' file not found [clang-diagnostic-error]
#include "SimTracker/Common/interface/DigitizerUtility.h"
         ^
Suppressed 402 warnings (401 in non-user code, 1 with check filters).
--
SimTracker/SiPhase2Digitizer/plugins/Phase2TrackerDigitizerAlgorithm.h:16:10: error: 'SimTracker/Common/interface/DigitizerUtility.h' file not found [clang-diagnostic-error]
#include "SimTracker/Common/interface/DigitizerUtility.h"
         ^
Suppressed 404 warnings (403 in non-user code, 1 with check filters).
--
SimTracker/SiPhase2Digitizer/plugins/Phase2TrackerDigitizerAlgorithm.h:16:10: error: 'SimTracker/Common/interface/DigitizerUtility.h' file not found [clang-diagnostic-error]
#include "SimTracker/Common/interface/DigitizerUtility.h"
         ^
Suppressed 769 warnings (768 in non-user code, 1 with check filters).
--
SimTracker/SiPixelDigitizer/plugins/SiPixelDigitizerAlgorithm.cc:87:10: error: 'SimTracker/Common/interface/SiPixelChargeReweightingAlgorithm.h' file not found [clang-diagnostic-error]
#include "SimTracker/Common/interface/SiPixelChargeReweightingAlgorithm.h"
         ^
Suppressed 745 warnings (744 in non-user code, 1 with check filters).
--
gmake: *** [config/SCRAM/GMake/Makefile.coderules:129: code-checks] Error 2
gmake: *** [There are compilation/build errors. Please see the detail log above.] Error 2

@cmsbuild
Copy link
Contributor

-code-checks

Logs: https://cmssdt.cern.ch/SDT/code-checks/cms-sw-PR-40349/33439

ERROR: Build errors found during clang-tidy run.

Suppressed 402 warnings (401 in non-user code, 1 with check filters).
--
SimTracker/SiPhase2Digitizer/plugins/Phase2TrackerDigitizerAlgorithm.h:16:10: error: 'SimTracker/Common/interface/DigitizerUtility.h' file not found [clang-diagnostic-error]
#include "SimTracker/Common/interface/DigitizerUtility.h"
         ^
Suppressed 390 warnings (389 in non-user code, 1 with check filters).
--
SimTracker/SiPhase2Digitizer/plugins/Phase2TrackerDigitizerAlgorithm.h:16:10: error: 'SimTracker/Common/interface/DigitizerUtility.h' file not found [clang-diagnostic-error]
#include "SimTracker/Common/interface/DigitizerUtility.h"
         ^
Suppressed 404 warnings (403 in non-user code, 1 with check filters).
--
SimTracker/SiPhase2Digitizer/plugins/Phase2TrackerDigitizerAlgorithm.h:16:10: error: 'SimTracker/Common/interface/DigitizerUtility.h' file not found [clang-diagnostic-error]
#include "SimTracker/Common/interface/DigitizerUtility.h"
         ^
Suppressed 769 warnings (768 in non-user code, 1 with check filters).
--
SimTracker/SiPixelDigitizer/plugins/SiPixelDigitizerAlgorithm.cc:87:10: error: 'SimTracker/Common/interface/SiPixelChargeReweightingAlgorithm.h' file not found [clang-diagnostic-error]
#include "SimTracker/Common/interface/SiPixelChargeReweightingAlgorithm.h"
         ^
Suppressed 745 warnings (744 in non-user code, 1 with check filters).
--
gmake: *** [config/SCRAM/GMake/Makefile.coderules:129: code-checks] Error 2
gmake: *** [There are compilation/build errors. Please see the detail log above.] Error 2

@cmsbuild
Copy link
Contributor

-code-checks

Logs: https://cmssdt.cern.ch/SDT/code-checks/cms-sw-PR-40349/33442

  • This PR adds an extra 80KB to repository

Code check has found code style and quality issues which could be resolved by applying following patch(s)

@cmsbuild
Copy link
Contributor

+code-checks

Logs: https://cmssdt.cern.ch/SDT/code-checks/cms-sw-PR-40349/33443

  • This PR adds an extra 80KB to repository

@tvami
Copy link
Contributor Author

tvami commented Dec 19, 2022

@mmusich
Copy link
Contributor

mmusich commented Dec 19, 2022

test parameters:

  • enable_test = threading
  • workflows_threading = 250202.182, 250202.184

@mmusich
Copy link
Contributor

mmusich commented Dec 19, 2022

@cmsbuild, please test

@mmusich
Copy link
Contributor

mmusich commented Dec 19, 2022

type trk

@cmsbuild cmsbuild added the trk label Dec 19, 2022
@cmsbuild
Copy link
Contributor

+1

Summary: https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-4ce99d/29683/summary.html
COMMIT: ec4ca15
CMSSW: CMSSW_13_0_X_2022-12-18-2300/el8_amd64_gcc11
Additional Tests: THREADING
User test area: For local testing, you can use /cvmfs/cms-ci.cern.ch/week0/cms-sw/cmssw/40349/29683/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: 49
  • DQMHistoTests: Total histograms compared: 3555748
  • DQMHistoTests: Total failures: 154
  • DQMHistoTests: Total nulls: 0
  • DQMHistoTests: Total successes: 3555572
  • DQMHistoTests: Total skipped: 22
  • DQMHistoTests: Total Missing objects: 0
  • DQMHistoSizes: Histogram memory added: 0.0 KiB( 48 files compared)
  • Checked 211 log files, 162 edm output root files, 49 DQM output files
  • TriggerResults: no differences found

@tvami
Copy link
Contributor Author

tvami commented Dec 19, 2022

hi @cms-sw/upgrade-l2 @cms-sw/simulation-l2 @cms-sw/orp-l2 is there a chance we could merge this before the winter break? In the end it's a very technical PR that doesnt change the physics output, but I'd need it for a follow-up PR

@civanch
Copy link
Contributor

civanch commented Dec 20, 2022

+1

updates are technical mostly

@srimanob
Copy link
Contributor

+Upgrade

Technical PR, change is not expected. Failure in comparison does not come from this PR.

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

@perrotta
Copy link
Contributor

+1

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