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

merge SLHC updates for CaloTowers #11940

Merged
merged 18 commits into from Oct 20, 2015
Merged

merge SLHC updates for CaloTowers #11940

merged 18 commits into from Oct 20, 2015

Conversation

cmsbuild
Copy link
Contributor

This PR updates the CaloTower geometry, topology, and algorithms to be consistent with the new HCAL geometry and topology code (followup on #10353). (Most of these changes are ported from 62XSLHC.)

A new parameter for calotowermaker is propagated to all the relevant HLT configs.

A few notes:

  1. I already rebased this onto bsunanda:Run2-hcx28 Make the topology tester up-to-date with the geometry changes for HCAL #11423, to avoid a future (small) merge conflict.
  2. The matrix tests will crash. This is expected because the new CaloTower geometry record is not in the database yet.
  3. I validated this PR using 4.53 with the XML geometry, comparing clean CMSSW_7_6_X_2015-09-23-2300 to the same IB with this PR (using checkdeps). The output is identical, as expected; see plots below:

eta
phi
pt

attn: @bsunanda, @ianna
Automatically ported from CMSSW_7_6_X #11497 (original by @kpedro88).

kpedro88 and others added 17 commits October 15, 2015 16:11
@kpedro88
merge SLHC updates for CaloTowers (cherry-pick and resolve conflicts)
2e550be
@kpedro88
update HLT configs for new parameter in CaloTowersCreator
904091e
@kpedro88
update geom db configs
39503fd
@kpedro88
constituents map in calogeometry record
98dbf87
@kpedro88
fix topology test py files
e31a79b
@kpedro88
Revert "update HLT configs for new parameter in CaloTowersCreator"
1c73ecb 
This reverts commit 0fd545f.
@kpedro88
set default value for CaloTowersCreator HcalPhase param
37f8f66
@kpedro88
some rebase and code style fixes
5e7734f
@kpedro88
add m_dins to CaloTowerGeometry
ac6494f
@kpedro88
add getSummary() to CaloTowerGeometry for DB
55a4644
@kpedro88
LogError in CaloGenericDetId
a01fb64
@kpedro88
simpler method for subdet-dependent methods in CaloTower (comment fro…
65ffbfc 
…m slava)
@kpedro88
add fillDescriptions for CaloTowersCreator
4d227df
@kpedro88
customize HLT for CaloTowerTopology
8ddab97
@Martin-Grunewald @kpedro88
Fixup Fake menu for cms-sw#11497
4e926ff
@kpedro88
clean up CaloTowerHardcodeGeometryLoader
421aeb2
@kpedro88
New Global Tags adding Calo Tower geometries with dense indexes in al…
d05559e 
…l scenarios.

Run1 ideal simulations: 76X_designRun1_v8: As 76X_mcRun1_design_v5 with the following changes:
- taxonomy changes for DT reconstruction uncertainties, ECAL inter calibration errors, ECAL electronic mapping, and HCAL reconstruction geometry
- updated Calo tower geometry based on more precise Hcal reco geometry, and introducing dense indexes, needed for integrating SLHC digitisation in 76X.

Run1 realistic simulations: 76X_mcRun1_realistic_v8: As 76X_mcRun1_realistic_v5 with the following changes:
- taxonomy changes for DT reconstruction uncertainties, ECAL inter calibration errors, ECAL electronic mapping, and HCAL reconstruction geometry
- updated Calo tower geometry based on more precise Hcal reco geometry, and introducing dense indexes, needed for integrating SLHC digitisation in 76X.

Run1 heavy ion simulations: 76X_mcRun1_HeavyIon_v8: As 76X_mcRun1_HeavyIon_v5 with the following changes:
- taxonomy changes for DT reconstruction uncertainties, ECAL inter calibration errors, ECAL electronic mapping, and HCAL reconstruction geometry
- updated Calo tower geometry based on more precise Hcal reco geometry, and introducing dense indexes, needed for integrating SLHC digitisation in 76X.

Run1 proton lead simulations: 76X_mcRun1_pA_v8: As 76X_mcRun1_pA_v5 with the following changes:
- taxonomy changes for DT reconstruction uncertainties, ECAL inter calibration errors, ECAL electronic mapping, and HCAL reconstruction geometry
- updated Calo tower geometry based on more precise Hcal reco geometry, and introducing dense indexes, needed for integrating SLHC digitisation in 76X.

Run2 ideal simulations: 76X_mcRun2_design_v8: As 76X_mcRun2_design_v5 with the following changes:
- taxonomy changes for DT reconstruction uncertainties, ECAL inter calibration errors, ECAL electronic mapping, and HCAL reconstruction geometry
- updated Calo tower geometry based on more precise Hcal reco geometry, and introducing dense indexes, needed for integrating SLHC digitisation in 76X.
- updated Jet probability calibration as a result of Spring15 campaign in asymptotic scenario.

Run2 startup simulations: 76X_mcRun2_startup_v8: As 76X_mcRun2_startup_v5 with the following changes:
- taxonomy changes for DT reconstruction uncertainties, ECAL inter calibration errors, ECAL electronic mapping, and HCAL reconstruction geometry
- updated Calo tower geometry based on more precise Hcal reco geometry, and introducing dense indexes, needed for integrating SLHC digitisation in 76X.

Run2 asymptotic simulations: 76X_mcRun2_asymptotic_v8: As 76X_mcRun2_asymptotic_v5 with the following changes:
- taxonomy changes for DT reconstruction uncertainties, ECAL inter calibration errors, ECAL electronic mapping, and HCAL reconstruction geometry
- updated Calo tower geometry based on more precise Hcal reco geometry, and introducing dense indexes, needed for integrating SLHC digitisation in 76X
- updated Jet probability calibration as a result of Spring15 campaign in asymptotic scenario.

Run2 HeavyIon simulations: 76X_mcRun2_HeavyIon_v8: As 76X_mcRun2_HeavyIon_v5 with the following changes:
- taxonomy changes for DT reconstruction uncertainties, ECAL inter calibration errors, ECAL electronic mapping, and HCAL reconstruction geometry
- updated Calo tower geometry based on more precise Hcal reco geometry, and introducing dense indexes, needed for integrating SLHC digitisation in 76X
- updated RCT parameters for Heavy Ion setup
- updated Jet probability calibration as a result of Spring15 campaign in asymptotic scenario.

Upgrade 2017 ideal simulations: 76X_upgrade2017_design_v4: As 76X_upgrade2017_design_v1 with the following changes:
- taxonomy changes for DT reconstruction uncertainties, ECAL inter calibration errors, ECAL electronic mapping, and HCAL reconstruction geometry
- updated Calo tower geometry based on more precise Hcal reco geometry, and introducing dense indexes, needed for integrating SLHC digitisation in 76X
- updated Jet probability calibration as a result of Spring15 campaign in asymptotic scenario.

Run1 HLT data processing: 76X_dataRun1_HLT_frozen_v7: As 76X_dataRun1_HLT_frozen_v4 (snapshot time set to 2015-10-14 17:45:00 UTC) with the following changes:
- taxonomy changes for DT reconstruction uncertainties, ECAL inter calibration errors, ECAL electronic mapping, Tracker, HCAL and Castor reconstruction geometry, and L1 RPC Hardware configuration
- updated Calo tower geometry based on more precise Hcal reco geometry, and introducing dense indexes, needed for integrating SLHC digitisation in 76X.

Run1 offline processing: 76X_dataRun1_v7: As 76X_dataRun1_v4 with the following changes:
- taxonomy changes for DT reconstruction uncertainties, ECAL inter calibration errors, ECAL electronic mapping, Tracker, HCAL and Castor reconstruction geometry, and L1 RPC Hardware configuration, DQM ref histos, Track probability and Jet probability calibration.
- updated Calo tower geometry based on more precise Hcal reco geometry, and introducing dense indexes, needed for integrating SLHC digitisation in 76X.

Run2 HLT processing: 76X_dataRun2_HLT_frozen_v6: As 76X_dataRun2_HLT_frozen_v4 (snapshot time set to 2015-10-14 17:45:00 UTC) with the following changes:
- taxonomy changes for DT reconstruction uncertainties, ECAL inter calibration errors, ECAL electronic mapping, Tracker, HCAL and Castor reconstruction geometry, and L1 RPC Hardware configuration
- updated Calo tower geometry based on more precise Hcal reco geometry, and introducing dense indexes, needed for integrating SLHC digitisation in 76X.

Run2 offline processing: 76X_dataRun2_v6: As 76X_dataRun1_v4 with the following changes:
- taxonomy changes for DT reconstruction uncertainties, ECAL inter calibration errors, ECAL electronic mapping, Tracker, HCAL and Castor reconstruction geometry, and L1 RPC Hardware configuration, DQM ref histos, Track probability and Jet probability calibration.
- updated Calo tower geometry based on more precise Hcal reco geometry, and introducing dense indexes, needed for integrating SLHC digitisation in 76X.
@ianna
Copy link
Contributor

ianna commented Oct 19, 2015

@cmsbuild please test

@cmsbuild cmsbuild added this to the Next CMSSW_8_0_X milestone Oct 19, 2015
@cmsbuild
Copy link
Contributor Author

The tests are being triggered in jenkins.
https://cmssdt.cern.ch/jenkins/job/ib-any-integration/8994/console

@cmsbuild
Copy link
Contributor Author

Comparison is ready
https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-11940/8994/summary.html

@kpedro88
Copy link
Contributor

The comparisons look good to me... (not sure why the tests ran fine here but not for #11497, also not sure why this PR says "all checks have failed" when the tests passed)

@davidlange6
Copy link
Contributor

Hi Kevin
Yes, the comparisons look good.. Fantastic..

On Oct 19, 2015, at 4:58 PM, Kevin Pedro notifications@github.com wrote:

The comparisons look good to me... (not sure why the tests ran fine here but not for #11497, also not sure why this PR says "all checks have failed" when the tests passed)

—
Reply to this email directly or view it on GitHub.

@slava77
Copy link
Contributor

slava77 commented Oct 20, 2015

+1

for #11940 09ad091

  • the same code as in 76X
  • earlier jenkins tests passed and showed no differences; changes since then were simple
  • note also additional tests done in 76X (notes in merge SLHC updates for CaloTowers #11497 )

@cmsbuild
Copy link
Contributor Author

The tests are being triggered in jenkins.
https://cmssdt.cern.ch/jenkins/job/ib-any-integration/9040/console

@cmsbuild
Copy link
Contributor Author

Pull request #11940 was updated. @perrotta, @cmsbuild, @civanch, @diguida, @ianna, @mdhildreth, @Martin-Grunewald, @franzoni, @Dr15Jones, @cerminar, @fwyzard, @ggovi, @mmusich can you please check and sign again.

@ianna
Copy link
Contributor

ianna commented Oct 20, 2015

+1

@cmsbuild
Copy link
Contributor Author

+1
Tested at: 09ad091
https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-11940/9040/summary.html

@cmsbuild
Copy link
Contributor Author

Comparison is ready
https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-11940/9040/summary.html

@civanch
Copy link
Contributor

civanch commented Oct 20, 2015

+1

@cmsbuild cmsbuild merged commit 09ad091 into cms-sw:CMSSW_8_0_X Oct 20, 2015
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
alca-pending comparison-available db-pending geometry-approved hlt-pending orp-pending pending-signatures reconstruction-approved simulation-approved tests-approved
Projects
None yet
Milestone
CMSSW_8_0_X
Development

Successfully merging this pull request may close these issues.

None yet
7 participants
@cmsbuild @ianna @kpedro88 @davidlange6 @slava77 @civanch @Martin-Grunewald