Added the gen filter for the run-II pMSSM effort

[mmrowietz]

PR description:

Added a pythia8 gen-level filter to be used for the run-II pMSSM signal production.

PR validation:

The code compiles, does not crash and works as intended.

[cmsbuild]

The code-checks are being triggered in jenkins.

[cmsbuild]

-code-checks

Logs: https://cmssdt.cern.ch/SDT/code-checks/cms-sw-PR-28201/12307

• This PR adds an extra 16KB to repository

Code check has found code style and quality issues which could be resolved by applying following patch(s)

• code-checks:
  https://cmssdt.cern.ch/SDT/code-checks/cms-sw-PR-28201/12307/code-checks.patch
  e.g. curl https://cmssdt.cern.ch/SDT/code-checks/cms-sw-PR-28201/12307/code-checks.patch | patch -p1
  You can also run scram build code-checks to apply code checks directly
• code-format:
  https://cmssdt.cern.ch/SDT/code-checks/cms-sw-PR-28201/12307/code-format.patch
  e.g. curl https://cmssdt.cern.ch/SDT/code-checks/cms-sw-PR-28201/12307/code-format.patch | patch -p1
  You can also run scram build code-format to apply code format directly

[cmsbuild]

The code-checks are being triggered in jenkins.

[cmsbuild]

+code-checks

Logs: https://cmssdt.cern.ch/SDT/code-checks/cms-sw-PR-28201/12308

• This PR adds an extra 16KB to repository

[cmsbuild]

A new Pull Request was created by @mmrowietz for master.

It involves the following packages:

GeneratorInterface/GenFilters

@SiewYan, @efeyazgan, @mkirsano, @cmsbuild, @agrohsje, @alberto-sanchez, @qliphy can you please review it and eventually sign? Thanks.
@alberto-sanchez, @agrohsje, @mkirsano this is something you requested to watch as well.
@davidlange6, @slava77, @fabiocos you are the release manager for this.

cms-bot commands are listed here

[qliphy]

please test

[cmsbuild]

The tests are being triggered in jenkins.
https://cmssdt.cern.ch/jenkins/job/ib-run-pr-tests/3024/console Started: 2019/10/18 16:08

[cmsbuild]

+1
Tested at: 76dc816
https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-99495f/3024/summary.html

[cmsbuild]

Comparison job queued.

[cmsbuild]

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

Comparison Summary:

• No significant changes to the logs found
• Reco comparison results: 0 differences found in the comparisons
• DQMHistoTests: Total files compared: 34
• DQMHistoTests: Total histograms compared: 2961064
• DQMHistoTests: Total failures: 1
• DQMHistoTests: Total nulls: 0
• DQMHistoTests: Total successes: 2960722
• DQMHistoTests: Total skipped: 341
• DQMHistoTests: Total Missing objects: 0
• DQMHistoSizes: Histogram memory added: 0.0 KiB( 33 files compared)
• Checked 147 log files, 16 edm output root files, 34 DQM output files

[cmsbuild]

This pull request is fully signed and it will be integrated in one of the next master IBs (tests are also fine). This pull request will now be reviewed by the release team before it's merged. @davidlange6, @slava77, @smuzaffar, @fabiocos (and backports should be raised in the release meeting by the corresponding L2)

[cmsbuild]

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

Comparison Summary:

• No significant changes to the logs found
• Reco comparison results: 0 differences found in the comparisons
• DQMHistoTests: Total files compared: 34
• DQMHistoTests: Total histograms compared: 2800084
• DQMHistoTests: Total failures: 1
• DQMHistoTests: Total nulls: 0
• DQMHistoTests: Total successes: 2799742
• DQMHistoTests: Total skipped: 341
• DQMHistoTests: Total Missing objects: 0
• DQMHistoSizes: Histogram memory added: 0.0 KiB( 33 files compared)
• Checked 147 log files, 16 edm output root files, 34 DQM output files

[fabiocos]

+1

[fabiocos]

@smuzaffar the build of this new module is failing in the IB, and even in a simple standalone test:

09:58 cmsdev25 3352> scram b --reset -j 8
Resetting caches
>> Local Products Rules ..... started
>> Local Products Rules ..... done
>> Building CMSSW version CMSSW_11_1_X_2019-12-09-2300 ----
>> Subsystem BigProducts built
>> Entering Package GeneratorInterface/GenFilters
>> Creating project symlinks
Entering library rule at GeneratorInterface/GenFilters
Entering library rule at src/GeneratorInterface/GenFilters/plugins
>> Compiling  /build/fabiocos/111X/crash/CMSSW_11_1_X_2019-12-09-2300/src/GeneratorInterface/GenFilters/src/pMSSMFilter.cc 
In file included from /cvmfs/cms-ib.cern.ch/week0/slc7_amd64_gcc820/cms/cmssw/CMSSW_11_1_X_2019-12-09-2300/src/FWCore/Concurrency/interface/SerialTaskQueueChain.h:27,
                 from /cvmfs/cms-ib.cern.ch/week0/slc7_amd64_gcc820/cms/cmssw/CMSSW_11_1_X_2019-12-09-2300/src/FWCore/Framework/interface/SharedResourcesAcquirer.h:22,
                 from /cvmfs/cms-ib.cern.ch/week0/slc7_amd64_gcc820/cms/cmssw/CMSSW_11_1_X_2019-12-09-2300/src/FWCore/Framework/interface/EDFilter.h:17,
                 from /build/fabiocos/111X/crash/CMSSW_11_1_X_2019-12-09-2300/src/GeneratorInterface/GenFilters/src/pMSSMFilter.cc:36:
/cvmfs/cms-ib.cern.ch/week0/slc7_amd64_gcc820/cms/cmssw/CMSSW_11_1_X_2019-12-09-2300/src/FWCore/Concurrency/interface/SerialTaskQueue.h:59:10: fatal error: tbb/task.h: No such file or directory
 #include "tbb/task.h"
          ^~~~~~~~~~~~
compilation terminated.
In file included from /cvmfs/cms-ib.cern.ch/week0/slc7_amd64_gcc820/cms/cmssw/CMSSW_11_1_X_2019-12-09-2300/src/FWCore/Concurrency/interface/SerialTaskQueueChain.h:27,
                 from /cvmfs/cms-ib.cern.ch/week0/slc7_amd64_gcc820/cms/cmssw/CMSSW_11_1_X_2019-12-09-2300/src/FWCore/Framework/interface/SharedResourcesAcquirer.h:22,
                 from /cvmfs/cms-ib.cern.ch/week0/slc7_amd64_gcc820/cms/cmssw/CMSSW_11_1_X_2019-12-09-2300/src/FWCore/Framework/interface/EDFilter.h:17,
                 from /build/fabiocos/111X/crash/CMSSW_11_1_X_2019-12-09-2300/src/GeneratorInterface/GenFilters/src/pMSSMFilter.cc:36:
/cvmfs/cms-ib.cern.ch/week0/slc7_amd64_gcc820/cms/cmssw/CMSSW_11_1_X_2019-12-09-2300/src/FWCore/Concurrency/interface/SerialTaskQueue.h:59:10: fatal error: tbb/task.h: No such file or directory
 #include "tbb/task.h"
          ^~~~~~~~~~~~
compilation terminated.
gmake: *** [config/SCRAM/GMake/Makefile.rules:1742: tmp/slc7_amd64_gcc820/src/GeneratorInterface/GenFilters/src/GeneratorInterfaceGenFilters/pMSSMFilter.cc.o] Error 1
gmake: *** [There are compilation/build errors. Please see the detail log above.] Error 2

I wonder what caused it to transparently pass the PR tests

[fabiocos]

@mmrowietz my mistake, I overlooked that this module was erroneously put in src instead of plugins. Furthermore the suggestion of @makortel of making it a global module should be better implemented.

[fabiocos]

@mmrowietz and following our style https://cms-sw.github.io/cms_coding_rules.html it would be better to name the class with an initial uppercase letter, although I understand the reason fo this name (the corresponding model uses a lowercase initial)

[smuzaffar]

no idea

[fabiocos]

@smuzaffar this PR was likely opened before my migration of the whole package to modules in plugins only. Nevertheless the latest test was of less than one day ago...

[smuzaffar]

If I run

scram p CMSSW_11_1_X_2019-12-08-2300
cd CMSSW_11_1_X_2019-12-08-2300/
cmsenv
git cms-merge-topic --debug --ssh -u cms-sw:28201

then I see the git do something like this

+ git branch -f pull/28201_backup cms-sw/refs/pull/28201/head
+ '[' '' = true ']'
+ git merge --no-ff -m 'Merged refs/pull/28201/head from repository cms-sw with cms-merge-topic' cms-sw/refs/pull/28201/head
Merge made by the 'recursive' strategy.
 GeneratorInterface/GenFilters/plugins/pMSSMFilter.cc    | 166 +++++++++++++
 GeneratorInterface/GenFilters/python/pMSSMFilter_cfi.py |  25 ++++++++
 2 files changed, 191 insertions(+)
 create mode 100644 GeneratorInterface/GenFilters/plugins/pMSSMFilter.cc
 create mode 100644 GeneratorInterface/GenFilters/python/pMSSMFilter_cfi.py

i.e file in merged in GeneratorInterface/GenFilters/plugins/ instead of GeneratorInterface/GenFilters/src/ . May be #28373 might have foolded git to move src files in to plugins? Any idea @kpedro88 why git behaved like this?

[kpedro88]

@smuzaffar I can reproduce the behavior you observe, but I am not sure why it happens.

I tried to make a small test repo to confirm the hypothesis that having a newer commit with git mv applied to an entire folder already merged would affect the merge of the older commit, but it doesn't show the same behavior:

mkdir gittest
cd gittest/
git init
mkdir src
touch src/A
touch src/B
touch src/C
git add src
git commit -m "add src files"
git checkout -b old
touch src/D
git add src/D
sleep 10 && git commit -m "add another src file"
git checkout -b new master
git mv src plugins
sleep 10 && git commit -m "mv src to plugins"
git checkout master
sleep 10 && git merge --no-ff new
sleep 10 && git merge --no-ff old

Merge made by the 'recursive' strategy.
 src/D | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 src/D

It's also very odd that merging the PR through GitHub does something different than git merge --no-ff.

[fabiocos]

@smuzaffar @kpedro88 thanks for checking, indeed I can reproduce in a straightforward way the observation of @smuzaffar , and at the same time a git cms-checkout-topic clearly show that src is present in the original. In some way the move of the ancestor directory was transferred also to the added file, which sounds bizarre. To be kept in mind for similar situations (in this case ti was easy to fix).