Commit 7c4b7358 authored by Viviana Cavaliere's avatar Viviana Cavaliere Committed by Graeme Stewart
Browse files

port HIV3 updates from TriggerMenu-00-15-84 to the 82-branch (ATR-13069) (TriggerMenu-00-15-82-04)

	* Ported changes for HIV3 menu from TriggerMenu-00-15-84 (ATR-13069)
	* Requires: TrigEgammaHypo-01-01-48
	* TriggerMenu-00-15-82-04

2016-02-18  Frank Winklmeier  <fwinkl@cern>
	* python/menu/Physics_HI_v3.py: Disable Calo offset corretion for HI menus (ATR-13323)
	* Requires: TriggerJobOpts-00-05-15
	* TriggerMenu-00-15-82-03

2016-02-04  Arantxa Ruiz Martinez  <aranzazu.ruiz.martinez@cern.ch>
	* Fix in generateCombinedChainDefs.py (ATR-13319)
	* TriggerMenu-00-15-82-02

	* g22_tight added to MC_pp_v6 (ATR-13314)
	* TriggerMenu-00-15-82-01
parent 50ce0b45
......@@ -121,9 +121,9 @@ def _addDPhiMetJet(theChainDef,chainDicts,listOfChainDefs):
from TrigJetHypo.TrigEFDPhiMetJetAllTEConfig import *
DPhiMetJet_Hypo = EFDPhiMetJet_Generic("EFDPhiMetJet_J"+str(JetThr).replace(".","")+"_DPhi"+str(DPhiCut).replace(".",""),
DPhiMetJet_Hypo = EFDPhiMetJet_Generic("EFDPhiMetJet_J"+str(JetThr).replace(".","")+"_"+str(maxJets)+"DPhi"+str(DPhiCut).replace(".",""),
dPhiCut=DPhiCut, minJetEt=JetThr*1000,maxDPhiJets=maxJets)
##Get only the last MET TE
inputTEsEF = []
......@@ -186,7 +186,7 @@ def _addTransverseMass(theChainDef,chainDicts,listOfChainDefs):
from TrigEgammaHypo.TrigEFMtAllTEConfig import *
MT_Hypo = TrigEFMtAllTE_Generic("TrigEFMtAllTE_Mt"+str(MTCut).replace(".",""),
MT_Hypo = TrigEFMtAllTE_Generic("TrigEFMtAllTE_"+str(ElectronThr)+"Mt"+str(MTCut).replace(".",""),
minMtCut=MTCut,maxNbElectrons=10,minElectronEt=ElectronThr)
##Get only the last MET TE
......
......@@ -1292,12 +1292,12 @@ class L2EFChain_e(L2EFChainDef):
# these can be made more configurable later (according to tracking algorithms etc...)
if 'etcut' in self.chainPart['addInfo']:
from TrigEgammaHypo.TrigL2CaloHypoConfig import L2CaloHypo_NoCut
from TrigEgammaHypo.TrigL2CaloHypoConfig import L2CaloHypo_EtCut
from TrigEgammaHypo.TrigL2ElectronHypoConfig import L2ElectronHypo_e_NoCut
from TrigEgammaHypo.TrigEFTrackHypoConfig import EFTrackHypo_e_NoCut
from TrigEgammaHypo.TrigEFElectronHypoConfig import TrigEFElectronHypo_e_NoCut
from TrigEgammaHypo.TrigEFCaloHypoConfig import TrigEFCaloHypo_EtCut
theL2CaloHypo = L2CaloHypo_NoCut("L2CaloHypo_e"+str(threshold)+"_NoCut",threshold )
theL2CaloHypo = L2CaloHypo_EtCut("L2CaloHypo_e"+str(threshold)+"_EtCut",threshold )
theL2ElectronHypo = L2ElectronHypo_e_NoCut("L2ElectronHypo_e"+str(threshold)+"_NoCut",threshold )
theTrigEFCaloHypo = TrigEFCaloHypo_EtCut("TrigEFCaloHypo_e"+str(threshold)+"_EtCut_heavyIon",threshold);
theEFTrackHypo = EFTrackHypo_e_NoCut("EFTrackHypo_e"+str(threshold)+"_NoCut_heavyIon",threshold)
......@@ -1326,7 +1326,7 @@ class L2EFChain_e(L2EFChainDef):
logElectronDef.debug('chain suffix: %s', algoSuffix)
#if 'mvt' in algoSuffix:
# algoSuffix = algoSuffix.replace('mvt','')
from TrigEgammaHypo.TrigL2CaloHypoConfig import L2CaloHypo_NoCut
from TrigEgammaHypo.TrigL2CaloHypoConfig import L2CaloHypo_EtCut
from TrigEgammaHypo.TrigL2ElectronHypoConfig import L2ElectronHypo_e_ID
from TrigEgammaHypo.TrigEFElectronHypoConfig import TrigEFElectronHypo_e_ID_HI
from TrigEgammaHypo.TrigEFElectronHypoConfig import TrigEFElectronHypo_e_Iso
......@@ -1337,7 +1337,7 @@ class L2EFChain_e(L2EFChainDef):
from TrigEgammaHypo.TrigEFTrackHypoConfig import EFTrackHypo_e
from TrigEgammaHypo.TrigEFCaloHypoConfig import TrigEFCaloHypo_All
# L2 Calo
theL2CaloHypo = L2CaloHypo_NoCut("L2CaloHypo_e"+str(threshold)+"_NoCut",threshold )
theL2CaloHypo = L2CaloHypo_EtCut("L2CaloHypo_e"+str(threshold)+"_EtCut",threshold )
# L2 Electron
theL2ElectronHypo = L2ElectronHypo_e_ID("TrigL2ElectronHypo_e"+str(threshold)+"_"+str(IDinfo),threshold,IDinfo)
......
......@@ -220,6 +220,12 @@ class L2EFChain_HI(L2EFChainDef):
threshold = self.chainPart['extra']
UChypo=UCC_th[threshold]
chainSuffix = threshold
if 'zdcpu' in self.chainPart['pileupInfo']:
from TrigT2MinBias.TrigT2MinBiasConfig import L2MbZdcFex_LG
from TrigT2MinBias.TrigT2MinBiasConfig import L2MbZdcHypo_sideAC_zdc_LG
theL2Fex1 = L2MbZdcFex_LG
theL2Hypo1 = L2MbZdcHypo_sideAC_zdc_LG
from TrigHIHypo.UE import theUEMaker, theFSCellMaker
########### Sequence List ##############
......@@ -239,6 +245,9 @@ class L2EFChain_HI(L2EFChainDef):
[theL2Fex1], 'EF_hi_step3']]
self.EFsequenceList += [[['EF_hi_step3'],
[theL2Fex2, theL2Hypo1], 'EF_hi_step4']]
if 'zdcpu' in self.chainPart['pileupInfo']:
self.EFsequenceList += [[['EF_hi_step2'],
[theL2Fex1, theL2Hypo1], 'EF_hi_step3']]
########### Signatures ###########
......@@ -249,23 +258,20 @@ class L2EFChain_HI(L2EFChainDef):
if 'perfzdc' in self.chainPart['extra']:
self.EFsignatureList += [ [['EF_hi_step3']] ]
self.EFsignatureList += [ [['EF_hi_step4']] ]
if 'zdcpu' in self.chainPart['pileupInfo']:
self.EFsignatureList += [ [['EF_hi_step3']] ]
self.TErenamingDict = {
'L2_hi_step1': mergeRemovingOverlap('L2_hi_step1_', chainSuffix),
'EF_hi_step1_fs': mergeRemovingOverlap('EF_hi_fs_', chainSuffix),
'EF_hi_step1_ue': mergeRemovingOverlap('EF_hi_ue_', chainSuffix),
'EF_hi_step2': mergeRemovingOverlap('EF_hi_', chainSuffix),
'EF_hi_step2': mergeRemovingOverlap('EF_hi_lg_', chainSuffix),
}
if 'perfzdc' in self.chainPart['extra']:
self.TErenamingDict = {
'L2_hi_step1': mergeRemovingOverlap('L2_hi_step1_', chainSuffix),
'EF_hi_step1_fs': mergeRemovingOverlap('EF_hi_fs_', chainSuffix),
'EF_hi_step1_ue': mergeRemovingOverlap('EF_hi_ue_', chainSuffix),
'EF_hi_step2': mergeRemovingOverlap('EF_hi_', chainSuffix),
'EF_hi_step3': mergeRemovingOverlap('EF_hi_hg_', chainSuffix),
'EF_hi_step4': mergeRemovingOverlap('EF_hi_perfzdc_', chainSuffix),
}
self.TErenamingDict['EF_hi_step3'] = mergeRemovingOverlap('EF_hi_hg_', chainSuffix)
self.TErenamingDict['EF_hi_step4'] = mergeRemovingOverlap('EF_hi_', chainSuffix)
if 'zdcpu' in self.chainPart['pileupInfo']:
self.TErenamingDict['EF_hi_step3'] = mergeRemovingOverlap('EF_hi_', chainSuffix+'_zdcpu')
###########################
def setup_hi_ultraperipheral(self):
......@@ -288,7 +294,7 @@ class L2EFChain_HI(L2EFChainDef):
chainSuffix = 'tight_upc'
if 'gg' in self.chainPart['hypoL2Info']:
minPixel=0
maxPixel=25
maxPixel=10
chainSuffix = 'gg_upc'
theL2PixelHypo = L2MbSpUPC("MbPixelSpUPC_min"+str(minPixel)+'_max'+str(maxPixel), minPixel, maxPixel)
......
......@@ -68,5 +68,19 @@ JetChainsToKeepMonitoring={
"j85_test1_2j45_test1",
"j85_test2_2j45_test2",
"j85_0eta240_test1_j25_240eta490_test1",
"j85_0eta240_test2_j25_240eta490_test2"
"j85_0eta240_test2_j25_240eta490_test2",
#hi jets (these can have different L1 seeds (or be used in combined chains), must include all of them to keep the monitoring)
"j50_ion_L1TE20",
"j50_ion_L1TE50",
"j50_ion_L1J10",
"j50_ion_L1ZDC_A_C",
"mu4_j50_ion_dr05",
"mu4_j50_ion",
"j75_ion_L1TE50",
"j75_ion_L1J10",
"j75_ion_L1ZDC_A_C",
"j150_ion_L1TE50",
"j150_ion_L1J10",
"j50_320eta490_ion_L1TE20",
"j50_320eta490_ion_L1TE50"
}
......@@ -96,7 +96,14 @@ Prescales.HLTPrescales.update({})
Prescales.L1Prescales_tight_mc_prescale = deepcopy(Prescales.L1Prescales)
Prescales.HLTPrescales_tight_mc_prescale = deepcopy(Prescales.HLTPrescales)
Prescales.HLTPrescales_tight_mc_prescale.update({
'mb_idperf_ion_L1MBTS_1' : [ -1, 0, -1],
'mb_idperf_ion_L1MBTS_1' : [ -1, 0, -1],
'mb_idperf_ion_L1MBTS_1_1' : [ -1, 0, -1],
'2e10_loose_ion' : [ -1, 0, -1],
'e10_etcut_ion' : [ -1, 0, -1],
'e10_etcut' : [ -1, 0, -1],
'e12_etcut' : [ -1, 0, -1],
'e12_etcut_ion' : [ -1, 0, -1],
'e12_etcut_ion_L1EM10' : [ -1, 0, -1],
})
# ######################################################
......
......@@ -658,6 +658,8 @@ def setupMenu():
#['e24_medium1_idperf_L1EM18VH', 'L1_EM18VH', [], [PhysicsStream], ['RATE:IDMonitoring', 'BW:Egamma'],-1],
#['e24_medium1_iloose_L2StarA_L1EM18VH', 'L1_EM18VH', [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'],-1],
['g22_tight', 'L1_EM15VH', [], [PhysicsStream], ['RATE:SinglePhoton', 'BW:Egamma'],-1],
]
......
......@@ -147,6 +147,11 @@ class L2EFChain_MB(L2EFChainDef):
theL2MbtsFex=L2MbMbtsFex
theL2MbtsHypo=MbMbtsHypo("L2MbMbtsHypo_1_1_inn_veto")
if "vetombts1side2in" in self.chainPart['extra']: #do EFID
doMbtsVeto=True
theL2MbtsFex=L2MbMbtsFex
theL2MbtsHypo=MbMbtsHypo("L2MbMbtsHypo_1_1_inn_one_side_veto")
########## L2 algos ##################
#if "sptrk" or "sp" in self.chainPart['recoAlg']:
if "noisesup" in self.chainPart['extra']:
......@@ -160,7 +165,10 @@ class L2EFChain_MB(L2EFChainDef):
chainSuffix = "sp"
if doMbtsVeto:
chainSuffix = chainSuffix+"_vetombts2in"
if "vetombts2in" in self.chainPart['extra']:
chainSuffix = chainSuffix+"_vetombts2in"
if "vetombts1side2in" in self.chainPart['extra']:
chainSuffix = chainSuffix+"_vetombts1side2in"
theL2Hypo = L2MbSpHypo
......@@ -386,6 +394,17 @@ class L2EFChain_MB(L2EFChainDef):
if 'ion' in self.chainPart['extra']:
doHeavyIon=True
theL2Fex = L2MbMbtsFex
doMbtsVeto=False
if "vetombts2in" in self.chainPart['extra']: #do EFID
doMbtsVeto=True
theL2MbtsVetoHypo=MbMbtsHypo("L2MbMbtsHypo_1_1_inn_veto")
if "vetombts1side2in" in self.chainPart['extra']: #do EFID
doMbtsVeto=True
theL2MbtsVetoHypo=MbMbtsHypo("L2MbMbtsHypo_1_1_inn_one_side_veto")
########## L2 algos ##################
if "mbts" in self.chainPart['recoAlg']:
l2hypo = self.chainName
......@@ -407,40 +426,55 @@ class L2EFChain_MB(L2EFChainDef):
chainSuffix = "mbts"
theL2Fex = L2MbMbtsFex
theL2Hypo = MbMbtsHypo('L2MbMbtsHypo_'+l2HypoCut)
theL2Hypo.AcceptAll = False
theL2Hypo.TimeCut = trigT2MinBiasProperties.mbtsTimeCut()
if(len(l2HypoCut) == 1):
theL2Hypo.MbtsCounters = int(l2HypoCut)
theL2Hypo.Coincidence = False
elif(len(l2HypoCut) == 3):
L2th = l2HypoCut.split("_")[0]
if not doMbtsVeto:
theL2Hypo = MbMbtsHypo('L2MbMbtsHypo_'+l2HypoCut)
theL2Hypo.AcceptAll = False
theL2Hypo.TimeCut = trigT2MinBiasProperties.mbtsTimeCut()
if(len(l2HypoCut) == 1):
theL2Hypo.MbtsCounters = int(l2HypoCut)
theL2Hypo.Coincidence = False
elif(len(l2HypoCut) == 3):
L2th = l2HypoCut.split("_")[0]
#print 'igb: threshold: ', L2th
theL2Hypo.MbtsCounters = int(L2th)
theL2Hypo.Coincidence = True
theL2Hypo.MbtsCounters = int(L2th)
theL2Hypo.Coincidence = True
else:
logMinBiasDef.error("Something weird in the setup_mb_mbts(), please check")
else:
logMinBiasDef.error("Something weird in the setup_mb_mbts(), please check")
theL2Hypo = theL2MbtsVetoHypo
if "vetombts2in" in self.chainPart['extra']:
chainSuffix = chainSuffix+"_vetombts2in"
if "vetombts1side2in" in self.chainPart['extra']:
chainSuffix = chainSuffix+"_vetombts1side2in"
########## EF algos ##################
########### Sequence List ##############
########theL2MbtsVetoHypo### Sequence List ##############
self.L2sequenceList += [["",
[dummyRoI],
'L2_mb_step0']]
self.L2sequenceList += [[['L2_mb_step0'],
[theL2Fex, theL2Hypo],
'L2_mb_step1']]
if not doMbtsVeto:
self.L2sequenceList += [[['L2_mb_step0'],
[theL2Fex, theL2Hypo],
'L2_mb_step1']]
else:
self.L2sequenceList += [[['L2_mb_step0'],
[theL2Fex, theL2Hypo],
'L2_mb_mbtsveto']]
########### Signatures ###########
self.L2signatureList += [ [['L2_mb_step0']] ]
self.L2signatureList += [ [['L2_mb_step1']] ]
self.TErenamingDict = {
'L2_mb_step1': mergeRemovingOverlap('L2_', ''+chainSuffix+'_'+l2HypoCut),
if not doMbtsVeto:
self.L2signatureList += [ [['L2_mb_step1']] ]
self.TErenamingDict = {
'L2_mb_step1': mergeRemovingOverlap('L2_', ''+chainSuffix+'_'+l2HypoCut),
}
else:
self.L2signatureList += [ [['L2_mb_mbtsveto']] ]
self.TErenamingDict = {
'L2_mb_mbtsveto': mergeRemovingOverlap('L2_mbtsveto_', ''+chainSuffix),
}
########################### high multiplicity triggers
......
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