Skip to content
Snippets Groups Projects
Commit d8b31ca0 authored by Mark Hodgkinson's avatar Mark Hodgkinson
Browse files

Remove text lines from MR conflict that should not have been kept.

parent b44bbe02
6 merge requests!58791DataQualityConfigurations: Modify L1Calo config for web display,!46784MuonCondInterface: Enable thread-safety checking.,!46776Updated LArMonitoring config file for WD to match new files produced using MT,!45405updated ART test cron job,!42417Draft: DIRE and VINCIA Base Fragments for Pythia 8.3,!38228Disable tau reco and some other things from pflow ESD job options.
Hide whitespace changes
Inline Side-by-side
Reconstruction/eflowRec/share/run_ESDStandardReco_FlowElements.py
+ 0
− 2
View file @ d8b31ca0
......@@ -36,7 +36,6 @@ rec.doCaloRinger.set_Value_and_Lock(False)
#Turn of TAG
rec.doWriteTAG.set_Value_and_Lock(False)
<<<<<<< Reconstruction/eflowRec/share/run_ESDStandardReco_FlowElements.py
#disables VertexCnvAlg
from InDetRecExample.InDetJobProperties import jobproperties
jobproperties.InDetJobProperties.doxAOD.set_Value_and_Lock(False)
......@@ -51,7 +50,6 @@ CaloNoiseCondAlg(noisetype="electronicNoise")
athenaCommonFlags.EvtMax=30
#Run pflopw jet finding - this cannot be enabled via reconstruction flags currently! (without enabling other things we don't want)
>>>>>>> Reconstruction/eflowRec/share/run_ESDStandardReco_FlowElements.py
UserAlgs = ["eflowRec/jetAlgs.py"]
include ("RecExCommon/RecExCommon_topOptions.py")
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment