'add SP veto' (TrigT2MinBias-00-02-34)

	* Add SP veto
	* tagging as TrigT2MinBias-00-02-34

Trigger/TrigAlgorithms/TrigT2MinBias/TrigT2MinBias/TrigCountSpacePointsHypo.h

@@ -33,6 +33,9 @@ class TrigCountSpacePointsHypo: public HLT::HypoAlgo {
   /** Name of the TrigSpacePointCounts object */
   std::string m_trigSpacePointCountsKey;
 
+  /** If enabled this inverts the final decision of the hypo, turning it into a veto. */
+  bool m_veto;
+
   /** If enabled the event is passed, ignoring the trigger decision. */
   bool m_acceptAll;
 

Trigger/TrigAlgorithms/TrigT2MinBias/python/TrigT2MinBiasConfig.py

@@ -491,6 +491,7 @@ MbSpHypo_1 = MbSpHypo  # remove once cosmic clice migrated
 #             Sp hypo configuratables
 L2MbSpHypo = MbSpHypo("L2MbSpHypo")
 L2MbSpHypo.AcceptAll = False
+L2MbSpHypo.Veto = False
 L2MbSpHypo.TriggerTypeAND = True
 L2MbSpHypo.TotalPixelClus = 2.
 L2MbSpHypo.PixelClusRatioA = -1. # Disable
@@ -510,11 +511,35 @@ L2MbSpHypo.SctSpBarrel_max = -1. # Disable
 L2MbSpHypo.SctSpEndcapA_max = -1. # Disable
 hypos["L2MbSpHypo"] = L2MbSpHypo
 
+#             Sp hypo configuratables
+L2MbSpHypo_veto = MbSpHypo("L2MbSpHypo_veto")
+L2MbSpHypo_veto.AcceptAll = False
+L2MbSpHypo_veto.Veto = True
+L2MbSpHypo_veto.TriggerTypeAND = True
+L2MbSpHypo_veto.TotalPixelClus = 2.
+L2MbSpHypo_veto.PixelClusRatioA = -1. # Disable
+L2MbSpHypo_veto.PixelClusRatioB = -1. # Disable
+L2MbSpHypo_veto.PixelClusEndcapC = -1. # Disable
+L2MbSpHypo_veto.PixelClusBarrel = -1. # Disable
+L2MbSpHypo_veto.PixelClusEndcapA = -1. # Disable
+L2MbSpHypo_veto.PixelClusEndcapC_max = -1. # Disable
+L2MbSpHypo_veto.PixelClusBarrel_max = -1. # Disable
+L2MbSpHypo_veto.PixelClusEndcapA_max = -1. # Disable
+L2MbSpHypo_veto.TotalSctSp = 3.
+L2MbSpHypo_veto.SctSpEndcapC = -1. # Disable
+L2MbSpHypo_veto.SctSpBarrel = -1. # Disable
+L2MbSpHypo_veto.SctSpEndcapA = -1. # Disable
+L2MbSpHypo_veto.SctSpEndcapC_max = -1. # Disable
+L2MbSpHypo_veto.SctSpBarrel_max = -1. # Disable
+L2MbSpHypo_veto.SctSpEndcapA_max = -1. # Disable
+hypos["L2MbSpHypo_veto"] = L2MbSpHypo_veto
+
 
 
 #             Sp hypo configuratables veto large multiplicity
 L2MbSpHypoLow = MbSpHypo("L2MbSpHypoLow")
 L2MbSpHypoLow.AcceptAll = False
+L2MbSpHypoLow.Veto = False
 L2MbSpHypoLow.TriggerTypeAND = False ## ???
 L2MbSpHypoLow.VetoLargeSP = True
 L2MbSpHypoLow.TotalPixelClus = 200. # 
@@ -538,11 +563,6 @@ L2MbSpHypoLow.SctSpEndcapA_max = -1. # Disable
 hypos["L2MbSpHypoLow"] = L2MbSpHypoLow
 
 
-
-
-
-
-
 L2MbSpHypo_PT = MbSpHypo("L2MbSpHypo_PT") # Pass through version
 L2MbSpHypo_PT.AcceptAll = True
 hypos["L2MbSpHypo_PT"] = L2MbSpHypo_PT
@@ -550,6 +570,7 @@ hypos["L2MbSpHypo_PT"] = L2MbSpHypo_PT
 # ... oneD version
 L2MbSpHypo_oneD = MbSpHypo("L2MbSpHypo_oneD")
 L2MbSpHypo_oneD.AcceptAll = False
+L2MbSpHypo_oneD.Veto = False
 L2MbSpHypo_oneD.TriggerTypeAND = False
 L2MbSpHypo_oneD.TotalPixelClus = -1. # Disable
 L2MbSpHypo_oneD.PixelClusRatioA = -1. # Disable
@@ -575,6 +596,7 @@ hypos["L2MbSpHypo_oneD"] = L2MbSpHypo_oneD
 # ... fwd version
 L2MbSpHypo_fwd = MbSpHypo("L2MbSpHypo_fwd")
 L2MbSpHypo_fwd.AcceptAll = False
+L2MbSpHypo_fwd.Veto = False
 L2MbSpHypo_fwd.TriggerTypeAND = False
 L2MbSpHypo_fwd.TotalPixelClus = 5.
 L2MbSpHypo_fwd.PixelClusRatioA = -1. # Disable
@@ -600,6 +622,7 @@ hypos["L2MbSpHypo_fwd"] = L2MbSpHypo_fwd
 # ... cos version
 L2MbSpHypo_cos = MbSpHypo("L2MbSpHypo_cos")
 L2MbSpHypo_cos.AcceptAll = False
+L2MbSpHypo_cos.Veto = False
 L2MbSpHypo_cos.TriggerTypeAND = True
 L2MbSpHypo_cos.TotalPixelClus = 3.
 L2MbSpHypo_cos.PixelClusRatioA = -1. # Disable
@@ -624,6 +647,7 @@ hypos["L2MbSpHypo_cos"] = L2MbSpHypo_cos
 # Setup for 2016 SCT only non collision bacground filtering
 L2MbSpHypo_ncb = MbSpHypo("L2MbSpHypo_ncb")
 L2MbSpHypo_ncb.AcceptAll = False
+L2MbSpHypo_ncb.Veto = False
 L2MbSpHypo_ncb.TriggerTypeAND = False # SCT only
 L2MbSpHypo_ncb.SctSpEndcaps_cut = 50 # max(SCT_EC_A, SCT_EC_C)
 L2MbSpHypo_ncb.TotalPixelClus = -1. # Disable
@@ -648,6 +672,7 @@ hypos["L2MbSpHypo_ncb"] = L2MbSpHypo_ncb
 # Setup for 2016 PIX blayer counting
 L2MbSpHypo_blayer = MbSpHypo("L2MbSpHypo_blayer")
 L2MbSpHypo_blayer.AcceptAll = False
+L2MbSpHypo_blayer.Veto = False
 L2MbSpHypo_blayer.TriggerTypeAND = False # PIX only
 L2MbSpHypo_blayer.SctSpEndcaps_cut = -1 # Disable
 L2MbSpHypo_blayer.TotalPixelClus = 50 # Minimum number of hits in the BLayer (layer restriction in FEX) 
@@ -672,6 +697,7 @@ hypos["L2MbSpHypo_blayer"] = L2MbSpHypo_blayer
 # ... setup for halo event trigger
 L2MbSpHypoBg = MbSpHypo("L2MbSpHypoBg")
 L2MbSpHypoBg.AcceptAll = False
+L2MbSpHypoBg.Veto = False
 L2MbSpHypoBg.TriggerTypeAND = False
 L2MbSpHypoBg.TotalPixelClus = 9.
 L2MbSpHypoBg.PixelClusRatioA = -1. # Disable
@@ -696,6 +722,7 @@ hypos["L2MbSpHypoBg"] = L2MbSpHypoBg
 # ... setup for MbSpMh
 L2MbSpMhHypo = MbSpHypo("L2MbSpMhHypo")
 L2MbSpMhHypo.AcceptAll = False
+L2MbSpMhHypo.Veto = False
 L2MbSpMhHypo.TriggerTypeAND = True
 L2MbSpMhHypo.TotalPixelClus = 349.
 L2MbSpMhHypo.PixelClusRatioA = -1. # Disable
@@ -718,6 +745,7 @@ hypos["L2MbSpMhHypo"] = L2MbSpMhHypo
 # ... setup for MbSpMh120
 L2MbSpMhPcHypo = MbSpHypo("L2MbSpMhPcHypo")
 L2MbSpMhPcHypo.AcceptAll = False
+L2MbSpMhPcHypo.Veto = False
 L2MbSpMhPcHypo.TriggerTypeAND = True 
 L2MbSpMhPcHypo.TotalPixelClus = 749.
 L2MbSpMhPcHypo.PixelClusRatioA = -1. # Disable
@@ -741,6 +769,7 @@ hypos["L2MbSpMhPcHypo"] = L2MbSpMhPcHypo
 # ... setup for MbSpMhNoPixHypo low pile up
 L2MbSpMhNoPixHypo = MbSpHypo("L2MbSpMhNoPixHypo")
 L2MbSpMhNoPixHypo.AcceptAll = False
+L2MbSpMhNoPixHypo.Veto = False
 L2MbSpMhNoPixHypo.TriggerTypeAND = False # Must use OR because Pixel is disabled
 L2MbSpMhNoPixHypo.TotalPixelClus = -1. # Disable
 L2MbSpMhNoPixHypo.PixelClusRatioA = -1. # Disable
@@ -763,6 +792,7 @@ hypos["L2MbSpMhNoPixHypo"] = L2MbSpMhNoPixHypo
 # ... setup for MbSpMhNoPixHypo_eff
 L2MbSpMhNoPixHypo_eff = MbSpHypo("L2MbSpMhNoPixHypo_eff")
 L2MbSpMhNoPixHypo_eff.AcceptAll = False
+L2MbSpMhNoPixHypo_eff.Veto = False
 L2MbSpMhNoPixHypo_eff.TriggerTypeAND = False # Must use OR because Pixel is disabled
 L2MbSpMhNoPixHypo_eff.TotalPixelClus = -1. # Disable
 L2MbSpMhNoPixHypo_eff.PixelClusRatioA = -1. # Disable
@@ -787,6 +817,7 @@ hypos["L2MbSpMhNoPixHypo_eff"] = L2MbSpMhNoPixHypo_eff
 # ... setup for MbSpMhNoPixHypo (medium pile-up)
 L2MbSpMhNoPixHypo_medium = MbSpHypo("L2MbSpMhNoPixHypo_medium")
 L2MbSpMhNoPixHypo_medium.AcceptAll = False
+L2MbSpMhNoPixHypo_medium.Veto = False
 L2MbSpMhNoPixHypo_medium.TriggerTypeAND = False # Must use OR because Pixel is disabled
 L2MbSpMhNoPixHypo_medium.TotalPixelClus = -1. # Disable
 L2MbSpMhNoPixHypo_medium.PixelClusRatioA = -1. # Disable
@@ -809,6 +840,7 @@ hypos["L2MbSpMhNoPixHypo_medium"] = L2MbSpMhNoPixHypo_medium
 # ... setup for MbSpMhNoPixHypo_eff
 L2MbSpMhNoPixHypo_medium_eff = MbSpHypo("L2MbSpMhNoPixHypo_medium_eff")
 L2MbSpMhNoPixHypo_medium_eff.AcceptAll = False
+L2MbSpMhNoPixHypo_medium_eff.Veto = False
 L2MbSpMhNoPixHypo_medium_eff.TriggerTypeAND = False # Must use OR because Pixel is disabled
 L2MbSpMhNoPixHypo_medium_eff.TotalPixelClus = -1. # Disable
 L2MbSpMhNoPixHypo_medium_eff.PixelClusRatioA = -1. # Disable
@@ -834,6 +866,7 @@ hypos["L2MbSpMhNoPixHypo_medium_eff"] = L2MbSpMhNoPixHypo_medium_eff
 # ... setup for MbSpMhNoPixHypo high pile up
 L2MbSpMhNoPixHypo_tight = MbSpHypo("L2MbSpMhNoPixHypo_tight")
 L2MbSpMhNoPixHypo_tight.AcceptAll = False
+L2MbSpMhNoPixHypo_tight.Veto = False
 L2MbSpMhNoPixHypo_tight.TriggerTypeAND = False # Must use OR because Pixel is disabled
 L2MbSpMhNoPixHypo_tight.TotalPixelClus = -1. # Disable
 L2MbSpMhNoPixHypo_tight.PixelClusRatioA = -1. # Disable
@@ -856,6 +889,7 @@ hypos["L2MbSpMhNoPixHypo_tight"] = L2MbSpMhNoPixHypo_tight
 # ... setup for MbSpMhNoPixHypo_eff
 L2MbSpMhNoPixHypo_tight_eff = MbSpHypo("L2MbSpMhNoPixHypo_tight_eff")
 L2MbSpMhNoPixHypo_tight_eff.AcceptAll = False
+L2MbSpMhNoPixHypo_tight_eff.Veto = False
 L2MbSpMhNoPixHypo_tight_eff.TriggerTypeAND = False # Must use OR because Pixel is disabled
 L2MbSpMhNoPixHypo_tight_eff.TotalPixelClus = -1. # Disable
 L2MbSpMhNoPixHypo_tight_eff.PixelClusRatioA = -1. # Disable

Trigger/TrigAlgorithms/TrigT2MinBias/src/TrigCountSpacePointsHypo.cxx

@@ -28,7 +28,9 @@ TrigCountSpacePointsHypo::TrigCountSpacePointsHypo(const std::string& name,
   // veto large multiplicity events
   declareProperty("VetoLargeSP",          m_vetoLargeSP = false); 
 
-  
+  // Invert the final decision of the hypo - turning it into a SP veto
+  declareProperty("Veto",                    m_veto = false); 
+
   // Threshold settings for multiplicity requirements.
   // A trigger threshold can be disabled by setting it to be < 0
   declareProperty("TotalPixelClus",          m_totalPixelClus_cut = 10.);
@@ -576,6 +578,12 @@ HLT::ErrorCode TrigCountSpacePointsHypo::hltExecute(const HLT::TriggerElement* o
       if(msgLvl() <= MSG::DEBUG) m_log << MSG::DEBUG << "Event fails Pixel OR SCT " << endreq;
   }
 
+  // Veto
+  if (m_veto == true) {
+    pass = !pass;
+    if(msgLvl() <= MSG::DEBUG) m_log << MSG::DEBUG << "Using inverted/VETO logic, final decision is " << (pass ? "PASS" : "FAIL") << endreq;
+  }
+
   // for monitoring  
   if( !pass ){
     m_totSelNumPixSP = -999;