Skip to content
Snippets Groups Projects

Support in AnalysisTop for MC samples with data overlay

Merged Support in AnalysisTop for MC samples with data overlay
(removed):AT_Nov13 into 21.2
All threads resolved!
Merged Iwona Grabowska-Bold requested to merge (removed):AT_Nov13 into 21.2
All threads resolved!

This is a first attempt to provide support for running AnalysisTop on MC samples with data overlay. A isDataOverlay flag is introduced, read from metadata and the PRW tool is switched off once isDataOverlay=true. Details discussed in ATLASG-1556

Best regards, Iwona

Merge request reports

Approval is optional

Merged by Nils Erik KrumnackNils Erik Krumnack 4 years ago (Nov 16, 2020 2:33pm UTC)

Merge details

  • Changes merged into 21.2 with 7f18342f (commits were squashed).
  • Deleted the source branch.

Activity

Filter activity
  • Approvals
  • Assignees & reviewers
  • Comments (from bots)
  • Comments (from users)
  • Commits & branches
  • Edits
  • Labels
  • Lock status
  • Mentions
  • Merge request status
  • Tracking
  • ATLAS Robot
    ATLAS Robot @atlasbot ·
    Developer

    :warning: WARNING: big files (>100K) are found in the changeset

    :pencil: 276K in file PhysicsAnalysis/TopPhys/xAOD/TopAnalysis/Root/EventSaverFlatNtuple.cxx

    :pencil: 120K in file PhysicsAnalysis/TopPhys/xAOD/TopConfiguration/TopConfiguration/TopConfig.h

    :pencil: 180K in file PhysicsAnalysis/TopPhys/xAOD/TopConfiguration/Root/TopConfig.cxx

  • ATLAS Robot
    ATLAS Robot @atlasbot ·
    Developer

    :warning: WARNING: big files (>100K) are found in the changeset

    :pencil: 276K in file PhysicsAnalysis/TopPhys/xAOD/TopAnalysis/Root/EventSaverFlatNtuple.cxx

    :pencil: 120K in file PhysicsAnalysis/TopPhys/xAOD/TopConfiguration/TopConfiguration/TopConfig.h

    :pencil: 180K in file PhysicsAnalysis/TopPhys/xAOD/TopConfiguration/Root/TopConfig.cxx

  • ATLAS Robot
    ATLAS Robot @atlasbot ·
    Developer

    This merge request affects 10 files:

    • PhysicsAnalysis/TopPhys/xAOD/TopAnalysis/Root/EventSaverFlatNtuple.cxx
    • PhysicsAnalysis/TopPhys/xAOD/TopAnalysis/util/top-xaod.cxx
    • PhysicsAnalysis/TopPhys/xAOD/TopCPTools/Root/TopMuonCPTools.cxx
    • PhysicsAnalysis/TopPhys/xAOD/TopCPTools/Root/TopTauCPTools.cxx
    • PhysicsAnalysis/TopPhys/xAOD/TopConfiguration/Root/ConfigurationSettings.cxx
    • PhysicsAnalysis/TopPhys/xAOD/TopConfiguration/Root/TopConfig.cxx
    • PhysicsAnalysis/TopPhys/xAOD/TopConfiguration/Root/TopPersistentSettings.cxx
    • PhysicsAnalysis/TopPhys/xAOD/TopConfiguration/TopConfiguration/TopConfig.h
    • PhysicsAnalysis/TopPhys/xAOD/TopConfiguration/TopConfiguration/TopPersistentSettings.h
    • PhysicsAnalysis/TopPhys/xAOD/TopCorrections/Root/MuonScaleFactorCalculator.cxx

    Adding @bmondal ,@spalazzo ,@omajersk ,@mvanadia ,@tdado as watchers

  • ATLAS Robot added 21.2 Analysis AnalysisTop Tau review-pending-level-1 labels

    added 21.2 Analysis AnalysisTop Tau review-pending-level-1 labels

  • Oliver Majersky
  • Oliver Majersky
  • Oliver Majersky
  • ATLAS Robot
    ATLAS Robot @atlasbot ·
    Developer

    :white_check_mark: CI Result SUCCESS (hash 915ff3ec)

    AthDerivation
    externals :white_check_mark:
    cmake :white_check_mark:
    make :white_check_mark:
    required tests :white_check_mark:
    optional tests :white_check_mark:

    Full details available on this CI monitor view
    :white_check_mark: AthDerivation: number of compilation errors 0, warnings 0
    :pencil: For experts only: Jenkins output [CI-MERGE-REQUEST-GCC62-CC7 188]

  • Louis-Guillaume Gagnon added review-user-action-required label and removed review-pending-level-1 label

    added review-user-action-required label and removed review-pending-level-1 label

  • ATLAS Robot
    ATLAS Robot @atlasbot ·
    Developer

    :pencil: Two CI jobs are triggered by 21.2 MR events: for AthDerivation with gcc62 compiler and with gcc8 for AnalysisBase and AthAnalysis projects.

    • Developers and shifters need to wait for both results, sometimes for additional hour or two.
  • ATLAS Robot
    ATLAS Robot @atlasbot ·
    Developer

    :white_check_mark: CI Result SUCCESS (hash 915ff3ec)

    AnalysisBase AthAnalysis
    externals :white_check_mark: :white_check_mark:
    cmake :white_check_mark: :white_check_mark:
    make :white_check_mark: :warning:
    required tests :white_check_mark: :white_check_mark:
    optional tests :white_check_mark: :white_check_mark:

    Full details available on this CI monitor view
    :white_check_mark: AnalysisBase: number of compilation errors 0, warnings 0
    :warning: AthAnalysis: number of compilation errors 0, warnings 6
    :pencil: For experts only: Jenkins output [CI-MERGE-REQUEST-CC7 23415]

  • Iwona Grabowska-Bold added 1 commit

    added 1 commit

    • e5aabbe8 - Bugfixes to the first attempt

    Compare with previous version

  • ATLAS Robot
    ATLAS Robot @atlasbot ·
    Developer

    :warning: WARNING: big files (>100K) are found in the changeset

    :pencil: 276K in file PhysicsAnalysis/TopPhys/xAOD/TopAnalysis/Root/EventSaverFlatNtuple.cxx

    :pencil: 120K in file PhysicsAnalysis/TopPhys/xAOD/TopConfiguration/TopConfiguration/TopConfig.h

    :pencil: 180K in file PhysicsAnalysis/TopPhys/xAOD/TopConfiguration/Root/TopConfig.cxx

  • ATLAS Robot
    ATLAS Robot @atlasbot ·
    Developer

    :white_check_mark: CI Result SUCCESS (hash e5aabbe8)

    AthDerivation
    externals :white_check_mark:
    cmake :white_check_mark:
    make :white_check_mark:
    required tests :white_check_mark:
    optional tests :white_check_mark:

    Full details available on this CI monitor view
    :white_check_mark: AthDerivation: number of compilation errors 0, warnings 0
    :pencil: For experts only: Jenkins output [CI-MERGE-REQUEST-GCC62-CC7 190]

  • Oliver Majersky
  • Iwona Grabowska-Bold added 1 commit

    added 1 commit

    • 0344216a - 3rd attempt with a fix from Oliver

    Compare with previous version

  • ATLAS Robot
    ATLAS Robot @atlasbot ·
    Developer

    :warning: WARNING: big files (>100K) are found in the changeset

    :pencil: 276K in file PhysicsAnalysis/TopPhys/xAOD/TopAnalysis/Root/EventSaverFlatNtuple.cxx

    :pencil: 120K in file PhysicsAnalysis/TopPhys/xAOD/TopConfiguration/TopConfiguration/TopConfig.h

    :pencil: 180K in file PhysicsAnalysis/TopPhys/xAOD/TopConfiguration/Root/TopConfig.cxx

  • ATLAS Robot
    ATLAS Robot @atlasbot ·
    Developer

    :warning: WARNING: big files (>100K) are found in the changeset

    :pencil: 276K in file PhysicsAnalysis/TopPhys/xAOD/TopAnalysis/Root/EventSaverFlatNtuple.cxx

    :pencil: 120K in file PhysicsAnalysis/TopPhys/xAOD/TopConfiguration/TopConfiguration/TopConfig.h

    :pencil: 180K in file PhysicsAnalysis/TopPhys/xAOD/TopConfiguration/Root/TopConfig.cxx

  • ATLAS Robot
    ATLAS Robot @atlasbot ·
    Developer

    This merge request affects 10 files:

    • PhysicsAnalysis/TopPhys/xAOD/TopAnalysis/Root/EventSaverFlatNtuple.cxx
    • PhysicsAnalysis/TopPhys/xAOD/TopAnalysis/util/top-xaod.cxx
    • PhysicsAnalysis/TopPhys/xAOD/TopCPTools/Root/TopMuonCPTools.cxx
    • PhysicsAnalysis/TopPhys/xAOD/TopCPTools/Root/TopTauCPTools.cxx
    • PhysicsAnalysis/TopPhys/xAOD/TopConfiguration/Root/ConfigurationSettings.cxx
    • PhysicsAnalysis/TopPhys/xAOD/TopConfiguration/Root/TopConfig.cxx
    • PhysicsAnalysis/TopPhys/xAOD/TopConfiguration/Root/TopPersistentSettings.cxx
    • PhysicsAnalysis/TopPhys/xAOD/TopConfiguration/TopConfiguration/TopConfig.h
    • PhysicsAnalysis/TopPhys/xAOD/TopConfiguration/TopConfiguration/TopPersistentSettings.h
    • PhysicsAnalysis/TopPhys/xAOD/TopCorrections/Root/MuonScaleFactorCalculator.cxx

    Adding @bmondal ,@spalazzo ,@omajersk ,@mvanadia ,@tdado as watchers

  • ATLAS Robot added review-pending-level-1 label and removed review-user-action-required label

    added review-pending-level-1 label and removed review-user-action-required label

  • Oliver Majersky resolved all threads

    resolved all threads

  • ATLAS Robot
    ATLAS Robot @atlasbot ·
    Developer

    :white_check_mark: CI Result SUCCESS (hash 0344216a)

    AthDerivation
    externals :white_check_mark:
    cmake :white_check_mark:
    make :white_check_mark:
    required tests :white_check_mark:
    optional tests :white_check_mark:

    Full details available on this CI monitor view
    :white_check_mark: AthDerivation: number of compilation errors 0, warnings 0
    :pencil: For experts only: Jenkins output [CI-MERGE-REQUEST-GCC62-CC7 191]

  • Oliver Majersky
  • Iwona Grabowska-Bold added 1 commit

    added 1 commit

    Compare with previous version

  • ATLAS Robot
    ATLAS Robot @atlasbot ·
    Developer

    :warning: WARNING: big files (>100K) are found in the changeset

    :pencil: 276K in file PhysicsAnalysis/TopPhys/xAOD/TopAnalysis/Root/EventSaverFlatNtuple.cxx

    :pencil: 120K in file PhysicsAnalysis/TopPhys/xAOD/TopConfiguration/TopConfiguration/TopConfig.h

    :pencil: 180K in file PhysicsAnalysis/TopPhys/xAOD/TopConfiguration/Root/TopConfig.cxx

  • Oliver Majersky resolved all threads

    resolved all threads

  • Oliver Majersky
    Oliver Majersky @omajersk ·
    Developer

    Thanks for the fixes @igrabows, from my side I'm happy with the code changes now.

  • Tomas Dado added 1 deleted label

    added 1 deleted label

  • ATLAS Robot
    ATLAS Robot @atlasbot ·
    Developer

    :white_check_mark: CI Result SUCCESS (hash 9ab2eede)

    AthDerivation
    externals :white_check_mark:
    cmake :white_check_mark:
    make :white_check_mark:
    required tests :white_check_mark:
    optional tests :white_check_mark:

    Full details available on this CI monitor view
    :white_check_mark: AthDerivation: number of compilation errors 0, warnings 0
    :pencil: For experts only: Jenkins output [CI-MERGE-REQUEST-GCC62-CC7 193]

  • ATLAS Robot
    ATLAS Robot @atlasbot ·
    Developer

    :warning: WARNING: big files (>100K) are found in the changeset

    :pencil: 276K in file PhysicsAnalysis/TopPhys/xAOD/TopAnalysis/Root/EventSaverFlatNtuple.cxx

    :pencil: 120K in file PhysicsAnalysis/TopPhys/xAOD/TopConfiguration/TopConfiguration/TopConfig.h

    :pencil: 180K in file PhysicsAnalysis/TopPhys/xAOD/TopConfiguration/Root/TopConfig.cxx

  • ATLAS Robot
    ATLAS Robot @atlasbot ·
    Developer

    This merge request affects 10 files:

    • PhysicsAnalysis/TopPhys/xAOD/TopAnalysis/Root/EventSaverFlatNtuple.cxx
    • PhysicsAnalysis/TopPhys/xAOD/TopAnalysis/util/top-xaod.cxx
    • PhysicsAnalysis/TopPhys/xAOD/TopCPTools/Root/TopMuonCPTools.cxx
    • PhysicsAnalysis/TopPhys/xAOD/TopCPTools/Root/TopTauCPTools.cxx
    • PhysicsAnalysis/TopPhys/xAOD/TopConfiguration/Root/ConfigurationSettings.cxx
    • PhysicsAnalysis/TopPhys/xAOD/TopConfiguration/Root/TopConfig.cxx
    • PhysicsAnalysis/TopPhys/xAOD/TopConfiguration/Root/TopPersistentSettings.cxx
    • PhysicsAnalysis/TopPhys/xAOD/TopConfiguration/TopConfiguration/TopConfig.h
    • PhysicsAnalysis/TopPhys/xAOD/TopConfiguration/TopConfiguration/TopPersistentSettings.h
    • PhysicsAnalysis/TopPhys/xAOD/TopCorrections/Root/MuonScaleFactorCalculator.cxx

    Adding @bmondal ,@spalazzo ,@omajersk ,@mvanadia ,@tdado as watchers

  • ATLAS Robot
    ATLAS Robot @atlasbot ·
    Developer

    :pencil: Two CI jobs are triggered by 21.2 MR events: for AthDerivation with gcc62 compiler and with gcc8 for AnalysisBase and AthAnalysis projects.

    • Developers and shifters need to wait for both results, sometimes for additional hour or two.
  • ATLAS Robot
    ATLAS Robot @atlasbot ·
    Developer

    :white_check_mark: CI Result SUCCESS (hash e5aabbe8)

    AnalysisBase AthAnalysis
    externals :white_check_mark: :white_check_mark:
    cmake :white_check_mark: :white_check_mark:
    make :white_check_mark: :warning:
    required tests :white_check_mark: :white_check_mark:
    optional tests :white_check_mark: :white_check_mark:

    Full details available on this CI monitor view
    :white_check_mark: AnalysisBase: number of compilation errors 0, warnings 0
    :warning: AthAnalysis: number of compilation errors 0, warnings 6
    :pencil: For experts only: Jenkins output [CI-MERGE-REQUEST-CC7 23426]

  • ATLAS Robot
    ATLAS Robot @atlasbot ·
    Developer

    :warning: WARNING: big files (>100K) are found in the changeset

    :pencil: 276K in file PhysicsAnalysis/TopPhys/xAOD/TopAnalysis/Root/EventSaverFlatNtuple.cxx

    :pencil: 120K in file PhysicsAnalysis/TopPhys/xAOD/TopConfiguration/TopConfiguration/TopConfig.h

    :pencil: 180K in file PhysicsAnalysis/TopPhys/xAOD/TopConfiguration/Root/TopConfig.cxx

  • ATLAS Robot
    ATLAS Robot @atlasbot ·
    Developer

    This merge request affects 10 files:

    • PhysicsAnalysis/TopPhys/xAOD/TopAnalysis/Root/EventSaverFlatNtuple.cxx
    • PhysicsAnalysis/TopPhys/xAOD/TopAnalysis/util/top-xaod.cxx
    • PhysicsAnalysis/TopPhys/xAOD/TopCPTools/Root/TopMuonCPTools.cxx
    • PhysicsAnalysis/TopPhys/xAOD/TopCPTools/Root/TopTauCPTools.cxx
    • PhysicsAnalysis/TopPhys/xAOD/TopConfiguration/Root/ConfigurationSettings.cxx
    • PhysicsAnalysis/TopPhys/xAOD/TopConfiguration/Root/TopConfig.cxx
    • PhysicsAnalysis/TopPhys/xAOD/TopConfiguration/Root/TopPersistentSettings.cxx
    • PhysicsAnalysis/TopPhys/xAOD/TopConfiguration/TopConfiguration/TopConfig.h
    • PhysicsAnalysis/TopPhys/xAOD/TopConfiguration/TopConfiguration/TopPersistentSettings.h
    • PhysicsAnalysis/TopPhys/xAOD/TopCorrections/Root/MuonScaleFactorCalculator.cxx

    Adding @bmondal ,@spalazzo ,@omajersk ,@mvanadia ,@tdado as watchers

  • ATLAS Robot
    ATLAS Robot @atlasbot ·
    Developer

    :pencil: Two CI jobs are triggered by 21.2 MR events: for AthDerivation with gcc62 compiler and with gcc8 for AnalysisBase and AthAnalysis projects.

    • Developers and shifters need to wait for both results, sometimes for additional hour or two.
  • ATLAS Robot
    ATLAS Robot @atlasbot ·
    Developer

    :white_check_mark: CI Result SUCCESS (hash 0344216a)

    AnalysisBase AthAnalysis
    externals :white_check_mark: :white_check_mark:
    cmake :white_check_mark: :white_check_mark:
    make :white_check_mark: :warning:
    required tests :white_check_mark: :white_check_mark:
    optional tests :white_check_mark: :white_check_mark:

    Full details available on this CI monitor view
    :white_check_mark: AnalysisBase: number of compilation errors 0, warnings 0
    :warning: AthAnalysis: number of compilation errors 0, warnings 6
    :pencil: For experts only: Jenkins output [CI-MERGE-REQUEST-CC7 23433]

  • ATLAS Robot
    ATLAS Robot @atlasbot ·
    Developer

    :pencil: Two CI jobs are triggered by 21.2 MR events: for AthDerivation with gcc62 compiler and with gcc8 for AnalysisBase and AthAnalysis projects.

    • Developers and shifters need to wait for both results, sometimes for additional hour or two.
  • ATLAS Robot
    ATLAS Robot @atlasbot ·
    Developer

    :white_check_mark: CI Result SUCCESS (hash 9ab2eede)

    AnalysisBase AthAnalysis
    externals :white_check_mark: :white_check_mark:
    cmake :white_check_mark: :white_check_mark:
    make :white_check_mark: :warning:
    required tests :white_check_mark: :white_check_mark:
    optional tests :white_check_mark: :white_check_mark:

    Full details available on this CI monitor view
    :white_check_mark: AnalysisBase: number of compilation errors 0, warnings 0
    :warning: AthAnalysis: number of compilation errors 0, warnings 6
    :pencil: For experts only: Jenkins output [CI-MERGE-REQUEST-CC7 23438]

  • Sergei Rosliakov added review-approved label and removed review-pending-level-1 label

    added review-approved label and removed review-pending-level-1 label

  • Nils Erik Krumnack mentioned in commit 7f18342f

    mentioned in commit 7f18342f

  • Nils Erik Krumnack merged

    merged

  • Atlas Nightlybuild added sweep:done label

    added sweep:done label

  • Atlas Nightlybuild picked the changes into the branch cherry-pick-7f18342f547-master with commit 2c87826f

    picked the changes into the branch cherry-pick-7f18342f547-master with commit 2c87826f

  • Nils Erik Krumnack mentioned in commit 2c87826f

    mentioned in commit 2c87826f

  • Atlas Nightlybuild mentioned in merge request !38320 (merged)

    mentioned in merge request !38320 (merged)

  • A
    Atlas Nightlybuild @atnight ·
    Maintainer

    Sweep summary
    successful:

    • master

    (see https://aiatlas154.cern.ch/jenkins/job/auto_git_sweeps/1342/console for details)

  • Adam Edward Barton mentioned in commit 9cfe540b

    mentioned in commit 9cfe540b

    • Please register or sign in to reply