Commit 20652648 authored by Tim Martin's avatar Tim Martin Committed by James Beacham
Browse files

Merge branch 'ExternalsUpdate-21.0-20171205' into '21.0' -- push to 21.0-mc16d


Former-commit-id: c054e93482b9179e205c7f54426788bbb7b21340
parent 37377da2
......@@ -14,7 +14,7 @@ print 'globalflags'
print globalflags
def ForwardDetectorsD3PD( alg = None,
file = "ForwardDetectordD3PD.root"
file = "ForwardDetectordD3PD.root",
tuplename = 'ForwardDetectorsD3PD',
**kw ):
......
......@@ -231,7 +231,7 @@ def getJetTileD3PDObject(objectname='JetTileD3PDObject', prefix='jet_', btagleve
prefix = 'flavor_assoctrk_',
level = _jetAssocLevel,
blockname = 'AssocTrackCont')
<
object.defineBlock(10, 'JetRoIword',
JetD3PDMaker.JetROIWordFillerTool
......
......@@ -5,5 +5,5 @@
# an "origin/" prefix before it. For tags however this is explicitly
# forbidden.
AthDerivationExternalsVersion = 1.0.17
GaudiVersion = v27r1.014
AthDerivationExternalsVersion = 1.0.27
GaudiVersion = v27r1.015
......@@ -5,5 +5,5 @@
# an "origin/" prefix before it. For tags however this is explicitly
# forbidden.
AthSimulationExternalsVersion = 1.0.17
GaudiVersion = v27r1.014
AthSimulationExternalsVersion = 1.0.27
GaudiVersion = v27r1.015
......@@ -5,5 +5,5 @@
# an "origin/" prefix before it. For tags however this is explicitly
# forbidden.
AthenaExternalsVersion = 1.0.17
AthenaExternalsVersion = 1.0.27
GaudiVersion = v27r1.015
......@@ -5,5 +5,5 @@
# an "origin/" prefix before it. For tags however this is explicitly
# forbidden.
AthenaExternalsVersion = 1.0.22
GaudiVersion = v27r1.013
AthenaExternalsVersion = 1.0.27
GaudiVersion = v27r1.015
......@@ -81,7 +81,7 @@ def getJetTracksMomentTool(**options):
)
return trkTool
def getJetClusterMomentTool(toolName="JetClusterMoments")
def getJetClusterMomentTool(toolName="JetClusterMoments"):
from JetMomentTools.JetMomentToolsConf import JetClusterMomentsTool
return JetClusterMomentsTool(toolName)
......
......@@ -51,9 +51,8 @@ class TrfBuilder:
if section == sectionName: # take only our section for sectionName into account
sectionCounter = sectionCounter + 1
for option in self.DigiRecoConfig.options(section): # loop over all settings in specified our section
#pfx += option + '=' \
#pfx += ' --' + option + '=' \
pfx += ' --' + option + ' ' \ # to support multiple values --preExec "AAA:aaa" "BBB:bbb"
# to support multiple values --preExec "AAA:aaa" "BBB:bbb"
pfx += ' --' + option + ' ' \
+ self.DigiRecoConfig.get(section, option) \
+ ' '
if sectionCounter == 0:
......
......@@ -32,7 +32,7 @@ if not hasattr( topSequence, "CBNT_AthenaAware" ):
from CBNT_Athena.CBNT_AthenaConf import *
from CBNT_Utils.CBNT_UtilsConf import *
CBNT_AthenaAware = CBNT_AthenaAware()
@ CBNT_AthenaAware.OutputLevel = 2
# CBNT_AthenaAware.OutputLevel = 2
topSequence += CBNT_AthenaAware
if not "CBNTAA_EventInfo" in topSequence.CBNT_AthenaAware.Members :
......
......@@ -79,19 +79,16 @@ class CoreLut(object):
@staticmethod
def getLutAndBit(tip):
def getLutAndBitFromTIP(tip):
tip = int(tip)
if tip>=0 tip<300:
if tip>=0 and tip<300:
lut = tip/15
bit = tip % 15
elif tip>=300 tip<504:
elif tip>=300 and tip<504:
lut = (tip-300)/12 + 20
bit = (tip-300) % 12
elif tip>=504 tip<512:
elif tip>=504 and tip<512:
lut = 37
bit = tip-504
else:
raise RuntimeError("CoreLut.py getLutAndBit(tip): tip %i does not exist" % tip)
raise RuntimeError("CoreLut.py getLutAndBitFromTIP(tip): tip %i does not exist" % tip)
return lut
......@@ -102,20 +99,15 @@ class CoreLut(object):
tip = firstTIPofConnector[ connector ] + signal
return CoreLut.getLutAndBit(tip)
return CoreLut.getLutAndBitFromTIP(tip)
@staticmethod
def isOnOneLut(connector, phase, listOfCableBits):
occupiedLuts = set([ getLutAndBit(connector,2*b + phase)[0] for b in listOfCableBits])
occupiedLuts = set([ CoreLut.getLutAndBit(connector,2*b + phase)[0] for b in listOfCableBits])
if len(occupiedLuts)>1:
raise RuntimeError("logic stretches over more than one LUT")
coreLut = CoreLut()
......@@ -629,9 +629,7 @@ class ItemDef:
LVL1MenuItem('L1_ZDC_A_BGRP7' ).setLogic(ZDC_A.x(1)&bgrp7cond).setTriggerType(TT.minb) # noqa: F821
LVL1MenuItem('L1_ZDC_C_BGRP7' ).setLogic(ZDC_C.x(1)&bgrp7cond).setTriggerType(TT.minb) # noqa: F821
LVL1MenuItem('L1_ZDC_MBTS_1' ).setLogic((ZDC_A.x(1)|ZDC_C.x(1))&( MBTS_A.x(1)| MBTS_C.x(1)) & physcond).setTriggerType(TT.minb) # noqa: F821
LVL1MenuItem('L1_ZDC_MBTS_2' ).setLogic((ZDC_A.x(1)|ZDC_C.x(1))&\ # noqa: F821
( MBTS_A.x(2)| MBTS_C.x(2)| MBTS_A.x(1))\ # noqa: F821
&( MBTS_A.x(2)| MBTS_C.x(2)| MBTS_C.x(1)) & physcond).setTriggerType(TT.minb) # noqa: F821
LVL1MenuItem('L1_ZDC_MBTS_2' ).setLogic((ZDC_A.x(1)|ZDC_C.x(1))&( MBTS_A.x(2)| MBTS_C.x(2)| MBTS_A.x(1))&( MBTS_A.x(2)| MBTS_C.x(2)| MBTS_C.x(1)) & physcond).setTriggerType(TT.minb) # noqa: F821
LVL1MenuItem('L1_ZDC_MBTS_1_1' ).setLogic((ZDC_A.x(1)|ZDC_C.x(1))&( MBTS_A.x(1)& MBTS_C.x(1)) & physcond).setTriggerType(TT.minb) # noqa: F821
LVL1MenuItem('L1_ZDC_MBTS_2_2' ).setLogic((ZDC_A.x(1)|ZDC_C.x(1))&( MBTS_A.x(2)& MBTS_C.x(2)) & physcond).setTriggerType(TT.minb) # noqa: F821
......@@ -661,7 +659,7 @@ class ItemDef:
LVL1MenuItem('L1_LUCID_UNPAIRED_ISO' ).setLogic( (LUCID_A.x(1)|LUCID_C.x(1))&unpaired_isocond).setTriggerType(TT.minb) # noqa: F821
LVL1MenuItem('L1_LUCID_UNPAIRED_NONISO' ).setLogic( (LUCID_A.x(1)|LUCID_C.x(1))&unpaired_nonisocond).setTriggerType(TT.minb) # noqa: F821
LVL1MenuItem('L1_LUCID_COMM_EMPTY' ).setLogic( NIMDIR5.x(1)&cosmiccond).setTriggerType(TT.minb) # noqa: F821
LVL1MenuItem('L1_LUCID_COMM_UNPAIRED_ISO' ).setLogic( NIMDIR5.x(1)&unpaired_isocond).setTriggerType(TT.minb)
LVL1MenuItem('L1_LUCID_COMM_UNPAIRED_ISO' ).setLogic( NIMDIR5.x(1)&unpaired_isocond).setTriggerType(TT.minb) # noqa: F821
LVL1MenuItem('L1_LUCID_A_C_UNPAIRED_ISO' ).setLogic( LUCID_A.x(1)&LUCID_C.x(1)&unpaired_isocond).setTriggerType(TT.minb) # noqa: F821
LVL1MenuItem('L1_LUCID_A_C_UNPAIRED_NONISO').setLogic( LUCID_A.x(1)&LUCID_C.x(1)&unpaired_nonisocond).setTriggerType(TT.minb) # noqa: F821
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment