diff --git a/Trigger/TrigValidation/TrigUpgradeTest/share/IDCalo.py b/Trigger/TrigValidation/TrigUpgradeTest/share/IDCalo.py
index 1af92bc25a6838d101aabd2f494b745d82275a6c..7a5649b8ba67799446d6283f20ee677e7a5cd1da 100644
--- a/Trigger/TrigValidation/TrigUpgradeTest/share/IDCalo.py
+++ b/Trigger/TrigValidation/TrigUpgradeTest/share/IDCalo.py
@@ -136,9 +136,9 @@ if TriggerFlags.doID:
if TriggerFlags.doCalo:
svcMgr.ToolSvc.TrigDataAccess.ApplyOffsetCorrection=False
-
- from TrigT2CaloEgamma.TrigT2CaloEgammaConfig import T2CaloEgamma_FastAlgo
- algo=T2CaloEgamma_FastAlgo("testFastAlgo")
+
+ from TrigT2CaloEgamma.TrigT2CaloEgammaConfig import T2CaloEgamma_ReFastAlgo
+ algo=T2CaloEgamma_ReFastAlgo("testFastAlgo")
algo.RoIs="EMViewRoIs"
allViewAlgorithms += algo
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/share/egamma.withViews.py b/Trigger/TrigValidation/TrigUpgradeTest/share/egamma.withViews.py
index 48ad0a9183e2ff7ee70f5e8afafb288d128b85db..03fdc4c03861740d8c8c0d697632653e838a5d4e 100644
--- a/Trigger/TrigValidation/TrigUpgradeTest/share/egamma.withViews.py
+++ b/Trigger/TrigValidation/TrigUpgradeTest/share/egamma.withViews.py
@@ -37,10 +37,11 @@ def createFastCaloSequence(rerun=False):
__prefix = "Rerurn_" if rerun else ""
__l1RoIDecisions = "RerunL1EM" if rerun else "L1EM"
__forViewDecsions = "RerunEMRoIDecisions" if rerun else "Filtered"+__l1RoIDecisions
+
+ from TrigT2CaloEgamma.TrigT2CaloEgammaConfig import T2CaloEgamma_ReFastAlgo
+ clusterMaker=T2CaloEgamma_ReFastAlgo( "FastClusterMaker" )
+
- from TrigT2CaloEgamma.TrigT2CaloEgammaConfig import T2CaloEgamma_FastAlgo
- #clusterMaker=T2CaloEgamma_FastAlgo(__prefix+"FastClusterMaker" )
- clusterMaker=T2CaloEgamma_FastAlgo( "FastClusterMaker" )
clusterMaker.ClustersName=clustersKey
svcMgr.ToolSvc.TrigDataAccess.ApplyOffsetCorrection=False
@@ -77,7 +78,6 @@ def createFastCaloSequence(rerun=False):
# fastCaloHypo.RoIs = fastCaloViewsMaker.InViewRoIs
fastCaloHypo.HypoOutputDecisions = __prefix+"EgammaCaloDecisions"
fastCaloHypo.HypoTools = [ TrigL2CaloHypoToolFromName( c,c ) for c in testChains ]
-
fastCaloSequence = seqAND( __prefix+"fastCaloSequence", [fastCaloViewsMaker, fastCaloInViewAlgs, fastCaloHypo ])
#if rerun:
# return parOR(__prefix+"egammaCaloStep", [ fastCaloSequence ] )
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/share/egamma_run_data.ref b/Trigger/TrigValidation/TrigUpgradeTest/share/egamma_run_data.ref
index 4b74e93a643704ca86b73eb3fcf6bcdfb8705d65..46311752fb0ff3ccafeb7c91a9e083393765d346 100644
--- a/Trigger/TrigValidation/TrigUpgradeTest/share/egamma_run_data.ref
+++ b/Trigger/TrigValidation/TrigUpgradeTest/share/egamma_run_data.ref
@@ -2,8 +2,8 @@ HLTRMakerAlg.MKTool.Serialiser 0 0 DEBUG xAOD::TrigCompositeConta
HLTRMakerAlg.MKTool.Serialiser 0 0 DEBUG xAOD::TrigCompositeAuxContainer#EgammaCaloDecisionsAux. Fragment size :376 bytes
HLTRMakerAlg.MKTool.Serialiser 0 0 DEBUG Fragment size including 344 bytes from 2x DynAux : 720
HLTRMakerAlg.MKTool.Serialiser 0 0 DEBUG xAOD::TrigCompositeContainer#ElectronL2Decisions Fragment size :176 bytes
-HLTRMakerAlg.MKTool.Serialiser 0 0 DEBUG xAOD::TrigCompositeAuxContainer#ElectronL2DecisionsAux. Fragment size :724 bytes
-HLTRMakerAlg.MKTool.Serialiser 0 0 DEBUG Fragment size including 456 bytes from 2x DynAux : 1180
+HLTRMakerAlg.MKTool.Serialiser 0 0 DEBUG xAOD::TrigCompositeAuxContainer#ElectronL2DecisionsAux. Fragment size :720 bytes
+HLTRMakerAlg.MKTool.Serialiser 0 0 DEBUG Fragment size including 456 bytes from 2x DynAux : 1176
HLTRMakerAlg.MKTool.Serialiser 0 0 DEBUG xAOD::TrigEMClusterContainer#HLT_xAOD__TrigEMClusterContainer_L2CaloClusters Fragment size :204 bytes
HLTRMakerAlg.MKTool.Serialiser 0 0 DEBUG xAOD::TrigEMClusterAuxContainer#HLT_xAOD__TrigEMClusterContainer_L2CaloClustersAux. Fragment size :804 bytes
HLTRMakerAlg.MKTool.Serialiser 0 0 DEBUG Fragment size including 88 bytes from 1x DynAux : 892
@@ -139,8 +139,8 @@ HLTRMakerAlg.MKTool.Serialiser 11 0 DEBUG xAOD::TrigElectronContai
HLTRMakerAlg.MKTool.Serialiser 11 0 DEBUG xAOD::TrigElectronAuxContainer#HLT_xAOD__TrigElectronContainer_L2ElectronFexAux. Fragment size :656 bytes
HLTRMakerAlg.MKTool.Serialiser 11 0 DEBUG Fragment size including 1336 bytes from 14x DynAux : 1992
HLTRMakerAlg.MKTool.Serialiser 12 0 DEBUG xAOD::TrigCompositeContainer#EgammaCaloDecisions Fragment size :176 bytes
-HLTRMakerAlg.MKTool.Serialiser 12 0 DEBUG xAOD::TrigCompositeAuxContainer#EgammaCaloDecisionsAux. Fragment size :1064 bytes
-HLTRMakerAlg.MKTool.Serialiser 12 0 DEBUG Fragment size including 524 bytes from 2x DynAux : 1588
+HLTRMakerAlg.MKTool.Serialiser 12 0 DEBUG xAOD::TrigCompositeAuxContainer#EgammaCaloDecisionsAux. Fragment size :1060 bytes
+HLTRMakerAlg.MKTool.Serialiser 12 0 DEBUG Fragment size including 524 bytes from 2x DynAux : 1584
HLTRMakerAlg.MKTool.Serialiser 12 0 DEBUG xAOD::TrigCompositeContainer#ElectronL2Decisions Fragment size :176 bytes
HLTRMakerAlg.MKTool.Serialiser 12 0 DEBUG xAOD::TrigCompositeAuxContainer#ElectronL2DecisionsAux. Fragment size :4224 bytes
HLTRMakerAlg.MKTool.Serialiser 12 0 DEBUG Fragment size including 1396 bytes from 2x DynAux : 5620
@@ -151,11 +151,11 @@ HLTRMakerAlg.MKTool.Serialiser 12 0 DEBUG xAOD::TrigElectronContai
HLTRMakerAlg.MKTool.Serialiser 12 0 DEBUG xAOD::TrigElectronAuxContainer#HLT_xAOD__TrigElectronContainer_L2ElectronFexAux. Fragment size :5440 bytes
HLTRMakerAlg.MKTool.Serialiser 12 0 DEBUG Fragment size including 4248 bytes from 14x DynAux : 9688
HLTRMakerAlg.MKTool.Serialiser 13 0 DEBUG xAOD::TrigCompositeContainer#EgammaCaloDecisions Fragment size :176 bytes
-HLTRMakerAlg.MKTool.Serialiser 13 0 DEBUG xAOD::TrigCompositeAuxContainer#EgammaCaloDecisionsAux. Fragment size :492 bytes
-HLTRMakerAlg.MKTool.Serialiser 13 0 DEBUG Fragment size including 368 bytes from 2x DynAux : 860
+HLTRMakerAlg.MKTool.Serialiser 13 0 DEBUG xAOD::TrigCompositeAuxContainer#EgammaCaloDecisionsAux. Fragment size :484 bytes
+HLTRMakerAlg.MKTool.Serialiser 13 0 DEBUG Fragment size including 368 bytes from 2x DynAux : 852
HLTRMakerAlg.MKTool.Serialiser 13 0 DEBUG xAOD::TrigCompositeContainer#ElectronL2Decisions Fragment size :176 bytes
-HLTRMakerAlg.MKTool.Serialiser 13 0 DEBUG xAOD::TrigCompositeAuxContainer#ElectronL2DecisionsAux. Fragment size :2720 bytes
-HLTRMakerAlg.MKTool.Serialiser 13 0 DEBUG Fragment size including 936 bytes from 2x DynAux : 3656
+HLTRMakerAlg.MKTool.Serialiser 13 0 DEBUG xAOD::TrigCompositeAuxContainer#ElectronL2DecisionsAux. Fragment size :2604 bytes
+HLTRMakerAlg.MKTool.Serialiser 13 0 DEBUG Fragment size including 936 bytes from 2x DynAux : 3540
HLTRMakerAlg.MKTool.Serialiser 13 0 DEBUG xAOD::TrigEMClusterContainer#HLT_xAOD__TrigEMClusterContainer_L2CaloClusters Fragment size :204 bytes
HLTRMakerAlg.MKTool.Serialiser 13 0 DEBUG xAOD::TrigEMClusterAuxContainer#HLT_xAOD__TrigEMClusterContainer_L2CaloClustersAux. Fragment size :1124 bytes
HLTRMakerAlg.MKTool.Serialiser 13 0 DEBUG Fragment size including 92 bytes from 1x DynAux : 1216
@@ -205,11 +205,11 @@ HLTRMakerAlg.MKTool.Serialiser 17 0 DEBUG xAOD::TrigElectronContai
HLTRMakerAlg.MKTool.Serialiser 17 0 DEBUG xAOD::TrigElectronAuxContainer#HLT_xAOD__TrigElectronContainer_L2ElectronFexAux. Fragment size :1852 bytes
HLTRMakerAlg.MKTool.Serialiser 17 0 DEBUG Fragment size including 2064 bytes from 14x DynAux : 3916
HLTRMakerAlg.MKTool.Serialiser 18 0 DEBUG xAOD::TrigCompositeContainer#EgammaCaloDecisions Fragment size :176 bytes
-HLTRMakerAlg.MKTool.Serialiser 18 0 DEBUG xAOD::TrigCompositeAuxContainer#EgammaCaloDecisionsAux. Fragment size :488 bytes
-HLTRMakerAlg.MKTool.Serialiser 18 0 DEBUG Fragment size including 368 bytes from 2x DynAux : 856
+HLTRMakerAlg.MKTool.Serialiser 18 0 DEBUG xAOD::TrigCompositeAuxContainer#EgammaCaloDecisionsAux. Fragment size :484 bytes
+HLTRMakerAlg.MKTool.Serialiser 18 0 DEBUG Fragment size including 368 bytes from 2x DynAux : 852
HLTRMakerAlg.MKTool.Serialiser 18 0 DEBUG xAOD::TrigCompositeContainer#ElectronL2Decisions Fragment size :176 bytes
-HLTRMakerAlg.MKTool.Serialiser 18 0 DEBUG xAOD::TrigCompositeAuxContainer#ElectronL2DecisionsAux. Fragment size :552 bytes
-HLTRMakerAlg.MKTool.Serialiser 18 0 DEBUG Fragment size including 396 bytes from 2x DynAux : 948
+HLTRMakerAlg.MKTool.Serialiser 18 0 DEBUG xAOD::TrigCompositeAuxContainer#ElectronL2DecisionsAux. Fragment size :528 bytes
+HLTRMakerAlg.MKTool.Serialiser 18 0 DEBUG Fragment size including 396 bytes from 2x DynAux : 924
HLTRMakerAlg.MKTool.Serialiser 18 0 DEBUG xAOD::TrigEMClusterContainer#HLT_xAOD__TrigEMClusterContainer_L2CaloClusters Fragment size :204 bytes
HLTRMakerAlg.MKTool.Serialiser 18 0 DEBUG xAOD::TrigEMClusterAuxContainer#HLT_xAOD__TrigEMClusterContainer_L2CaloClustersAux. Fragment size :1124 bytes
HLTRMakerAlg.MKTool.Serialiser 18 0 DEBUG Fragment size including 92 bytes from 1x DynAux : 1216
@@ -230,11 +230,11 @@ HLTRMakerAlg.MKTool.Serialiser 19 0 DEBUG xAOD::TrigElectronAuxCon
HLTRMakerAlg.MKTool.Serialiser 19 0 DEBUG Fragment size including 4360 bytes from 14x DynAux : 9984
TrigSignatureMoniMT INFO HLT_2e3_etcut 20 10 6 5 5
TrigSignatureMoniMT INFO HLT_2e3_etcut decisions 16 100
-TrigSignatureMoniMT INFO HLT_e3_e5_etcut 20 20 12 11 11
-TrigSignatureMoniMT INFO HLT_e3_e5_etcut decisions 46 279
-TrigSignatureMoniMT INFO HLT_e3_etcut 20 9 8 8 8
-TrigSignatureMoniMT INFO HLT_e3_etcut decisions 22 140
-TrigSignatureMoniMT INFO HLT_e5_etcut 20 20 17 17 17
-TrigSignatureMoniMT INFO HLT_e5_etcut decisions 52 333
+TrigSignatureMoniMT INFO HLT_e3_e5_etcut 20 20 11 10 10
+TrigSignatureMoniMT INFO HLT_e3_e5_etcut decisions 44 250
+TrigSignatureMoniMT INFO HLT_e3_etcut 20 9 8 7 7
+TrigSignatureMoniMT INFO HLT_e3_etcut decisions 22 137
+TrigSignatureMoniMT INFO HLT_e5_etcut 20 20 17 16 16
+TrigSignatureMoniMT INFO HLT_e5_etcut decisions 50 329
TrigSignatureMoniMT INFO HLT_e7_etcut 20 20 11 11 11
TrigSignatureMoniMT INFO HLT_e7_etcut decisions 17 173
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/share/photon.withViews.py b/Trigger/TrigValidation/TrigUpgradeTest/share/photon.withViews.py
index 8f5743bfff452207e234dbe41deef437d472262c..a31e9a9da602ad9559e5e83bbdba3d34fbb739f0 100644
--- a/Trigger/TrigValidation/TrigUpgradeTest/share/photon.withViews.py
+++ b/Trigger/TrigValidation/TrigUpgradeTest/share/photon.withViews.py
@@ -6,8 +6,8 @@ include("TrigUpgradeTest/testHLT_MT.py")
testChains = ["HLT_g5_etcut"]
-from TrigT2CaloEgamma.TrigT2CaloEgammaConfig import T2CaloEgamma_FastAlgo
-theFastCaloAlgo=T2CaloEgamma_FastAlgo("FastCaloAlgo" )
+from TrigT2CaloEgamma.TrigT2CaloEgammaConfig import T2CaloEgamma_ReFastAlgo
+theFastCaloAlgo=T2CaloEgamma_ReFastAlgo("FastCaloAlgo" )
theFastCaloAlgo.ClustersName="L2CaloClusters"
svcMgr.ToolSvc.TrigDataAccess.ApplyOffsetCorrection=False
@@ -25,9 +25,8 @@ def createFastCaloSequence(rerun=False):
__l1RoIDecisions = "RerunEMRoIDecisions" if rerun else "EMRoIDecisions"
__forViewDecsions = "RerunEMRoIDecisions" if rerun else "Filtered"+__l1RoIDecisions
- from TrigT2CaloEgamma.TrigT2CaloEgammaConfig import T2CaloEgamma_FastAlgo
- #clusterMaker=T2CaloEgamma_FastAlgo(__prefix+"FastClusterMaker" )
- clusterMaker=T2CaloEgamma_FastAlgo( "FastClusterMaker" )
+ from TrigT2CaloEgamma.TrigT2CaloEgammaConfig import T2CaloEgamma_ReFastAlgo
+ clusterMaker=T2CaloEgamma_ReFastAlgo( "FastClusterMaker" )
clusterMaker.ClustersName="L2CaloClusters"
svcMgr.ToolSvc.TrigDataAccess.ApplyOffsetCorrection=False