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

HYDJET, PYQUEN and the new embedding #30185

Merged
merged 13 commits into from Jul 22, 2020
Merged

HYDJET, PYQUEN and the new embedding #30185

merged 13 commits into from Jul 22, 2020

Conversation

wouf
Copy link
Contributor

@wouf wouf commented Jun 10, 2020

PR description:

The integrated Pull Request for the:

  1. Full embedding mode for HI generators to use within mixing (as result of discussion in Access edm::event from GeneratorInterface #28636)
  2. New Hydjet version 1.9.1 interface made as external generator (with the Hydjet integration as external cmsdist#5412) and adjusted to use in the updated embedding mode. To replace Hydjet Interface External #28764
  3. PYQUEN update up to version 1.5.4 (Hydjet integration as external cmsdist#5412) with adjustment to use in the updated embedding mode.

More details at https://indico.cern.ch/event/932445/contributions/3935235/attachments/2073197/3480861/HJ1.pdf

PR validation:

  1. The new full embedded mixing may be tested with HYDJET 1.9.1:

a) Creating the underlying HYDJET sample (background):
cmsDriver.py Hydjet_Quenched_MinBias_5020GeV_cfi --conditions auto:phase1_2018_realistic_hi --scenario HeavyIons -n 2 --era Run2_2018_pp_on_AA --eventcontent RAWSIM --relval 9000,100 -s GEN,SIM --datatier GEN-SIM --beamspot Realistic25ns13TeVEarly2018Collision --geometry DB:Extended

b) Creating the embedded HYDJET sample (signal, GEN-SIM):
cmsDriver.py Hydjet_Quenched_B12_5020GeV_cfi --conditions auto:phase1_2018_realistic_hi --scenario HeavyIons -n 2 --era Run2_2018_pp_on_AA --eventcontent RAWSIM --relval 2000,1 -s GEN,SIM --datatier GEN-SIM --beamspot Realistic25ns13TeVEarly2018Collision --geometry DB:Extended --pileup HiMixEmbGEN --pileup_input file:Hydjet_Quenched_MinBias_5020GeV_cfi_GEN_SIM.root --fileout step1_GEN_SIM_PU.root

c) Creating the embedded HYDJET sample (signal, step2):
cmsDriver.py step2 -s DIGI:pdigi_hi,L1,DIGI2RAW,HLT:@Fake2 --conditions auto:phase1_2018_realistic_hi --scenario HeavyIons -n 2 --era Run2_2018_pp_on_AA --eventcontent FEVTDEBUGHLT --datatier GEN-SIM-DIGI-RAW-HLTDEBUG --filein=file:step1_GEN_SIM_PU.root --beamspot Realistic25ns13TeVEarly2018Collision --pileup HiMix --pileup_input file:Hydjet_Quenched_MinBias_5020GeV_cfi_GEN_SIM.root

d) Creating the embedded HYDJET sample (signal, step3):
cmsDriver.py step3 --conditions auto:phase1_2018_realistic_hi --pileup_input file:Hydjet_Quenched_MinBias_5020GeV_cfi_GEN_SIM.root -n 2 --era Run2_2018_pp_on_AA --eventcontent RECOSIM,MINIAODSIM,DQM,ALCARECO --filein=file:step2_DIGI_L1_DIGI2RAW_HLT_PU.root --runUnscheduled -s RAW2DIGI,L1Reco,RECO,ALCA:SiStripCalZeroBias+SiPixelCalZeroBias,EI,PAT,VALIDATION:@standardValidationNoHLT+@miniAODValidation,DQM:@standardDQMFakeHLT+@miniAODDQM --datatier GEN-SIM-RECO,MINIAODSIM,DQMIO,ALCARECO --pileup HiMix

  1. HYDJET validation:
    please test workflow 150 with Hydjet integration as external cmsdist#5412

  2. PYQUEN validation:
    please test workflow 301.0 with Hydjet integration as external cmsdist#5412

@cmsbuild
Copy link
Contributor

The code-checks are being triggered in jenkins.

@wouf wouf changed the title From cmssw 11 1 0 pre8 HYDJET, PYQUEN and new embedding Jun 10, 2020
@wouf wouf changed the title HYDJET, PYQUEN and new embedding HYDJET, PYQUEN and the new embedding Jun 10, 2020
@cmsbuild
Copy link
Contributor

-code-checks

ERROR: Build errors found during clang-tidy run.

GeneratorInterface/HydjetInterface/src/HydjetHadronizer.cc:328:23: error: expected ';' after expression [clang-diagnostic-error]
  LogDebug("SubEvent") std::cout << " Number of sub events " << nsub_;
                      ^
                      ;
GeneratorInterface/HydjetInterface/src/HydjetHadronizer.cc:329:21: error: expected ';' after expression [clang-diagnostic-error]
  LogDebug("Hydjet") std::cout<< " Number of hard events " << hyjpar.njet;
                    ^
                    ;
GeneratorInterface/HydjetInterface/src/HydjetHadronizer.cc:330:21: error: expected ';' after expression [clang-diagnostic-error]
  LogDebug("Hydjet") std::cout<< " Number of hard particles " << nhard_;
                    ^
                    ;
GeneratorInterface/HydjetInterface/src/HydjetHadronizer.cc:361:7: error: use of undeclared identifier 'stab'; did you mean 'swab'? [clang-diagnostic-error]
      stab++;
      ^~~~
      swab
--
GeneratorInterface/HydjetInterface/src/HydjetHadronizer.cc:361:11: error: cannot increment value of type 'void (const void *__restrict, void *__restrict, ssize_t) throw()' (aka 'void (const void *__restrict, void *__restrict, long) throw()') [clang-diagnostic-error]
      stab++;
          ^
GeneratorInterface/HydjetInterface/src/HydjetHadronizer.cc:402:42: error: use of undeclared identifier 'stab'; did you mean 'swab'? [clang-diagnostic-error]
            << ", stable particles: " << stab << std::endl;
                                         ^~~~
                                         swab
--
gmake: *** [config/SCRAM/GMake/Makefile.coderules:128: code-checks] Error 2
gmake: *** [There are compilation/build errors. Please see the detail log above.] Error 2

@cmsbuild
Copy link
Contributor

The code-checks are being triggered in jenkins.

@cmsbuild
Copy link
Contributor

-code-checks

ERROR: Build errors found during clang-tidy run.

GeneratorInterface/HydjetInterface/src/HydjetHadronizer.cc:361:7: error: use of undeclared identifier 'stab'; did you mean 'swab'? [clang-diagnostic-error]
      stab++;
      ^~~~
      swab
--
GeneratorInterface/HydjetInterface/src/HydjetHadronizer.cc:361:11: error: cannot increment value of type 'void (const void *__restrict, void *__restrict, ssize_t) throw()' (aka 'void (const void *__restrict, void *__restrict, long) throw()') [clang-diagnostic-error]
      stab++;
          ^
GeneratorInterface/HydjetInterface/src/HydjetHadronizer.cc:402:42: error: use of undeclared identifier 'stab'; did you mean 'swab'? [clang-diagnostic-error]
            << ", stable particles: " << stab << std::endl;
                                         ^~~~
                                         swab
--
gmake: *** [config/SCRAM/GMake/Makefile.coderules:128: code-checks] Error 2
gmake: *** [There are compilation/build errors. Please see the detail log above.] Error 2

@silviodonato
Copy link
Contributor

+operations

@cmsbuild
Copy link
Contributor

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. @silviodonato, @dpiparo (and backports should be raised in the release meeting by the corresponding L2)

@silviodonato
Copy link
Contributor

silviodonato commented Jul 21, 2020

please test with cms-sw/cmsdist#5412

@cmsbuild
Copy link
Contributor

cmsbuild commented Jul 21, 2020

The tests are being triggered in jenkins.
Tested with other pull request(s) cms-sw/cmsdist#5412

@cmsbuild
Copy link
Contributor

+1
Tested at: c459f83
https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-9d1961/8188/summary.html
CMSSW: CMSSW_11_2_X_2020-07-21-1100
SCRAM_ARCH: slc7_amd64_gcc820

@cmsbuild
Copy link
Contributor

Comparison job queued.

@cmsbuild
Copy link
Contributor

Comparison is ready
https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-9d1961/8188/summary.html

Comparison Summary:

  • No significant changes to the logs found
  • Reco comparison results: 812 differences found in the comparisons
  • DQMHistoTests: Total files compared: 34
  • DQMHistoTests: Total histograms compared: 2525996
  • DQMHistoTests: Total failures: 4181
  • DQMHistoTests: Total nulls: 0
  • DQMHistoTests: Total successes: 2521768
  • DQMHistoTests: Total skipped: 47
  • DQMHistoTests: Total Missing objects: 0
  • DQMHistoSizes: Histogram memory added: 0.0 KiB( 33 files compared)
  • Checked 144 log files, 17 edm output root files, 34 DQM output files

@qliphy
Copy link
Contributor

qliphy commented Jul 22, 2020

+1

@silviodonato
Copy link
Contributor

merge

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

5 participants