diff --git a/unittests/simplyGluino_default_nodesMap.py b/unittests/simplyGluino_default_nodesMap.py index 0cebf09bd..df8f315a0 100644 --- a/unittests/simplyGluino_default_nodesMap.py +++ b/unittests/simplyGluino_default_nodesMap.py @@ -64,12 +64,12 @@ 0 : 'PV', 1 : 'gluino', 2 : 'gluino', - 5 : 'N1', - 3 : 'q', + 3 : 'N1', 4 : 'q', - 8 : 'N1', - 6 : 'q', - 7 : 'q' + 5 : 'q', + 6 : 'N1', + 7 : 'q', + 8 : 'q' } }, { @@ -92,12 +92,12 @@ 0 : 'PV', 1 : 'gluino', 2 : 'gluino', - 5 : 'N1', - 3 : 'q', + 3 : 'N1', 4 : 'q', - 8 : 'N1', - 6 : 'q', - 7 : 'q' + 5 : 'q', + 6 : 'N1', + 7 : 'q', + 8 : 'q' } }, { @@ -120,12 +120,12 @@ 0 : 'PV', 1 : 'gluino', 2 : 'gluino', - 5 : 'N1', - 3 : 'q', + 3 : 'N1', 4 : 'q', - 8 : 'N1', - 6 : 'q', - 7 : 'q' + 5 : 'q', + 6 : 'N1', + 7 : 'q', + 8 : 'q' }, 'likelihood' : 1.267167e-11, 'l_max' : 0.07085462, diff --git a/unittests/summary_scan_default.txt b/unittests/summary_scan_default.txt index f9e0f605a..3ec8102c3 100644 --- a/unittests/summary_scan_default.txt +++ b/unittests/summary_scan_default.txt @@ -1,4 +1,4 @@ -#Global results summary (20 files) +#Global results summary (21 files) #The most constraining analysis corresponds to the one with largest observed r. #The most senstive (ATLAS/CMS) analysis corresponds to the one with largest expected r from those analyses for which this information is available. #Analyses used for combination = ATLAS-CONF-2013-037,CMS-SUS-13-012. @@ -8,6 +8,7 @@ T1tttt.slha CMS-PAS-SUS-15-002 30.5 -1 ATLAS-CONF-2013-037 5.92 5.47 CMS-SUS-13-012 5.82 8.24 8.87 10.4 T1ttttoff.slha CMS-PAS-SUS-15-002 8.16 -1 N/A -1 -1 CMS-SUS-13-012 0.662 0.936 0.662 0.936 T6bbHH_pyhf.slha N/A -1 -1 N/A -1 -1 N/A -1 -1 -1 -1 +TRV1_1800_300_300.slha N/A -1 -1 N/A -1 -1 N/A -1 -1 -1 -1 broken.slha N/A -1 -1 N/A -1 -1 N/A -1 -1 -1 -1 complicated.slha ATLAS-SUSY-2013-02 0.388 -1 ATLAS-CONF-2013-037 0.00183 0.00209 CMS-SUS-13-012 0.13 0.208 0.133 0.21 gluinoToTops.slha CMS-PAS-SUS-15-002 5.52 -1 ATLAS-CONF-2013-037 0.479 0.443 CMS-SUS-13-012 0.844 0.703 1.12 0.884 diff --git a/unittests/testBrowser.py b/unittests/testBrowser.py index 46479efb6..a3dcd81f9 100755 --- a/unittests/testBrowser.py +++ b/unittests/testBrowser.py @@ -22,7 +22,7 @@ class RunBrowserTest(unittest.TestCase): def testBrowser(self): browser = databaseBrowser.Browser("unittest") - self.assertEqual(len(browser),14) + self.assertEqual(len(browser),15) # Check the upper limit for the HM200 signal region: ul = browser.getULForSR(expid='ATLAS-SUSY-2018-31', datasetID='SRA_H') diff --git a/unittests/testExpSMSDict.py b/unittests/testExpSMSDict.py index c7f83bbc6..eb7175da0 100755 --- a/unittests/testExpSMSDict.py +++ b/unittests/testExpSMSDict.py @@ -25,22 +25,22 @@ def testDict(self): database.selectExpResults(useNonValidated=True) expDict = database.expSMSDict - self.assertEqual(len(list(expDict.getSMS())),71) - self.assertEqual(len(list(expDict.getTx())),550) + self.assertEqual(len(list(expDict.getSMS())),72) + self.assertEqual(len(list(expDict.getTx())),551) def testFilter(self): database.selectExpResults(analysisIDs='CMS*',useNonValidated=True) expDict = database.expSMSDict - self.assertEqual(len(list(expDict.getSMS())),35) - self.assertEqual(len(list(expDict.getTx())),438) + self.assertEqual(len(list(expDict.getSMS())),36) + self.assertEqual(len(list(expDict.getTx())),439) # Reset database: database.selectExpResults(useNonValidated=True) expDict = database.expSMSDict - self.assertEqual(len(list(expDict.getSMS())),71) - self.assertEqual(len(list(expDict.getTx())),550) + self.assertEqual(len(list(expDict.getSMS())),72) + self.assertEqual(len(list(expDict.getTx())),551) def testNodeDict(self): diff --git a/unittests/testInclusiveExpResult.py b/unittests/testInclusiveExpResult.py index 88112f361..b3c9821af 100755 --- a/unittests/testInclusiveExpResult.py +++ b/unittests/testInclusiveExpResult.py @@ -41,7 +41,7 @@ def test_expsms_inclusive(self): nodes_and_indices = getNodesIndices(expsms) self.assertEqual(nodes_and_indices, [('PV', 0), ('Inclusive', 1), ('HSCP', 2), - ('*anySM', 3), ('MET', 4)]) + ('MET', 3), ('*anySM', 4)]) self.assertTrue(isinstance(expsms.canonName,InclusiveValue)) @@ -56,8 +56,8 @@ def test_expsms_inclusive(self): matched = tx.hasSMSas(smsA) nodes_and_indices = getNodesIndices(matched) self.assertEqual(nodes_and_indices,[('PV', 0), ('gluino', 1), - ('sta_1', 2), ('W+', 3), - ('N1', 4), ('N2', 5), ('sta_1~', 6), ('q', 7), + ('sta_1', 2), ('N1', 3), + ('W+', 4), ('N2', 5), ('sta_1~', 6), ('q', 7), ('q', 8), ('W-', 9)]) @@ -66,8 +66,8 @@ def test_expsms_inclusive(self): matched = tx.hasSMSas(smsB) nodes_and_indices = getNodesIndices(matched) self.assertEqual(nodes_and_indices,[('PV', 0), ('gluino', 1), - ('sta_1', 2), ('q', 3), - ('N1', 4), ('q', 5)]) + ('sta_1', 2), ('N1', 3), + ('q', 4), ('q', 5)]) edges = getEdges(matched) self.assertEqual(edges,sorted([('PV', 'gluino'), ('PV', 'sta_1'), @@ -80,8 +80,8 @@ def test_expsms_inclusive(self): matched = tx.hasSMSas(smsC) nodes_and_indices = getNodesIndices(matched) self.assertEqual(nodes_and_indices,[('PV', 0), ('gluino', 1), - ('sta_1', 2), ('Z', 3), - ('N1', 4), ('N2', 5), + ('sta_1', 2), ('N1', 3), + ('Z', 4), ('N2', 5), ('q', 6), ('q', 7)]) smsD = '(PV > sta_1,gluino(1)), (gluino(1) > u,u~,N2(2)), (N2(2) > W-, sta_1)' @@ -100,10 +100,10 @@ def test_inclusive_dt(self): expsms = list(tx.smsMap.keys())[0] self.assertTrue(isinstance(expsms.canonName,InclusiveValue)) nodes_and_indices = getNodesIndices(expsms) - self.assertEqual(nodes_and_indices,[('PV', 0), ('C1+', 1), - ('C1-', 2), ('*anySM', 3), - ('MET', 4), ('*anySM', 5), - ('MET', 6)]) + self.assertEqual(nodes_and_indices,[('PV', 0), ('C1', 1), + ('C1', 2), ('MET', 3), + ('*anySM', 4), ('MET', 5), + ('*anySM', 6)]) smsA = '(PV > C1-(1),C1+(2)), (C1+(2) > u,N1), (C1-(1) > W-,N1)' slhafile="./testFiles/slha/longLived.slha" @@ -112,10 +112,10 @@ def test_inclusive_dt(self): smsA = ExpSMS.from_string(smsA,model=model) matched = tx.hasSMSas(smsA) nodes_and_indices = getNodesIndices(matched) - self.assertEqual(nodes_and_indices,[('PV', 0), ('C1+', 1), - ('C1-', 2), ('q', 3), - ('N1', 4), ('W-', 5), - ('N1', 6)]) + self.assertEqual(nodes_and_indices,[('PV', 0), ('C1-', 1), + ('C1+', 2), ('N1', 3), + ('W-', 4), ('N1', 5), + ('q', 6)]) edges = getEdges(matched) self.assertEqual(edges,sorted([('PV', 'C1+'), ('PV', 'C1-'), ('C1+', 'q'), ('C1+', 'N1'), @@ -126,10 +126,10 @@ def test_inclusive_dt(self): smsA = ExpSMS.from_string(smsA,model=model) matched = tx.hasSMSas(smsA) nodes_and_indices = getNodesIndices(matched) - self.assertEqual(nodes_and_indices,[('PV', 0), ('C1+', 1), - ('C1-', 2), ('q', 3), - ('N1', 4), ('q', 5), - ('N1', 6), ('nu', 7), + self.assertEqual(nodes_and_indices,[('PV', 0), ('C1-', 1), + ('C1+', 2), ('N1', 3), + ('q', 4), ('N1', 5), + ('q', 6), ('nu', 7), ('e-', 8)]) edges = getEdges(matched) self.assertEqual(edges,sorted([('C1+', 'N1'), ('C1+', 'q'),