diff --git a/Trigger/TrigHypothesis/TrigEgammaHypo/python/TrigEgammaPidTools.py b/Trigger/TrigHypothesis/TrigEgammaHypo/python/TrigEgammaPidTools.py
index 2b23e618fa8135fb81384575f88c79d961d52b42..075f9710ef1a9d815654877ee2bcfa5a9255c0a9 100644
--- a/Trigger/TrigHypothesis/TrigEgammaHypo/python/TrigEgammaPidTools.py
+++ b/Trigger/TrigHypothesis/TrigEgammaHypo/python/TrigEgammaPidTools.py
@@ -34,13 +34,14 @@ from ElectronPhotonSelectorTools.TrigEGammaPIDdefs import SelectionDefElectron
from ElectronPhotonSelectorTools.TrigEGammaPIDdefs import SelectionDefPhoton
# Path for versioned configuration
-ConfigFilePath = "ElectronPhotonSelectorTools/trigger/mc15_20150712/"
+ConfigFilePath = "ElectronPhotonSelectorTools/trigger/rel21_20161021/"
# Dictionaries for ToolNames
ElectronToolName = {'vloose':'AsgElectronIsEMVLooseSelector',
'loose':'AsgElectronIsEMLooseSelector',
'medium':'AsgElectronIsEMMediumSelector',
'tight':'AsgElectronIsEMTightSelector',
+ 'mergedtight':'AsgElectronIsEMMergedTightSelector',
'lhvloose':'AsgElectronLHVLooseSelector',
'lhloose':'AsgElectronLHLooseSelector',
'lhmedium':'AsgElectronLHMediumSelector',
@@ -50,6 +51,7 @@ ElectronCaloToolName = {'vloose':'AsgElectronIsEMVLooseCaloSelector',
'loose':'AsgElectronIsEMLooseCaloSelector',
'medium':'AsgElectronIsEMMediumCaloSelector',
'tight':'AsgElectronIsEMTightCaloSelector',
+ 'mergedtight':'AsgElectronIsEMMergedTightCaloSelector',
'lhvloose':'AsgElectronLHVLooseCaloSelector',
'lhloose':'AsgElectronLHLooseCaloSelector',
'lhmedium':'AsgElectronLHMediumCaloSelector',
@@ -102,6 +104,7 @@ ElectronToolConfigFile = {'vloose':'ElectronIsEMVLooseSelectorCutDefs.conf',
'loose':'ElectronIsEMLooseSelectorCutDefs.conf',
'medium':'ElectronIsEMMediumSelectorCutDefs.conf',
'tight':'ElectronIsEMTightSelectorCutDefs.conf',
+ 'mergedtight':'ElectronIsEMMergedTightSelectorCutDefs.conf',
'lhvloose':'ElectronLikelihoodVeryLooseTriggerConfig2015.conf',
'lhloose':'ElectronLikelihoodLooseTriggerConfig2015.conf',
'lhmedium':'ElectronLikelihoodMediumTriggerConfig2015.conf',
@@ -111,6 +114,7 @@ ElectronCaloToolConfigFile = {'vloose':'ElectronIsEMVLooseSelectorCutDefs.conf',
'loose':'ElectronIsEMLooseSelectorCutDefs.conf',
'medium':'ElectronIsEMMediumSelectorCutDefs.conf',
'tight':'ElectronIsEMTightSelectorCutDefs.conf',
+ 'mergedtight':'ElectronIsEMMergedTightSelectorCutDefs.conf',
'lhvloose':'ElectronLikelihoodEFCaloOnlyVeryLooseConfig2015.conf',
'lhloose':'ElectronLikelihoodEFCaloOnlyLooseConfig2015.conf',
'lhmedium':'ElectronLikelihoodEFCaloOnlyMediumConfig2015.conf',
@@ -120,6 +124,7 @@ ElectronIsEMBits = {'vloose':SelectionDefElectron.ElectronLooseHLT,
'loose':SelectionDefElectron.ElectronLooseHLT,
'medium':SelectionDefElectron.ElectronMediumHLT,
'tight':SelectionDefElectron.ElectronTightHLT,
+ 'mergedtight':SelectionDefElectron.ElectronTightHLT, #Can define separate mask
'lhvloose':SelectionDefElectron.ElectronLooseHLT,
'lhloose':SelectionDefElectron.ElectronLooseHLT,
'lhmedium':SelectionDefElectron.ElectronLooseHLT,
@@ -128,7 +133,9 @@ ElectronIsEMBits = {'vloose':SelectionDefElectron.ElectronLooseHLT,
ElectronPidName = {'vloose':egammaPID.ElectronIDLooseHLT,
'loose':egammaPID.ElectronIDLooseHLT,
'medium':egammaPID.ElectronIDMediumHLT,
- 'tight':egammaPID.ElectronIDTightHLT,}
+ 'tight':egammaPID.ElectronIDTightHLT,
+ 'mergedtight':egammaPID.ElectronIDTightHLT,
+ }
# Dictionaries for ToolNames
PhotonToolName = {'loose':'AsgPhotonIsEMLooseSelector',
diff --git a/Trigger/TrigHypothesis/TrigEgammaHypo/python/TrigL2CaloHypoCutDefs.py b/Trigger/TrigHypothesis/TrigEgammaHypo/python/TrigL2CaloHypoCutDefs.py
index 0a5853cadf8f5a7f6889cd7c5a043498182c06bd..e794b0cd84c7a79159eac20e256b4443888d188f 100644
--- a/Trigger/TrigHypothesis/TrigEgammaHypo/python/TrigL2CaloHypoCutDefs.py
+++ b/Trigger/TrigHypothesis/TrigEgammaHypo/python/TrigL2CaloHypoCutDefs.py
@@ -44,41 +44,35 @@ class L2CaloCutMaps():
self.MapsHADETthr = {
'vloose': [0.2337, 0.20976, 0.1392, 0.1872, 0.1315, 0.3234, 0.384, 0.1901, 0.1901],
'loose': [0.2337, 0.2097, 0.1392, 0.1872, 0.1255, 0.3234, 0.3840, 0.1901, 0.1901],
- 'loose1': [0.1738, 0.1696, 0.1318, 0.1738, 0.0548875, 0.1486, 0.1696, 0.1738, 0.157],
'lhvloose': [0.2337, 0.20976, 0.1392, 0.1872, 0.1315, 0.3234, 0.384, 0.1901, 0.1901],
'lhloose': [0.2337, 0.2097, 0.1392, 0.1872, 0.1255, 0.3234, 0.3840, 0.1901, 0.1901],
'medium': [0.1872, 0.1824, 0.1392, 0.1872, 0.08196 ,0.2497, 0.384, 0.19008, 0.19008],
'lhmedium': [0.1872, 0.1824, 0.1392, 0.1872, 0.08196 ,0.2497, 0.384, 0.19008, 0.19008],
- 'medium1': [0.1638, 0.1596, 0.1218, 0.1638, 0.0448875, 0.1386, 0.1596, 0.1638, 0.147],
'tight': [0.1872, 0.1824, 0.1392, 0.1872, 0.06864, 0.24972, 0.31368, 0.1872, 0.168],
'lhtight': [0.1872, 0.1824, 0.1392, 0.1872, 0.06864, 0.24972, 0.31368, 0.1872, 0.168],
- 'tight1': [0.1638, 0.1596, 0.1218, 0.1638, 0.0448875, 0.1386, 0.1596, 0.1638, 0.147],
+ 'mergedtight': [0.1872, 0.1824, 0.1392, 0.1872, 0.06864, 0.24972, 0.31368, 0.1872, 0.168],
}
self.MapsCAERATIOthr = {
'vloose': [0.48, 0.448, 0.1295, 0.0137, -9999. ,0.0122, 0.512, 0.6073, -9999],
'loose': [0.48, 0.448, 0.1295, 0.0137, -9999., 0.0122, 0.512, 0.6073, -9999],
- 'loose1': [0.57, 0.532, 0.342, 0.228, -9999., 0.304, 0.608, 0.722, -9999.],
'lhvloose': [0.48, 0.448, 0.1295, 0.0137, -9999. ,0.0122, 0.512, 0.6073, -9999],
'lhloose': [0.48, 0.448, 0.1295, 0.0137, -9999., 0.0122, 0.512, 0.6073, -9999],
'medium': [0.48, 0.448, 0.288, 0.192, -9999., 0.0176, 0.512, 0.608, -9999.],
'lhmedium': [0.48, 0.448, 0.288, 0.192, -9999., 0.0176, 0.512, 0.608, -9999.],
- 'medium1': [0.57, 0.532, 0.342, 0.228, -9999., 0.304, 0.608, 0.722, -9999.],
'tight': [0.48, 0.448, 0.288, 0.192, -9999., 0.256, 0.512, 0.608, -9999.],
'lhtight': [0.48, 0.448, 0.288, 0.192, -9999., 0.256, 0.512, 0.608, -9999.],
- 'tight1': [0.57, 0.532, 0.342, 0.228, -9999., 0.304, 0.608, 0.722, -9999.],
+ 'mergedtight': [-9999., -9999., -9999., -9999., -9999., -9999., -9999., -9999., -9999.],
}
self.MapsCARCOREthr = {
'vloose': [0.448, 0.48, 0.5414, 0.576, 0.352, 0.608, 0.576, 0.608, 0.55],
'loose': [0.6806, 0.6710, 0.6306, 0.6619, 0.4704, 0.7094, 0.7012, 0.6977, 0.6960],
- 'loose1': [0.532, 0.57, 0.646, 0.684, -9999., 0.722, 0.684, 0.722, -9999.],
'lhvloose': [0.448, 0.48, 0.5414, 0.576, 0.352, 0.608, 0.576, 0.608, 0.55],
'lhloose': [0.6806, 0.6710, 0.6306, 0.6619, 0.4704, 0.7094, 0.7012, 0.6977, 0.6960],
'medium': [0.448, 0.48, 0.544, 0.576, 0.352, 0.608, 0.576, 0.608, 0.598],
'lhmedium': [0.448, 0.48, 0.544, 0.576, 0.352, 0.608, 0.576, 0.608, 0.598],
- 'medium1': [0.532, 0.57, 0.646, 0.684, 0.418, 0.722, 0.684, 0.722, 0.70],
'tight': [0.448, 0.48, 0.544, 0.576, 0.352, 0.608, 0.576, 0.608, 0.598],
'lhtight': [0.448, 0.48, 0.544, 0.576, 0.352, 0.608, 0.576, 0.608, 0.598],
- 'tight1': [0.532, 0.57, 0.646, 0.684, 0.418, 0.722, 0.684, 0.722, 0.70],
+ 'mergedtight': [-9999., -9999., -9999., -9999., -9999., -9999., -9999., -9999., -9999.],
}
##########################
# Et 12 GeV
@@ -100,43 +94,37 @@ class L2CaloCutMaps():
if(float(threshold) >= 12. and float(threshold) < 22):
log_trigegL2.info("Configuring L2CaloCuts for mid Et %s",threshold)
self.MapsHADETthr = {
- 'loose1': [0.04225, 0.04075, 0.04575, 0.03575, 0.05275, 0.05325, 0.05525, 0.05325, 0.04675],
'vloose': [0.0871, 0.0617, 0.0564, 0.0827, 0.0889, 0.2052, 0.1674, 0.1481, 0.1481],
'loose': [0.08472, 0.05928, 0.054, 0.0803, 0.0829, 0.1932, 0.1590, 0.1384 , 0.1384],
'lhvloose': [0.0871, 0.0617, 0.0564, 0.0827, 0.0889, 0.2052, 0.1674, 0.1481, 0.1481],
'lhloose': [0.08472, 0.05928, 0.054, 0.0803, 0.0829, 0.1932, 0.1590, 0.1384 , 0.1384],
- 'medium1': [0.04225, 0.04075, 0.04575, 0.03575, 0.05275, 0.05325, 0.05525, 0.05325, 0.04675],
'medium': [0.0588, 0.0564, 0.054, 0.048, 0.06384, 0.17868, 0.1284, 0.07536, 0.07536],
'lhmedium': [0.0588, 0.0564, 0.054, 0.048, 0.06384, 0.17868, 0.1284, 0.07536, 0.07536],
'tight': [0.0588, 0.0564, 0.054, 0.048, 0.04368, 0.15612, 0.11064, 0.07536, 0.07536],
'lhtight': [0.0588, 0.0564, 0.054, 0.048, 0.04368, 0.15612, 0.11064, 0.07536, 0.07536],
- 'tight1': [0.043, 0.043, 0.043, 0.043, 0.043, 0.043, 0.043, 0.043, 0.043],
+ 'mergedtight': [0.0588, 0.0564, 0.054, 0.048, 0.04368, 0.15612, 0.11064, 0.07536, 0.07536],
}
self.MapsCARCOREthr = {
- 'loose1': [0.8275, 0.8225, 0.7975, 0.8275, -9999., 0.8075, 0.8475, 0.8475, -9999.],
'vloose': [0.6646, 0.6590, 0.6226, 0.6539, 0.4704, 0.6536, 0.6972, 0.6817, 0.672],
'loose': [0.6806, 0.6710, 0.6306, 0.6619, 0.4704, 0.6616, 0.7012, 0.6977, 0.696],
'lhvloose': [0.6646, 0.6590, 0.6226, 0.6539, 0.4704, 0.6536, 0.6972, 0.6817, 0.672],
'lhloose': [0.6806, 0.6710, 0.6306, 0.6619, 0.4704, 0.6616, 0.7012, 0.6977, 0.696],
'medium': [0.69896, 0.68416, 0.64368, 0.68488, 0.4704, 0.6816, 0.704, 0.6992, 0.6992],
'lhmedium': [0.69896, 0.68416, 0.64368, 0.68488, 0.4704, 0.6816, 0.704, 0.6992, 0.6992],
- 'medium1': [0.8275, 0.8225, 0.7975, 0.8275, -9999., 0.8075, 0.8475, 0.8475, -9999.],
'tight': [0.71296, 0.69344, 0.64368, 0.69064, 0.4704, 0.7036, 0.73024, 0.7164, 0.7164],
'lhtight': [0.71296, 0.69344, 0.64368, 0.69064, 0.4704, 0.7036, 0.73024, 0.7164, 0.7164],
- 'tight1': [0.90, 0.89, 0.89, 0.89, 0.90, 0.89, 0.89, 0.89, 0.89],
+ 'mergedtight': [-9999., -9999., -9999., -9999., -9999., -9999., -9999., -9999., -9999.],
}
self.MapsCAERATIOthr = {
'vloose': [0.5702, 0.6063, 0.4418, 0.4257, -9999. , 0.3408, 0.5836, 0.6800, -999],
'loose': [0.5702, 0.6063, 0.4418, 0.4257, -9999., 0.3408, 0.5836, 0.6800, -999],
'lhvloose': [0.5702, 0.6063, 0.4418, 0.4257, -9999. , 0.3408, 0.5836, 0.6800, -999],
'lhloose': [0.5702, 0.6063, 0.4418, 0.4257, -9999., 0.3408, 0.5836, 0.6800, -999],
- 'loose1': [0.775269, 0.735433, 0.574831, 0.513675, -9999., 0.584799, 0.776095, 0.822032, -9999.],
'medium': [0.636, 0.6064, 0.5552, 0.476, -9999., 0.5536, 0.664, 0.68 , -9999.],
'lhmedium': [0.636, 0.6064, 0.5552, 0.476, -9999., 0.5536, 0.664, 0.68 , -9999.],
- 'medium1': [0.775269, 0.735433, 0.574831, 0.513675, -9999., 0.584799, 0.776095, 0.822032, -9999.],
'tight': [0.636, 0.652, 0.5552, 0.4768, -9999., 0.6056, 0.6696, 0.7128, -9999.],
'lhtight': [0.636, 0.652, 0.5552, 0.4768, -9999., 0.6056, 0.6696, 0.7128, -9999.],
- 'tight1': [0.60, 0.70, 0.70, 0.75, 0.85, 0.90, 0.90, 0.90, 0.90],
+ 'mergedtight': [-9999., -9999., -9999., -9999., -9999., -9999., -9999., -9999., -9999.],
}
##########################
# Et 22 GeV
@@ -157,61 +145,51 @@ class L2CaloCutMaps():
'loose': [0.0588, 0.0564, 0.054, 0.048, 0.0297, 0.06, 0.06, 0.06, 0.054],
'lhvloose': [0.0612, 0.0588, 0.0564, 0.0504, 0.0357, 0.072, 0.0684, 0.0696, 0.0636],
'lhloose': [0.0588, 0.0564, 0.054, 0.048, 0.0297, 0.06, 0.06, 0.06, 0.054],
- 'loose1': [0.0275625, 0.0259875, 0.0291375, 0.0228375, 0.0259875, 0.0391125, 0.0359625, 0.0370125, 0.0291375],
'medium': [0.0588, 0.0564, 0.054, 0.048, 0.02376, 0.06, 0.06, 0.06, 0.054],
'lhmedium': [0.0588, 0.0564, 0.054, 0.048, 0.02376, 0.06, 0.06, 0.06, 0.054],
- 'medium1': [0.0256693, 0.0240023, 0.0271098, 0.0206744, 0.0211902, 0.0301758, 0.0297629, 0.0295336, 0.020514],
'tight': [0.0588, 0.0564, 0.054, 0.048, 0.02376, 0.06, 0.06, 0.06, 0.054],
'lhtight': [0.0588, 0.0564, 0.054, 0.048, 0.02376, 0.06, 0.06, 0.06, 0.054],
- 'tight1': [0.0256693, 0.0240023, 0.0271098, 0.0206744, 0.0211902, 0.0301758, 0.0297629, 0.0295336, 0.020514],
+ 'mergedtight': [0.0588, 0.0564, 0.054, 0.048, 0.02376, 0.06, 0.06, 0.06, 0.054],
}
self.MapsCARCOREthr = {
'vloose': [0.6912 , 0.6808 , 0.6832 , 0.6744 , 0.5976 , 0.6416, 0.692 , 0.6848 , 0.68],
'loose': [0.7112, 0.6968, 0.6952, 0.6864, 0.5976, 0.6616, 0.704 , 0.7008, 0.696],
'lhvloose': [0.6912 , 0.6808 , 0.6832 , 0.6744 , 0.5976 , 0.6416, 0.692 , 0.6848 , 0.68],
'lhloose': [0.7112, 0.6968, 0.6952, 0.6864, 0.5976, 0.6616, 0.704 , 0.7008, 0.696],
- 'loose1': [0.819375, 0.819375, 0.800375, 0.828875, 0.7125, 0.805125, 0.843125, 0.824125, 0.700625],
'medium': [0.716, 0.712, 0.6952, 0.692, 0.5976, 0.6816, 0.7168, 0.7128, 0.716],
'lhmedium': [0.716, 0.712, 0.6952, 0.692, 0.5976, 0.6816, 0.7168, 0.7128, 0.716],
- 'medium1': [0.882167, 0.882156, 0.857124, 0.886262, 0.724005, 0.871725, 0.902082, 0.887027, 0.744103],
'tight': [0.7288, 0.7296, 0.72, 0.7048, 0.6, 0.7128, 0.7312, 0.7256, 0.7192],
'lhtight': [0.7288, 0.7296, 0.72, 0.7048, 0.6, 0.7128, 0.7312, 0.7256, 0.7192],
- 'tight1': [0.882167, 0.882156, 0.857124, 0.886262, 0.724005, 0.871725, 0.902082, 0.887027, 0.744103],
+ 'mergedtight': [-9999., -9999., -9999., -9999., -9999., -9999., -9999., -9999., -9999.],
}
self.MapsCAERATIOthr = {
'vloose': [-999., -999., -999., -999., -999., -999., -999., -999., -999.],
'loose': [-999., -999., -999., -999., -999., -999., -999., -999., -999.],
'lhvloose': [-999., -999., -999., -999., -999., -999., -999., -999., -999.],
'lhloose': [-999., -999., -999., -999., -999., -999., -999., -999., -999.],
- 'loose1': [-999., -999., -999., -999., -999., -999., -999., -999., -999.],
'medium': [0.656, 0.66, 0.6, 0.604, -9999., 0.624, 0.664, 0.692, -9999.],
'lhmedium': [0.656, 0.66, 0.6, 0.604, -9999., 0.624, 0.664, 0.692, -9999.],
- 'medium1': [0.83009, 0.830144, 0.794944, 0.794558, -9999, 0.794933, 0.895365, 0.904011, -9999.],
'tight': [0.72, 0.712, 0.68, 0.672, -9999., 0.68, 0.716, 0.74, -9999.],
'lhtight': [0.72, 0.712, 0.68, 0.672, -9999., 0.68, 0.716, 0.74, -9999.],
- 'tight1': [0.83009, 0.830144, 0.794944, 0.794558, -9999, 0.794933, 0.895365, 0.904011, -9999.],
+ 'mergedtight': [-9999., -9999., -9999., -9999., -9999., -9999., -9999., -9999., -9999.],
}
# Following is much easier, no Et dependence
# Almost no dependence on PID
class L2CaloPhotonCutMaps():
def __init__(self):
-
self.MapsHADETthr = {
- 'loose': [0.0789, 0.0706, 0.0831, 0.0673, 0.0597, 0.0661, 0.0833, 0.0803, 0.0591],
- 'medium': [0.0789, 0.0706, 0.0831, 0.0673, 0.0597, 0.0661, 0.0833, 0.0803, 0.0591],
- 'tight': [0.0789, 0.0706, 0.0831, 0.0673, 0.0597, 0.0661, 0.0833, 0.0803, 0.0591],
- }
+ 'loose': [0.091, 0.0828, 0.0952, 0.0795, 0.0719, 0.0783, 0.0955, 0.0924, 0.0713],
+ 'medium': [0.091, 0.0828, 0.0952, 0.0795, 0.0719, 0.0783, 0.0955, 0.0924, 0.0713],
+ 'tight': [0.091, 0.0828, 0.0952, 0.0795, 0.0719, 0.0783, 0.0955, 0.0924, 0.0713],
+ }
self.MapsCARCOREthr = {
- 'loose': [0.8981, 0.8805, 0.8915, 0.8717, 0.8717, 0.8728, 0.9027, 0.8709, 0.8788],
- 'medium': [0.8981, 0.8805, 0.8915, 0.8717, 0.8717, 0.8728, 0.9027, 0.8709, 0.8788],
- 'tight': [0.8981, 0.8805, 0.8915, 0.8717, 0.8717, 0.8728, 0.9027, 0.8709, 0.8788],
+ 'loose': [0.8852, 0.8676, 0.8785, 0.8588, 0.8588, 0.8599, 0.8898, 0.8579, 0.8659],
+ 'medium': [0.8852, 0.8676, 0.8785, 0.8588, 0.8588, 0.8599, 0.8898, 0.8579, 0.8659],
+ 'tight': [0.8852, 0.8676, 0.8785, 0.8588, 0.8588, 0.8599, 0.8898, 0.8579, 0.8659],
}
self.MapsCAERATIOthr = {
'loose': [-999., -999., -999., -999., -999., -999., -999., -999., -999.],
- 'medium': [0.7266, 0.7625, 0.7402, 0.6861, 0.6861, 0.7453, 0.5746, 0.4539, 0.6761],
- 'tight': [0.7266, 0.7625, 0.7402, 0.6861, 0.6861, 0.7453, 0.5746, 0.4539, 0.6761],
- }
-
-
-
+ 'medium': [0.4655, 0.4014, 0.4091, 0.39, 0.4249, 0.4842, 0.205, 0.3927, 0.415],
+ 'tight': [0.4655, 0.4014, 0.4091, 0.39, 0.4249, 0.4842, 0.205, 0.3927, 0.415],
+ }
diff --git a/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigEFCaloCalibFex.cxx b/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigEFCaloCalibFex.cxx
index 49c86774eab1ad5b3ec646536ee7cd0e8d687ce9..7aa9fba96745aba06e601e71bc8e05a4c449414c 100755
--- a/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigEFCaloCalibFex.cxx
+++ b/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigEFCaloCalibFex.cxx
@@ -129,13 +129,13 @@ HLT::ErrorCode TrigEFCaloCalibFex::hltExecute(const HLT::TriggerElement* inputTE
std::vector<const xAOD::CaloClusterContainer*> vectorClusterContainer;
stat = getFeatures(inputTE, vectorClusterContainer);
if ( stat!= HLT::OK ) {
- msg() << MSG::ERROR << " REGTEST: No CaloClusterContainers retrieved for the trigger element" << endreq;
+ msg() << MSG::ERROR << " REGTEST: No CaloClusterContainers retrieved for the trigger element" << endmsg;
return HLT::OK;
}
//debug message
if ( msgLvl() <= MSG::VERBOSE)
msg() << MSG::VERBOSE << " REGTEST: Got " << vectorClusterContainer.size()
- << " CaloClusterContainers associated to the TE " << endreq;
+ << " CaloClusterContainers associated to the TE " << endmsg;
// Check that there is only one ClusterContainer in the RoI
if (vectorClusterContainer.size() != 1){
@@ -143,7 +143,7 @@ HLT::ErrorCode TrigEFCaloCalibFex::hltExecute(const HLT::TriggerElement* inputTE
msg() << MSG::ERROR
<< "REGTEST: Size of vectorClusterContainer is not 1, it is: "
<< vectorClusterContainer.size()
- << endreq;
+ << endmsg;
//return HLT::BAD_JOB_SETUP;
return HLT::OK;
}
@@ -154,13 +154,13 @@ HLT::ErrorCode TrigEFCaloCalibFex::hltExecute(const HLT::TriggerElement* inputTE
if ( msgLvl() <= MSG::ERROR )
msg() << MSG::ERROR
<< " REGTEST: Retrieval of CaloClusterContainer from vector failed"
- << endreq;
+ << endmsg;
//return HLT::BAD_JOB_SETUP;
return HLT::OK;
}
if(msgLvl() <= MSG::DEBUG) msg() << MSG::DEBUG
- << clusContainer->size() << " calo clusters in container" << endreq;
+ << clusContainer->size() << " calo clusters in container" << endmsg;
if(clusContainer->size() < 1){
return HLT::OK;
@@ -169,17 +169,17 @@ HLT::ErrorCode TrigEFCaloCalibFex::hltExecute(const HLT::TriggerElement* inputTE
m_pCaloClusterContainer = new xAOD::CaloClusterContainer();
std::string clusterCollKey = "";
- msg() << MSG::DEBUG << "CaloClusterContainer is stored with key = " << m_persKey << endreq;
+ msg() << MSG::DEBUG << "CaloClusterContainer is stored with key = " << m_persKey << endmsg;
- // msg() << MSG::DEBUG << store()->dump() << endreq;
+ // msg() << MSG::DEBUG << store()->dump() << endmsg;
HLT::ErrorCode sc = getUniqueKey( m_pCaloClusterContainer, clusterCollKey, m_persKey );
if (sc != HLT::OK) {
- msg() << MSG::DEBUG << "Could not retrieve the cluster collection key" << endreq;
+ msg() << MSG::DEBUG << "Could not retrieve the cluster collection key" << endmsg;
return sc;
}
if (store()->record (m_pCaloClusterContainer, clusterCollKey).isFailure()) {
- msg() << MSG::ERROR << "recording CaloClusterContainer with key <" << clusterCollKey << "> failed" << endreq;
+ msg() << MSG::ERROR << "recording CaloClusterContainer with key <" << clusterCollKey << "> failed" << endmsg;
delete m_pCaloClusterContainer;
return HLT::TOOL_FAILURE;
}
@@ -205,7 +205,7 @@ HLT::ErrorCode TrigEFCaloCalibFex::hltExecute(const HLT::TriggerElement* inputTE
if (vectorCellContainer.size() != 1){
msg() << MSG::ERROR
<< "REGTEST: Size of calo cell container vector is not 1 but " << vectorCellContainer.size()
- << endreq;
+ << endmsg;
return HLT::ERROR;
}
else{
@@ -294,13 +294,13 @@ HLT::ErrorCode TrigEFCaloCalibFex::hltExecute(const HLT::TriggerElement* inputTE
pass = true;
if ( msgLvl() <= MSG::DEBUG ) {
msg() << MSG::DEBUG << "AcceptAll property is set: taking all events"
- << endreq;
+ << endmsg;
}
} else {
pass = false;
if ( msgLvl() <= MSG::DEBUG ) {
msg() << MSG::DEBUG << "AcceptAll property not set: applying selection"
- << endreq;
+ << endmsg;
}
}
@@ -308,11 +308,11 @@ HLT::ErrorCode TrigEFCaloCalibFex::hltExecute(const HLT::TriggerElement* inputTE
clusterCollKey, msg());
if ( !status ) {
- msg() << MSG::ERROR << "recording CaloClusterContainer with key <" << clusterCollKey << "> failed" << endreq;
+ msg() << MSG::ERROR << "recording CaloClusterContainer with key <" << clusterCollKey << "> failed" << endmsg;
return HLT::TOOL_FAILURE;
} else {
if(msgLvl() <= MSG::DEBUG)
- msg() << MSG::DEBUG << " REGTEST: Recorded the cluster container in the RoI " << endreq;
+ msg() << MSG::DEBUG << " REGTEST: Recorded the cluster container in the RoI " << endmsg;
}
std::string aliasKey = "";
@@ -321,14 +321,14 @@ HLT::ErrorCode TrigEFCaloCalibFex::hltExecute(const HLT::TriggerElement* inputTE
if (stat != HLT::OK) {
msg() << MSG::ERROR
<< "Write of RoI Cluster Container into outputTE failed"
- << endreq;
+ << endmsg;
return HLT::NAV_ERROR;
}
// set output TriggerElement unless acceptAll is set
if (!m_acceptAll) pass = result;
- if ( msgLvl() <= MSG::DEBUG ) msg() << MSG::DEBUG << "acceptInput = " << pass << endreq;
+ if ( msgLvl() <= MSG::DEBUG ) msg() << MSG::DEBUG << "acceptInput = " << pass << endmsg;
// Time total TrigEFCaloHypo execution time.
// -------------------------------------
@@ -342,15 +342,15 @@ std::string TrigEFCaloCalibFex::retrieveCellContName( const HLT::TriggerElement*
std::vector<const CaloCellContainer*> vectorOfCellContainers;
if( getFeatures(inputTE, vectorOfCellContainers, "") != HLT::OK) {
- msg() << MSG::ERROR << "Failed to get TrigCells" << endreq;
+ msg() << MSG::ERROR << "Failed to get TrigCells" << endmsg;
return "";
}
- msg() << MSG::DEBUG << "Got vector with " << vectorOfCellContainers.size() << " CellContainers" << endreq;
+ msg() << MSG::DEBUG << "Got vector with " << vectorOfCellContainers.size() << " CellContainers" << endmsg;
// if no containers were found, just leave the vector empty and leave
if ( vectorOfCellContainers.size() < 1) {
- msg() << MSG::ERROR << "No cells to analyse, leaving!" << endreq;
+ msg() << MSG::ERROR << "No cells to analyse, leaving!" << endmsg;
return "";
}
@@ -360,13 +360,13 @@ std::string TrigEFCaloCalibFex::retrieveCellContName( const HLT::TriggerElement*
// All this only to retrieve the key :
std::string cellCollKey;
if ( getStoreGateKey( theCellCont, cellCollKey) != HLT::OK) {
- msg() << MSG::ERROR << "Failed to get key for TrigCells" << endreq;
+ msg() << MSG::ERROR << "Failed to get key for TrigCells" << endmsg;
return "";
}
if(msgLvl() <= MSG::DEBUG) {
- msg() << MSG::DEBUG << " REGTEST: Retrieved the cell container in the RoI " << endreq;
- msg() << MSG::DEBUG << " REGTEST: Retrieved a Cell Container of Size= " << theCellCont->size() << endreq;
+ msg() << MSG::DEBUG << " REGTEST: Retrieved the cell container in the RoI " << endmsg;
+ msg() << MSG::DEBUG << " REGTEST: Retrieved a Cell Container of Size= " << theCellCont->size() << endmsg;
}
return cellCollKey;
diff --git a/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigEFCaloHypo.cxx b/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigEFCaloHypo.cxx
index b12a77e92225c2db1208719978e30cf5da06ec97..f11f5a00d7eafe8169e3fd3f370866e7b37f999b 100755
--- a/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigEFCaloHypo.cxx
+++ b/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigEFCaloHypo.cxx
@@ -257,13 +257,13 @@ HLT::ErrorCode TrigEFCaloHypo::hltExecute(const HLT::TriggerElement* outputTE,
if ( msgLvl() <= MSG::ERROR )
msg() << MSG::ERROR
<< " REGTEST: Retrieval of CaloClusterContainer from vector failed"
- << endreq;
+ << endmsg;
//return HLT::BAD_JOB_SETUP;
return HLT::OK;
}
if(msgLvl() <= MSG::DEBUG) msg() << MSG::DEBUG
- << clusContainer->size() << " calo clusters in container" << endreq;
+ << clusContainer->size() << " calo clusters in container" << endmsg;
if(clusContainer->size() < 1){
return HLT::OK;
diff --git a/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigEFElectronHypo.cxx b/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigEFElectronHypo.cxx
index 4d09b62a3f6ff19d7d232439036b53f684ea5393..846baf0e2d331dfab9579b6c1c879d8d12546280 100755
--- a/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigEFElectronHypo.cxx
+++ b/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigEFElectronHypo.cxx
@@ -347,7 +347,7 @@ HLT::ErrorCode TrigEFElectronHypo::hltBeginRun() {
HLT::ErrorCode TrigEFElectronHypo::hltFinalize(){
// ----------------------------------------------------------------------
- msg() << MSG::INFO << "in finalize()" << endreq;
+ msg() << MSG::INFO << "in finalize()" << endmsg;
return HLT::OK;
}
@@ -454,7 +454,7 @@ HLT::ErrorCode TrigEFElectronHypo::hltExecute(const HLT::TriggerElement* outputT
Ncand[cutIndex++]++;
- if(msgLvl() <= MSG::DEBUG) msg() << MSG::DEBUG << "REGTEST Ncand[0]: " << Ncand[0] << endreq;
+ if(msgLvl() <= MSG::DEBUG) msg() << MSG::DEBUG << "REGTEST Ncand[0]: " << Ncand[0] << endmsg;
if(m_acceptAll){
xBits->markPassing(egIt,m_EgammaContainer,true);
continue;
@@ -513,7 +513,7 @@ HLT::ErrorCode TrigEFElectronHypo::hltExecute(const HLT::TriggerElement* outputT
if(msgLvl() <= MSG::DEBUG) msg() << MSG::DEBUG
<<" isEMTrig = "
<< std::hex << isEMTrig
- << endreq;
+ << endmsg;
unsigned int isEMbit=0;
ATH_MSG_DEBUG("isEMVLoose " << egIt->selectionisEM(isEMbit,"isEMVLoose"));
ATH_MSG_DEBUG("isEMVLoose " << std::hex << isEMbit);
@@ -592,7 +592,7 @@ HLT::ErrorCode TrigEFElectronHypo::hltExecute(const HLT::TriggerElement* outputT
}
else{
- if(msgLvl() <= MSG::DEBUG) msg() << MSG::DEBUG << "Apply Isolation" << endreq;
+ if(msgLvl() <= MSG::DEBUG) msg() << MSG::DEBUG << "Apply Isolation" << endmsg;
//--Declare vectors of isolation variables for different cone sizes
std::vector<float> EtCone, PtCone;
@@ -621,17 +621,17 @@ HLT::ErrorCode TrigEFElectronHypo::hltExecute(const HLT::TriggerElement* outputT
//printout
if(msgLvl() <= MSG::DEBUG) {
- msg() << MSG::DEBUG << "Absolute Calo Isolation (vector size = " << EtCone.size() << ") :" << endreq;
+ msg() << MSG::DEBUG << "Absolute Calo Isolation (vector size = " << EtCone.size() << ") :" << endmsg;
for(std::size_t iConeSize = 0; iConeSize < EtCone.size(); iConeSize++) {
msg() << MSG::DEBUG << "*** " << m_mapEtCone[iConeSize]
<< ", Cut = " << m_EtConeCut[iConeSize]
- << ", Value = " << EtCone[iConeSize] << endreq;
+ << ", Value = " << EtCone[iConeSize] << endmsg;
}
- msg() << MSG::DEBUG << "Absolute Track Isolation (vector size = " << PtCone.size()<< ") :" << endreq;
+ msg() << MSG::DEBUG << "Absolute Track Isolation (vector size = " << PtCone.size()<< ") :" << endmsg;
for(std::size_t iConeSize = 0; iConeSize < PtCone.size(); iConeSize++) {
msg() << MSG::DEBUG << "*** " << m_mapPtCone[iConeSize]
<< ", Cut = " << m_PtConeCut[iConeSize]
- << ", Value = " << PtCone[iConeSize] << endreq;
+ << ", Value = " << PtCone[iConeSize] << endmsg;
}
}
@@ -704,11 +704,11 @@ HLT::ErrorCode TrigEFElectronHypo::hltExecute(const HLT::TriggerElement* outputT
}
if(m_useClusETforTrackIso) {
trkIso_ele_pt=ele_clus_pt;
- msg() << MSG::DEBUG << "For Relative Track Isolation use ele_clus_pt = " << trkIso_ele_pt << endreq;
+ msg() << MSG::DEBUG << "For Relative Track Isolation use ele_clus_pt = " << trkIso_ele_pt << endmsg;
}
else {
trkIso_ele_pt=ele_trk_pt;
- msg() << MSG::DEBUG << "For Relative Track Isolation use ele_trk_pt = " << trkIso_ele_pt << endreq;
+ msg() << MSG::DEBUG << "For Relative Track Isolation use ele_trk_pt = " << trkIso_ele_pt << endmsg;
}
@@ -729,17 +729,17 @@ HLT::ErrorCode TrigEFElectronHypo::hltExecute(const HLT::TriggerElement* outputT
//printout
if(msgLvl() <= MSG::DEBUG) {
- msg() << MSG::DEBUG << "Relative Calo Isolation (vector size = " << RelEtCone.size()<< ") :" << endreq;
+ msg() << MSG::DEBUG << "Relative Calo Isolation (vector size = " << RelEtCone.size()<< ") :" << endmsg;
for(std::size_t iConeSize = 0; iConeSize < RelEtCone.size(); iConeSize++) {
msg() << MSG::DEBUG << "*** " << m_mapRelEtCone[iConeSize]
<< ", Cut = " << m_RelEtConeCut[iConeSize]
- << ", Value = " << RelEtCone[iConeSize] << endreq;
+ << ", Value = " << RelEtCone[iConeSize] << endmsg;
}
- msg() << MSG::DEBUG << "Relative Track Isolation Cuts (vector size = " << RelPtCone.size()<< ") :" << endreq;
+ msg() << MSG::DEBUG << "Relative Track Isolation Cuts (vector size = " << RelPtCone.size()<< ") :" << endmsg;
for(std::size_t iConeSize = 0; iConeSize < RelPtCone.size(); iConeSize++) {
msg() << MSG::DEBUG << "*** " << m_mapRelPtCone[iConeSize]
<< ", Cut = " << m_RelPtConeCut[iConeSize]
- << ", Value = " << RelPtCone[iConeSize] << endreq;
+ << ", Value = " << RelPtCone[iConeSize] << endmsg;
}
}
@@ -826,7 +826,7 @@ double TrigEFElectronHypo::findImpact(const xAOD::TrackParticle* track) const
m_trackToVertexTool->perigeeAtBeamspot(*track);
if (perigee==0) {
- if(msgLvl() <= MSG::WARNING) msg() << MSG::WARNING <<"No perigee using beam spot; no d0 calculation"<<endreq;
+ if(msgLvl() <= MSG::WARNING) msg() << MSG::WARNING <<"No perigee using beam spot; no d0 calculation"<<endmsg;
perigee = m_trackToVertexTool->perigeeAtVertex(*track, m_primaryVertex);
}
diff --git a/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigEFMtAllTE.cxx b/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigEFMtAllTE.cxx
index be5058b3323ed85bcc8c391735a6910bb68f2588..a6f260a707712c2bfcd4dcc06470a08025093cdf 100755
--- a/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigEFMtAllTE.cxx
+++ b/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigEFMtAllTE.cxx
@@ -50,7 +50,7 @@ HLT::ErrorCode TrigEFMtAllTE::hltExecute(std::vector<HLT::TEVec>& inputs, unsign
HLT::TriggerElement* outputTE = makeOutputTE(inputs, type_out);
if (outputTE && inputs.size() != 2) {
msg() << MSG::WARNING << "OutputTE is null or input TE size not two"
- << endreq;
+ << endmsg;
return HLT::OK;
}
@@ -65,12 +65,12 @@ HLT::ErrorCode TrigEFMtAllTE::hltExecute(std::vector<HLT::TEVec>& inputs, unsign
m_mt_electron1_pass = -999;
if(tes1.size() == 0) {
- msg() << MSG::WARNING << "No MET TE found" << endreq;
+ msg() << MSG::WARNING << "No MET TE found" << endmsg;
return HLT::MISSING_FEATURE;
}
if(tes2.size() == 0) {
- msg() << MSG::WARNING << "No jet TE found" << endreq;
+ msg() << MSG::WARNING << "No jet TE found" << endmsg;
return HLT::MISSING_FEATURE;
}
@@ -79,11 +79,11 @@ HLT::ErrorCode TrigEFMtAllTE::hltExecute(std::vector<HLT::TEVec>& inputs, unsign
std::vector<const xAOD::TrigMissingET*> v_met;
HLT::ErrorCode statMET = getFeatures(tes1.front(), v_met);
if(statMET != HLT::OK) {
- msg() << MSG::WARNING << " Failed to get vectorMissingETs " << endreq;
+ msg() << MSG::WARNING << " Failed to get vectorMissingETs " << endmsg;
return HLT::OK;
}
if(v_met.size() == 0){
- msg() << MSG::WARNING << " Failed to get vectorMissingETs " << endreq;
+ msg() << MSG::WARNING << " Failed to get vectorMissingETs " << endmsg;
return HLT::MISSING_FEATURE;
}
@@ -96,17 +96,17 @@ HLT::ErrorCode TrigEFMtAllTE::hltExecute(std::vector<HLT::TEVec>& inputs, unsign
const xAOD::ElectronContainer* outEle=0;
HLT::ErrorCode statEles = getFeature(tes2.front(), outEle);
if(statEles != HLT::OK) {
- msg() << MSG::WARNING << " Failed to get Electrons " << endreq;
+ msg() << MSG::WARNING << " Failed to get Electrons " << endmsg;
return HLT::OK;
}
if(outEle == 0){
- msg() << MSG::DEBUG << " Got no Electrons associated to the TE! " << endreq;
+ msg() << MSG::DEBUG << " Got no Electrons associated to the TE! " << endmsg;
return HLT::MISSING_FEATURE;
}
const xAOD::TrigPassBits* bits(0);
HLT::ErrorCode status = getFeature(tes2.front(), bits, "passbits");
if (status != HLT::OK) {
- msg() << MSG::WARNING << " Failed to get TrigPassBits " << endreq;
+ msg() << MSG::WARNING << " Failed to get TrigPassBits " << endmsg;
return HLT::MISSING_FEATURE;
}
@@ -117,7 +117,7 @@ HLT::ErrorCode TrigEFMtAllTE::hltExecute(std::vector<HLT::TEVec>& inputs, unsign
if(!bits->isPassing( aEle, outEle )) {
if (msgLvl() <= MSG::DEBUG) {
- msg() << MSG::DEBUG << "Electron found not passing Hypo object" << endreq;
+ msg() << MSG::DEBUG << "Electron found not passing Hypo object" << endmsg;
}
continue;
}
@@ -131,8 +131,8 @@ HLT::ErrorCode TrigEFMtAllTE::hltExecute(std::vector<HLT::TEVec>& inputs, unsign
float mt = sqrt(2*elept*met*(1-cos(delta_phi)));
if (msgLvl() <= MSG::DEBUG) {
- msg() << MSG::DEBUG << "Electron pt " << elept << " MeV, MT: " << mt << " MeV, MET: " << met << " MeV" << endreq;
- msg() << MSG::DEBUG << "Electron pt cut " << m_MinElectronEt*CLHEP::GeV << " MeV, MT cut: " << m_MinMtCut*CLHEP::GeV << " MeV" << endreq;
+ msg() << MSG::DEBUG << "Electron pt " << elept << " MeV, MT: " << mt << " MeV, MET: " << met << " MeV" << endmsg;
+ msg() << MSG::DEBUG << "Electron pt cut " << m_MinElectronEt*CLHEP::GeV << " MeV, MT cut: " << m_MinMtCut*CLHEP::GeV << " MeV" << endmsg;
}
if(electron_counter == 0) {
@@ -154,7 +154,7 @@ HLT::ErrorCode TrigEFMtAllTE::hltExecute(std::vector<HLT::TEVec>& inputs, unsign
}
if (msgLvl() <= MSG::DEBUG) {
- msg() << MSG::DEBUG << "Decision: " << pass << endreq;
+ msg() << MSG::DEBUG << "Decision: " << pass << endmsg;
}
if (pass) outputTE->setActiveState(true);
diff --git a/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigEFPhotonHypo.cxx b/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigEFPhotonHypo.cxx
index b64d40df0ea2c077b955145488f5f4cc96a49550..b911dce21e9afd5db19be4341dac08e3739c25ac 100755
--- a/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigEFPhotonHypo.cxx
+++ b/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigEFPhotonHypo.cxx
@@ -49,6 +49,8 @@
#include "PATCore/TResult.h" // for TResult
// to add TrigPassBits
#include "xAODTrigger/TrigPassBits.h"
+using std::string;
+
namespace {
template <class DEST,class SRC>
inline DEST** my_pp_cast(SRC** ptr) {
@@ -156,7 +158,7 @@ TrigEFPhotonHypo::~TrigEFPhotonHypo()
HLT::ErrorCode TrigEFPhotonHypo::hltInitialize()
{
if(msgLvl() <= MSG::DEBUG)
- msg() << MSG::DEBUG << "in initialize()" << endreq;
+ msg() << MSG::DEBUG << "in initialize()" << endmsg;
if (timerSvc())
m_totalTimer = addTimer("TrigEFPhotonHypoTot");
@@ -173,18 +175,18 @@ HLT::ErrorCode TrigEFPhotonHypo::hltInitialize()
m_egammaPhotonCutIDTool=ToolHandle<IAsgPhotonIsEMSelector>(m_egammaPhotonCutIDToolName);
if(m_egammaPhotonCutIDTool.retrieve().isFailure()) {
msg() << MSG::ERROR << "Unable to retrieve " << m_egammaPhotonCutIDTool
- << " tool " << endreq;
+ << " tool " << endmsg;
return HLT::BAD_JOB_SETUP;
}
else {
- msg()<<MSG::DEBUG<<"Tool " << m_egammaPhotonCutIDTool << " retrieved"<<endreq;
+ msg()<<MSG::DEBUG<<"Tool " << m_egammaPhotonCutIDTool << " retrieved"<<endmsg;
//timing
if (timerSvc()) m_timerPIDTool_Pho = addTimer("m_egammaPhotonCutIDToolName");
}
}
//print summary info
- msg() << MSG::INFO << "REGTEST: Particle Identification tool: " << m_egammaPhotonCutIDToolName << endreq;
+ msg() << MSG::INFO << "REGTEST: Particle Identification tool: " << m_egammaPhotonCutIDToolName << endmsg;
//------------------------------------------------------------------------------
//Check Isolation Cone Sizes
@@ -215,7 +217,7 @@ HLT::ErrorCode TrigEFPhotonHypo::hltInitialize()
if(msgLvl() <= MSG::DEBUG)
msg() << MSG::DEBUG
<< "Initialization of TrigEFPhotonHypo completed successfully"
- << endreq;
+ << endmsg;
return HLT::OK;
}
@@ -231,7 +233,7 @@ HLT::ErrorCode TrigEFPhotonHypo::hltBeginRun() {
HLT::ErrorCode TrigEFPhotonHypo::hltFinalize(){
// ----------------------------------------------------------------------
- msg() << MSG::INFO << "in finalize()" << endreq;
+ msg() << MSG::INFO << "in finalize()" << endmsg;
return HLT::OK;
}
@@ -269,19 +271,19 @@ HLT::ErrorCode TrigEFPhotonHypo::hltExecute(const HLT::TriggerElement* outputTE,
if (stat != HLT::OK ) {
msg() << MSG::WARNING
<< " Failed to get xAOD::PhotonContainer's from the trigger element"
- << endreq;
+ << endmsg;
if (timerSvc()) m_totalTimer->stop();
return HLT::OK;
}
if(msgLvl() <= MSG::DEBUG)
msg() << MSG::DEBUG << "REGTEST: Got " << vectorEgammaContainers.size()
- << " xAOD::PhotonContainers's associated to the TE " << endreq;
+ << " xAOD::PhotonContainers's associated to the TE " << endmsg;
if (vectorEgammaContainers.size() < 1) {
msg() << MSG::DEBUG
<< " empty xAOD::PhotonContainer from the trigger element"
- << endreq;
+ << endmsg;
if (timerSvc()) m_totalTimer->stop();
return HLT::OK;
}
@@ -292,7 +294,7 @@ HLT::ErrorCode TrigEFPhotonHypo::hltExecute(const HLT::TriggerElement* outputTE,
if ( msgLvl() <= MSG::ERROR )
msg() << MSG::ERROR
<< " REGTEST: Retrieval of xOAD::PhotonContainer from vector failed"
- << endreq;
+ << endmsg;
if (timerSvc()) m_totalTimer->stop();
return HLT::OK;
}
@@ -348,21 +350,21 @@ HLT::ErrorCode TrigEFPhotonHypo::hltExecute(const HLT::TriggerElement* outputTE,
ATH_MSG_DEBUG(" Applying HIGH Lumi Cuts on Photons");
// re-run the Offline isEM for Photons
if (m_egammaPhotonCutIDTool == 0) {
- msg() << MSG::ERROR << m_egammaPhotonCutIDTool << " null, hypo continues but no isEM cut applied" << endreq;
+ msg() << MSG::ERROR << m_egammaPhotonCutIDTool << " null, hypo continues but no isEM cut applied" << endmsg;
}else{
if (timerSvc()) m_timerPIDTool_Pho->start(); //timer
if ( m_egammaPhotonCutIDTool->accept(egIt) ) {
if(msgLvl() <= MSG::DEBUG) msg() << MSG::DEBUG
<< "passes PID egammaPhotonCutIDTool with TAccept"
- << endreq;
+ << endmsg;
}
// Get isEM value from m_egammaPhotonCutIDTool->IsemValue(), not from (*egIt)->isem()
- if(msgLvl() <= MSG::DEBUG) msg() << MSG::DEBUG <<" IsemValue() = "<< m_egammaPhotonCutIDTool->IsemValue()<< endreq;
+ if(msgLvl() <= MSG::DEBUG) msg() << MSG::DEBUG <<" IsemValue() = "<< m_egammaPhotonCutIDTool->IsemValue()<< endmsg;
isEMTrig = m_egammaPhotonCutIDTool->IsemValue();
if(msgLvl() <= MSG::DEBUG) msg() << MSG::DEBUG
<<" isEMTrig = "
<< std::hex << isEMTrig
- << endreq;
+ << endmsg;
if (timerSvc()) m_timerPIDTool_Pho->stop(); //timer
}
//-------------------------------------------------------------
@@ -374,7 +376,7 @@ HLT::ErrorCode TrigEFPhotonHypo::hltExecute(const HLT::TriggerElement* outputTE,
if( (isEMTrig & m_IsEMrequiredBits)!=0 ) {
if(msgLvl() <= MSG::DEBUG) msg() << MSG::DEBUG << "REGTEST IsEM = " << std::hex << isEMTrig
- << " cut not satisfied for pattern:" << std::hex << m_IsEMrequiredBits << endreq;
+ << " cut not satisfied for pattern:" << std::hex << m_IsEMrequiredBits << endmsg;
continue;
}
@@ -404,13 +406,13 @@ HLT::ErrorCode TrigEFPhotonHypo::hltExecute(const HLT::TriggerElement* outputTE,
const xAOD::CaloCluster* clus = egIt->caloCluster();
if(!clus) {
if(msgLvl() <= MSG::DEBUG)
- msg() << MSG::DEBUG << "REGTEST no cluster pointer in egamma object " << endreq;
+ msg() << MSG::DEBUG << "REGTEST no cluster pointer in egamma object " << endmsg;
continue;
}
Ncand[4]++;
if( clus->et() < m_emEt) {
if(msgLvl() <= MSG::DEBUG)
- msg() << MSG::DEBUG << "REGTEST Et cut no satisfied: "<< clus->et() << "< cut: " << m_emEt << endreq;
+ msg() << MSG::DEBUG << "REGTEST Et cut no satisfied: "<< clus->et() << "< cut: " << m_emEt << endmsg;
continue;
}
Ncand[5]++;
@@ -520,7 +522,7 @@ HLT::ErrorCode TrigEFPhotonHypo::hltExecute(const HLT::TriggerElement* outputTE,
if(msgLvl() <= MSG::DEBUG) {
- msg() << MSG::DEBUG << "REGTEST: Result = " <<(pass ? "passed" : "failed")<< endreq;
+ msg() << MSG::DEBUG << "REGTEST: Result = " <<(pass ? "passed" : "failed")<< endmsg;
}
if(attachFeature(outputTE, xBits.release(),"passbits") != HLT::OK)
diff --git a/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigEFTrackHypo.cxx b/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigEFTrackHypo.cxx
index d31f78d0461c22823977724c4794406c53ca75a2..8714e162397fa0c750691ba3807aa97012d065e4 100755
--- a/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigEFTrackHypo.cxx
+++ b/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigEFTrackHypo.cxx
@@ -84,7 +84,7 @@ TrigEFTrackHypo::~TrigEFTrackHypo()
//----------------------------------------------------------------------------
HLT::ErrorCode TrigEFTrackHypo::hltBeginRun(){
- msg() << MSG::INFO << "TrigEFTrackHypo::beginRun()" << endreq;
+ msg() << MSG::INFO << "TrigEFTrackHypo::beginRun()" << endmsg;
return HLT::OK;
}
@@ -94,11 +94,11 @@ HLT::ErrorCode TrigEFTrackHypo::hltBeginRun(){
HLT::ErrorCode TrigEFTrackHypo::hltInitialize() {
// ----------------------------------------------------------------------
- msg() << MSG::INFO << "TrigEFTrackHypo initialize()" << endreq;
+ msg() << MSG::INFO << "TrigEFTrackHypo initialize()" << endmsg;
msg() << MSG::INFO
<< "Initialization of TrigEFTrackHypo completed successfully"
- << endreq;
+ << endmsg;
return HLT::OK;
}
@@ -107,7 +107,7 @@ HLT::ErrorCode TrigEFTrackHypo::hltInitialize() {
HLT::ErrorCode TrigEFTrackHypo::hltFinalize() {
// ----------------------------------------------------------------------
- msg() << MSG::INFO << "TrigEFTrackHypo finalize()" << endreq;
+ msg() << MSG::INFO << "TrigEFTrackHypo finalize()" << endmsg;
return HLT::OK;
}
@@ -124,19 +124,19 @@ HLT::ErrorCode TrigEFTrackHypo::hltExecute(const HLT::TriggerElement* outputTE,
int outputLevel = msgLvl();
if(outputLevel <= MSG::DEBUG)
- msg() << MSG::DEBUG << name() << ": in execute()" << endreq;
+ msg() << MSG::DEBUG << name() << ": in execute()" << endmsg;
// AcceptAll property = true means selection cuts should not be applied
if (m_acceptAll){
if(outputLevel <= MSG::DEBUG)
- msg() << MSG::DEBUG << "AcceptAll property is set: taking all events" << endreq;
+ msg() << MSG::DEBUG << "AcceptAll property is set: taking all events" << endmsg;
pass=true;
return HLT::OK;
}
else {
if(outputLevel <= MSG::DEBUG)
msg() << MSG::DEBUG << "AcceptAll property not set: applying selection"
- << endreq;
+ << endmsg;
}
@@ -147,18 +147,18 @@ HLT::ErrorCode TrigEFTrackHypo::hltExecute(const HLT::TriggerElement* outputTE,
//const Rec::TrackParticleContainer* m_TrkParticleCont(0);
if ( HLT::OK != getFeature(outputTE, m_TrkParticleCont) ) {
- msg() << MSG::ERROR << "Failed to get TrackParticleContainer from the trigger element " << endreq;
+ msg() << MSG::ERROR << "Failed to get TrackParticleContainer from the trigger element " << endmsg;
return HLT::NAV_ERROR;
}
if ( !m_TrkParticleCont ) {
- msg() << MSG::DEBUG << "No TrackParticleContainer present" << endreq;
+ msg() << MSG::DEBUG << "No TrackParticleContainer present" << endmsg;
return HLT::OK;
}
if(outputLevel <= MSG::DEBUG)
msg() << MSG::DEBUG << " REGTEST: Got " << m_TrkParticleCont->size()
- << " TrackParticleContainer's associated to the TE " << endreq;
+ << " TrackParticleContainer's associated to the TE " << endmsg;
m_numTrkPart=m_TrkParticleCont->size();
@@ -207,7 +207,7 @@ HLT::ErrorCode TrigEFTrackHypo::hltExecute(const HLT::TriggerElement* outputTE,
// << " TRTratio=" << trtratio
// << " D0=" << d0
// << " Pt=" << pt
- // << endreq;
+ // << endmsg;
// ---------------------------------------------------
// At least one track passed cuts: accept the event:
// ---------------------------------------------------
@@ -216,7 +216,7 @@ HLT::ErrorCode TrigEFTrackHypo::hltExecute(const HLT::TriggerElement* outputTE,
} // end of loop in tracks
- // msg() << MSG::DEBUG << "Number of tracks found: " << ntracks << endreq;
+ // msg() << MSG::DEBUG << "Number of tracks found: " << ntracks << endmsg;
if (ntracks >= m_numTracks) accepted = true;
if(accepted){
@@ -224,12 +224,12 @@ HLT::ErrorCode TrigEFTrackHypo::hltExecute(const HLT::TriggerElement* outputTE,
pass =true;
if(outputLevel <= MSG::DEBUG)
- msg() << MSG::DEBUG << " REGTEST: Event accepted ! " << endreq;
+ msg() << MSG::DEBUG << " REGTEST: Event accepted ! " << endmsg;
}
else{
if(outputLevel <= MSG::DEBUG)
- msg() << MSG::DEBUG << " REGTEST: No track was found !! Event rejected " << endreq;
+ msg() << MSG::DEBUG << " REGTEST: No track was found !! Event rejected " << endmsg;
}
// Time total TrigEFTrackHypo execution time.
diff --git a/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigL2CaloHypo.cxx b/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigL2CaloHypo.cxx
index 561c85ddab20de9abad96c8752adb205cafb1b76..c947dbffc62e6f3ef705ffdfa6c37d581c76cb96 100755
--- a/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigL2CaloHypo.cxx
+++ b/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigL2CaloHypo.cxx
@@ -72,68 +72,68 @@ TrigL2CaloHypo::~TrigL2CaloHypo()
HLT::ErrorCode TrigL2CaloHypo::hltInitialize()
{
if ( msgLvl() <= MSG::DEBUG ) {
- msg() << MSG::DEBUG << "Initialization completed successfully" << endreq;
+ msg() << MSG::DEBUG << "Initialization completed successfully" << endmsg;
// default=True (for now...May06)
msg() << MSG::DEBUG << "AcceptAll = "
- << (m_acceptAll==true ? "True" : "False") << endreq;
- msg() << MSG::DEBUG << "EtaBins = " << m_etabin << endreq;
+ << (m_acceptAll==true ? "True" : "False") << endmsg;
+ msg() << MSG::DEBUG << "EtaBins = " << m_etabin << endmsg;
msg() << MSG::DEBUG << "ETthr = "
- << m_eTthr << "(lo)/" << m_eT2thr << "(hi)" << endreq;
+ << m_eTthr << "(lo)/" << m_eT2thr << "(hi)" << endmsg;
msg() << MSG::DEBUG << "HADETthr = "
- << m_hadeTthr << "(lo)/" << m_hadeT2thr << "(hi)" << endreq;
- msg() << MSG::DEBUG << "CARCOREthr = " << m_carcorethr << endreq;
- msg() << MSG::DEBUG << "CAERATIOthr = " << m_caeratiothr << endreq;
- msg() << MSG::DEBUG << "dPHICLUSTERthr = " << m_dphicluster << endreq;
- msg() << MSG::DEBUG << "dETACLUSTERthr = " << m_detacluster << endreq;
- msg() << MSG::DEBUG << "WETA2thr = " << m_WETA2thr << endreq;
- msg() << MSG::DEBUG << "WSTOTthr = " << m_WSTOTthr << endreq;
- msg() << MSG::DEBUG << "F3thr = " << m_F3thr << endreq;
+ << m_hadeTthr << "(lo)/" << m_hadeT2thr << "(hi)" << endmsg;
+ msg() << MSG::DEBUG << "CARCOREthr = " << m_carcorethr << endmsg;
+ msg() << MSG::DEBUG << "CAERATIOthr = " << m_caeratiothr << endmsg;
+ msg() << MSG::DEBUG << "dPHICLUSTERthr = " << m_dphicluster << endmsg;
+ msg() << MSG::DEBUG << "dETACLUSTERthr = " << m_detacluster << endmsg;
+ msg() << MSG::DEBUG << "WETA2thr = " << m_WETA2thr << endmsg;
+ msg() << MSG::DEBUG << "WSTOTthr = " << m_WSTOTthr << endmsg;
+ msg() << MSG::DEBUG << "F3thr = " << m_F3thr << endmsg;
}
unsigned int nEtaBin=m_etabin.size();
if ( m_eTthr.size() != nEtaBin-1 ) {
- msg() << MSG::ERROR << " etThr size is " << m_eTthr.size() << " but needs " << nEtaBin-1 << endreq;
+ msg() << MSG::ERROR << " etThr size is " << m_eTthr.size() << " but needs " << nEtaBin-1 << endmsg;
return StatusCode::FAILURE;
}
if ( m_eT2thr.size() != nEtaBin-1 ) {
- msg() << MSG::ERROR << " et2Thr size is " << m_eT2thr.size() << " but needs " << nEtaBin-1 << endreq;
+ msg() << MSG::ERROR << " et2Thr size is " << m_eT2thr.size() << " but needs " << nEtaBin-1 << endmsg;
return StatusCode::FAILURE;
}
if ( m_hadeTthr.size() != nEtaBin-1 ) {
- msg() << MSG::ERROR << " hadetThr size is " << m_hadeTthr.size() << " but needs " << nEtaBin-1 << endreq;
+ msg() << MSG::ERROR << " hadetThr size is " << m_hadeTthr.size() << " but needs " << nEtaBin-1 << endmsg;
return StatusCode::FAILURE;
}
if ( m_hadeT2thr.size() != nEtaBin-1 ) {
- msg() << MSG::ERROR << " hadet2Thr size is " << m_hadeT2thr.size() << " but needs " << nEtaBin-1 << endreq;
+ msg() << MSG::ERROR << " hadet2Thr size is " << m_hadeT2thr.size() << " but needs " << nEtaBin-1 << endmsg;
return StatusCode::FAILURE;
}
if ( m_carcorethr.size() != nEtaBin-1 ) {
- msg() << MSG::ERROR << " carcore size is " << m_carcorethr.size() << " but needs " << nEtaBin-1 << endreq;
+ msg() << MSG::ERROR << " carcore size is " << m_carcorethr.size() << " but needs " << nEtaBin-1 << endmsg;
return StatusCode::FAILURE;
}
if ( m_caeratiothr.size() != nEtaBin-1 ) {
- msg() << MSG::ERROR << " caeratio size is " << m_caeratiothr.size() << " but needs " << nEtaBin-1 << endreq;
+ msg() << MSG::ERROR << " caeratio size is " << m_caeratiothr.size() << " but needs " << nEtaBin-1 << endmsg;
return StatusCode::FAILURE;
}
if ( m_WETA2thr.size() != nEtaBin-1 ) {
- msg() << MSG::ERROR << " Weta2 size is " << m_WETA2thr.size() << " but needs " << nEtaBin-1 << endreq;
+ msg() << MSG::ERROR << " Weta2 size is " << m_WETA2thr.size() << " but needs " << nEtaBin-1 << endmsg;
return StatusCode::FAILURE;
}
if ( m_WSTOTthr.size() != nEtaBin-1 ) {
- msg() << MSG::ERROR << " Wstot size is " << m_WSTOTthr.size() << " but needs " << nEtaBin-1 << endreq;
+ msg() << MSG::ERROR << " Wstot size is " << m_WSTOTthr.size() << " but needs " << nEtaBin-1 << endmsg;
return StatusCode::FAILURE;
}
if ( m_F3thr.size() != nEtaBin-1 ) {
- msg() << MSG::ERROR << " Wstot size is " << m_WSTOTthr.size() << " but needs " << nEtaBin-1 << endreq;
+ msg() << MSG::ERROR << " Wstot size is " << m_WSTOTthr.size() << " but needs " << nEtaBin-1 << endmsg;
return StatusCode::FAILURE;
}
@@ -143,7 +143,7 @@ HLT::ErrorCode TrigL2CaloHypo::hltInitialize()
HLT::ErrorCode TrigL2CaloHypo::hltFinalize()
{
if ( msgLvl() <= MSG::INFO )
- msg() << MSG::INFO << "In TrigL2CaloHypo::finalize()" << endreq;
+ msg() << MSG::INFO << "In TrigL2CaloHypo::finalize()" << endmsg;
return HLT::OK;
}
@@ -213,7 +213,7 @@ HLT::ErrorCode TrigL2CaloHypo::hltExecute(const HLT::TriggerElement* outputTE, b
// should be only 1 cluster, normally!
if (vectorOfClusters.size() != 1) {
msg() << MSG::DEBUG << "Size of vector of TrigEMClusters is not 1!"
- << endreq;
+ << endmsg;
return HLT::OK;
}
m_PassedCuts++; //Input
@@ -221,7 +221,7 @@ HLT::ErrorCode TrigL2CaloHypo::hltExecute(const HLT::TriggerElement* outputTE, b
const xAOD::TrigEMCluster* pClus = vectorOfClusters.front();
if ( !pClus ) {
- msg() << MSG::WARNING << "No EM cluster in RoI" << endreq;
+ msg() << MSG::WARNING << "No EM cluster in RoI" << endmsg;
return HLT::OK;
}
@@ -278,7 +278,7 @@ HLT::ErrorCode TrigL2CaloHypo::hltExecute(const HLT::TriggerElement* outputTE, b
if ( msgLvl() <= MSG::DEBUG ) {
msg() << MSG::DEBUG << "TrigEMCluster: eta=" << pClus->eta()
<< " roi eta=" << etaRef << " DeltaEta=" << m_dEta
- << " cut: <" << m_detacluster << endreq;
+ << " cut: <" << m_detacluster << endmsg;
}
if ( fabs(pClus->eta() - etaRef) > m_detacluster ) return HLT::OK;
m_PassedCuts++; //Deta
@@ -287,34 +287,34 @@ HLT::ErrorCode TrigL2CaloHypo::hltExecute(const HLT::TriggerElement* outputTE, b
if ( msgLvl() <= MSG::DEBUG ) {
msg() << MSG::DEBUG << ": phi=" << pClus->phi()
<< " roi phi="<< phiRef << " DeltaPhi="<< m_dPhi
- << " cut: <" << m_dphicluster << endreq;
+ << " cut: <" << m_dphicluster << endmsg;
}
if( m_dPhi > m_dphicluster ) return HLT::OK;
m_PassedCuts++; //DPhi
// eta range
if ( m_etaBin==-1 ) { // VD
- msg() << MSG::DEBUG << "Cluster eta: " << absEta << " outside eta range " << m_etabin[m_etabin.size()-1] << endreq;
+ msg() << MSG::DEBUG << "Cluster eta: " << absEta << " outside eta range " << m_etabin[m_etabin.size()-1] << endmsg;
return HLT::OK;
} else {
if ( msgLvl() <= MSG::DEBUG )
- msg() << MSG::DEBUG << "eta bin used for cuts " << m_etaBin << endreq;
+ msg() << MSG::DEBUG << "eta bin used for cuts " << m_etaBin << endmsg;
}
m_PassedCuts++; // passed eta cut
// Rcore
if ( msgLvl() <= MSG::DEBUG )
msg() << MSG::DEBUG << "TrigEMCluster: Rcore=" << m_rCore
- << " cut: >" << m_carcorethr[m_etaBin] << endreq;
+ << " cut: >" << m_carcorethr[m_etaBin] << endmsg;
if ( m_rCore < m_carcorethr[m_etaBin] ) return HLT::OK;
m_PassedCuts++; //Rcore
// Eratio
if ( msgLvl() <= MSG::DEBUG )
msg() << MSG::DEBUG << "TrigEMCluster: Eratio=" << m_energyRatio
- << " cut: >" << m_caeratiothr[m_etaBin] << endreq;
+ << " cut: >" << m_caeratiothr[m_etaBin] << endmsg;
if ( inCrack || m_F1<m_F1thr[0] ) {
- msg() << MSG::DEBUG << "TrigEMCluster: InCrack= " << inCrack << " F1=" << m_F1 << endreq;
+ msg() << MSG::DEBUG << "TrigEMCluster: InCrack= " << inCrack << " F1=" << m_F1 << endmsg;
} else {
if ( m_energyRatio < m_caeratiothr[m_etaBin] ) return HLT::OK;
}
@@ -324,7 +324,7 @@ HLT::ErrorCode TrigL2CaloHypo::hltExecute(const HLT::TriggerElement* outputTE, b
// ET_em
if ( msgLvl() <= MSG::DEBUG )
msg() << MSG::DEBUG << "TrigEMCluster: ET_em=" << m_eT_T2Calo
- << " cut: >" << m_eTthr[m_etaBin] << endreq;
+ << " cut: >" << m_eTthr[m_etaBin] << endmsg;
if ( m_eT_T2Calo < m_eTthr[m_etaBin]) return HLT::OK;
m_PassedCuts++; // ET_em
@@ -335,19 +335,19 @@ HLT::ErrorCode TrigL2CaloHypo::hltExecute(const HLT::TriggerElement* outputTE, b
if ( msgLvl() <= MSG::DEBUG )
msg() << MSG::DEBUG << "ET_em>" << m_eT2thr[m_etaBin]
- << ": use high ET_had cut: <" << hadET_cut << endreq;
+ << ": use high ET_had cut: <" << hadET_cut << endmsg;
} else {
hadET_cut = m_hadeTthr[m_etaBin];
if ( msgLvl() <= MSG::DEBUG )
msg() << MSG::DEBUG << "ET_em<" << m_eT2thr[m_etaBin]
- << ": use low ET_had cut: <" << hadET_cut << endreq;
+ << ": use low ET_had cut: <" << hadET_cut << endmsg;
}
// ET_had
if ( msgLvl() <= MSG::DEBUG )
msg() << MSG::DEBUG << "TrigEMCluster: ET_had=" << m_hadET_T2Calo
- << " cut: <" << hadET_cut << endreq;
+ << " cut: <" << hadET_cut << endmsg;
if ( m_hadET_T2Calo > hadET_cut ) return HLT::OK;
m_PassedCuts++; //ET_had
@@ -355,7 +355,7 @@ HLT::ErrorCode TrigL2CaloHypo::hltExecute(const HLT::TriggerElement* outputTE, b
// F1
if ( msgLvl() <= MSG::DEBUG )
msg() << MSG::DEBUG << "TrigEMCluster: F1=" << m_F1
- << " cut: >" << m_F1thr[0] << endreq;
+ << " cut: >" << m_F1thr[0] << endmsg;
// if ( m_F1 < m_F1thr[0]) return HLT::OK; //(VD) not cutting on this variable, only used to select whether to cut or not on eRatio
m_PassedCuts++; //F1
@@ -363,7 +363,7 @@ HLT::ErrorCode TrigL2CaloHypo::hltExecute(const HLT::TriggerElement* outputTE, b
//Weta2
if ( msgLvl() <= MSG::DEBUG )
msg() << MSG::DEBUG << "TrigEMCluster: Weta2=" << m_Weta2
- << " cut: <" << m_WETA2thr[m_etaBin] << endreq;
+ << " cut: <" << m_WETA2thr[m_etaBin] << endmsg;
if ( m_Weta2 > m_WETA2thr[m_etaBin]) return HLT::OK;
m_PassedCuts++; //Weta2
@@ -371,14 +371,14 @@ HLT::ErrorCode TrigL2CaloHypo::hltExecute(const HLT::TriggerElement* outputTE, b
//Wstot
if ( msgLvl() <= MSG::DEBUG )
msg() << MSG::DEBUG << "TrigEMCluster: Wstot=" << m_Wstot
- << " cut: <" << m_WSTOTthr[m_etaBin] << endreq;
+ << " cut: <" << m_WSTOTthr[m_etaBin] << endmsg;
if ( m_Wstot >= m_WSTOTthr[m_etaBin]) return HLT::OK;
m_PassedCuts++; //Wstot
//F3
if ( msgLvl() <= MSG::DEBUG )
msg() << MSG::DEBUG << "TrigEMCluster: F3=" << m_F3
- << " cut: <" << m_F3thr[m_etaBin] << endreq;
+ << " cut: <" << m_F3thr[m_etaBin] << endmsg;
if ( m_F3 > m_F3thr[m_etaBin]) return HLT::OK;
m_PassedCuts++; //F3
@@ -388,7 +388,7 @@ HLT::ErrorCode TrigL2CaloHypo::hltExecute(const HLT::TriggerElement* outputTE, b
// Reach this point successfully
if ( msgLvl() <= MSG::DEBUG )
- msg() << MSG::DEBUG << "pass = " << pass << endreq;
+ msg() << MSG::DEBUG << "pass = " << pass << endmsg;
// (VD) this is quite obvious - it would be better to be able to arrive here eve if fails and see the line FAIL!
diff --git a/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigL2CaloLayersHypo.cxx b/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigL2CaloLayersHypo.cxx
index db6405754ed3a5c894780fe997f55b902ca17cef..ad083f40f1eff99ae4a79dd7ba0fde46546c54be 100755
--- a/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigL2CaloLayersHypo.cxx
+++ b/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigL2CaloLayersHypo.cxx
@@ -57,22 +57,22 @@ TrigL2CaloLayersHypo::~TrigL2CaloLayersHypo()
HLT::ErrorCode TrigL2CaloLayersHypo::hltInitialize()
{
if ( msgLvl() <= MSG::DEBUG ) {
- msg() << MSG::DEBUG << "Initialization completed successfully" << endreq;
+ msg() << MSG::DEBUG << "Initialization completed successfully" << endmsg;
msg() << MSG::DEBUG << "AcceptAll = "
- << (m_acceptAll==true ? "True" : "False") << endreq;
+ << (m_acceptAll==true ? "True" : "False") << endmsg;
msg() << MSG::DEBUG << "EnergyFractionCut per layer = "
- << m_EnergyFracCut << endreq;
+ << m_EnergyFracCut << endmsg;
msg() << MSG::DEBUG << "AbsoluteEnergyCut per layer = "
- << m_EnergyAbsCut << endreq;
+ << m_EnergyAbsCut << endmsg;
}
if ( m_EnergyFracCut.size() != 4 ) {
- msg() << MSG::ERROR << " EnergyFracCut size is " << m_EnergyFracCut.size() << " but needs 4" << endreq;
+ msg() << MSG::ERROR << " EnergyFracCut size is " << m_EnergyFracCut.size() << " but needs 4" << endmsg;
return StatusCode::FAILURE;
}
if ( m_EnergyAbsCut.size() != 4 ) {
- msg() << MSG::ERROR << " EnergyAbsCut size is " << m_EnergyAbsCut.size() << " but needs 4" << endreq;
+ msg() << MSG::ERROR << " EnergyAbsCut size is " << m_EnergyAbsCut.size() << " but needs 4" << endmsg;
return StatusCode::FAILURE;
}
@@ -82,7 +82,7 @@ HLT::ErrorCode TrigL2CaloLayersHypo::hltInitialize()
HLT::ErrorCode TrigL2CaloLayersHypo::hltFinalize()
{
if ( msgLvl() <= MSG::INFO )
- msg() << MSG::INFO << "In TrigL2CaloLayersHypo::finalize()" << endreq;
+ msg() << MSG::INFO << "In TrigL2CaloLayersHypo::finalize()" << endmsg;
return HLT::OK;
}
@@ -96,13 +96,13 @@ HLT::ErrorCode TrigL2CaloLayersHypo::hltExecute(const HLT::TriggerElement* outpu
pass = true;
if ( msgLvl() <= MSG::DEBUG )
msg() << MSG::DEBUG << "AcceptAll property is set: taking all events"
- << endreq;
+ << endmsg;
return HLT::OK;
} else {
pass = false;
if ( msgLvl() <= MSG::DEBUG ) {
msg() << MSG::DEBUG << "AcceptAll property not set: applying selection"
- << endreq;
+ << endmsg;
}
}
@@ -134,20 +134,20 @@ HLT::ErrorCode TrigL2CaloLayersHypo::hltExecute(const HLT::TriggerElement* outpu
if ( stat != HLT::OK ) {
if ( msgLvl() <= MSG::WARNING)
- msg() << MSG::WARNING << "Failed to get TrigEMClusters" << endreq;
+ msg() << MSG::WARNING << "Failed to get TrigEMClusters" << endmsg;
return HLT::OK;
}
if ( msgLvl() <= MSG::DEBUG ) {
msg() << MSG::DEBUG << "Found vector with " << vectorOfClusters.size()
- << " TrigEMClusters" << endreq;
+ << " TrigEMClusters" << endmsg;
}
// should be only 1 cluster, normally!
if (vectorOfClusters.size() != 1) {
msg() << MSG::DEBUG << "Size of vector of TrigEMClusters is not 1!"
- << endreq;
+ << endmsg;
return HLT::OK;
}
@@ -156,7 +156,7 @@ HLT::ErrorCode TrigL2CaloLayersHypo::hltExecute(const HLT::TriggerElement* outpu
m_preSampFrac=m_preSamp=m_monEta=m_monPhi=m_Energy=-9999.0;
if ( !pClus && (pClus->energy()>0.1) && (fabsf(pClus->eta())<2.1) ) {
- msg() << MSG::WARNING << "No EM cluster in RoI" << endreq;
+ msg() << MSG::WARNING << "No EM cluster in RoI" << endmsg;
return HLT::OK;
}
m_monEta = pClus->eta();
@@ -185,7 +185,7 @@ HLT::ErrorCode TrigL2CaloLayersHypo::hltExecute(const HLT::TriggerElement* outpu
// Reach this point successfully
if ( msgLvl() <= MSG::DEBUG )
- msg() << MSG::DEBUG << "pass = " << pass << endreq;
+ msg() << MSG::DEBUG << "pass = " << pass << endmsg;
return HLT::OK;
}
diff --git a/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigL2ElectronFex.cxx b/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigL2ElectronFex.cxx
index 2e7c079ee102ed37472c79ef6d6f33f3d40f9040..98a10201da59c488feea3008ff57118ea584a368 100755
--- a/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigL2ElectronFex.cxx
+++ b/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigL2ElectronFex.cxx
@@ -223,7 +223,7 @@ HLT::ErrorCode TrigL2ElectronFex::hltExecute(const HLT::TriggerElement* inputTE,
//if ( dEta > m_detacluster || dPhi > m_dphicluster ) {
// if ( msgLvl() <= MSG::DEBUG ) {
- // msg() << MSG::DEBUG << "Cluster doesn't match RoI! Leaving." << endreq;
+ // msg() << MSG::DEBUG << "Cluster doesn't match RoI! Leaving." << endmsg;
// }
// return HLT::OK;
//}
diff --git a/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigL2PhotonFex.cxx b/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigL2PhotonFex.cxx
index e526d400ec9fd496b55c99f9dd62701edaccb2ff..853752be2038e7ed3d0aa3cce830e00633f8e073 100755
--- a/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigL2PhotonFex.cxx
+++ b/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigL2PhotonFex.cxx
@@ -45,7 +45,7 @@ TrigL2PhotonFex::~TrigL2PhotonFex()
HLT::ErrorCode TrigL2PhotonFex::hltInitialize()
{
if ( msgLvl() <= MSG::DEBUG ) {
- msg() << MSG::DEBUG << "Initializing" << endreq;
+ msg() << MSG::DEBUG << "Initializing" << endmsg;
}
return HLT::OK;
@@ -55,7 +55,7 @@ HLT::ErrorCode TrigL2PhotonFex::hltInitialize()
HLT::ErrorCode TrigL2PhotonFex::hltFinalize()
{
if ( msgLvl() <= MSG::DEBUG ) {
- msg() << MSG::DEBUG << "Finalizing" << endreq;
+ msg() << MSG::DEBUG << "Finalizing" << endmsg;
}
return HLT::OK;
@@ -112,7 +112,7 @@ HLT::ErrorCode TrigL2PhotonFex::hltExecute(const HLT::TriggerElement* inputTE,
}
else {
if ( msgLvl() <= MSG::DEBUG){
- msg() << MSG::DEBUG << "Failed to get TrigEMCluster" << endreq;
+ msg() << MSG::DEBUG << "Failed to get TrigEMCluster" << endmsg;
}
return HLT::MISSING_FEATURE;
}
@@ -122,7 +122,7 @@ HLT::ErrorCode TrigL2PhotonFex::hltExecute(const HLT::TriggerElement* inputTE,
if(pClus == 0){
if ( msgLvl() <= MSG::WARNING ){
- msg() << MSG::WARNING << "Failed to retieve TrigEMCluster from ElementLink" << endreq;
+ msg() << MSG::WARNING << "Failed to retieve TrigEMCluster from ElementLink" << endmsg;
}
return HLT::MISSING_FEATURE;
}
@@ -133,7 +133,7 @@ HLT::ErrorCode TrigL2PhotonFex::hltExecute(const HLT::TriggerElement* inputTE,
dPhi = (dPhi < M_PI ? dPhi : 2*M_PI - dPhi );
if ( msgLvl() <= MSG::DEBUG ) {
msg() << MSG::DEBUG << "TrigPhoton will be built with: dEta=" << dEta
- << " and dPhi= " << dPhi << endreq;
+ << " and dPhi= " << dPhi << endmsg;
}
// create TrigPhoton from TrigEMCluster
@@ -150,7 +150,7 @@ HLT::ErrorCode TrigL2PhotonFex::hltExecute(const HLT::TriggerElement* inputTE,
// REGTEST output
if ( msgLvl() <= MSG::DEBUG ) {
msg() << MSG::DEBUG << "REGTEST: TrigPhotonContainer has " << m_trigPhotonContainer->size()
- << " element" << endreq;
+ << " element" << endmsg;
if (!m_trigPhotonContainer->empty()) {
xAOD::TrigPhoton* p_tp = m_trigPhotonContainer->front();
msg() << MSG::DEBUG << "REGTEST: TrigPhoton: RoI=" << p_tp->roiWord()
@@ -161,7 +161,7 @@ HLT::ErrorCode TrigL2PhotonFex::hltExecute(const HLT::TriggerElement* inputTE,
<< "; Had Et=" << p_tp->etHad()
<< "; EnergyRatio=" << p_tp->eratio()
<< "; rCore=" << p_tp->rcore()
- << endreq;
+ << endmsg;
}
}
@@ -177,12 +177,12 @@ HLT::ErrorCode TrigL2PhotonFex::hltExecute(const HLT::TriggerElement* inputTE,
if( status == HLT::OK ){
if( msgLvl() <= MSG::DEBUG ){
- msg() << MSG::DEBUG << "Attached TrigPhotonContainer to outputTE with ID: " << outputTE->getId() << endreq;
+ msg() << MSG::DEBUG << "Attached TrigPhotonContainer to outputTE with ID: " << outputTE->getId() << endmsg;
}
}
else {
if ( msgLvl() <= MSG::ERROR ){
- msg() << MSG::ERROR << "Failed to attach TrigPhotonContainer!" << endreq;
+ msg() << MSG::ERROR << "Failed to attach TrigPhotonContainer!" << endmsg;
}
return status;
}
diff --git a/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigL2PhotonHypo.cxx b/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigL2PhotonHypo.cxx
index 83168c9fd61ca3dd5a26b37a135b90beffc1c5ce..411822ebfbfdb4797e60b830d72c8c0107c80a1b 100755
--- a/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigL2PhotonHypo.cxx
+++ b/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigL2PhotonHypo.cxx
@@ -78,52 +78,52 @@ TrigL2PhotonHypo::~TrigL2PhotonHypo()
HLT::ErrorCode TrigL2PhotonHypo::hltInitialize()
{
if ( msgLvl() <= MSG::DEBUG ) {
- msg() << MSG::DEBUG << "Initialization completed successfully" << endreq;
+ msg() << MSG::DEBUG << "Initialization completed successfully" << endmsg;
msg() << MSG::DEBUG << "AcceptAll = "
- << (m_acceptAll==true ? "True" : "False") << endreq;
+ << (m_acceptAll==true ? "True" : "False") << endmsg;
// msg() << MSG::DEBUG << "SaveTrigPhotons = "
- // << (m_saveTrigPh==true ? "True" : "False") << endreq;
- msg() << MSG::DEBUG << "EtaBins = " << m_etabin << endreq;
+ // << (m_saveTrigPh==true ? "True" : "False") << endmsg;
+ msg() << MSG::DEBUG << "EtaBins = " << m_etabin << endmsg;
msg() << MSG::DEBUG << "ETthr = "
- << m_eTthr << "(lo)/" << m_eT2thr << "(hi)" << endreq;
+ << m_eTthr << "(lo)/" << m_eT2thr << "(hi)" << endmsg;
msg() << MSG::DEBUG << "HADETthr = "
- << m_hadeTthr << "(lo)/" << m_hadeT2thr << "(hi)" << endreq;
- msg() << MSG::DEBUG << "CARCOREthr = " << m_carcorethr << endreq;
- msg() << MSG::DEBUG << "CAERATIOthr = " << m_caeratiothr << endreq;
- msg() << MSG::DEBUG << "dPHICLUSTERthr = " << m_dphicluster << endreq;
- msg() << MSG::DEBUG << "dETACLUSTERthr = " << m_detacluster << endreq;
+ << m_hadeTthr << "(lo)/" << m_hadeT2thr << "(hi)" << endmsg;
+ msg() << MSG::DEBUG << "CARCOREthr = " << m_carcorethr << endmsg;
+ msg() << MSG::DEBUG << "CAERATIOthr = " << m_caeratiothr << endmsg;
+ msg() << MSG::DEBUG << "dPHICLUSTERthr = " << m_dphicluster << endmsg;
+ msg() << MSG::DEBUG << "dETACLUSTERthr = " << m_detacluster << endmsg;
}
unsigned int nEtaBin=m_etabin.size();
if ( m_eTthr.size() != nEtaBin-1 ) {
- msg() << MSG::ERROR << " etThr size is " << m_eTthr.size() << " but needs " << nEtaBin-1 << endreq;
+ msg() << MSG::ERROR << " etThr size is " << m_eTthr.size() << " but needs " << nEtaBin-1 << endmsg;
return StatusCode::FAILURE;
}
if ( m_eT2thr.size() != nEtaBin-1 ) {
- msg() << MSG::ERROR << " et2Thr size is " << m_eT2thr.size() << " but needs " << nEtaBin-1 << endreq;
+ msg() << MSG::ERROR << " et2Thr size is " << m_eT2thr.size() << " but needs " << nEtaBin-1 << endmsg;
return StatusCode::FAILURE;
}
if ( m_hadeTthr.size() != nEtaBin-1 ) {
- msg() << MSG::ERROR << " hadetThr size is " << m_hadeTthr.size() << " but needs " << nEtaBin-1 << endreq;
+ msg() << MSG::ERROR << " hadetThr size is " << m_hadeTthr.size() << " but needs " << nEtaBin-1 << endmsg;
return StatusCode::FAILURE;
}
if ( m_hadeT2thr.size() != nEtaBin-1 ) {
- msg() << MSG::ERROR << " hadet2Thr size is " << m_hadeT2thr.size() << " but needs " << nEtaBin-1 << endreq;
+ msg() << MSG::ERROR << " hadet2Thr size is " << m_hadeT2thr.size() << " but needs " << nEtaBin-1 << endmsg;
return StatusCode::FAILURE;
}
if ( m_carcorethr.size() != nEtaBin-1 ) {
- msg() << MSG::ERROR << " carcore size is " << m_carcorethr.size() << " but needs " << nEtaBin-1 << endreq;
+ msg() << MSG::ERROR << " carcore size is " << m_carcorethr.size() << " but needs " << nEtaBin-1 << endmsg;
return StatusCode::FAILURE;
}
if ( m_caeratiothr.size() != nEtaBin-1 ) {
- msg() << MSG::ERROR << " caeratio size is " << m_caeratiothr.size() << " but needs " << nEtaBin-1 << endreq;
+ msg() << MSG::ERROR << " caeratio size is " << m_caeratiothr.size() << " but needs " << nEtaBin-1 << endmsg;
return StatusCode::FAILURE;
}
@@ -134,7 +134,7 @@ HLT::ErrorCode TrigL2PhotonHypo::hltInitialize()
HLT::ErrorCode TrigL2PhotonHypo::hltFinalize()
{
if ( msgLvl() <= MSG::INFO )
- msg() << MSG::INFO << "In TrigL2PhotonHypo::finalize()" << endreq;
+ msg() << MSG::INFO << "In TrigL2PhotonHypo::finalize()" << endmsg;
return HLT::OK;
}
@@ -176,19 +176,19 @@ HLT::ErrorCode TrigL2PhotonHypo::hltExecute(const HLT::TriggerElement* outputTE,
if( status != HLT::OK ) {
if(msgLvl() <= MSG::WARNING) {
- msg() << MSG::WARNING << "Failed to get TrigPhotonContainer from TE" << endreq;
+ msg() << MSG::WARNING << "Failed to get TrigPhotonContainer from TE" << endmsg;
}
return HLT::OK;
}
if(msgLvl() <= MSG::DEBUG) {
msg() << MSG::DEBUG << "Retrieved vector with " << vecTrigPhotonCont.size()
- << " TrigPhotonContainers from TE" << endreq;
+ << " TrigPhotonContainers from TE" << endmsg;
}
if(vecTrigPhotonCont.size()!=1){
if(msgLvl() <= MSG::DEBUG) {
- msg() << MSG::DEBUG << "Number of TrigPhotonContainers retrieved from TE is not 1, exiting" << endreq;
+ msg() << MSG::DEBUG << "Number of TrigPhotonContainers retrieved from TE is not 1, exiting" << endmsg;
}
return HLT::OK;
}
@@ -201,14 +201,14 @@ HLT::ErrorCode TrigL2PhotonHypo::hltExecute(const HLT::TriggerElement* outputTE,
if ( m_PhotonContainer == 0 ) {
if ( msgLvl() <= MSG::DEBUG ) {
- msg() << MSG::DEBUG << "TrigPhotonContainer is NULL, exiting" << endreq;
+ msg() << MSG::DEBUG << "TrigPhotonContainer is NULL, exiting" << endmsg;
}
return HLT::OK;
}
if(m_PhotonContainer->size()!=1){
if(msgLvl() <= MSG::DEBUG) {
- msg() << MSG::DEBUG << "Number of TrigPhotons in TrigPhotonContainer is not 1, exiting" << endreq;
+ msg() << MSG::DEBUG << "Number of TrigPhotons in TrigPhotonContainer is not 1, exiting" << endmsg;
}
return HLT::OK;
}
@@ -217,7 +217,7 @@ HLT::ErrorCode TrigL2PhotonHypo::hltExecute(const HLT::TriggerElement* outputTE,
if ( photon == 0 ) {
if ( msgLvl() <= MSG::DEBUG ) {
- msg() << MSG::DEBUG << "TrigPhoton is NULL, exiting" << endreq;
+ msg() << MSG::DEBUG << "TrigPhoton is NULL, exiting" << endmsg;
}
return HLT::OK;
}
@@ -228,7 +228,7 @@ HLT::ErrorCode TrigL2PhotonHypo::hltExecute(const HLT::TriggerElement* outputTE,
/*
if ( !photon->isValid() ) {
if ( msgLvl() <= MSG::DEBUG ) {
- msg() << MSG::DEBUG << "TrigPhoton has Valid flag = FALSE" << endreq;
+ msg() << MSG::DEBUG << "TrigPhoton has Valid flag = FALSE" << endmsg;
}
return HLT::OK;
}
@@ -255,7 +255,7 @@ HLT::ErrorCode TrigL2PhotonHypo::hltExecute(const HLT::TriggerElement* outputTE,
// ET_em
if ( msgLvl() <= MSG::DEBUG ){
msg() << MSG::DEBUG << "EtCutOnly property is set: TrigPhoton: ET_em=" << EmET
- << " cut in etaBin " << etaBin << " is ET_em >= " << m_eTthr[0] << endreq;
+ << " cut in etaBin " << etaBin << " is ET_em >= " << m_eTthr[0] << endmsg;
}
if ( EmET < m_eTthr[0]) return HLT::OK;
pass = true;
@@ -268,7 +268,7 @@ HLT::ErrorCode TrigL2PhotonHypo::hltExecute(const HLT::TriggerElement* outputTE,
// apply cuts: DeltaEta(clus-ROI)
if ( msgLvl() <= MSG::DEBUG ) {
msg() << MSG::DEBUG << "TrigPhoton dEta=" << dEta
- << " cut is dEta <= " << m_detacluster << endreq;
+ << " cut is dEta <= " << m_detacluster << endmsg;
}
if ( fabs(dEta) > m_detacluster ) return HLT::OK;
m_PassedCuts++;
@@ -276,25 +276,25 @@ HLT::ErrorCode TrigL2PhotonHypo::hltExecute(const HLT::TriggerElement* outputTE,
// DeltaPhi(clus-ROI)
if ( msgLvl() <= MSG::DEBUG ) {
msg() << MSG::DEBUG << "TrigPhoton dPhi=" << dPhi
- << " cut is dPhi <= " << m_dphicluster << endreq;
+ << " cut is dPhi <= " << m_dphicluster << endmsg;
}
if( fabs(dPhi) > m_dphicluster ) return HLT::OK;
m_PassedCuts++;
// eta range
if ( etaBin==-1 ) {
- msg() << MSG::DEBUG << "Photon eta: " << absEta << " outside eta range " << m_etabin[m_etabin.size()-1] << endreq;
+ msg() << MSG::DEBUG << "Photon eta: " << absEta << " outside eta range " << m_etabin[m_etabin.size()-1] << endmsg;
return HLT::OK;
} else {
if ( msgLvl() <= MSG::DEBUG )
- msg() << MSG::DEBUG << "eta bin used for cuts " << etaBin << endreq;
+ msg() << MSG::DEBUG << "eta bin used for cuts " << etaBin << endmsg;
}
m_PassedCuts++; // passed eta cut
// Reta (was previously called Rcore)
if ( msgLvl() <= MSG::DEBUG ){
msg() << MSG::DEBUG << "TrigPhoton Reta=" << Reta
- << " cut in etaBin " << etaBin << " is Reta >= " << m_carcorethr[etaBin] << endreq;
+ << " cut in etaBin " << etaBin << " is Reta >= " << m_carcorethr[etaBin] << endmsg;
}
if ( Reta < m_carcorethr[etaBin] ) return HLT::OK;
m_PassedCuts++;
@@ -302,12 +302,12 @@ HLT::ErrorCode TrigL2PhotonHypo::hltExecute(const HLT::TriggerElement* outputTE,
// Eratio
if ( msgLvl() <= MSG::DEBUG ){
msg() << MSG::DEBUG << "TrigPhoton: Eratio=" << Eratio
- << " cut in etaBin " << etaBin << " is Eratio >= " << m_caeratiothr[etaBin] << endreq;
+ << " cut in etaBin " << etaBin << " is Eratio >= " << m_caeratiothr[etaBin] << endmsg;
}
bool inCrack = ( absEta > 2.37 || ( absEta > 1.37 && absEta < 1.52) );
if ( inCrack || f1<m_F1thr[0] ) {
msg() << MSG::DEBUG << "TrigPhoton: InCrack= " << inCrack << " F1=" << f1
- << " Eratio cut not being applied" << endreq;
+ << " Eratio cut not being applied" << endmsg;
} else {
if ( Eratio < m_caeratiothr[etaBin] ) return HLT::OK;
}
@@ -317,7 +317,7 @@ HLT::ErrorCode TrigL2PhotonHypo::hltExecute(const HLT::TriggerElement* outputTE,
// ET_em
if ( msgLvl() <= MSG::DEBUG ){
msg() << MSG::DEBUG << "TrigPhoton: ET_em=" << EmET
- << " cut in etaBin " << etaBin << " is ET_em >= " << m_eTthr[etaBin] << endreq;
+ << " cut in etaBin " << etaBin << " is ET_em >= " << m_eTthr[etaBin] << endmsg;
}
if ( EmET < m_eTthr[etaBin]) return HLT::OK;
m_PassedCuts++;
@@ -331,18 +331,18 @@ HLT::ErrorCode TrigL2PhotonHypo::hltExecute(const HLT::TriggerElement* outputTE,
if ( msgLvl() <= MSG::DEBUG )
msg() << MSG::DEBUG << "ET_em>" << m_eT2thr[etaBin]
- << ": use high ET_had cut: <" << hadET_cut << endreq;
+ << ": use high ET_had cut: <" << hadET_cut << endmsg;
} else {
hadET_cut = m_hadeTthr[etaBin];
if ( msgLvl() <= MSG::DEBUG )
msg() << MSG::DEBUG << "ET_em<" << m_eT2thr[etaBin]
- << ": use low ET_had cut: <" << hadET_cut << endreq;
+ << ": use low ET_had cut: <" << hadET_cut << endmsg;
}
if ( msgLvl() <= MSG::DEBUG ){
msg() << MSG::DEBUG << "TrigPhoton: ET_had=" << HadEmRatio
- << " cut in etaBin " << etaBin << " is ET_had <=" << hadET_cut << endreq;
+ << " cut in etaBin " << etaBin << " is ET_had <=" << hadET_cut << endmsg;
}
if ( HadEmRatio > hadET_cut ) return HLT::OK;
m_PassedCuts++;
@@ -351,18 +351,18 @@ HLT::ErrorCode TrigL2PhotonHypo::hltExecute(const HLT::TriggerElement* outputTE,
// F1
if ( msgLvl() <= MSG::DEBUG ){
msg() << MSG::DEBUG << "TrigPhoton: F1=" << f1
- << " cut: >" << m_F1thr[0] << endreq;
+ << " cut: >" << m_F1thr[0] << endmsg;
}
// if ( f1 < m_F1thr[0]) return HLT::OK; //(VD) not cutting on this (see comment on TrigL2CaloHypo)
if ( msgLvl() <= MSG::DEBUG ){
- msg() << MSG::DEBUG << "F1 cut is NOT being applied" << endreq;
+ msg() << MSG::DEBUG << "F1 cut is NOT being applied" << endmsg;
}
m_PassedCuts++;
pass = true;
if ( msgLvl() <= MSG::DEBUG ){
- msg() << MSG::DEBUG << "pass = " << pass << endreq;
+ msg() << MSG::DEBUG << "pass = " << pass << endmsg;
}
return HLT::OK;