Merge branch 'cherry-pick-ddef6fcd344-master' into 'master'

Sweeping !38380 from 21.2 to master.
updated FTAG CDI file

See merge request atlas/athena!38403

PhysicsAnalysis/Algorithms/FTagAnalysisAlgorithms/python/FTagAnalysisSequence.py

@@ -49,9 +49,11 @@ def makeFTagAnalysisSequence( seq, dataType, jetCollection,
         if btIndex != -1:
             jetCollection = jetCollection[:btIndex]
 
+        # CDI file
+        # https://twiki.cern.ch/twiki/bin/view/AtlasProtected/BTagCalibrationRecommendationsRelease21
         bTagCalibFile = "xAODBTaggingEfficiency/13TeV/2017-21-13TeV-MC16-CDI-2019-07-30_v1.root"
     else:
-        bTagCalibFile = "xAODBTaggingEfficiency/13TeV/2019-21-13TeV-MC16-CDI-2019-10-07_v1.root"
+        bTagCalibFile = "xAODBTaggingEfficiency/13TeV/2020-21-13TeV-MC16-CDI-2020-03-11_Sh228_v3.root"
 
     # # Create the analysis algorithm sequence object:
     # seq = AnaAlgSequence( "FTagAnalysisSequence" )