Merge branch 'egammaValidation_ART_AODMerge_doTrigger_False' into 'master'

egammaValidation : make rec.doTrigger=False also in the AODMerge step.

See merge request atlas/athena!39045

Reconstruction/egamma/egammaValidation/CMakeLists.txt

@@ -7,8 +7,11 @@ atlas_subdir( egammaValidation )
 atlas_add_component ( egammmaValidation
 	src/*.cxx 
 	src/components/*.cxx 
-    LINK_LIBRARIES AsgTools AthenaBaseComps EgammaAnalysisInterfacesLib GaudiKernel IsolationSelectionLib MCTruthClassifierLib PATCoreAcceptLib xAODBase xAODEgamma xAODEventInfo xAODTracking xAODTruth )
+    LINK_LIBRARIES AsgTools AthenaBaseComps EgammaAnalysisInterfacesLib GaudiKernel IsolationSelectionLib 
+                   MCTruthClassifierLib PATCoreAcceptLib xAODBase xAODEgamma xAODEventInfo 
+                   xAODTracking xAODTruth )
 
+atlas_install_python_modules( python/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} )
 # Install JO files from the package:
 atlas_install_joboptions( share/*.py )
 # ART shell executable scripts :

Reconstruction/egamma/egammaValidation/python/egammaOnlyPreExec.py

+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+
+from ParticleBuilderOptions.AODFlags import AODFlags
+from RecExConfig.RecAlgsFlags import recAlgs
+from RecExConfig.RecFlags import rec
+from JetRec.JetRecFlags import jetFlags
+
+
+def setRunEgammaOnlyRecoFlags():
+    rec.doTrigger.set_Value_and_Lock(False)
+    rec.doTau.set_Value_and_Lock(False)
+    rec.doMuon.set_Value_and_Lock(False)
+    rec.doBTagging.set_Value_and_Lock(False)
+    recAlgs.doMuonSpShower.set_Value_and_Lock(False)
+    recAlgs.doEFlow.set_Value_and_Lock(False)
+    recAlgs.doEFlowJet.set_Value_and_Lock(False)
+    recAlgs.doMissingET.set_Value_and_Lock(False)
+    recAlgs.doMissingETSig.set_Value_and_Lock(False)
+    recAlgs.doTrigger.set_Value_and_Lock(False)
+    AODFlags.ThinGeantTruth.set_Value_and_Lock(False)
+    AODFlags.egammaTrackSlimmer.set_Value_and_Lock(False)
+    AODFlags.ThinInDetForwardTrackParticles.set_Value_and_Lock(False)
+    AODFlags.ThinNegativeEnergyNeutralPFOs.set_Value_and_Lock(False)
+    jetFlags.Enabled = False
+
+
+def setRunEgammaOnlyMergeFlags():
+    rec.doTrigger.set_Value_and_Lock(False)
+    recAlgs.doTrigger.set_Value_and_Lock(False)

Reconstruction/egamma/egammaValidation/share/egamma_art_checker_joboptions.py

 #
-# Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration.
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration.
 #
 
-from AthenaCommon.AppMgr                    import theApp
-from AthenaCommon.AppMgr                    import ServiceMgr as svcMgr
-from AthenaCommon.AlgSequence               import AlgSequence
-from GaudiSvc.GaudiSvcConf                  import THistSvc
+from AtlasGeoModel import GeoModelInit
+from AtlasGeoModel import SetGeometryVersion
+from AthenaCommon.GlobalFlags import jobproperties
+from AthenaCommon.DetFlags import DetFlags
+from AthenaCommon.GlobalFlags import globalflags
+from AthenaCommon.AppMgr import theApp
+from AthenaCommon.AppMgr import ServiceMgr as svcMgr
+from AthenaCommon.AlgSequence import AlgSequence
+from GaudiSvc.GaudiSvcConf import THistSvc
 import AthenaPoolCnvSvc.ReadAthenaPool
 
 from MCTruthClassifier.MCTruthClassifierConf import MCTruthClassifier
-MCClassifier = MCTruthClassifier( name                      = "MCTruthClassifier",
-                                  ParticleCaloExtensionTool = "" )
+MCClassifier = MCTruthClassifier(name="MCTruthClassifier",
+                                 ParticleCaloExtensionTool="")
 ToolSvc += MCClassifier
 # Ouput Message Level
 svcMgr.MessageSvc.OutputLevel = INFO
 
-Geometry="ATLAS-R2-2016-01-00-01"
-from AthenaCommon.GlobalFlags import globalflags
+Geometry = "ATLAS-R2-2016-01-00-01"
 globalflags.DetGeo.set_Value_and_Lock('atlas')
-from AthenaCommon.DetFlags import DetFlags
 DetFlags.detdescr.all_setOn()
 DetFlags.Forward_setOff()
 DetFlags.ID_setOff()
 
-from AthenaCommon.GlobalFlags import jobproperties
-jobproperties.Global.DetDescrVersion=Geometry
+jobproperties.Global.DetDescrVersion = Geometry
 
-from AtlasGeoModel import SetGeometryVersion
-from AtlasGeoModel import GeoModelInit
-include( "CaloDetMgrDetDescrCnv/CaloDetMgrDetDescrCnv_joboptions.py" )
-include( "LArDetDescr/LArDetDescr_joboptions.py" )
+include("CaloDetMgrDetDescrCnv/CaloDetMgrDetDescrCnv_joboptions.py")
+include("LArDetDescr/LArDetDescr_joboptions.py")
 
 
 # ART File
@@ -38,7 +38,7 @@ svcMgr.EventSelector.InputCollections = [testFile]
 
 
 job = CfgMgr.AthSequencer("AthAlgSeq")
-job += CfgMgr.EgammaMonitoring('MonitoringAlg', sampleType = particleType)
+job += CfgMgr.EgammaMonitoring('MonitoringAlg', sampleType=particleType)
 
 
 theApp.EvtMax = 60000
@@ -46,7 +46,8 @@ theApp.EvtMax = 60000
 
 outputFile = 'Nightly-monitoring_'+particleType+'.hist.root'
 svcMgr += CfgMgr.THistSvc()
-svcMgr.THistSvc.Output = ["MONITORING DATAFILE='"+outputFile+"' OPT='RECREATE'"]
+svcMgr.THistSvc.Output = [
+    "MONITORING DATAFILE='"+outputFile+"' OPT='RECREATE'"]
 
 
-print ( "\n\nALL OK\n\n" )
+print("\n\nALL OK\n\n")

Reconstruction/egamma/egammaValidation/test/test_electron.sh

@@ -29,7 +29,7 @@ case $ArtProcess in
         echo "Unsetting ATHENA_NUM_PROC=${ATHENA_NUM_PROC}"
         unset  ATHENA_NUM_PROC
 
-	AODMerge_tf.py --inputAODFile=art_core_*/Nightly_AOD_electron.pool.root --outputAOD_MRGFile=Nightly_AOD_electron.pool.root --preExec "from RecExConfig.RecAlgsFlags import recAlgs; recAlgs.doTrigger=False" --postInclude "all:egammaValidation/egammaArtCaloCalPostInclude.py"
+	AODMerge_tf.py --inputAODFile=art_core_*/Nightly_AOD_electron.pool.root --outputAOD_MRGFile=Nightly_AOD_electron.pool.root --preExec "from egammaValidation.egammaOnlyPreExec import setRunEgammaOnlyMergeFlags; setRunEgammaOnlyMergeFlags()" --postInclude "all:egammaValidation/egammaArtCaloCalPostInclude.py"
 	
 	echo  "art-result: $? AODMerge"
 
@@ -67,7 +67,8 @@ case $ArtProcess in
 	echo "Unsetting ATHENA_NUM_PROC=${ATHENA_NUM_PROC}"
 	unset  ATHENA_NUM_PROC
 	
-	Reco_tf.py --inputRDOFile=$x --outputAODFile=Nightly_AOD_electron.pool.root --maxEvents=2000 --autoConfiguration="everything" --preExec="from ParticleBuilderOptions.AODFlags import AODFlags; AODFlags.ThinGeantTruth.set_Value_and_Lock(False);AODFlags.egammaTrackSlimmer.set_Value_and_Lock(False);AODFlags.ThinInDetForwardTrackParticles.set_Value_and_Lock(False); AODFlags.ThinNegativeEnergyNeutralPFOs.set_Value_and_Lock(False); rec.doTrigger=False; rec.doTau=False ; rec.doMuon=False; rec.doBTagging=False ; from RecExConfig.RecAlgsFlags import recAlgs; recAlgs.doMuonSpShower=False ; recAlgs.doEFlow=False ; recAlgs.doEFlowJet=False ; recAlgs.doMissingET=False ; recAlgs.doMissingETSig=False ; recAlgs.doTrigger=False ; from JetRec.JetRecFlags import jetFlags ; jetFlags.Enabled=False ; " --postInclude "ESDtoAOD:egammaValidation/egammaArtCaloCalPostInclude.py" "POOLMergeAthenaMPAOD0:egammaValidation/egammaArtCaloCalPostInclude.py"
+    Reco_tf.py --inputRDOFile=$x --outputAODFile=Nightly_AOD_electron.pool.root --maxEvents=2000 --autoConfiguration="everything" --preExec="from egammaValidation.egammaOnlyPreExec import setRunEgammaOnlyRecoFlags; setRunEgammaOnlyRecoFlags()" --postInclude "ESDtoAOD:egammaValidation/egammaArtCaloCalPostInclude.py" "POOLMergeAthenaMPAOD0:egammaValidation/egammaArtCaloCalPostInclude.py"
+
 	
 	echo  "art-result: $? reconstruction"
 

Reconstruction/egamma/egammaValidation/test/test_electron_pileup.sh

@@ -29,7 +29,7 @@ case $ArtProcess in
         echo "Unsetting ATHENA_NUM_PROC=${ATHENA_NUM_PROC}"
         unset  ATHENA_NUM_PROC
 
-	AODMerge_tf.py --inputAODFile=art_core_*/Nightly_AOD_electron.pool.root --outputAOD_MRGFile=Nightly_AOD_electron.pool.root --preExec "from RecExConfig.RecAlgsFlags import recAlgs; recAlgs.doTrigger=False" --postInclude "all:egammaValidation/egammaArtCaloCalPostInclude.py"
+	AODMerge_tf.py --inputAODFile=art_core_*/Nightly_AOD_electron.pool.root --outputAOD_MRGFile=Nightly_AOD_electron.pool.root --preExec "from egammaValidation.egammaOnlyPreExec import setRunEgammaOnlyMergeFlags; setRunEgammaOnlyMergeFlags()" --postInclude "all:egammaValidation/egammaArtCaloCalPostInclude.py"
 	echo  "art-result: $? AODMerge"
 
 	set +e
@@ -65,7 +65,7 @@ case $ArtProcess in
 	echo "Unsetting ATHENA_NUM_PROC=${ATHENA_NUM_PROC}"
 	unset  ATHENA_NUM_PROC
 	
-	Reco_tf.py --inputRDOFile=$x --outputAODFile=Nightly_AOD_electron.pool.root --maxEvents=2000 --autoConfiguration="everything" --preExec="from ParticleBuilderOptions.AODFlags import AODFlags; AODFlags.ThinGeantTruth.set_Value_and_Lock(False);AODFlags.egammaTrackSlimmer.set_Value_and_Lock(False);AODFlags.ThinInDetForwardTrackParticles.set_Value_and_Lock(False);AODFlags.ThinNegativeEnergyNeutralPFOs.set_Value_and_Lock(False); rec.doTrigger=False; rec.doTau=False ; rec.doMuon=False; rec.doBTagging=False ; from RecExConfig.RecAlgsFlags import recAlgs; recAlgs.doMuonSpShower=False ; recAlgs.doEFlow=False ; recAlgs.doEFlowJet=False ; recAlgs.doMissingET=False ; recAlgs.doMissingETSig=False ; recAlgs.doTrigger=False ; from JetRec.JetRecFlags import jetFlags ; jetFlags.Enabled=False ; " --postInclude "ESDtoAOD:egammaValidation/egammaArtCaloCalPostInclude.py" "POOLMergeAthenaMPAOD0:egammaValidation/egammaArtCaloCalPostInclude.py"
+	Reco_tf.py --inputRDOFile=$x --outputAODFile=Nightly_AOD_electron.pool.root --maxEvents=2000 --autoConfiguration="everything" --preExec="from egammaValidation.egammaOnlyPreExec import setRunEgammaOnlyRecoFlags; setRunEgammaOnlyRecoFlags()" --postInclude "ESDtoAOD:egammaValidation/egammaArtCaloCalPostInclude.py" "POOLMergeAthenaMPAOD0:egammaValidation/egammaArtCaloCalPostInclude.py"
 
 	echo  "art-result: $? reconstruction"
 

Reconstruction/egamma/egammaValidation/test/test_gamma.sh

@@ -30,7 +30,7 @@ case $ArtProcess in
         echo "Unsetting ATHENA_NUM_PROC=${ATHENA_NUM_PROC}"
         unset  ATHENA_NUM_PROC
 
-        AODMerge_tf.py --inputAODFile=art_core_*/Nightly_AOD_gamma.pool.root --outputAOD_MRGFile=Nightly_AOD_gamma.pool.root  --preExec "from RecExConfig.RecAlgsFlags import recAlgs; recAlgs.doTrigger=False" --postInclude "all:egammaValidation/egammaArtCaloCalPostInclude.py"
+        AODMerge_tf.py --inputAODFile=art_core_*/Nightly_AOD_gamma.pool.root --outputAOD_MRGFile=Nightly_AOD_gamma.pool.root  --preExec "rec.doTrigger=False; from RecExConfig.RecAlgsFlags import recAlgs; recAlgs.doTrigger=False" --postInclude "all:egammaValidation/egammaArtCaloCalPostInclude.py"
 	
 	echo  "art-result: $? AODMerge"
 

Reconstruction/egamma/egammaValidation/test/test_gamma_pileup.sh

@@ -30,7 +30,7 @@ case $ArtProcess in
         echo "Unsetting ATHENA_NUM_PROC=${ATHENA_NUM_PROC}"
         unset  ATHENA_NUM_PROC
 
-        AODMerge_tf.py --inputAODFile=art_core_*/Nightly_AOD_gamma.pool.root --outputAOD_MRGFile=Nightly_AOD_gamma.pool.root --preExec "from RecExConfig.RecAlgsFlags import recAlgs; recAlgs.doTrigger=False" --postInclude "all:egammaValidation/egammaArtCaloCalPostInclude.py" 
+        AODMerge_tf.py --inputAODFile=art_core_*/Nightly_AOD_gamma.pool.root --outputAOD_MRGFile=Nightly_AOD_gamma.pool.root --preExec "rec.doTrigger=False; from RecExConfig.RecAlgsFlags import recAlgs; recAlgs.doTrigger=False" --postInclude "all:egammaValidation/egammaArtCaloCalPostInclude.py" 
 
 	echo  "art-result: $? AODMerge"