Merge branch 'susy5_prescaled_trigs_only' into '21.2'

Moving prescaled single-lepton  triggers from SUSY5 to SUSY17

See merge request atlas/athena!14162

Former-commit-id: e8901b3259619999b1c88735aa4b0910a1c0a0f1

PhysicsAnalysis/DerivationFramework/DerivationFrameworkSUSY/share/SUSY17.py

@@ -170,10 +170,17 @@ from DerivationFrameworkSUSY.SUSY5TriggerList import PrescaledHighPtTriggers
 trig_expression = '(' + ' || '.join(METorPhoton_triggers+Lepton_triggers) + ')' 
 MEttrig_expression ='(' + ' || '.join(METorPhoton_triggers) + ')' 
 Prestrig_expression ='(' + ' || '.join(PrescaledLowPtTriggers + PrescaledHighPtTriggers) + ')' 
+PresLowPttrig_expression ='(' + ' || '.join(PrescaledLowPtTriggers) + ')'
 
 JetEleExpression = '(count(AntiKt4EMTopoJets.DFCommonJets_Calib_pt>25*GeV && abs(AntiKt4EMTopoJets.DFCommonJets_Calib_eta)<2.8)>=2)'
+JetEleLooseExpression = '(count(AntiKt4EMTopoJets.DFCommonJets_Calib_pt>10*GeV && abs(AntiKt4EMTopoJets.DFCommonJets_Calib_eta)<2.8)>=1)'
 
-LepTrigexpression = '('+'('+trig_expression+'&&'+objectSelectionHL+'&&'+JetEleExpression+')'+'||'+'('+MEttrig_expression +'&&'+ objectSelectionSL+'&&'+JetEleExpression+')'+'||'+'('+Prestrig_expression +'&&'+ JetEleExpression +'&&'+ objectSelection+')'+')'
+if DerivationFrameworkIsMonteCarlo:
+  LepTrigexpression = '('+'('+trig_expression+'&&'+objectSelectionHL+'&&'+JetEleExpression+')'+'||'+'('+MEttrig_expression +'&&'+ objectSelectionSL+'&&'+JetEleExpression+')'+'||'+'('+Prestrig_expression +'&&'+ JetEleExpression +'&&'+ objectSelection+')'+')'
+else:
+  # prescaled triggers originally from SUSY5
+  LepTrigexpression = '(' + '('+Prestrig_expression +'&&'+ JetEleExpression +'&&'+ objectSelection+')'+'||'+ '('+PresLowPttrig_expression +'&&'+ JetEleLooseExpression +'&&'+ objectSelectionSL+')'+ ')'
+  
 
 expression = LepTrigexpression
 
@@ -235,10 +242,11 @@ replaceAODReducedJets(reducedJetList, SeqSUSY17, "SUSY17")
 # Tau truth building/matching
 #==============================================================================
 # now part of MCTruthCommon
-#if DerivationFrameworkIsMonteCarlo:
+if DerivationFrameworkIsMonteCarlo:
 #  from DerivationFrameworkSUSY.SUSYTruthCommon import addTruthTaus
 #  addTruthTaus(AugmentationTools)
-
+  # modify tool from MCTruthCommon, following SUSY5
+  ToolSvc.DFCommonTauTruthMatchingTool.WriteInvisibleFourMomentum = True
 
 #==============================================================================
 # Augment after skim

PhysicsAnalysis/DerivationFramework/DerivationFrameworkSUSY/share/SUSY5.py

@@ -171,11 +171,8 @@ trig_expression = '(' + ' || '.join(METorPhoton_triggers+Lepton_triggers) + ')'
 MEttrig_expression ='(' + ' || '.join(METorPhoton_triggers) + ')' 
 
 if not DerivationFrameworkIsMonteCarlo:
-  Prestrig_expression ='(' + ' || '.join(PrescaledLowPtTriggers + PrescaledHighPtTriggers) + ')' 
-  PresLowPttrig_expression ='(' + ' || '.join(PrescaledLowPtTriggers) + ')' 
   JetEleExpression = '(count(AntiKt4EMTopoJets.DFCommonJets_Calib_pt>25*GeV && abs(AntiKt4EMTopoJets.DFCommonJets_Calib_eta)<2.8)>=2)'
-  JetEleLooseExpression = '(count(AntiKt4EMTopoJets.DFCommonJets_Calib_pt>10*GeV && abs(AntiKt4EMTopoJets.DFCommonJets_Calib_eta)<2.8)>=1)'
-  LepTrigexpression = '('+'('+trig_expression+'&&'+objectSelectionHL+'&&'+JetEleExpression+')'+'||'+'('+MEttrig_expression +'&&'+ objectSelectionSL+'&&'+JetEleExpression+')'+'||'+'('+Prestrig_expression +'&&'+ JetEleExpression +'&&'+ objectSelection+')'+'||'+'('+PresLowPttrig_expression +'&&'+ JetEleLooseExpression +'&&'+ objectSelectionSL+')'+')'
+  LepTrigexpression = '('+'('+trig_expression+'&&'+objectSelectionHL+'&&'+JetEleExpression+')'+'||'+'('+MEttrig_expression +'&&'+ objectSelectionSL+'&&'+JetEleExpression+')'+')'
 else :
   LepTrigexpression = '('+'('+trig_expression+'&&'+objectSelectionHL+')'+'||'+'('+MEttrig_expression +'&&'+ objectSelectionSL+')'+')'