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

SIM/DIGI/RECO changes for HF QIE10 (part B) #13334

Merged
merged 2 commits into from Feb 26, 2016

Conversation

kpedro88
Copy link
Contributor

This is the second part of #13232, which was split into 2 PRs. For the first part, see #13331.

@ggovi @franzoni - please continue the review here if you have further comments.
@civanch, your review would be appreciated also.
@slava77, this is identical to what you've already approved.

I rebased this branch up to the HEAD of the CMSSW_8_0_X branch, which includes #13331, so it should be ready to test.

@cmsbuild
Copy link
Contributor

A new Pull Request was created by @kpedro88 (Kevin Pedro) for CMSSW_8_0_X.

It involves the following packages:

CalibCalorimetry/HcalAlgos
CalibCalorimetry/HcalPlugins
CalibFormats/HcalObjects
CondFormats/HcalObjects
Configuration/EventContent
Configuration/StandardSequences
RecoLocalCalo/HcalRecAlgos
RecoLocalCalo/HcalRecProducers
SimCalorimetry/CaloSimAlgos
SimCalorimetry/HcalSimAlgos
SimCalorimetry/HcalSimProducers
SimCalorimetry/HcalZeroSuppressionProducers
SimGeneral/MixingModule

@civanch, @diguida, @cvuosalo, @cerminar, @cmsbuild, @franzoni, @mdhildreth, @slava77, @ggovi, @mmusich, @davidlange6 can you please review it and eventually sign? Thanks.
@ghellwig, @apfeiffer1, @wmtan, @makortel, @GiacomoSguazzoni, @tocheng, @VinInn, @Martin-Grunewald, @rovere, @cerati, @argiro, @dgulhan this is something you requested to watch as well.
@slava77, @Degano, @smuzaffar you are the release manager for this.

cms-bot commands are list here #13028

@kpedro88 kpedro88 mentioned this pull request Feb 18, 2016
@slava77
Copy link
Contributor

slava77 commented Feb 18, 2016

@cmsbuild please test

@cmsbuild
Copy link
Contributor

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

@cmsbuild
Copy link
Contributor

-1
Tested at: 15d5123
I found an error when building:

Leaving library rule at TauAnalysis/MCEmbeddingTools
>> Compiling  /build/cmsbuild/jenkins-workarea/workspace/ib-any-integration/CMSSW_8_0_X_2016-02-17-1400/src/SimCalorimetry/HcalSimProducers/src/HcalTestHitGenerator.cc 
>> Compiling edm plugin /build/cmsbuild/jenkins-workarea/workspace/ib-any-integration/CMSSW_8_0_X_2016-02-17-1400/src/SimCalorimetry/HcalSimProducers/plugins/SealModule.cc 
Copying tmp/slc6_amd64_gcc493/src/CondFormats/HcalObjects/test/testSerializationHcalObjects/testSerializationHcalObjects to productstore area:
In file included from /build/cmsbuild/jenkins-workarea/workspace/ib-any-integration/CMSSW_8_0_X_2016-02-17-1400/src/SimCalorimetry/HcalSimProducers/src/HcalDigitizer.cc:1:0:
/build/cmsbuild/jenkins-workarea/workspace/ib-any-integration/CMSSW_8_0_X_2016-02-17-1400/src/SimCalorimetry/HcalSimProducers/interface/HcalDigitizer.h:7:67: fatal error: SimCalorimetry/HcalSimAlgos/interface/HcalQIE10Traits.h: No such file or directory
 #include "SimCalorimetry/HcalSimAlgos/interface/HcalQIE10Traits.h"
                                                                   ^
compilation terminated.
In file included from /build/cmsbuild/jenkins-workarea/workspace/ib-any-integration/CMSSW_8_0_X_2016-02-17-1400/src/SimCalorimetry/HcalSimProducers/interface/HcalDigiProducer.h:5:0,
                 from /build/cmsbuild/jenkins-workarea/workspace/ib-any-integration/CMSSW_8_0_X_2016-02-17-1400/src/SimCalorimetry/HcalSimProducers/src/HcalDigiProducer.cc:1:


you can see the results of the tests here:
https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-13334/11293/summary.html

The following merge commits were also included on top of IB + this PR after doing git cms-merge-topic:
aa97d14
3a229d9
66fa865
You can see more details here:
https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-13334/11293/git-log-recent-commits
https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-13334/11293/git-merge-result

@cmsbuild
Copy link
Contributor

Pull request #13334 was updated. @civanch, @diguida, @cvuosalo, @cerminar, @cmsbuild, @franzoni, @mdhildreth, @slava77, @ggovi, @mmusich, @davidlange6 can you please check and sign again.

@kpedro88
Copy link
Contributor Author

Forgot to git add a few files, fixed now. Is this still targeted for 80X or should we move to the auto-generated #13344?

@slava77
Copy link
Contributor

slava77 commented Feb 18, 2016

@cmsbuild please test

@cmsbuild
Copy link
Contributor

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

@cmsbuild
Copy link
Contributor

@cmsbuild
Copy link
Contributor

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

@cmsbuild
Copy link
Contributor

@cmsbuild
Copy link
Contributor

@davidlange6
Copy link
Contributor

@kpedro88 - the 81x version of this PR does not merge. Could you have a look at it?

@kpedro88
Copy link
Contributor Author

@davidlange6 - the conflict is in Eras.py. I'm not sure of the correct procedure here - if I rebase this branch to the head of CMSSW_8_1_X, it will pollute the history of the 8_0_X PR. (If you merge this one first, then I can rebase and it will only affect the 8_1_X PR...)

@kpedro88
Copy link
Contributor Author

@civanch - can you also sign this one?

@civanch
Copy link
Contributor

civanch commented Feb 23, 2016

+1

@kpedro88
Copy link
Contributor Author

@mmusich @franzoni @slava77 - Please sign if the PR is acceptable...

@slava77
Copy link
Contributor

slava77 commented Feb 24, 2016

+1

for #13334 abaf9a4

  • changes here appear to be essentially the same as in the HF QIE10 for 2016 #13232 1b8d4b9, previously signed by reco HF QIE10 for 2016 #13232 (comment). 2016 era modifications added in this PR affect only the simulation part.
  • jenkins tests pass and comparisons with baseline show no differences
    • the statement above ignores outputs of 25202, which had a different set of input minbias files in step2 (*00000/1E73E3F5-407C-E511-81C2-0025905B85B2.root file was present only in this PR test)

@kpedro88
Copy link
Contributor Author

@mmusich @franzoni - Gentle reminder...

@mmusich
Copy link
Contributor

mmusich commented Feb 24, 2016

+1

@kpedro88
Copy link
Contributor Author

@davidlange6 - can this be merged? I'll address the merge conflict in #13344 afterward.

@kpedro88
Copy link
Contributor Author

@davidlange6 - I'm just going to keep pinging you...

@davidlange6
Copy link
Contributor

good - distracted with shorter term issues this week..

On Feb 26, 2016, at 2:14 PM, Kevin Pedro notifications@github.com wrote:

@davidlange6 - I'm just going to keep pinging you...


Reply to this email directly or view it on GitHub.

davidlange6 added a commit that referenced this pull request Feb 26, 2016
SIM/DIGI/RECO changes for HF QIE10 (part B)
@davidlange6 davidlange6 merged commit 7623111 into cms-sw:CMSSW_8_0_X Feb 26, 2016
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

10 participants