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

Clean caloParams #43154

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Clean caloParams #43154

wants to merge 3 commits into from

Conversation

aloeliger
Copy link
Contributor

PR description:

This PR addresses #42668

I have moved a large number of caloParams files that were cluttering the L1TCalorimeter directory into their own L1T managed repository here: https://github.com/cms-l1t-offline/caloParams. This repository can be cloned into L1Trigger/L1TCalorimeter/python and all imports should work as before. I have removed most of L1Trigger/Configuration/python/customiseSettings and have set it to try to search for the new caloParams directory, error-ing out with instructions if it is not found.

@bundocka and @mitaylor since you two work with the caloParams the most, I want to run this solution by you before it is committed.

PR validation:

caloParams functions can be imported from the same path they were previously, provided this repository is present

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:

This PR is not a backport and is not expected to be backported.

the calo params archive can now be found in https://github.com/cms-l1t-offline/caloParams, and cloned to the L1TCalorimeter python repository to achieve the same function, while keeping CMSSW more organized
@cmsbuild
Copy link
Contributor

+code-checks

Logs: https://cmssdt.cern.ch/SDT/code-checks/cms-sw-PR-43154/37456

  • This PR adds an extra 16KB to repository

  • There are other open Pull requests which might conflict with changes you have proposed:

@cmsbuild
Copy link
Contributor

cmsbuild commented Oct 31, 2023

A new Pull Request was created by @aloeliger (Andrew Loeliger) for master.

It involves the following packages:

  • L1Trigger/Configuration (l1)
  • L1Trigger/L1TCalorimeter (l1)

@epalencia, @aloeliger, @cmsbuild can you please review it and eventually sign? Thanks.
@thomreis, @ReyerBand, @wang0jin, @missirol, @rchatter, @argiro, @Martin-Grunewald this is something you requested to watch as well.
@rappoccio, @sextonkennedy, @antoniovilela you are the release manager for this.

cms-bot commands are listed here

@aloeliger
Copy link
Contributor Author

please test

@cmsbuild
Copy link
Contributor

+1

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

Comparison Summary

Summary:

  • You potentially added 3 lines to the logs
  • Reco comparison results: 33 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

@bundocka
Copy link
Contributor

bundocka commented Nov 1, 2023

Hi Andrew,
Thanks a lot for this. Hopefully this will keep everyone happy. A few comments:

  • I think we should keep the caloParams_cfi base class in the master, for clarity, and there may be other classes that rely on it
  • We need to leave the cmsDriver customisations unaffected by this change, i.e. we should be able to run something like [1] and it be transparent to this PR. This prevents us receiving a flood of emails complaining about the existing workflows not working in latest CMSSW.

Cheers,
Aaron

[1]
cmsDriver.py l1Ntuple -s RAW2DIGI --python_filename=met.py -n 10 --era=Run3 --data --no_output --conditions=132X_dataRun3_Prompt_v4 --customise=L1Trigger/Configuration/customiseReEmul.L1TReEmulFromRAWCalo --customise=L1Trigger/Configuration/customiseSettings.L1TSettingsToCaloParams_2023_v0_3 --customise=L1Trigger/L1TNtuples/customiseL1Ntuple.L1NtupleAODRAWEMUCalo --filein=/store/data/Run2023C/Muon0/RAW-RECO/ZMu-PromptReco-v1/000/367/112/00000/e50aedd7-1801-4bb8-8456-c2f814b00958.root

@smuzaffar
Copy link
Contributor

Milestone for this pull request has been moved to CMSSW_14_0_X.Please open a backport if it should also go in to CMSSW_13_3_X.

@smuzaffar smuzaffar modified the milestones: CMSSW_13_3_X, CMSSW_14_0_X Nov 6, 2023
@cmsbuild cmsbuild modified the milestones: CMSSW_14_0_X, CMSSW_13_3_X Nov 6, 2023
@mitaylor
Copy link
Contributor

mitaylor commented Nov 7, 2023

Hi Andrew,

Sorry for the delayed response. I agree with Aaron that this disrupts all of my normal workflows which use the definitions in customiseSettings.py. So those should still be included either in CMSSW or copied in from elsewhere. Otherwise it looks great. Thanks so much,

Molly

@mitaylor
Copy link
Contributor

mitaylor commented Jan 5, 2024

@aloeliger
Copy link
Contributor Author

Apologies all who have been waiting for this, this has been continually delayed, I am going to be taking a look at whether this is still a suitable solution now that the holidays are over.

@cmsbuild
Copy link
Contributor

cmsbuild commented Feb 6, 2024

Milestone for this pull request has been moved to CMSSW_14_1_X. Please open a backport if it should also go in to CMSSW_14_0_X.

@cmsbuild
Copy link
Contributor

Milestone for this pull request has been moved to CMSSW_14_2_X. Please open a backport if it should also go in to CMSSW_14_1_X.

@cmsbuild cmsbuild modified the milestones: CMSSW_14_1_X, CMSSW_14_2_X Aug 27, 2024
@antoniovilela
Copy link
Contributor

ping (to make bot change milestone)

@cmsbuild
Copy link
Contributor

Milestone for this pull request has been moved to CMSSW_15_0_X. Please open a backport if it should also go in to CMSSW_14_2_X.

@cmsbuild cmsbuild modified the milestones: CMSSW_14_2_X, CMSSW_15_0_X Nov 22, 2024
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.

6 participants