Skip to content
Snippets Groups Projects

Generators: Sherpa3 compatibility for common base fragments

Merged Christian Gutschow requested to merge cgutscho/athena:cg_sherpa_syntax into main

Syntax adjustments to support switching between Sherpa2 and 3 versions more easily in the future.

cc @ewelina @fsiegert

Merge request reports

Loading
Loading

Activity

Filter activity
  • Approvals
  • Assignees & reviewers
  • Comments (from bots)
  • Comments (from users)
  • Commits & branches
  • Edits
  • Labels
  • Lock status
  • Mentions
  • Merge request status
  • Tracking
  • Frank Siegert
  • Frank Siegert
  • Thanks a lot for making these adjustments. They all look very reasonable and I only found a few issues that I have commented on inline.

  • added 1 commit

    Compare with previous version

  • Christian Gutschow resolved all threads

    resolved all threads

  • Christian Gutschow marked this merge request as ready

    marked this merge request as ready

  • added 1 commit

    • a6c7b5b5 - throw exceptions when including the wrong baseline PDF

    Compare with previous version

  • This merge request affects 1 package:

    • Generators/Sherpa_i

    This merge request affects 14 files:

    • Generators/Sherpa_i/share/common/Base_Fragment.py
    • Generators/Sherpa_i/share/common/EW_scheme_sinthetaW_mZ.py
    • Generators/Sherpa_i/share/common/Fusing_Direct.py
    • Generators/Sherpa_i/share/common/Fusing_Fragmentation.py
    • Generators/Sherpa_i/share/common/Lund_Hadronisation.py
    • Generators/Sherpa_i/share/common/NNPDF30NNLO.py
    • Generators/Sherpa_i/share/common/NNPDF30NNLO_nf_4.py
    • Generators/Sherpa_i/share/common/PDF4LHC21.py
    • Generators/Sherpa_i/share/common/PDF4LHC21_nf_4.py
    • Generators/Sherpa_i/share/common/Pythia8_Hadronisation.py
    • Generators/Sherpa_i/share/example/simple/README.md
    • Generators/Sherpa_i/share/example/simple/mc.Sh22x_Example.py
    • Generators/Sherpa_i/share/example/simple/mc.Sh30x_Example.py
    • Generators/Sherpa_i/share/example/simple/mc.Sh_Example.py
  • :pencil: :scissors: The system determined that CI tests (with names matching "^CITest_Trigger.*$") are not needed for this code change. They are not run. This is not an indicator to restart the job.

  • :x: CI Result FAILURE (hash a6c7b5b5)

    Athena AthGeneration
    externals :white_check_mark: :white_check_mark:
    cmake :white_check_mark: :white_check_mark:
    make :white_check_mark: :white_check_mark:
    tests :white_check_mark: :o:

    Full details available on this CI monitor view. Check the JIRA CI status board for known problems
    :white_check_mark: Athena: number of compilation errors 0, warnings 0
    :white_check_mark: AthGeneration: number of compilation errors 0, warnings 0
    :pencil: For experts only: Jenkins output [CI-MERGE-REQUEST-CC7 77581]

  • added 1 commit

    • bd6e3c2a - use new syntax also in ART tests

    Compare with previous version

  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Please register or sign in to reply
    Loading