Set PartonShower automatically when using the new JES recommendations

Hi @omajersk @ravinab @sahinsoy and @thsteven ,

I modified some code to allow the PartonShower to be read automatically by AnalysisTop when using the new JES precision recommendation. The changes are as follows:

TopConfiguration:

• remove the "JetMCtoMCCalibration" option, since the user should not be able to overwrite the PS by hand
• add a new TDPPath_JES to point to the TDPPath which contains the additional column with the PS information

TopAnalysis:

• take DSID and look for corresponding PS value, but only if the JES recommendations are switched on
• then set this parton shower value with "jetMCtoMCCalibration(shower)

TopDataPreparation: here I made more changes, and you have to check if you are happy with them

• I removed the reading of the XSup/down values completely, since we never had this information to bein with, so the option is never used
• read now in the 5th column as the Shower type for JES
• check if the PS value for the JES from TopDataPreparation is actually allowed, otherwise return "undefined"
• if the value is missing completely, set to "undefined" as well

There was no need for me to touch TopCPTools, since that one does already what we want if the PS is not set correctly. I tested the code with and without the PrecisionRecommendation flag for a pythia8, herwig704, herwig713 and Sherpa221 sample, and saw the behaviour I intended.

Cheers, Andrea

added 21.2 AnalysisTop labels

requested review from @omajersk

assigned to @ravinab

added 1 commit

• 32c44a7b - apply patch from Baptiste

Compare with previous version

marked this merge request as ready

This merge request affects 4 packages:

• PhysicsAnalysis/TopPhys/TopPhysUtils/TopDataPreparation
• PhysicsAnalysis/TopPhys/xAOD/TopAnalysis
• PhysicsAnalysis/TopPhys/xAOD/TopCPTools
• PhysicsAnalysis/TopPhys/xAOD/TopConfiguration

Affected files list will not be printed in this case

Adding @omajersk ,@sahinsoy ,@ravinab ,@thsteven ,@tdado as watchers

added Analysis JetEtmiss analysis-review-required review-pending-level-1 labels

This merge request affects 4 packages:

• PhysicsAnalysis/TopPhys/TopPhysUtils/TopDataPreparation
• PhysicsAnalysis/TopPhys/xAOD/TopAnalysis
• PhysicsAnalysis/TopPhys/xAOD/TopCPTools
• PhysicsAnalysis/TopPhys/xAOD/TopConfiguration

Affected files list will not be printed in this case

Adding @omajersk ,@sahinsoy ,@ravinab ,@thsteven ,@tdado as watchers

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

132K in file PhysicsAnalysis/TopPhys/xAOD/TopConfiguration/TopConfiguration/TopConfig.h

188K in file PhysicsAnalysis/TopPhys/xAOD/TopConfiguration/Root/TopConfig.cxx

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

132K in file PhysicsAnalysis/TopPhys/xAOD/TopConfiguration/TopConfiguration/TopConfig.h

188K in file PhysicsAnalysis/TopPhys/xAOD/TopConfiguration/Root/TopConfig.cxx

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.

CI Result SUCCESS (hash 32c44a7b)

	AnalysisBase
externals
cmake
make
tests

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

CI Result SUCCESS (hash 32c44a7b)

	AthDerivation
externals
cmake
make
tests

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

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

added review-approved label and removed review-user-action-required label

resolved all threads

added analysis-review-approved label and removed analysis-review-required label

Hi @krumnack, can we have this merged today? We would like to get this into the new release this week.

merged