From a48b814219932d99ba7f7697505a283cc6558a47 Mon Sep 17 00:00:00 2001
From: Heather Russell <heather.russell@cern.ch>
Date: Thu, 1 Jun 2017 14:29:28 +0200
Subject: [PATCH] Updaing LVL1 XMLs with new L1_MU21 definition
---
.../data/LVL1config_MC_pp_v7.xml | 21 ++++++-------------
.../data/LVL1config_Physics_pp_v7.xml | 21 ++++++-------------
2 files changed, 12 insertions(+), 30 deletions(-)
diff --git a/Trigger/TriggerCommon/TriggerMenuXML/data/LVL1config_MC_pp_v7.xml b/Trigger/TriggerCommon/TriggerMenuXML/data/LVL1config_MC_pp_v7.xml
index 81b0ed6e25c6..41bbb76218fb 100644
--- a/Trigger/TriggerCommon/TriggerMenuXML/data/LVL1config_MC_pp_v7.xml
+++ b/Trigger/TriggerCommon/TriggerMenuXML/data/LVL1config_MC_pp_v7.xml
@@ -126,12 +126,9 @@
<InternalTrigger name="BGRP1"/>
</AND>
</TriggerItem>
- <TriggerItem ctpid="17" partition="1" name="L1_MU21" complex_deadtime="0" definition="((MU20[x1]|MU21[x1])&BGRP0&BGRP1)" trigger_type="10001000" monitor="LF:000|HF:000">
+ <TriggerItem ctpid="17" partition="1" name="L1_MU21" complex_deadtime="0" definition="(MU21[x1]&BGRP0&BGRP1)" trigger_type="10001000" monitor="LF:000|HF:000">
<AND>
- <OR>
- <TriggerCondition multi="1" name="MU20_x1" triggerthreshold="MU20"/>
- <TriggerCondition multi="1" name="MU21_x1" triggerthreshold="MU21"/>
- </OR>
+ <TriggerCondition multi="1" name="MU21_x1" triggerthreshold="MU21"/>
<InternalTrigger name="BGRP0"/>
<InternalTrigger name="BGRP1"/>
</AND>
@@ -3246,12 +3243,9 @@
<InternalTrigger name="BGRP9"/>
</AND>
</TriggerItem>
- <TriggerItem ctpid="406" partition="1" name="L1_MU21_FIRSTEMPTY" complex_deadtime="0" definition="((MU20[x1]|MU21[x1])&BGRP0&BGRP6)" trigger_type="10001000" monitor="LF:000|HF:000">
+ <TriggerItem ctpid="406" partition="1" name="L1_MU21_FIRSTEMPTY" complex_deadtime="0" definition="(MU21[x1]&BGRP0&BGRP6)" trigger_type="10001000" monitor="LF:000|HF:000">
<AND>
- <OR>
- <TriggerCondition multi="1" name="MU20_x1" triggerthreshold="MU20"/>
- <TriggerCondition multi="1" name="MU21_x1" triggerthreshold="MU21"/>
- </OR>
+ <TriggerCondition multi="1" name="MU21_x1" triggerthreshold="MU21"/>
<InternalTrigger name="BGRP0"/>
<InternalTrigger name="BGRP6"/>
</AND>
@@ -3895,12 +3889,9 @@
<InternalTrigger name="BGRP0"/>
</AND>
</TriggerItem>
- <TriggerItem ctpid="497" partition="1" name="L1_MU21_FTK" complex_deadtime="0" definition="((MU20[x1]|MU21[x1])&BGRP0&BGRP1)" trigger_type="10100000" monitor="LF:000|HF:000">
+ <TriggerItem ctpid="497" partition="1" name="L1_MU21_FTK" complex_deadtime="0" definition="(MU21[x1]&BGRP0&BGRP1)" trigger_type="10100000" monitor="LF:000|HF:000">
<AND>
- <OR>
- <TriggerCondition multi="1" name="MU20_x1" triggerthreshold="MU20"/>
- <TriggerCondition multi="1" name="MU21_x1" triggerthreshold="MU21"/>
- </OR>
+ <TriggerCondition multi="1" name="MU21_x1" triggerthreshold="MU21"/>
<InternalTrigger name="BGRP0"/>
<InternalTrigger name="BGRP1"/>
</AND>
diff --git a/Trigger/TriggerCommon/TriggerMenuXML/data/LVL1config_Physics_pp_v7.xml b/Trigger/TriggerCommon/TriggerMenuXML/data/LVL1config_Physics_pp_v7.xml
index d0d1b238e3f1..6f730e4e042d 100644
--- a/Trigger/TriggerCommon/TriggerMenuXML/data/LVL1config_Physics_pp_v7.xml
+++ b/Trigger/TriggerCommon/TriggerMenuXML/data/LVL1config_Physics_pp_v7.xml
@@ -126,12 +126,9 @@
<InternalTrigger name="BGRP1"/>
</AND>
</TriggerItem>
- <TriggerItem ctpid="17" partition="1" name="L1_MU21" complex_deadtime="0" definition="((MU20[x1]|MU21[x1])&BGRP0&BGRP1)" trigger_type="10001000" monitor="LF:000|HF:000">
+ <TriggerItem ctpid="17" partition="1" name="L1_MU21" complex_deadtime="0" definition="(MU21[x1]&BGRP0&BGRP1)" trigger_type="10001000" monitor="LF:000|HF:000">
<AND>
- <OR>
- <TriggerCondition multi="1" name="MU20_x1" triggerthreshold="MU20"/>
- <TriggerCondition multi="1" name="MU21_x1" triggerthreshold="MU21"/>
- </OR>
+ <TriggerCondition multi="1" name="MU21_x1" triggerthreshold="MU21"/>
<InternalTrigger name="BGRP0"/>
<InternalTrigger name="BGRP1"/>
</AND>
@@ -3246,12 +3243,9 @@
<InternalTrigger name="BGRP9"/>
</AND>
</TriggerItem>
- <TriggerItem ctpid="406" partition="1" name="L1_MU21_FIRSTEMPTY" complex_deadtime="0" definition="((MU20[x1]|MU21[x1])&BGRP0&BGRP6)" trigger_type="10001000" monitor="LF:000|HF:000">
+ <TriggerItem ctpid="406" partition="1" name="L1_MU21_FIRSTEMPTY" complex_deadtime="0" definition="(MU21[x1]&BGRP0&BGRP6)" trigger_type="10001000" monitor="LF:000|HF:000">
<AND>
- <OR>
- <TriggerCondition multi="1" name="MU20_x1" triggerthreshold="MU20"/>
- <TriggerCondition multi="1" name="MU21_x1" triggerthreshold="MU21"/>
- </OR>
+ <TriggerCondition multi="1" name="MU21_x1" triggerthreshold="MU21"/>
<InternalTrigger name="BGRP0"/>
<InternalTrigger name="BGRP6"/>
</AND>
@@ -3909,12 +3903,9 @@
<InternalTrigger name="BGRP0"/>
</AND>
</TriggerItem>
- <TriggerItem ctpid="497" partition="1" name="L1_MU21_FTK" complex_deadtime="0" definition="((MU20[x1]|MU21[x1])&BGRP0&BGRP1)" trigger_type="10100000" monitor="LF:000|HF:000">
+ <TriggerItem ctpid="497" partition="1" name="L1_MU21_FTK" complex_deadtime="0" definition="(MU21[x1]&BGRP0&BGRP1)" trigger_type="10100000" monitor="LF:000|HF:000">
<AND>
- <OR>
- <TriggerCondition multi="1" name="MU20_x1" triggerthreshold="MU20"/>
- <TriggerCondition multi="1" name="MU21_x1" triggerthreshold="MU21"/>
- </OR>
+ <TriggerCondition multi="1" name="MU21_x1" triggerthreshold="MU21"/>
<InternalTrigger name="BGRP0"/>
<InternalTrigger name="BGRP1"/>
</AND>
--
GitLab