Merge branch 'Fix_test_trigUpgr_dataScouting_build' into 'master'

Fixed dataScoutingTest.py and updated dataScouting.ref

See merge request atlas/athena!24206

Trigger/TrigValidation/TrigUpgradeTest/share/dataScoutingTest.py

@@ -12,7 +12,7 @@ doMuon   = False
 doJet    = False
 doCombo  = False
 
-from TriggerMenuMT.HLTMenuConfig.Menu.MenuComponents import Chain, ChainStep
+from TriggerMenuMT.HLTMenuConfig.Menu.MenuComponents import Chain, ChainStep, RecoFragmentsPool
 testChains = []
 
 ##################################################################
@@ -31,29 +31,32 @@ AllowedEventBuildingIdentifiers.extend(['dataScoutingElectronTest','pebtestthree
 ##################################################################
 if (doElectron):
     from TriggerMenuMT.HLTMenuConfig.CommonSequences.CaloSequenceSetup import fastCaloMenuSequence
-    from TriggerMenuMT.HLTMenuConfig.Egamma.ElectronSequenceSetup import electronMenuSequence
-
-    fastCaloStep= fastCaloMenuSequence("Ele")
-    electronStep= electronMenuSequence()
-
-    step1=ChainStep("Step1_etcut", [fastCaloStep])
-    step2=ChainStep("Step2_etcut", [electronStep])
+    from TrigUpgradeTest.InDetSetup import inDetSetup
+    from TriggerMenuMT.HLTMenuConfig.Egamma.ElectronDef import fastCaloSequenceCfg, fastElectronSequenceCfg, precisionCaloSequenceCfg
+    
+    fastCalo = RecoFragmentsPool.retrieve( fastCaloSequenceCfg, None ) 
+    electronReco = RecoFragmentsPool.retrieve( fastElectronSequenceCfg, None )
+    precisionReco = RecoFragmentsPool.retrieve( precisionCaloSequenceCfg, None )
+
+    step1=ChainStep("Step1_etcut", [fastCalo])
+    step2=ChainStep("Step2_etcut", [electronReco])
+    step3=ChainStep("Step3_etcut", [precisionReco])
     step3_PEB1=ChainStep("Step3_pebtestone", [pebInfoWriterSequence("pebtestone")]) # adds some LAr ROBs and the full HLT result
     step3_DS=ChainStep("Step3_dataScoutingElectronTest", [dataScoutingSequence("dataScoutingElectronTest")]) # adds the special HLT result
     step4_PEB3=ChainStep("Step3_pebtestthree", [pebInfoWriterSequence("pebtestthree")]) # same as pebtestone but without any HLT result
 
     egammaChains = [
         # DS+PEB chain (special HLT result and subset of detector data saved)
-        Chain(name='HLT_e3_etcut_dataScoutingElectronTest_pebtestthree',  Seed="L1_EM3",  ChainSteps=[step1, step2, step3_DS, step4_PEB3]  ),
+        Chain(name='HLT_e3_etcut_dataScoutingElectronTest_pebtestthree',  Seed="L1_EM3",  ChainSteps=[step1, step2, step3, step3_DS, step4_PEB3]  ),
 
         # Pure DS chain (only special HLT result saved and no detector data saved)
-        Chain(name='HLT_e5_etcut_dataScoutingElectronTest',  Seed="L1_EM3",  ChainSteps=[step1, step2, step3_DS]  ),
+        Chain(name='HLT_e5_etcut_dataScoutingElectronTest',  Seed="L1_EM3",  ChainSteps=[step1, step2, step3, step3_DS]  ),
 
         # PEB chain (full HLT result and subset of detector data saved)
-        Chain(name='HLT_e7_etcut_pebtestone',  Seed="L1_EM3",  ChainSteps=[step1, step2, step3_PEB1]  ),
+        Chain(name='HLT_e7_etcut_pebtestone',  Seed="L1_EM3",  ChainSteps=[step1, step2, step3, step3_PEB1]  ),
 
         # Standard chain (full HLT result and full detector data saved)
-        Chain(name='HLT_e12_etcut',  Seed="L1_EM3",  ChainSteps=[step1, step2]  )
+        Chain(name='HLT_e12_etcut',  Seed="L1_EM3",  ChainSteps=[step1, step2, step3]  )
     ]
     testChains += egammaChains
 

Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Egamma/PhotonDef.py

@@ -22,7 +22,7 @@ def fastPhotonCaloSequenceCfg( flags ):
 def fastPhotonSequenceCfg( flags ):    
     return fastPhotonMenuSequence()
 
-def precisionCaloSequenceCfg( flags ):
+def precisionPhotonCaloSequenceCfg( flags ):
     return precisionCaloMenuSequence()
 
 #----------------------------------------------------------------
@@ -79,7 +79,7 @@ class PhotonChainConfiguration(ChainConfigurationBase):
     def getPrecisionCaloPhoton(self):
         stepName = "PhotonPrecisionCalo"
         log.debug("Configuring step " + stepName)
-        precisionCaloPhoton = RecoFragmentsPool.retrieve( precisionCaloSequenceCfg, None )
+        precisionCaloPhoton = RecoFragmentsPool.retrieve( precisionPhotonCaloSequenceCfg, None )
         return ChainStep(stepName, [precisionCaloPhoton])