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

Hotline skim AlCaReco workflows #9802

Merged
merged 15 commits into from
Jun 30, 2015
Merged

Hotline skim AlCaReco workflows #9802

merged 15 commits into from
Jun 30, 2015

Conversation

cmsbuild
Copy link
Contributor

-Adding new package Calibration/Hotline containing hotline skim code
-Adding two new AlCaRecos implementing the hotline skims
-Including the hotline skims in the AlCaRecoMatrix under StreamExpress
-Including the hotline skims in the RelVal RECOD step

See presentation here: https://indico.cern.ch/event/368342/contribution/5/material/slides/0.pdf
Automatically ported from CMSSW_7_5_X #9627 (original by @duanders).

@cmsbuild
Copy link
Contributor Author

A new Pull Request was created by @cmsbuild for CMSSW_7_6_X.

Hotline skim AlCaReco workflows

It involves the following packages:

Calibration/Hotline
Configuration/AlCa
Configuration/EventContent
Configuration/PyReleaseValidation
Configuration/StandardSequences
DPGAnalysis/Skims

The following packages do not have a category, yet:

Calibration/Hotline

@diguida, @boudoul, @franzoni, @cerminar, @cmsbuild, @srimanob, @mmusich, @davidlange6 can you please review it and eventually sign? Thanks.
@ghellwig, @Martin-Grunewald, @makortel, @GiacomoSguazzoni, @rovere, @VinInn, @appeltel, @cerati, @dgulhan this is something you requested to watch as well.
You can sign-off by replying to this message having '+1' in the first line of your reply.
You can reject by replying to this message having '-1' in the first line of your reply.
If you are a L2 or a release manager you can ask for tests by saying 'please test' in the first line of a comment.
@Degano you are the release manager for this.
You can merge this pull request by typing 'merge' in the first line of your comment.

@davidlange6
Copy link
Contributor

@deguio - you said you had signed this - could you please review and sign so that we can proceed with the others.

@davidlange6
Copy link
Contributor

@diguida,( not @deguio - sorry wrong tab-complete). you said you had signed this - could you please review and sign so that we can proceed with the others.

@diguida
Copy link
Contributor

diguida commented Jun 30, 2015

@davidlange6 sorry. I signed the 75X version, which is exactly the same, but the +1 here was still in the "write" tab (i.e. forgot to click "Comment").
Let me cross check again, to be super-whooper sure

@diguida
Copy link
Contributor

diguida commented Jun 30, 2015

+1
Forward port of #9627

  • new package Calibration/Hotline containing hotline skim code
  • new AlCaReco implementing the hotline skim: sequences are in the client code, and paths are implemented in Configuration/StandardSequences/python/AlCaRecoStreams_cff.py;
  • hotline skim is included in the AlCaRecoMatrix under StreamExpress;
  • hotline skim is included in dataReco definition for data RelVals;
  • re-shaping of the definition of AlCaReco EventContent, in order to avoid python circular dependencies.

To be implemented: AlCa prompt implementation for AlCa harvesting step.

Same code changes as #9627

$ git cms-merge-topic 9627
$ git diff --stat CMSSW_7_5_X
 Calibration/Hotline/python/hotlineSkims_Output_cff.py          |  33 ++++++++++++++
 Calibration/Hotline/python/hotlineSkims_cff.py                 | 323 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 Configuration/AlCa/python/autoAlca.py                          |   2 +-
 Configuration/EventContent/python/AlCaRecoOutput_cff.py        |  59 ++++++++++++++++++++++++
 Configuration/EventContent/python/EventContentCosmics_cff.py   |  25 -----------
 Configuration/EventContent/python/EventContentHeavyIons_cff.py |   3 --
 Configuration/EventContent/python/EventContent_cff.py          |  58 ------------------------
 Configuration/PyReleaseValidation/python/relval_steps.py       |   2 +-
 Configuration/StandardSequences/python/AlCaRecoStreams_cff.py  |  52 +++++++++++++++++++++
 DPGAnalysis/Skims/python/WElectronSkim_cff.py                  |   2 +-
 10 files changed, 470 insertions(+), 89 deletions(-)

vs

$ git cms-merge-topic 9802
$ git diff --stat CMSSW_7_6_X
 Calibration/Hotline/python/hotlineSkims_Output_cff.py              |  33 +++++++++++++
 Calibration/Hotline/python/hotlineSkims_cff.py                     | 323 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 CondCore/ORA/src/ClassUtils.cc                                     |   9 ++--
 CondTools/Geometry/plugins/BuildFile.xml                           |   1 -
 CondTools/Geometry/plugins/PHcalParametersDBBuilder.cc             |   2 +-
 Configuration/AlCa/python/autoAlca.py                              |   2 +-
 Configuration/EventContent/python/AlCaRecoOutput_cff.py            |  59 ++++++++++++++++++++++++
 Configuration/EventContent/python/EventContentCosmics_cff.py       |  25 ----------
 Configuration/EventContent/python/EventContentHeavyIons_cff.py     |   3 --
 Configuration/EventContent/python/EventContent_cff.py              |  58 -----------------------
 Configuration/PyReleaseValidation/python/relval_steps.py           |   2 +-
 Configuration/StandardSequences/python/AlCaRecoStreams_cff.py      |  52 +++++++++++++++++++++
 DPGAnalysis/Skims/python/WElectronSkim_cff.py                      |   2 +-
 Geometry/CSCGeometry/test/BuildFile.xml                            |   4 +-
 Geometry/HcalCommonData/BuildFile.xml                              |   1 -
 Geometry/HcalCommonData/interface/HcalParametersFromDD.h           |  16 -------
 Geometry/HcalCommonData/plugins/BuildFile.xml                      |   9 ----
 Geometry/HcalCommonData/plugins/HcalParametersESModule.cc          |  66 --------------------------
 Geometry/HcalCommonData/src/HcalParametersFromDD.cc                |  97 --------------------------------------
 Geometry/HcalEventSetup/interface/HcalDDDGeometryEP.h              |  48 +++++++++++++++++++
 Geometry/HcalEventSetup/python/HcalDDDGeometry_cfi.py              |  12 +++++
 Geometry/HcalEventSetup/src/HcalDDDGeometryEP.cc                   | 108 +++++++++++++++++++++++++++++++++++++++++++
 Geometry/HcalEventSetup/src/SealModule.cc                          |   2 +
 Geometry/HcalTowerAlgo/BuildFile.xml                               |   1 +
 Geometry/HcalTowerAlgo/interface/HcalDDDGeometry.h                 |  67 +++++++++++++++++++++++++++
 Geometry/HcalTowerAlgo/interface/HcalDDDGeometryLoader.h           |  51 ++++++++++++++++++++
 Geometry/HcalTowerAlgo/interface/HcalParametersFromDD.h            |  16 +++++++
 Geometry/HcalTowerAlgo/plugins/BuildFile.xml                       |   1 +
 Geometry/HcalTowerAlgo/plugins/HcalParametersESModule.cc           |  45 ++++++++++++++++++
 Geometry/HcalTowerAlgo/plugins/HcalParametersESModule.h            |  28 +++++++++++
 Geometry/HcalTowerAlgo/src/HcalDDDGeometry.cc                      | 255 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 Geometry/HcalTowerAlgo/src/HcalDDDGeometryLoader.cc                | 245 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 Geometry/HcalTowerAlgo/src/HcalParametersFromDD.cc                 |  97 ++++++++++++++++++++++++++++++++++++++
 Geometry/HcalTowerAlgo/test/BuildFile.xml                          |   4 ++
 Geometry/HcalTowerAlgo/test/HcalParametersAnalyzer.cc              | 137 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
 Geometry/HcalTowerAlgo/test/runHcalParametersAnalyzer_cfg.py       |  24 ++++++++++
 Geometry/HcalTowerAlgo/test/runHcalParametersFromDDAnalyzer_cfg.py |  17 +++++++
 Geometry/MuonNumbering/src/ES_MuonDDDConstants.cc                  |   4 --
 Geometry/Records/src/ES_MuonDDDConstants.cc                        |   4 ++
 Geometry/Records/test/BuildFile.xml                                |   9 ----
 Geometry/Records/test/HcalParametersAnalyzer.cc                    | 137 ------------------------------------------------------
 Geometry/Records/test/runHcalParametersAnalyzer_cfg.py             |  24 ----------
 Geometry/Records/test/runHcalParametersFromDDAnalyzer_cfg.py       |  17 -------
 43 files changed, 1638 insertions(+), 479 deletions(-)

but the merge commit is ok

Auto-merging Configuration/PyReleaseValidation/python/relval_steps.py
Auto-merging Configuration/EventContent/python/EventContent_cff.py
Merge made by the 'recursive' strategy.
 Calibration/Hotline/python/hotlineSkims_Output_cff.py          |  33 ++++++++++++++
 Calibration/Hotline/python/hotlineSkims_cff.py                 | 323 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 Configuration/AlCa/python/autoAlca.py                          |   2 +-
 Configuration/EventContent/python/AlCaRecoOutput_cff.py        |  59 ++++++++++++++++++++++++
 Configuration/EventContent/python/EventContentCosmics_cff.py   |  25 -----------
 Configuration/EventContent/python/EventContentHeavyIons_cff.py |   3 --
 Configuration/EventContent/python/EventContent_cff.py          |  58 ------------------------
 Configuration/PyReleaseValidation/python/relval_steps.py       |   2 +-
 Configuration/StandardSequences/python/AlCaRecoStreams_cff.py  |  52 +++++++++++++++++++++
 DPGAnalysis/Skims/python/WElectronSkim_cff.py                  |   2 +-
 10 files changed, 470 insertions(+), 89 deletions(-)
 create mode 100644 Calibration/Hotline/python/hotlineSkims_Output_cff.py
 create mode 100644 Calibration/Hotline/python/hotlineSkims_cff.py

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.

5 participants