diff --git a/Trigger/TrigConfiguration/TrigConfData/TrigConfData/L1ThresholdBase.icc b/Trigger/TrigConfiguration/TrigConfData/TrigConfData/L1ThresholdBase.icc
index 8fd3b09e641c40f170d561098ab183bac83c6a63..324b3f068eb9ae1ac693ec02bbc26b18add66b5d 100644
--- a/Trigger/TrigConfiguration/TrigConfData/TrigConfData/L1ThresholdBase.icc
+++ b/Trigger/TrigConfiguration/TrigConfData/TrigConfData/L1ThresholdBase.icc
@@ -26,6 +26,14 @@ namespace TrigConf {
template<class T>
void ValueWithEtaDependence<T>::addRangeValue(const T & value, int etaMin, int etaMax, unsigned int priority, bool symmetric) {
RangeValue rv = { value, etaMin, etaMax, priority, symmetric };
+ for( const auto & rv : m_rangeValues ) {
+ if( rv.priority != priority )
+ continue;
+ if( (etaMax >= rv.etaMin) and (etaMin <= rv.etaMax) ) { // overlaps with existing range of the same priority
+ throw std::runtime_error( "Range eta " + std::to_string(etaMin) + " - " + std::to_string(etaMax) +
+ " (priority " + std::to_string(priority) + ") overlaps with existing range of the same priority");
+ }
+ }
m_rangeValues.emplace_back( std::move(rv) );
}
diff --git a/Trigger/TrigConfiguration/TrigConfData/src/L1ThresholdBase.cxx b/Trigger/TrigConfiguration/TrigConfData/src/L1ThresholdBase.cxx
index 0cfcb613e3136f9d644414289882582f384c26a3..ef7f82139c65c6d60deac876ffde2fadf1f0adb3 100644
--- a/Trigger/TrigConfiguration/TrigConfData/src/L1ThresholdBase.cxx
+++ b/Trigger/TrigConfiguration/TrigConfData/src/L1ThresholdBase.cxx
@@ -40,15 +40,22 @@ TrigConf::L1Threshold::update()
m_thrValue = getAttribute<unsigned int>("value", true, 0);
m_input = getAttribute("input", true, "");
m_mapping = getAttribute<unsigned int>("mapping");
- if( const auto & thrVs = data().get_child_optional("thrValues") ) {
- for( auto & x : thrVs.get() ) {
- auto value = x.second.get_child("value").get_value<unsigned int>();
- auto etamin = x.second.get_child("etamin").get_value<unsigned int>();
- auto etamax = x.second.get_child("etamax").get_value<unsigned int>();
- auto priority = x.second.get_child("priority").get_value<unsigned int>();
- m_etaDepThrValue.addRangeValue(value, etamin, etamax, priority, /*symmetric=*/ false);
+ try {
+ if( const auto & thrVs = data().get_child_optional("thrValues") ) {
+ for( auto & x : thrVs.get() ) {
+ auto value = x.second.get_child("value").get_value<unsigned int>();
+ auto etamin = x.second.get_child("etamin").get_value<int>();
+ auto etamax = x.second.get_child("etamax").get_value<int>();
+ auto priority = x.second.get_child("priority").get_value<unsigned int>();
+ m_etaDepThrValue.addRangeValue(value, etamin, etamax, priority, /*symmetric=*/ false);
+ }
}
}
+ catch(std::exception & ex) {
+ std::cerr << "Caught exception when reading threshold values for threshold " << m_name << std::endl
+ << ex.what() << std::endl;
+ throw;
+ }
}
unsigned int
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Base/Thresholds.py b/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Base/Thresholds.py
index 9a73f33e0b13962000180cfe12417cfe40ba13f2..42a021f2584b319ef72e15262f8133dd32c12cad 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Base/Thresholds.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Base/Thresholds.py
@@ -181,6 +181,7 @@ class LegacyThreshold( Threshold ):
had_veto = p['had_veto'],
isobits = p['isobits'],
use_relIso = p['use_relIso'])
+ thrv.checkOverlapAny( self.thresholdValues )
self.thresholdValues.append(thrv)
return self
@@ -611,6 +612,14 @@ class ThresholdValue(object):
self.window = window
self.priority = priority
+ def checkOverlapAny(self, listOfThrValues):
+ for rv in listOfThrValues:
+ if rv.priority != self.priority:
+ continue
+ if (self.etamax >= rv.etamin) and (self.etamin <= rv.etamax):
+ # overlaps with existing range of the same priority
+ raise RuntimeError( "ThresholdValue %s: Range eta %i - %i (priority %i) overlaps with existing range of the same priority" % \
+ (self.name, self.etamin, self.etamax, self.priority) )
def setIsolation(self, em_isolation, had_isolation, had_veto, isobits, use_relIso):
self.em_isolation = em_isolation
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Config/ThresholdDef.py b/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Config/ThresholdDef.py
index 1ffd30c77f9d02d76edcf5669e88097139a0a488..a2e1133ad06c3237ae924ee31625a1798418efe4 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Config/ThresholdDef.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Config/ThresholdDef.py
@@ -44,86 +44,86 @@ class ThresholdDef:
EMThreshold( 'eEM8VH', 'eEM').setIsolation( rhad = "Tight" )\
.addThrValue(9, priority=1)\
.addThrValue(9, -8, 8, priority=2)\
- .addThrValue(7, -11, -8, priority=2).addThrValue(7, 8, 11, priority=2)\
- .addThrValue(6, -14, -11, priority=2).addThrValue(6, 11, 14, priority=2)\
- .addThrValue(5, -15, -14, priority=2).addThrValue(5, 14, 15, priority=2)\
- .addThrValue(7, -18, -15, priority=2).addThrValue(7, 15, 18, priority=2)\
- .addThrValue(8, -25, -18, priority=2).addThrValue(8, 18, 25, priority=2)
+ .addThrValue(7, -11, -9, priority=2).addThrValue(7, 9, 11, priority=2)\
+ .addThrValue(6, -14, -12, priority=2).addThrValue(6, 12, 14, priority=2)\
+ .addThrValue(5, -15, -15, priority=2).addThrValue(5, 15, 15, priority=2)\
+ .addThrValue(7, -18, -16, priority=2).addThrValue(7, 16, 18, priority=2)\
+ .addThrValue(8, -25, -19, priority=2).addThrValue(8, 19, 25, priority=2)
EMThreshold( 'eEM10VH', 'eEM' ).setIsolation( rhad = "Medium" )\
.addThrValue(11, priority=1)\
- .addThrValue(11, -8, 7, priority=2)\
- .addThrValue(9, -11, -8, priority=2).addThrValue(9, 8, 11, priority=2)\
- .addThrValue(8, -14, -11, priority=2).addThrValue(8, 11, 14, priority=2)\
- .addThrValue(7, -15, -14, priority=2).addThrValue(7, 14, 15, priority=2)\
- .addThrValue(9, -18, -15, priority=2).addThrValue(9, 15, 18, priority=2)\
- .addThrValue(10, -25, -18, priority=2).addThrValue(10, 18, 25, priority=2)
+ .addThrValue(11, -8, 8, priority=2)\
+ .addThrValue(9, -11, -9, priority=2).addThrValue(9, 9, 11, priority=2)\
+ .addThrValue(8, -14, -12, priority=2).addThrValue(8, 12, 14, priority=2)\
+ .addThrValue(7, -15, -15, priority=2).addThrValue(7, 15, 15, priority=2)\
+ .addThrValue(9, -18, -16, priority=2).addThrValue(9, 16, 18, priority=2)\
+ .addThrValue(10, -25, -19, priority=2).addThrValue(10, 19, 25, priority=2)
EMThreshold( 'eEM15VH', 'eEM').setIsolation( rhad = "Loose" )\
.addThrValue(17, priority=1)\
.addThrValue(17, -7, 7, priority=2)\
- .addThrValue(16, -9, -7, priority=2).addThrValue(16, 7, 9, priority=2)\
- .addThrValue(15, -12, -9, priority=2).addThrValue(15, 9, 12, priority=2)\
- .addThrValue(14, -14, -12, priority=2).addThrValue(14, 12, 14, priority=2)\
- .addThrValue(13, -15, -14, priority=2).addThrValue(13, 14, 15, priority=2)\
- .addThrValue(15, -17, -15, priority=2).addThrValue(15, 15, 17, priority=2)\
- .addThrValue(16, -25, -17, priority=2).addThrValue(16, 17, 25, priority=2)
+ .addThrValue(16, -9, -8, priority=2).addThrValue(16, 8, 9, priority=2)\
+ .addThrValue(15, -12, -10, priority=2).addThrValue(15, 10, 12, priority=2)\
+ .addThrValue(14, -14, -13, priority=2).addThrValue(14, 13, 14, priority=2)\
+ .addThrValue(13, -15, -15, priority=2).addThrValue(13, 15, 15, priority=2)\
+ .addThrValue(15, -17, -16, priority=2).addThrValue(15, 16, 17, priority=2)\
+ .addThrValue(16, -25, -18, priority=2).addThrValue(16, 18, 25, priority=2)
EMThreshold( 'eEM20VH', 'eEM').setIsolation( rhad = "Loose" )\
.addThrValue(22, priority=1)\
.addThrValue(22, -7, 7, priority=2)\
- .addThrValue(21, -8, -7, priority=2).addThrValue(21, 7, 8, priority=2)\
- .addThrValue(20, -11, -8, priority=2).addThrValue(20, 8, 11, priority=2)\
- .addThrValue(19, -13, -11, priority=2).addThrValue(19, 11, 13, priority=2)\
- .addThrValue(18, -14, -13, priority=2).addThrValue(18, 13, 14, priority=2)\
- .addThrValue(17, -15, -14, priority=2).addThrValue(17, 14, 15, priority=2)\
- .addThrValue(19, -17, -15, priority=2).addThrValue(19, 15, 17, priority=2)\
- .addThrValue(21, -25, -17, priority=2).addThrValue(21, 17, 25, priority=2)
+ .addThrValue(21, -8, -8, priority=2).addThrValue(21, 8, 8, priority=2)\
+ .addThrValue(20, -11, -9, priority=2).addThrValue(20, 9, 11, priority=2)\
+ .addThrValue(19, -13, -12, priority=2).addThrValue(19, 12, 13, priority=2)\
+ .addThrValue(18, -14, -14, priority=2).addThrValue(18, 14, 14, priority=2)\
+ .addThrValue(17, -15, -15, priority=2).addThrValue(17, 15, 15, priority=2)\
+ .addThrValue(19, -17, -16, priority=2).addThrValue(19, 16, 17, priority=2)\
+ .addThrValue(21, -25, -18, priority=2).addThrValue(21, 18, 25, priority=2)
# (V)HI section
EMThreshold( 'eEM15VHI', 'eEM').setIsolation( reta = "Loose", wstot = "Medium" )\
.addThrValue(17, priority=1)\
.addThrValue(17, -7, 7, priority=2)\
- .addThrValue(16, -9, -7, priority=2).addThrValue(16, 7, 9, priority=2)\
- .addThrValue(15, -12, -9, priority=2).addThrValue(15, 9, 12, priority=2)\
- .addThrValue(14, -14, -12, priority=2).addThrValue(14, 12, 14, priority=2)\
- .addThrValue(13, -15, -14, priority=2).addThrValue(13, 14, 15, priority=2)\
- .addThrValue(15, -17, -15, priority=2).addThrValue(15, 15, 17, priority=2)\
- .addThrValue(16, -25, -17, priority=2).addThrValue(16, 17, 25, priority=2)
+ .addThrValue(16, -9, -8, priority=2).addThrValue(16, 8, 9, priority=2)\
+ .addThrValue(15, -12, -10, priority=2).addThrValue(15, 10, 12, priority=2)\
+ .addThrValue(14, -14, -13, priority=2).addThrValue(14, 13, 14, priority=2)\
+ .addThrValue(13, -15, -15, priority=2).addThrValue(13, 15, 15, priority=2)\
+ .addThrValue(15, -17, -16, priority=2).addThrValue(15, 16, 17, priority=2)\
+ .addThrValue(16, -25, -18, priority=2).addThrValue(16, 18, 25, priority=2)
EMThreshold( 'eEM18VHI', 'eEM').setIsolation( reta = "Loose", wstot = "Medium" )\
.addThrValue(20, priority=1)\
.addThrValue(20, -7, 7, priority=2)\
- .addThrValue(19, -8, -7, priority=2).addThrValue(19, 7, 8, priority=2)\
- .addThrValue(18, -11, -8, priority=2).addThrValue(18, 8, 11, priority=2)\
- .addThrValue(17, -13, -11, priority=2).addThrValue(17, 11, 13, priority=2)\
- .addThrValue(16, -14, -13, priority=2).addThrValue(16, 13, 14, priority=2)\
- .addThrValue(15, -15, -14, priority=2).addThrValue(15, 14, 15, priority=2)\
- .addThrValue(17, -17, -15, priority=2).addThrValue(17, 15, 17, priority=2)\
- .addThrValue(19, -25, -17, priority=2).addThrValue(19, 17, 25, priority=2)
+ .addThrValue(19, -8, -8, priority=2).addThrValue(19, 8, 8, priority=2)\
+ .addThrValue(18, -11, -9, priority=2).addThrValue(18, 9, 11, priority=2)\
+ .addThrValue(17, -13, -12, priority=2).addThrValue(17, 12, 13, priority=2)\
+ .addThrValue(16, -14, -14, priority=2).addThrValue(16, 14, 14, priority=2)\
+ .addThrValue(15, -15, -15, priority=2).addThrValue(15, 15, 15, priority=2)\
+ .addThrValue(17, -17, -16, priority=2).addThrValue(17, 16, 17, priority=2)\
+ .addThrValue(19, -25, -18, priority=2).addThrValue(19, 18, 25, priority=2)
EMThreshold( 'eEM20VHI', 'eEM').setIsolation( reta = "Loose", wstot = "Medium" )\
.addThrValue(22, priority=1)\
.addThrValue(22, -7, 7, priority=2)\
- .addThrValue(21, -8, -7, priority=2).addThrValue(21, 7, 8, priority=2)\
- .addThrValue(20, -11, -8, priority=2).addThrValue(20, 8, 11, priority=2)\
- .addThrValue(19, -13, -11, priority=2).addThrValue(19, 11, 13, priority=2)\
- .addThrValue(18, -14, -13, priority=2).addThrValue(18, 13, 14, priority=2)\
- .addThrValue(17, -15, -14, priority=2).addThrValue(17, 14, 15, priority=2)\
- .addThrValue(19, -17, -15, priority=2).addThrValue(19, 15, 17, priority=2)\
- .addThrValue(21, -25, -17, priority=2).addThrValue(21, 17, 25, priority=2)
+ .addThrValue(21, -8, -8, priority=2).addThrValue(21, 8, 8, priority=2)\
+ .addThrValue(20, -11, -9, priority=2).addThrValue(20, 9, 11, priority=2)\
+ .addThrValue(19, -13, -12, priority=2).addThrValue(19, 12, 13, priority=2)\
+ .addThrValue(18, -14, -14, priority=2).addThrValue(18, 14, 14, priority=2)\
+ .addThrValue(17, -15, -15, priority=2).addThrValue(17, 15, 15, priority=2)\
+ .addThrValue(19, -17, -16, priority=2).addThrValue(19, 16, 17, priority=2)\
+ .addThrValue(21, -25, -18, priority=2).addThrValue(21, 18, 25, priority=2)
EMThreshold( 'eEM22VHI', 'eEM').setIsolation( reta = "Loose", wstot = "Medium" )\
.addThrValue(24, priority=1)\
.addThrValue(24, -7, 7, priority=2)\
- .addThrValue(23, -8, -7, priority=2).addThrValue(23, 7, 8, priority=2)\
- .addThrValue(22, -11, -8, priority=2).addThrValue(22, 8, 11, priority=2)\
- .addThrValue(21, -13, -11, priority=2).addThrValue(21, 11, 13, priority=2)\
- .addThrValue(20, -14, -13, priority=2).addThrValue(20, 13, 14, priority=2)\
- .addThrValue(19, -15, -14, priority=2).addThrValue(19, 14, 15, priority=2)\
- .addThrValue(21, -17, -15, priority=2).addThrValue(21, 15, 17, priority=2)\
- .addThrValue(23, -25, -17, priority=2).addThrValue(23, 17, 25, priority=2)
+ .addThrValue(23, -8, -8, priority=2).addThrValue(23, 8, 8, priority=2)\
+ .addThrValue(22, -11, -9, priority=2).addThrValue(22, 9, 11, priority=2)\
+ .addThrValue(21, -13, -12, priority=2).addThrValue(21, 12, 13, priority=2)\
+ .addThrValue(20, -14, -14, priority=2).addThrValue(20, 14, 14, priority=2)\
+ .addThrValue(19, -15, -15, priority=2).addThrValue(19, 15, 15, priority=2)\
+ .addThrValue(21, -17, -16, priority=2).addThrValue(21, 16, 17, priority=2)\
+ .addThrValue(23, -25, -18, priority=2).addThrValue(23, 18, 25, priority=2)
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Config/ThresholdDefLegacy.py b/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Config/ThresholdDefLegacy.py
index 255f1e677e5499779ec2caaa1f2dee8edd60c303..ff0dde5e44b457e68b76ca6f59a8f81f89032d71 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Config/ThresholdDefLegacy.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Config/ThresholdDefLegacy.py
@@ -45,8 +45,8 @@ class ThresholdDefLegacy:
LegacyThreshold( 'EM50V', 'EM').addThrValue(52, priority=1)\
.addThrValue(51, -12, -8, priority=2).addThrValue(51, 8, 12, priority=2)\
- .addThrValue(50, -16, -12, priority=2).addThrValue(50, 12, 16, priority=2)\
- .addThrValue(51, -20, -16, priority=2).addThrValue(51, 16, 20, priority=2)
+ .addThrValue(50, -16, -13, priority=2).addThrValue(50, 13, 16, priority=2)\
+ .addThrValue(51, -20, -17, priority=2).addThrValue(51, 17, 20, priority=2)
# VH section
@@ -54,67 +54,67 @@ class ThresholdDefLegacy:
LegacyThreshold( 'EM8VH', 'EM').addThrValue(9, priority=1)\
.addThrValue(9, -8, 8, priority=2)\
- .addThrValue(7, -11, -8, priority=2).addThrValue(7, 8, 11, priority=2)\
- .addThrValue(6, -14, -11, priority=2).addThrValue(6, 11, 14, priority=2)\
- .addThrValue(5, -15, -14, priority=2).addThrValue(5, 14, 15, priority=2)\
- .addThrValue(7, -18, -15, priority=2).addThrValue(7, 15, 18, priority=2)\
- .addThrValue(8, -25, -18, priority=2).addThrValue(8, 18, 25, priority=2)
+ .addThrValue(7, -11, -9, priority=2).addThrValue(7, 9, 11, priority=2)\
+ .addThrValue(6, -14, -12, priority=2).addThrValue(6, 12, 14, priority=2)\
+ .addThrValue(5, -15, -15, priority=2).addThrValue(5, 15, 15, priority=2)\
+ .addThrValue(7, -18, -16, priority=2).addThrValue(7, 16, 18, priority=2)\
+ .addThrValue(8, -25, -19, priority=2).addThrValue(8, 19, 25, priority=2)
LegacyThreshold( 'EM10VH', 'EM').addThrValue(11, priority=1)\
.addThrValue(11, -8, 8, priority=2)\
- .addThrValue(9, -11, -8, priority=2).addThrValue(9, 8, 11, priority=2)\
- .addThrValue(8, -14, -11, priority=2).addThrValue(8, 11, 14, priority=2)\
- .addThrValue(7, -15, -14, priority=2).addThrValue(7, 14, 15, priority=2)\
- .addThrValue(9, -18, -15, priority=2).addThrValue(9, 15, 18, priority=2)\
- .addThrValue(10, -25, -18, priority=2).addThrValue(10, 18, 25, priority=2)
+ .addThrValue(9, -11, -9, priority=2).addThrValue(9, 9, 11, priority=2)\
+ .addThrValue(8, -14, -12, priority=2).addThrValue(8, 12, 14, priority=2)\
+ .addThrValue(7, -15, -15, priority=2).addThrValue(7, 15, 15, priority=2)\
+ .addThrValue(9, -18, -16, priority=2).addThrValue(9, 16, 18, priority=2)\
+ .addThrValue(10, -25, -19, priority=2).addThrValue(10, 19, 25, priority=2)
#ATR-19302
if isV8:
LegacyThreshold( 'EM10VHI', 'EM').addThrValue(11, priority=1)\
.addThrValue(11, -8, 8, priority=2)\
- .addThrValue(9, -11, -8, priority=2).addThrValue(9, 8, 11, priority=2)\
- .addThrValue(8, -14, -11, priority=2).addThrValue(8, 11, 14, priority=2)\
- .addThrValue(7, -15, -14, priority=2).addThrValue(7, 14, 15, priority=2)\
- .addThrValue(9, -18, -15, priority=2).addThrValue(9, 15, 18, priority=2)\
- .addThrValue(10, -25, -18, priority=2).addThrValue(10, 18, 25, priority=2)
+ .addThrValue(9, -11, -9, priority=2).addThrValue(9, 9, 11, priority=2)\
+ .addThrValue(8, -14, -12, priority=2).addThrValue(8, 12, 14, priority=2)\
+ .addThrValue(7, -15, -15, priority=2).addThrValue(7, 15, 15, priority=2)\
+ .addThrValue(9, -18, -16, priority=2).addThrValue(9, 16, 18, priority=2)\
+ .addThrValue(10, -25, -19, priority=2).addThrValue(10, 19, 25, priority=2)
LegacyThreshold( 'EM13VH', 'EM').addThrValue(15, priority=1)\
.addThrValue(15, -7, 7, priority=2)\
- .addThrValue(14, -9, -7, priority=2).addThrValue(14, 7, 9, priority=2)\
- .addThrValue(13, -12, -9, priority=2).addThrValue(13, 9, 12, priority=2)\
- .addThrValue(12, -14, -12, priority=2).addThrValue(12, 12, 14, priority=2)\
- .addThrValue(11, -15, -14, priority=2).addThrValue(11, 14, 15, priority=2)\
- .addThrValue(13, -17, -15, priority=2).addThrValue(13, 15, 17, priority=2)\
- .addThrValue(14, -25, -17, priority=2).addThrValue(14, 17, 25, priority=2)
+ .addThrValue(14, -9, -8, priority=2).addThrValue(14, 8, 9, priority=2)\
+ .addThrValue(13, -12, -10, priority=2).addThrValue(13, 10, 12, priority=2)\
+ .addThrValue(12, -14, -13, priority=2).addThrValue(12, 13, 14, priority=2)\
+ .addThrValue(11, -15, -15, priority=2).addThrValue(11, 15, 15, priority=2)\
+ .addThrValue(13, -17, -16, priority=2).addThrValue(13, 16, 17, priority=2)\
+ .addThrValue(14, -25, -18, priority=2).addThrValue(14, 18, 25, priority=2)
LegacyThreshold( 'EM15VH', 'EM').addThrValue(17, priority=1)\
- .addThrValue(17, -7, 0, priority=2)\
- .addThrValue(16, -9, -7, priority=2).addThrValue(16, 7, 9, priority=2)\
- .addThrValue(15, -12, -9, priority=2).addThrValue(15, 9, 12, priority=2)\
- .addThrValue(14, -14, -12, priority=2).addThrValue(14, 12, 14, priority=2)\
- .addThrValue(13, -15, -14, priority=2).addThrValue(13, 14, 15, priority=2)\
- .addThrValue(15, -17, -15, priority=2).addThrValue(15, 15, 17, priority=2)\
- .addThrValue(16, -25, -17, priority=2).addThrValue(16, 17, 25, priority=2)
+ .addThrValue(17, -7, 7, priority=2)\
+ .addThrValue(16, -9, -8, priority=2).addThrValue(16, 8, 9, priority=2)\
+ .addThrValue(15, -12, -10, priority=2).addThrValue(15, 10, 12, priority=2)\
+ .addThrValue(14, -14, -13, priority=2).addThrValue(14, 13, 14, priority=2)\
+ .addThrValue(13, -15, -15, priority=2).addThrValue(13, 15, 15, priority=2)\
+ .addThrValue(15, -17, -16, priority=2).addThrValue(15, 16, 17, priority=2)\
+ .addThrValue(16, -25, -18, priority=2).addThrValue(16, 18, 25, priority=2)
LegacyThreshold( 'EM18VH', 'EM').addThrValue(20, priority=1)\
.addThrValue(20, -7, 7, priority=2)\
- .addThrValue(19, -8, -7, priority=2).addThrValue(19, 7, 8, priority=2)\
- .addThrValue(18, -11, -8, priority=2).addThrValue(18, 8, 11, priority=2)\
- .addThrValue(17, -13, -11, priority=2).addThrValue(17, 11, 13, priority=2)\
- .addThrValue(16, -14, -13, priority=2).addThrValue(16, 13, 14, priority=2)\
- .addThrValue(15, -15, -14, priority=2).addThrValue(15, 14, 15, priority=2)\
- .addThrValue(17, -17, -15, priority=2).addThrValue(17, 15, 17, priority=2)\
- .addThrValue(19, -25, -17, priority=2).addThrValue(19, 17, 25, priority=2)
+ .addThrValue(19, -8, -8, priority=2).addThrValue(19, 8, 8, priority=2)\
+ .addThrValue(18, -11, -9, priority=2).addThrValue(18, 9, 11, priority=2)\
+ .addThrValue(17, -13, -12, priority=2).addThrValue(17, 12, 13, priority=2)\
+ .addThrValue(16, -14, -14, priority=2).addThrValue(16, 14, 14, priority=2)\
+ .addThrValue(15, -15, -15, priority=2).addThrValue(15, 15, 15, priority=2)\
+ .addThrValue(17, -17, -16, priority=2).addThrValue(17, 16, 17, priority=2)\
+ .addThrValue(19, -25, -18, priority=2).addThrValue(19, 18, 25, priority=2)
LegacyThreshold( 'EM20VH', 'EM').addThrValue(22, priority=1)\
.addThrValue(22, -7, 7, priority=2)\
- .addThrValue(21, -8, -7, priority=2).addThrValue(21, 7, 8, priority=2)\
- .addThrValue(20, -11, -8, priority=2).addThrValue(20, 8, 11, priority=2)\
- .addThrValue(19, -13, -11, priority=2).addThrValue(19, 11, 13, priority=2)\
- .addThrValue(18, -14, -13, priority=2).addThrValue(18, 13, 14, priority=2)\
- .addThrValue(17, -15, -14, priority=2).addThrValue(17, 14, 15, priority=2)\
- .addThrValue(19, -17, -15, priority=2).addThrValue(19, 15, 17, priority=2)\
- .addThrValue(21, -25, -17, priority=2).addThrValue(21, 17, 25, priority=2)
+ .addThrValue(21, -8, -8, priority=2).addThrValue(21, 8, 8, priority=2)\
+ .addThrValue(20, -11, -9, priority=2).addThrValue(20, 9, 11, priority=2)\
+ .addThrValue(19, -13, -12, priority=2).addThrValue(19, 12, 13, priority=2)\
+ .addThrValue(18, -14, -14, priority=2).addThrValue(18, 14, 14, priority=2)\
+ .addThrValue(17, -15, -15, priority=2).addThrValue(17, 15, 15, priority=2)\
+ .addThrValue(19, -17, -16, priority=2).addThrValue(19, 16, 17, priority=2)\
+ .addThrValue(21, -25, -18, priority=2).addThrValue(21, 18, 25, priority=2)
# I section
@@ -135,23 +135,23 @@ class ThresholdDefLegacy:
LegacyThreshold( 'EM22VH', 'EM').addThrValue(24, priority=1)\
.addThrValue(24, -6, 6, priority=2)\
.addThrValue(23, -8, -7, priority=2).addThrValue(23, 7, 8, priority=2)\
- .addThrValue(22, -11, -8, priority=2).addThrValue(22, 8, 11, priority=2)\
- .addThrValue(21, -13, -11, priority=2).addThrValue(21, 11, 13, priority=2)\
- .addThrValue(20, -14, -13, priority=2).addThrValue(20, 13, 14, priority=2)\
- .addThrValue(19, -15, -14, priority=2).addThrValue(19, 14, 15, priority=2)\
- .addThrValue(21, -17, -15, priority=2).addThrValue(21, 15, 17, priority=2)\
- .addThrValue(23, -25, -17, priority=2).addThrValue(23, 17, 25, priority=2)
+ .addThrValue(22, -11, -9, priority=2).addThrValue(22, 9, 11, priority=2)\
+ .addThrValue(21, -13, -12, priority=2).addThrValue(21, 12, 13, priority=2)\
+ .addThrValue(20, -14, -14, priority=2).addThrValue(20, 14, 14, priority=2)\
+ .addThrValue(19, -15, -15, priority=2).addThrValue(19, 15, 15, priority=2)\
+ .addThrValue(21, -17, -16, priority=2).addThrValue(21, 16, 17, priority=2)\
+ .addThrValue(23, -25, -18, priority=2).addThrValue(23, 18, 25, priority=2)
ThresholdValue.setDefaults('EM', {'isobits' : '01000', 'use_relIso' : True })
LegacyThreshold( 'EM24VHIM', 'EM').addThrValue(24, priority=1)\
.addThrValue(26, -7, 7, priority=2)\
- .addThrValue(25, -8, -7, priority=2).addThrValue(25, 7, 8, priority=2)\
- .addThrValue(24, -11, -8, priority=2).addThrValue(24, 8, 11, priority=2)\
- .addThrValue(23, -13, -11, priority=2).addThrValue(23, 11, 13, priority=2)\
- .addThrValue(22, -14, -13, priority=2).addThrValue(22, 13, 14, priority=2)\
- .addThrValue(21, -15, -14, priority=2).addThrValue(21, 14, 15, priority=2)\
- .addThrValue(23, -17, -15, priority=2).addThrValue(23, 15, 17, priority=2)\
- .addThrValue(25, -25, -17, priority=2).addThrValue(25, 17, 25, priority=2)
+ .addThrValue(25, -8, -8, priority=2).addThrValue(25, 8, 8, priority=2)\
+ .addThrValue(24, -11, -9, priority=2).addThrValue(24, 9, 11, priority=2)\
+ .addThrValue(23, -13, -12, priority=2).addThrValue(23, 12, 13, priority=2)\
+ .addThrValue(22, -14, -14, priority=2).addThrValue(22, 14, 14, priority=2)\
+ .addThrValue(21, -15, -15, priority=2).addThrValue(21, 15, 15, priority=2)\
+ .addThrValue(23, -17, -16, priority=2).addThrValue(23, 16, 17, priority=2)\
+ .addThrValue(25, -25, -18, priority=2).addThrValue(25, 18, 25, priority=2)
ThresholdValue.setDefaults('EM', {'isobits' : '00100', 'use_relIso' : True })
@@ -159,35 +159,35 @@ class ThresholdDefLegacy:
if not isV6 and not isHI:
LegacyThreshold( 'EM15VHI', 'EM').addThrValue(17, priority=1)\
.addThrValue(17, -7, 7, priority=2)\
- .addThrValue(16, -9, -7, priority=2).addThrValue(16, 7, 9, priority=2)\
- .addThrValue(15, -12, -9, priority=2).addThrValue(15, 9, 12, priority=2)\
- .addThrValue(14, -14, -12, priority=2).addThrValue(14, 12, 14, priority=2)\
- .addThrValue(13, -15, -14, priority=2).addThrValue(13, 14, 15, priority=2)\
- .addThrValue(15, -17, -15, priority=2).addThrValue(15, 15, 17, priority=2)\
- .addThrValue(16, -25, -17, priority=2).addThrValue(16, 17, 25, priority=2)
+ .addThrValue(16, -9, -8, priority=2).addThrValue(16, 8, 9, priority=2)\
+ .addThrValue(15, -12, -10, priority=2).addThrValue(15, 10, 12, priority=2)\
+ .addThrValue(14, -14, -13, priority=2).addThrValue(14, 13, 14, priority=2)\
+ .addThrValue(13, -15, -15, priority=2).addThrValue(13, 15, 15, priority=2)\
+ .addThrValue(15, -17, -16, priority=2).addThrValue(15, 16, 17, priority=2)\
+ .addThrValue(16, -25, -18, priority=2).addThrValue(16, 18, 25, priority=2)
for thrV in [15]:
LegacyThreshold('EM%iHI' % thrV, 'EM').addThrValue(thrV)
LegacyThreshold( 'EM18VHI', 'EM').addThrValue(20, priority=1)\
.addThrValue(20, -7, 7, priority=2)\
- .addThrValue(19, -8, -7, priority=2).addThrValue(19, 7, 8, priority=2)\
- .addThrValue(18, -11, -8, priority=2).addThrValue(18, 8, 11, priority=2)\
- .addThrValue(17, -13, -11, priority=2).addThrValue(17, 11, 13, priority=2)\
- .addThrValue(16, -14, -13, priority=2).addThrValue(16, 13, 14, priority=2)\
- .addThrValue(15, -15, -14, priority=2).addThrValue(15, 14, 15, priority=2)\
- .addThrValue(17, -17, -15, priority=2).addThrValue(17, 15, 17, priority=2)\
- .addThrValue(19, -25, -17, priority=2).addThrValue(19, 17, 25, priority=2)
+ .addThrValue(19, -8, -8, priority=2).addThrValue(19, 8, 8, priority=2)\
+ .addThrValue(18, -11, -9, priority=2).addThrValue(18, 9, 11, priority=2)\
+ .addThrValue(17, -13, -12, priority=2).addThrValue(17, 12, 13, priority=2)\
+ .addThrValue(16, -14, -14, priority=2).addThrValue(16, 14, 14, priority=2)\
+ .addThrValue(15, -15, -15, priority=2).addThrValue(15, 15, 15, priority=2)\
+ .addThrValue(17, -17, -16, priority=2).addThrValue(17, 16, 17, priority=2)\
+ .addThrValue(19, -25, -18, priority=2).addThrValue(19, 18, 25, priority=2)
LegacyThreshold( 'EM20VHI', 'EM').addThrValue(22, priority=1)\
.addThrValue(22, -6, 6, priority=2)\
.addThrValue(21, -8, -7, priority=2).addThrValue(21, 7, 8, priority=2)\
- .addThrValue(20, -11, -8, priority=2).addThrValue(20, 8, 11, priority=2)\
- .addThrValue(19, -13, -11, priority=2).addThrValue(19, 11, 13, priority=2)\
- .addThrValue(18, -14, -13, priority=2).addThrValue(18, 13, 14, priority=2)\
- .addThrValue(17, -15, -14, priority=2).addThrValue(17, 14, 15, priority=2)\
- .addThrValue(19, -17, -15, priority=2).addThrValue(19, 15, 17, priority=2)\
- .addThrValue(21, -25, -17, priority=2).addThrValue(21, 17, 25, priority=2)
+ .addThrValue(20, -11, -9, priority=2).addThrValue(20, 9, 11, priority=2)\
+ .addThrValue(19, -13, -12, priority=2).addThrValue(19, 12, 13, priority=2)\
+ .addThrValue(18, -14, -14, priority=2).addThrValue(18, 14, 14, priority=2)\
+ .addThrValue(17, -15, -15, priority=2).addThrValue(17, 15, 15, priority=2)\
+ .addThrValue(19, -17, -16, priority=2).addThrValue(19, 16, 17, priority=2)\
+ .addThrValue(21, -25, -18, priority=2).addThrValue(21, 18, 25, priority=2)
LegacyThreshold( 'EM22VHI', 'EM').addThrValue(24, priority=1)\
.addThrValue(24, -6, 6, priority=2)\
@@ -201,33 +201,33 @@ class ThresholdDefLegacy:
LegacyThreshold( 'EM24VHI', 'EM').addThrValue(24, priority=1)\
.addThrValue(26, -7, 7, priority=2)\
- .addThrValue(25, -8, -7, priority=2).addThrValue(25, 7, 8, priority=2)\
- .addThrValue(24, -11, -8, priority=2).addThrValue(24, 8, 11, priority=2)\
- .addThrValue(23, -13, -11, priority=2).addThrValue(23, 11, 13, priority=2)\
- .addThrValue(22, -14, -13, priority=2).addThrValue(22, 13, 14, priority=2)\
- .addThrValue(21, -15, -14, priority=2).addThrValue(21, 14, 15, priority=2)\
- .addThrValue(23, -17, -15, priority=2).addThrValue(23, 15, 17, priority=2)\
- .addThrValue(25, -25, -17, priority=2).addThrValue(25, 17, 25, priority=2)
+ .addThrValue(25, -8, -8, priority=2).addThrValue(25, 8, 8, priority=2)\
+ .addThrValue(24, -11, -9, priority=2).addThrValue(24, 9, 11, priority=2)\
+ .addThrValue(23, -13, -12, priority=2).addThrValue(23, 12, 13, priority=2)\
+ .addThrValue(22, -14, -14, priority=2).addThrValue(22, 14, 14, priority=2)\
+ .addThrValue(21, -15, -15, priority=2).addThrValue(21, 15, 15, priority=2)\
+ .addThrValue(23, -17, -16, priority=2).addThrValue(23, 16, 17, priority=2)\
+ .addThrValue(25, -25, -18, priority=2).addThrValue(25, 18, 25, priority=2)
LegacyThreshold( 'EM26VHI', 'EM').addThrValue(26, priority=1)\
.addThrValue(28, -7, 7, priority=2)\
- .addThrValue(27, -8, -7, priority=2).addThrValue(27, 7, 8, priority=2)\
- .addThrValue(26, -11, -8, priority=2).addThrValue(26, 8, 11, priority=2)\
- .addThrValue(25, -13, -11, priority=2).addThrValue(25, 11, 13, priority=2)\
- .addThrValue(24, -14, -13, priority=2).addThrValue(24, 13, 14, priority=2)\
- .addThrValue(23, -15, -14, priority=2).addThrValue(23, 14, 15, priority=2)\
- .addThrValue(25, -17, -15, priority=2).addThrValue(25, 15, 17, priority=2)\
- .addThrValue(27, -25, -17, priority=2).addThrValue(27, 17, 25, priority=2)
+ .addThrValue(27, -8, -8, priority=2).addThrValue(27, 8, 8, priority=2)\
+ .addThrValue(26, -11, -9, priority=2).addThrValue(26, 9, 11, priority=2)\
+ .addThrValue(25, -13, -12, priority=2).addThrValue(25, 12, 13, priority=2)\
+ .addThrValue(24, -14, -14, priority=2).addThrValue(24, 14, 14, priority=2)\
+ .addThrValue(23, -15, -15, priority=2).addThrValue(23, 15, 15, priority=2)\
+ .addThrValue(25, -17, -16, priority=2).addThrValue(25, 16, 17, priority=2)\
+ .addThrValue(27, -25, -18, priority=2).addThrValue(27, 18, 25, priority=2)
LegacyThreshold( 'EM30VHI', 'EM').addThrValue(30, priority=1)\
.addThrValue(32, -7, 7, priority=2)\
- .addThrValue(31, -8, -7, priority=2).addThrValue(31, 7, 8, priority=2)\
- .addThrValue(30, -11, -8, priority=2).addThrValue(30, 8, 11, priority=2)\
- .addThrValue(29, -13, -11, priority=2).addThrValue(29, 11, 13, priority=2)\
- .addThrValue(28, -14, -13, priority=2).addThrValue(28, 13, 14, priority=2)\
- .addThrValue(27, -15, -14, priority=2).addThrValue(27, 14, 15, priority=2)\
- .addThrValue(29, -17, -15, priority=2).addThrValue(29, 15, 17, priority=2)\
- .addThrValue(31, -29, -17, priority=2).addThrValue(31, 17, 29, priority=2)
+ .addThrValue(31, -8, -8, priority=2).addThrValue(31, 8, 8, priority=2)\
+ .addThrValue(30, -11, -9, priority=2).addThrValue(30, 9, 11, priority=2)\
+ .addThrValue(29, -13, -12, priority=2).addThrValue(29, 12, 13, priority=2)\
+ .addThrValue(28, -14, -14, priority=2).addThrValue(28, 14, 14, priority=2)\
+ .addThrValue(27, -15, -15, priority=2).addThrValue(27, 15, 15, priority=2)\
+ .addThrValue(29, -17, -16, priority=2).addThrValue(29, 16, 17, priority=2)\
+ .addThrValue(31, -29, -18, priority=2).addThrValue(31, 18, 29, priority=2)
LegacyThreshold( 'EM3HI', 'EM').addThrValue(3, priority=1)