HCAL: setting hardcoded PFCuts conditions for Phase2 #43139

abdoulline · 2023-10-28T11:02:25Z

PR description:

Needed in the context of #43025
to use Conditions for all the eras, including Phase2
No any regular wf is affected

PR validation:

(1) dump of the relevant HcalPFCutsRcd from the Event for Phase2 with aging 1000/fb, i.e.

from SLHCUpgradeSimulations.Configuration.aging import customise_aging_1000
process = customise_aging_1000(process)

Yields expected numbers:

          eta             phi             dep             det     value0     value1      DetId
           -1               1               1              HB  0.8000000  1.0000000   43100401
           -1               1               2              HB  1.2000000  1.5000000   43200401
           -1               1               3              HB  1.2000000  1.5000000   43300401
           -1               1               4              HB  1.2000000  1.5000000   43400401
           -2               1               1              HB  0.8000000  1.0000000   43100801
           -2               1               2              HB  1.2000000  1.5000000   43200801
           -2               1               3              HB  1.2000000  1.5000000   43300801
           -2               1               4              HB  1.2000000  1.5000000   43400801
           ...

(2) runTheMatrix.py -l limited --ibeos --useInput all

cmsbuild · 2023-10-28T11:10:10Z

+code-checks

Logs: https://cmssdt.cern.ch/SDT/code-checks/cms-sw-PR-43139/37418

This PR adds an extra 32KB to repository

cmsbuild · 2023-10-28T11:10:35Z

A new Pull Request was created by @abdoulline (Salavat Abdullin) for master.

It involves the following packages:

CalibCalorimetry/HcalAlgos (alca)
CalibCalorimetry/HcalPlugins (alca)

@cmsbuild, @perrotta, @saumyaphor4252, @consuegs can you please review it and eventually sign? Thanks.
@thomreis, @wang0jin, @ReyerBand, @mmusich, @rsreds, @yuanchao, @mariadalfonso, @rchatter, @argiro, @bsunanda, @tocheng this is something you requested to watch as well.
@sextonkennedy, @rappoccio, @antoniovilela you are the release manager for this.

cms-bot commands are listed here

perrotta · 2023-10-30T09:29:48Z

CalibCalorimetry/HcalAlgos/src/HcalDbHardcode.cc

+HcalPFCut HcalDbHardcode::makePFCut(HcalGenericDetId fId, double intLumi, bool noHE) const {  // GeV
+
+  // from SLHCUpgradeSimulations/Configuration/python/aging.py
+  double lumis[] = {300, 1000, 3000, 4500};  // integrated lumi points


All these can be made const and moved inside the scope of the if block below

@perrotta you're right (I've sketched it on Saturday morning not much thinking...)

cmsbuild · 2023-10-30T10:07:57Z

+code-checks

Logs: https://cmssdt.cern.ch/SDT/code-checks/cms-sw-PR-43139/37432

This PR adds an extra 28KB to repository

cmsbuild · 2023-10-30T10:08:06Z

Pull request #43139 was updated. @perrotta, @saumyaphor4252, @cmsbuild, @consuegs can you please check and sign again.

perrotta · 2023-10-30T13:48:01Z

please test

cmsbuild · 2023-10-30T17:49:00Z

-1

Failed Tests: RelVals-INPUT
Summary: https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-d29a55/35506/summary.html
COMMIT: 3c5e0f0
CMSSW: CMSSW_13_3_X_2023-10-30-1100/el8_amd64_gcc12
User test area: For local testing, you can use /cvmfs/cms-ci.cern.ch/week1/cms-sw/cmssw/43139/35506/install.sh to create a dev area with all the needed externals and cmssw changes.

RelVals-INPUT

140.56140.56_RunHI2018/step2_RunHI2018.log
14234.014234.0_TTbar_14TeV+2023FSPU/step2_TTbar_14TeV+2023FSPU.log
25034.11425034.114_TTbar_14TeV+2026D98PU_OTInefficiency10PC/step2_TTbar_14TeV+2026D98PU_OTInefficiency10PC.log

Comparison Summary

Summary:

You potentially removed 4 lines from the logs
Reco comparison results: 10 differences found in the comparisons
DQMHistoTests: Total files compared: 50
DQMHistoTests: Total histograms compared: 3362691
DQMHistoTests: Total failures: 12
DQMHistoTests: Total nulls: 0
DQMHistoTests: Total successes: 3362657
DQMHistoTests: Total skipped: 22
DQMHistoTests: Total Missing objects: 0
DQMHistoSizes: Histogram memory added: 0.0 KiB( 49 files compared)
Checked 214 log files, 167 edm output root files, 50 DQM output files
TriggerResults: no differences found

mmusich · 2023-10-30T22:56:37Z

CalibCalorimetry/HcalAlgos/src/HcalDbHardcode.cc

+    HcalDetId hid(fId);
+    int depth_m1 = hid.depth() - 1;
+    for (int i = 0; i < 4; i++) {
+      if (fabs(intLumi - lumis[i]) < eps) {


Suggested change

if (fabs(intLumi - lumis[i]) < eps) {

if (std::abs(intLumi - lumis[i]) < eps) {

cmsbuild · 2023-10-31T05:43:44Z

+code-checks

Logs: https://cmssdt.cern.ch/SDT/code-checks/cms-sw-PR-43139/37446

This PR adds an extra 28KB to repository

antoniovilela · 2023-11-01T14:21:05Z

@abdoulline @perrotta
Let's squash these three commits?

squash 3 commits

cmsbuild · 2023-11-01T18:07:15Z

+code-checks

Logs: https://cmssdt.cern.ch/SDT/code-checks/cms-sw-PR-43139/37484

This PR adds an extra 28KB to repository

cmsbuild · 2023-11-01T18:07:40Z

Pull request #43139 was updated. @cmsbuild, @perrotta, @saumyaphor4252, @consuegs can you please check and sign again.

abdoulline · 2023-11-01T18:23:31Z

Sorry for unnecessary buzz... I've finally retrieved my notes from the previous squash to use them for this case.

antoniovilela · 2023-11-01T20:43:14Z

+1

antoniovilela · 2023-11-01T20:45:27Z

merge

cmsbuild · 2023-11-01T23:19:47Z

+1

Summary: https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-d29a55/35552/summary.html
COMMIT: 5a86153
CMSSW: CMSSW_13_3_X_2023-11-01-1100/el8_amd64_gcc12
User test area: For local testing, you can use /cvmfs/cms-ci.cern.ch/week1/cms-sw/cmssw/43139/35552/install.sh to create a dev area with all the needed externals and cmssw changes.

Comparison Summary

Summary:

You potentially removed 3 lines from the logs
Reco comparison results: 26 differences found in the comparisons
DQMHistoTests: Total files compared: 50
DQMHistoTests: Total histograms compared: 3362691
DQMHistoTests: Total failures: 1073
DQMHistoTests: Total nulls: 0
DQMHistoTests: Total successes: 3361596
DQMHistoTests: Total skipped: 22
DQMHistoTests: Total Missing objects: 0
DQMHistoSizes: Histogram memory added: 0.0 KiB( 49 files compared)
Checked 214 log files, 167 edm output root files, 50 DQM output files
TriggerResults: no differences found

cmsbuild added this to the CMSSW_13_3_X milestone Oct 28, 2023

cmsbuild added alca-pending pending-signatures tests-pending orp-pending code-checks-pending labels Oct 28, 2023

abdoulline mentioned this pull request Oct 28, 2023

Adapt PF code to read Hcal thresholds from GT #43025

Merged

cmsbuild added code-checks-approved and removed code-checks-pending labels Oct 28, 2023

perrotta reviewed Oct 30, 2023

View reviewed changes

cmsbuild added code-checks-pending and removed code-checks-approved labels Oct 30, 2023

cmsbuild added code-checks-approved and removed code-checks-pending labels Oct 30, 2023

cmsbuild added tests-started and removed tests-pending labels Oct 30, 2023

cmsbuild added tests-rejected and removed tests-started labels Oct 30, 2023

mmusich reviewed Oct 30, 2023

View reviewed changes

cmsbuild added tests-pending code-checks-pending and removed tests-rejected code-checks-approved labels Oct 31, 2023

set Phase2 hardcoded PFcuts

5a86153

squash 3 commits

abdoulline force-pushed the HcalPFCuts_hardcoded_Phase2 branch from 2812288 to 5a86153 Compare November 1, 2023 18:01

cmsbuild added alca-pending pending-signatures tests-pending code-checks-pending and removed alca-approved fully-signed tests-approved code-checks-approved labels Nov 1, 2023

cmsbuild added code-checks-approved and removed code-checks-pending labels Nov 1, 2023

cmsbuild added tests-started orp-approved and removed tests-pending orp-pending labels Nov 1, 2023

cmsbuild merged commit f0bc2a8 into cms-sw:master Nov 1, 2023

cmsbuild added tests-approved and removed tests-started labels Nov 1, 2023

abdoulline mentioned this pull request Nov 2, 2023

Adding lumi=0 defaults to hardcode HB PFCuts for Phase2 #43171

Merged

RSalvatico mentioned this pull request Nov 13, 2023

Change EGM code to be able to read HCAL PF thresholds from DB #43164

Merged

malbouis mentioned this pull request Nov 17, 2023

Overview of implementations to consume HCalPFCuts from DB #43312

Open

abdoulline deleted the HcalPFCuts_hardcoded_Phase2 branch May 11, 2024 20:03

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

HCAL: setting hardcoded PFCuts conditions for Phase2 #43139

HCAL: setting hardcoded PFCuts conditions for Phase2 #43139

abdoulline commented Oct 28, 2023 •

edited

Loading

cmsbuild commented Oct 28, 2023

cmsbuild commented Oct 28, 2023

perrotta Oct 30, 2023

abdoulline Oct 30, 2023

cmsbuild commented Oct 30, 2023

cmsbuild commented Oct 30, 2023

perrotta commented Oct 30, 2023

cmsbuild commented Oct 30, 2023

mmusich Oct 30, 2023

cmsbuild commented Oct 31, 2023

antoniovilela commented Nov 1, 2023

cmsbuild commented Nov 1, 2023

cmsbuild commented Nov 1, 2023

abdoulline commented Nov 1, 2023

antoniovilela commented Nov 1, 2023

antoniovilela commented Nov 1, 2023

cmsbuild commented Nov 1, 2023

	if (fabs(intLumi - lumis[i]) < eps) {
	if (std::abs(intLumi - lumis[i]) < eps) {

HCAL: setting hardcoded PFCuts conditions for Phase2 #43139

HCAL: setting hardcoded PFCuts conditions for Phase2 #43139

Conversation

abdoulline commented Oct 28, 2023 • edited Loading

PR description:

PR validation:

cmsbuild commented Oct 28, 2023

cmsbuild commented Oct 28, 2023

perrotta Oct 30, 2023

Choose a reason for hiding this comment

abdoulline Oct 30, 2023

Choose a reason for hiding this comment

cmsbuild commented Oct 30, 2023

cmsbuild commented Oct 30, 2023

perrotta commented Oct 30, 2023

cmsbuild commented Oct 30, 2023

RelVals-INPUT

Comparison Summary

mmusich Oct 30, 2023

Choose a reason for hiding this comment

cmsbuild commented Oct 31, 2023

antoniovilela commented Nov 1, 2023

cmsbuild commented Nov 1, 2023

cmsbuild commented Nov 1, 2023

abdoulline commented Nov 1, 2023

antoniovilela commented Nov 1, 2023

antoniovilela commented Nov 1, 2023

cmsbuild commented Nov 1, 2023

Comparison Summary

abdoulline commented Oct 28, 2023 •

edited

Loading