Update DFSUSY

This MR contains some small fixes for the DerivationFramework, mainly to fix DAOD_PHYS for SUSY samples

• adding some missing files in DerivationFrameworkSUSY
• adding some if the changes recently pushed to 21.2 (stopping action-on-import in SUSYWeightMetadata.py), see MR
• removed TRUTH3.py from DFSUSY

Tagging also @crizzi, @zmarshal and @egramsta.

Thanks for the MR! Also FYI @jcatmore

Ah, somehow we already have merge conflicts, and the externals build failed? What is happening here?

Hi,

I think the conflicts are in PHYS.py. The version in this MR doesn't include the changes made over the past days with the trigger matching, e.g. in this version it is still all commented out. So I think this needs to be updated to the new version.

James.

added 1631 commits

• aec7f5a4...fed8358f - 1630 commits from branch atlas:master
• 3b832806 - merging in current master

Compare with previous version

This merge request affects 3 packages:

• PhysicsAnalysis/DerivationFramework/DerivationFrameworkMCTruth
• PhysicsAnalysis/DerivationFramework/DerivationFrameworkPhys
• PhysicsAnalysis/DerivationFramework/DerivationFrameworkSUSY

Adding @zmarshal ,@miholzbo ,@dshope ,@crizzi ,@alopezso as watchers

added Derivation master review-pending-level-1 labels

CI Result SUCCESS (hash 3b832806)

	Athena	AthSimulation	AthGeneration	AnalysisBase
externals
cmake
make
required tests
optional tests

Full details available on this CI monitor view
Athena: number of compilation errors 0, warnings 0
AthSimulation: number of compilation errors 0, warnings 0
AthGeneration: number of compilation errors 0, warnings 0
AnalysisBase: number of compilation errors 0, warnings 0
For experts only: Jenkins output [CI-MERGE-REQUEST-CC7 22241]

Hi @zmarshal, @jcatmore,

I am very sorry, I wasn't aware of the recent updates in PHYS.py. I merged in the current master and pushed again, this time the builds succeeded!

Best, Michael

added 1 commit

• 4022b626 - updating Copyright

Compare with previous version

This merge request affects 3 packages:

• PhysicsAnalysis/DerivationFramework/DerivationFrameworkMCTruth
• PhysicsAnalysis/DerivationFramework/DerivationFrameworkPhys
• PhysicsAnalysis/DerivationFramework/DerivationFrameworkSUSY

Adding @zmarshal ,@miholzbo ,@dshope ,@crizzi ,@alopezso as watchers

CI Result SUCCESS (hash 4022b626)

	Athena	AthSimulation	AthGeneration	AnalysisBase
externals
cmake
make
required tests
optional tests

Full details available on this CI monitor view
Athena: number of compilation errors 0, warnings 0
AthSimulation: number of compilation errors 0, warnings 0
AthGeneration: number of compilation errors 0, warnings 0
AnalysisBase: number of compilation errors 0, warnings 0
For experts only: Jenkins output [CI-MERGE-REQUEST-CC7 22313]

resolved all threads

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

Changes look fine, all threads appear to be resolved, and all tests pass. L1 approving.

merged

mentioned in commit aca72e35

added sweep:ignore label