Changes to PartonShowerBsHepMCFilter and LHEGenericFilter

[perrozzi]

PartonShowerBsHepMCFilter searches now a B-hadron among status 2 (i.e. outgoing) particles to accept the event
LHEGenericFilter accepts now several logics for a given numRequired, i.e. LT meaning < NumRequired, GT >, EQ =, NE !=

[cmsbuild]

A new Pull Request was created by @perrozzi for CMSSW_7_1_X.

Changes to PartonShowerBsHepMCFilter and LHEGenericFilter

It involves the following packages:

GeneratorInterface/Core
GeneratorInterface/GenFilters

@vciulli, @covarell, @thuer, @cmsbuild, @bendavid, @govoni can you please review it and eventually sign? Thanks.
@mkirsano 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.

[bendavid]

Are all of these changes already in 76x?

[perrozzi]

no. I can make a PR also for that branch

[bendavid]

yes please do

[perrozzi]

btw, I am trying to cherrypick but doesn't work, is there another semi-automatic procedure to recover the commits or shall I proceed "by hand"?

[bendavid]

Why doesn't cherry-pick work?

[perrozzi]

no idea...
I am in CMSSW_7_6_0_pre2
I added
git cms-addpkg GeneratorInterface/GenFilters
git cms-addpkg GeneratorInterface/Core
and when I do
git cherry-pick 2e6b88d..f14bc79
it returns a long series of error messages unrelated to the files belonging to the commits...

[...]
error: addinfo_cache failed for path 'HLTrigger/JetMET/plugins/HLTRHemisphere.cc'
error: addinfo_cache failed for path 'HLTrigger/JetMET/plugins/HLTCAWZTagFilter.cc'
error: addinfo_cache failed for path 'Geometry/TrackerCommonData/plugins/DDPixFwdDiskAlgo.h'
error: addinfo_cache failed for path 'Geometry/TrackerCommonData/plugins/DDPixBarLayerUpgradeAlgo.h'
error: addinfo_cache failed for path 'FastSimulation/TrackingRecHitProducer/interface/SiStripGaussianSmearingRecHitConverterAlgorithm.h'
error: addinfo_cache failed for path 'FastSimulation/TrackingRecHitProducer/interface/SiPixelGaussianSmearingRecHitConverterAlgorithm.h'
error: addinfo_cache failed for path 'DetectorDescription/RegressionTest/bin/DDErrorReport.cpp'
error: addinfo_cache failed for path 'DataFormats/BTauReco/interface/CATopJetTagInfo.h'

On branch from-CMSSW_7_6_0_pre2

You are currently cherry-picking.

(all conflicts fixed: run "git commit")

nothing to commit, working directory clean
The previous cherry-pick is now empty, possibly due to conflict resolution.
If you wish to commit it anyway, use:

git commit --allow-empty

Otherwise, please use 'git reset'

[bendavid]

Well the first few commits are probably already in 76x

[perrozzi]

even if I remove pierluigi's commits, only 3 files, the status is

bash-4.1$ git status

On branch from-CMSSW_7_6_0_pre2

You are currently cherry-picking.

(fix conflicts and run "git commit")

Changes to be committed:

new file: GeneratorInterface/GenFilters/python/LHEGenericFilter_cfi.py

Unmerged paths:

(use "git add/rm ..." as appropriate to mark resolution)

deleted by us: GeneratorInterface/GenFilters/interface/LHEGenericFilter.h

deleted by us: GeneratorInterface/GenFilters/src/LHEGenericFilter.cc

i.e. 3 out of 7 files are modified

[bendavid]

Well ok if there are real conflicts they have to be resolved. Otherwise some non-trival rebase. Or else indeed just do it by hand.

[perrozzi]

(I'll do it by hand...)

[perrozzi]

#11188

[perrozzi]

#11190 should not suffer from the problem, closing this PR

[perrozzi]

(also the PR on this branch is still relevant)

[perrozzi]

Hi, since the PR #11190 has been merged and this one is a clone for 71X (including the last commit to add edm::LogError, I would kindly ask to approve it to have asap a CMSSW production release incorporating these features. thanks a lot

[cmsbuild]

Pull request #11149 was updated. @vciulli, @covarell, @thuer, @cmsbuild, @bendavid, @govoni can you please check and sign again.

[bendavid]

+1

[cmsbuild]

This pull request is fully signed and it will be integrated in one of the next CMSSW_7_1_X IBs after it passes the integration tests. This pull request requires discussion in the ORP meeting before it's merged. @davidlange6, @Degano, @smuzaffar