diff --git a/Control/CalypsoExample/Digitization/scripts/faserMDC_digi.py b/Control/CalypsoExample/Digitization/scripts/faserMDC_digi.py
index fc426f2a7216f8d7afcdd14f9c0d1de39738d5ca..b57bbb5d0cd1275132fe44458b2dd6a5074f343b 100755
--- a/Control/CalypsoExample/Digitization/scripts/faserMDC_digi.py
+++ b/Control/CalypsoExample/Digitization/scripts/faserMDC_digi.py
@@ -65,16 +65,22 @@ configFlags.Input.isMC = True # Needed to bypass autoconfig
configFlags.IOVDb.DatabaseInstance = "OFLP200" # Use MC conditions for now
<<<<<<< HEAD
+<<<<<<< HEAD
+=======
+>>>>>>> 6e1b4d4be8e (Configuration fixes)
configFlags.Input.ProjectName = "mc20"
#configFlags.GeoModel.Align.Dynamic = False
configFlags.Beam.NumberOfCollisions = 0.
configFlags.Digitization.TruthOutput = True
+<<<<<<< HEAD
=======
ConfigFlags.Input.ProjectName = "mc20"
#ConfigFlags.GeoModel.Align.Dynamic = False
ConfigFlags.Beam.NumberOfCollisions = 0.
ConfigFlags.Digitization.TruthOutput = True
>>>>>>> 05a628fdc98 (GeometryTest runs successfully)
+=======
+>>>>>>> 6e1b4d4be8e (Configuration fixes)
# TI12 old geometry
if runtype == "TI12OldMC":
diff --git a/Control/CalypsoExample/Digitization/scripts/faserMDC_digi_merge.py b/Control/CalypsoExample/Digitization/scripts/faserMDC_digi_merge.py
index b9c9804cf0fb32204fbae2620f904fd34d04c1d5..51ad97c4e5bd4de7dd8a31a4b27958241c7689a6 100755
--- a/Control/CalypsoExample/Digitization/scripts/faserMDC_digi_merge.py
+++ b/Control/CalypsoExample/Digitization/scripts/faserMDC_digi_merge.py
@@ -138,16 +138,22 @@ configFlags.Input.isMC = True # Needed to bypass autoconfig
configFlags.IOVDb.DatabaseInstance = "OFLP200" # Use MC conditions for now
<<<<<<< HEAD
+<<<<<<< HEAD
+=======
+>>>>>>> 6e1b4d4be8e (Configuration fixes)
configFlags.Input.ProjectName = "mc20"
#configFlags.GeoModel.Align.Dynamic = False
configFlags.Beam.NumberOfCollisions = 0.
configFlags.Digitization.TruthOutput = True
+<<<<<<< HEAD
=======
ConfigFlags.Input.ProjectName = "mc20"
#ConfigFlags.GeoModel.Align.Dynamic = False
ConfigFlags.Beam.NumberOfCollisions = 0.
ConfigFlags.Digitization.TruthOutput = True
>>>>>>> 05a628fdc98 (GeometryTest runs successfully)
+=======
+>>>>>>> 6e1b4d4be8e (Configuration fixes)
# TI12 old geometry
if runtype == "TI12OldMC":
diff --git a/Control/CalypsoExample/Digitization/scripts/faser_digi.py b/Control/CalypsoExample/Digitization/scripts/faser_digi.py
index 346fe972f75edc9b18d3f68ccd668325559e625d..d1542c9b1c4d4b8f3a846b1e4c715bfdddf4c309 100755
--- a/Control/CalypsoExample/Digitization/scripts/faser_digi.py
+++ b/Control/CalypsoExample/Digitization/scripts/faser_digi.py
@@ -68,16 +68,22 @@ configFlags.Input.isMC = True # Needed to bypass autoconfig
configFlags.IOVDb.DatabaseInstance = "OFLP200" # Use MC conditions for now
<<<<<<< HEAD
+<<<<<<< HEAD
+=======
+>>>>>>> 6e1b4d4be8e (Configuration fixes)
configFlags.Input.ProjectName = "mc20"
#configFlags.GeoModel.Align.Dynamic = False
configFlags.Beam.NumberOfCollisions = 0.
configFlags.Digitization.TruthOutput = True
+<<<<<<< HEAD
=======
ConfigFlags.Input.ProjectName = "mc20"
#ConfigFlags.GeoModel.Align.Dynamic = False
ConfigFlags.Beam.NumberOfCollisions = 0.
ConfigFlags.Digitization.TruthOutput = True
>>>>>>> 05a628fdc98 (GeometryTest runs successfully)
+=======
+>>>>>>> 6e1b4d4be8e (Configuration fixes)
# TI12 old geometry
if runtype == "TI12OldMC":
diff --git a/Control/CalypsoExample/Digitization/scripts/faser_digi_merge.py b/Control/CalypsoExample/Digitization/scripts/faser_digi_merge.py
index 1cd4a2739b7754e1692168493503f466d576ef5a..3285f38887442b08d6488d6ed9e64e79743fd90e 100755
--- a/Control/CalypsoExample/Digitization/scripts/faser_digi_merge.py
+++ b/Control/CalypsoExample/Digitization/scripts/faser_digi_merge.py
@@ -178,16 +178,22 @@ configFlags.Input.isMC = True # Needed to bypass autoconfig
configFlags.IOVDb.DatabaseInstance = "OFLP200" # Use MC conditions for now
<<<<<<< HEAD
+<<<<<<< HEAD
+=======
+>>>>>>> 6e1b4d4be8e (Configuration fixes)
configFlags.Input.ProjectName = "mc20"
#configFlags.GeoModel.Align.Dynamic = False
configFlags.Beam.NumberOfCollisions = 0.
configFlags.Digitization.TruthOutput = True
+<<<<<<< HEAD
=======
ConfigFlags.Input.ProjectName = "mc20"
#ConfigFlags.GeoModel.Align.Dynamic = False
ConfigFlags.Beam.NumberOfCollisions = 0.
ConfigFlags.Digitization.TruthOutput = True
>>>>>>> 05a628fdc98 (GeometryTest runs successfully)
+=======
+>>>>>>> 6e1b4d4be8e (Configuration fixes)
# TI12 old geometry
if runtype == "TI12OldMC":
diff --git a/Control/CalypsoExample/Generation/scripts/faserMDC_foresee.py b/Control/CalypsoExample/Generation/scripts/faserMDC_foresee.py
index 1172cbbe0b825323f2db9bbccc1c0fbae753e3f2..dd1106962a980c670d6a5c7b41584d5f387debe3 100755
--- a/Control/CalypsoExample/Generation/scripts/faserMDC_foresee.py
+++ b/Control/CalypsoExample/Generation/scripts/faserMDC_foresee.py
@@ -63,7 +63,11 @@ if __name__ == '__main__':
#
# Sim configFlags
#
+<<<<<<< HEAD
configFlags.GeoModel.Layout = "FASER"
+=======
+ configFlags.Sim.Layout = "FASER"
+>>>>>>> 6e1b4d4be8e (Configuration fixes)
configFlags.Sim.PhysicsList = "FTFP_BERT"
configFlags.Sim.ReleaseGeoModel = False
configFlags.Sim.IncludeParentsInG4Event = True # Controls whether BeamTruthEvent is written to output HITS file
@@ -78,16 +82,22 @@ if __name__ == '__main__':
configFlags.addFlag("Sim.Beam.yshift", 12.)
<<<<<<< HEAD
+<<<<<<< HEAD
+=======
+>>>>>>> 6e1b4d4be8e (Configuration fixes)
configFlags.GeoModel.FaserVersion = "FASERNU-03" # Geometry set-up
configFlags.IOVDb.GlobalTag = "OFLCOND-FASER-03" # Conditions set-up
configFlags.addFlag("Input.InitialTimeStamp", 0) # To avoid autoconfig
#configFlags.GeoModel.Align.Dynamic = False
+<<<<<<< HEAD
=======
ConfigFlags.GeoModel.FaserVersion = "FASERNU-03" # Geometry set-up
ConfigFlags.IOVDb.GlobalTag = "OFLCOND-FASER-03" # Conditions set-up
ConfigFlags.addFlag("Input.InitialTimeStamp", 0) # To avoid autoconfig
#ConfigFlags.GeoModel.Align.Dynamic = False
>>>>>>> 05a628fdc98 (GeometryTest runs successfully)
+=======
+>>>>>>> 6e1b4d4be8e (Configuration fixes)
#
# Preset particle gun parameters
diff --git a/Control/CalypsoExample/Generation/scripts/faserMDC_particlegun.py b/Control/CalypsoExample/Generation/scripts/faserMDC_particlegun.py
index 27b8ec3d7fdb02c310cf4b4458a167b49f62a245..22a8a4dd4f25f6863a4a740ae991b2161d2871c6 100755
--- a/Control/CalypsoExample/Generation/scripts/faserMDC_particlegun.py
+++ b/Control/CalypsoExample/Generation/scripts/faserMDC_particlegun.py
@@ -63,7 +63,11 @@ if __name__ == '__main__':
#
# Sim configFlags
#
+<<<<<<< HEAD
configFlags.GeoModel.Layout = "FASER"
+=======
+ configFlags.Sim.Layout = "FASER"
+>>>>>>> 6e1b4d4be8e (Configuration fixes)
configFlags.Sim.PhysicsList = "FTFP_BERT"
configFlags.Sim.ReleaseGeoModel = False
configFlags.Sim.IncludeParentsInG4Event = True # Controls whether BeamTruthEvent is written to output HITS file
@@ -74,16 +78,22 @@ if __name__ == '__main__':
configFlags.addFlag("Sim.Beam.yshift", 0)
<<<<<<< HEAD
+<<<<<<< HEAD
+=======
+>>>>>>> 6e1b4d4be8e (Configuration fixes)
configFlags.GeoModel.FaserVersion = "FASERNU-03" # Geometry set-up
configFlags.IOVDb.GlobalTag = "OFLCOND-FASER-03" # Conditions set-up
configFlags.addFlag("Input.InitialTimeStamp", 0) # To avoid autoconfig
#configFlags.GeoModel.Align.Dynamic = False
+<<<<<<< HEAD
=======
ConfigFlags.GeoModel.FaserVersion = "FASERNU-03" # Geometry set-up
ConfigFlags.IOVDb.GlobalTag = "OFLCOND-FASER-03" # Conditions set-up
ConfigFlags.addFlag("Input.InitialTimeStamp", 0) # To avoid autoconfig
#ConfigFlags.GeoModel.Align.Dynamic = False
>>>>>>> 05a628fdc98 (GeometryTest runs successfully)
+=======
+>>>>>>> 6e1b4d4be8e (Configuration fixes)
#
# Preset particle gun parameters
diff --git a/Control/CalypsoExample/Generation/scripts/faser_particlegun.py b/Control/CalypsoExample/Generation/scripts/faser_particlegun.py
index 84792f9f0873003fda5e5c89361f598b544bb7fe..80b68f52fa8ea90064c10b4d2367bfcb2dcd855d 100755
--- a/Control/CalypsoExample/Generation/scripts/faser_particlegun.py
+++ b/Control/CalypsoExample/Generation/scripts/faser_particlegun.py
@@ -66,7 +66,11 @@ if __name__ == '__main__':
#
# Sim configFlags
#
+<<<<<<< HEAD
configFlags.GeoModel.Layout = "FASER"
+=======
+ configFlags.Sim.Layout = "FASER"
+>>>>>>> 6e1b4d4be8e (Configuration fixes)
configFlags.Sim.PhysicsList = "FTFP_BERT"
configFlags.Sim.ReleaseGeoModel = False
configFlags.Sim.IncludeParentsInG4Event = True # Controls whether BeamTruthEvent is written to output HITS file
@@ -103,6 +107,7 @@ if __name__ == '__main__':
print(f"Unknown geometry {args.geom}!")
sys.exit(1)
+<<<<<<< HEAD
<<<<<<< HEAD
configFlags.addFlag("Input.InitialTimeStamp", 0) # To avoid autoconfig
#configFlags.GeoModel.Align.Dynamic = False
@@ -110,6 +115,10 @@ if __name__ == '__main__':
ConfigFlags.addFlag("Input.InitialTimeStamp", 0) # To avoid autoconfig
#ConfigFlags.GeoModel.Align.Dynamic = False
>>>>>>> 05a628fdc98 (GeometryTest runs successfully)
+=======
+ configFlags.addFlag("Input.InitialTimeStamp", 0) # To avoid autoconfig
+ #configFlags.GeoModel.Align.Dynamic = False
+>>>>>>> 6e1b4d4be8e (Configuration fixes)
#
# Preset particle gun parameters
#
diff --git a/Control/CalypsoExample/GeoModelTest/python/Faser04TestConfig.py b/Control/CalypsoExample/GeoModelTest/python/Faser04TestConfig.py
index 8fafafd90bf371165dfe624d2c48a28f3c78258f..33faa5ac812ab0db24a93ec3e07b0ea715012784 100644
--- a/Control/CalypsoExample/GeoModelTest/python/Faser04TestConfig.py
+++ b/Control/CalypsoExample/GeoModelTest/python/Faser04TestConfig.py
@@ -5,10 +5,14 @@ import sys
from AthenaCommon.Constants import VERBOSE, INFO
from Campaigns.Utils import Campaign
<<<<<<< HEAD
+<<<<<<< HEAD
from AthenaConfiguration.ComponentFactory import CompFactory, isComponentAccumulatorCfg
=======
from AthenaConfiguration.ComponentFactory import CompFactory
>>>>>>> 05a628fdc98 (GeometryTest runs successfully)
+=======
+from AthenaConfiguration.ComponentFactory import CompFactory, isComponentAccumulatorCfg
+>>>>>>> 6e1b4d4be8e (Configuration fixes)
def GeoModelTestCfg(flags, name="GeoModelTestAlg", **kwargs):
@@ -34,6 +38,7 @@ if __name__ == "__main__":
from AthenaCommon.Configurable import Configurable
from CalypsoConfiguration.AllConfigFlags import initConfigFlags
+<<<<<<< HEAD
# # Configurable.configurableRun3Behavior = True
# print("CACfg = ", isComponentAccumulatorCfg())
@@ -43,6 +48,16 @@ if __name__ == "__main__":
# Flags for this job
<<<<<<< HEAD
+=======
+ # Configurable.configurableRun3Behavior = True
+
+ print("CACfg = ", isComponentAccumulatorCfg())
+
+ print("AthenaCommon.Include", "AthenaCommon.Include" in sys.modules)
+ print("Configurable._useGlobalInstances", Configurable._useGlobalInstances)
+
+# Flags for this job
+>>>>>>> 6e1b4d4be8e (Configuration fixes)
configFlags = initConfigFlags()
configFlags.Input.isMC = True # Needed to bypass autoconfig
configFlags.Input.MCCampaign = Campaign.Unknown
@@ -60,6 +75,7 @@ if __name__ == "__main__":
# configFlags.Detector.EnableDownstreamDipole = True
# configFlags.Detector.EnableEcal = True
configFlags.lock()
+<<<<<<< HEAD
=======
ConfigFlags.Input.isMC = True # Needed to bypass autoconfig
ConfigFlags.Input.MCCampaign = Campaign.Unknown
@@ -78,6 +94,8 @@ if __name__ == "__main__":
# ConfigFlags.Detector.EnableEcal = True
ConfigFlags.lock()
>>>>>>> 05a628fdc98 (GeometryTest runs successfully)
+=======
+>>>>>>> 6e1b4d4be8e (Configuration fixes)
# Configure components
from CalypsoConfiguration.MainServicesConfig import MainServicesCfg
diff --git a/Control/CalypsoExample/NeutrinoHits/scripts/faser_dumpnu.py b/Control/CalypsoExample/NeutrinoHits/scripts/faser_dumpnu.py
index 4e7e48051ef4c003ff373c470f3c0c3de4a79c1c..f14d9bcac29bb60548c8bbb4a38e4ce56f773f8f 100755
--- a/Control/CalypsoExample/NeutrinoHits/scripts/faser_dumpnu.py
+++ b/Control/CalypsoExample/NeutrinoHits/scripts/faser_dumpnu.py
@@ -60,6 +60,7 @@ configFlags = initConfigFlags()
configFlags.Input.isMC = True # Needed to bypass autoconfig
configFlags.IOVDb.DatabaseInstance = "OFLP200" # Use MC conditions for now
+<<<<<<< HEAD
<<<<<<< HEAD
configFlags.Input.ProjectName = "mc20"
#configFlags.GeoModel.Align.Dynamic = False
@@ -69,6 +70,11 @@ ConfigFlags.Input.ProjectName = "mc20"
#ConfigFlags.GeoModel.Align.Dynamic = False
ConfigFlags.Beam.NumberOfCollisions = 0.
>>>>>>> 05a628fdc98 (GeometryTest runs successfully)
+=======
+configFlags.Input.ProjectName = "mc20"
+#configFlags.GeoModel.Align.Dynamic = False
+configFlags.Beam.NumberOfCollisions = 0.
+>>>>>>> 6e1b4d4be8e (Configuration fixes)
if runtype == "TI12MC03":
configFlags.GeoModel.FaserVersion = "FASERNU-03"
diff --git a/Control/CalypsoExample/Reconstruction/scripts/faserMDC_reco.py b/Control/CalypsoExample/Reconstruction/scripts/faserMDC_reco.py
index 8bc27b33e1743feba44ed93b467034551366ff43..447f54f2658453e6dd48219be603e0dd4138da21 100755
--- a/Control/CalypsoExample/Reconstruction/scripts/faserMDC_reco.py
+++ b/Control/CalypsoExample/Reconstruction/scripts/faserMDC_reco.py
@@ -70,6 +70,7 @@ configFlags = initConfigFlags()
configFlags.Input.isMC = args.isMC # Needed to bypass autoconfig
configFlags.IOVDb.DatabaseInstance = "OFLP200" # Use MC conditions for now
+<<<<<<< HEAD
<<<<<<< HEAD
configFlags.Input.ProjectName = "data20"
#configFlags.GeoModel.Align.Dynamic = False
@@ -77,6 +78,10 @@ configFlags.Input.ProjectName = "data20"
ConfigFlags.Input.ProjectName = "data20"
#ConfigFlags.GeoModel.Align.Dynamic = False
>>>>>>> 05a628fdc98 (GeometryTest runs successfully)
+=======
+configFlags.Input.ProjectName = "data20"
+#configFlags.GeoModel.Align.Dynamic = False
+>>>>>>> 6e1b4d4be8e (Configuration fixes)
# For tracking
configFlags.TrackingGeometry.MaterialSource = "/cvmfs/faser.cern.ch/repo/sw/database/DBRelease/current/acts/material-maps.json"
diff --git a/Control/CalypsoExample/Reconstruction/scripts/faser_reco.py b/Control/CalypsoExample/Reconstruction/scripts/faser_reco.py
index c420f6a83eff8dfb05d4687ba1b50725aff3b652..2527c427e32727eed86a96622d825a42639f28dc 100755
--- a/Control/CalypsoExample/Reconstruction/scripts/faser_reco.py
+++ b/Control/CalypsoExample/Reconstruction/scripts/faser_reco.py
@@ -110,6 +110,7 @@ if args.isMC:
else:
configFlags.IOVDb.DatabaseInstance = "CONDBR3" # Use data conditions
+<<<<<<< HEAD
<<<<<<< HEAD
configFlags.Input.ProjectName = "data20"
#configFlags.GeoModel.Align.Dynamic = False
@@ -117,6 +118,10 @@ configFlags.Input.ProjectName = "data20"
ConfigFlags.Input.ProjectName = "data20"
#ConfigFlags.GeoModel.Align.Dynamic = False
>>>>>>> 05a628fdc98 (GeometryTest runs successfully)
+=======
+configFlags.Input.ProjectName = "data20"
+#configFlags.GeoModel.Align.Dynamic = False
+>>>>>>> 6e1b4d4be8e (Configuration fixes)
configFlags.Exec.SkipEvents = args.skip
diff --git a/Control/CalypsoExample/Simulation/scripts/faserMDC_simulate.py b/Control/CalypsoExample/Simulation/scripts/faserMDC_simulate.py
index c92877364d818c5d23ecc89bcd6a2265c9133c2b..b84e81dd3ce885aea11d4dddc8105abdf5492f68 100755
--- a/Control/CalypsoExample/Simulation/scripts/faserMDC_simulate.py
+++ b/Control/CalypsoExample/Simulation/scripts/faserMDC_simulate.py
@@ -136,7 +136,11 @@ if __name__ == '__main__':
#
# Sim configFlags
#
+<<<<<<< HEAD
configFlags.GeoModel.Layout = "FASER"
+=======
+ configFlags.Sim.Layout = "FASER"
+>>>>>>> 6e1b4d4be8e (Configuration fixes)
configFlags.Sim.PhysicsList = "FTFP_BERT"
configFlags.Sim.ReleaseGeoModel = False
configFlags.Sim.IncludeParentsInG4Event = True # Controls whether BeamTruthEvent is written to output HITS file
@@ -148,16 +152,22 @@ if __name__ == '__main__':
configFlags.addFlag("Sim.Beam.yshift", args.yshift)
<<<<<<< HEAD
+<<<<<<< HEAD
+=======
+>>>>>>> 6e1b4d4be8e (Configuration fixes)
configFlags.GeoModel.FaserVersion = "FASERNU-03" # Geometry set-up
configFlags.IOVDb.GlobalTag = "OFLCOND-FASER-03" # Conditions set-up
configFlags.addFlag("Input.InitialTimeStamp", 0) # To avoid autoconfig
#configFlags.GeoModel.Align.Dynamic = False
+<<<<<<< HEAD
=======
ConfigFlags.GeoModel.FaserVersion = "FASERNU-03" # Geometry set-up
ConfigFlags.IOVDb.GlobalTag = "OFLCOND-FASER-03" # Conditions set-up
ConfigFlags.addFlag("Input.InitialTimeStamp", 0) # To avoid autoconfig
#ConfigFlags.GeoModel.Align.Dynamic = False
>>>>>>> 05a628fdc98 (GeometryTest runs successfully)
+=======
+>>>>>>> 6e1b4d4be8e (Configuration fixes)
# import sys
# configFlags.fillFromArgs(sys.argv[1:])
diff --git a/Control/CalypsoExample/Simulation/scripts/faser_simulate.py b/Control/CalypsoExample/Simulation/scripts/faser_simulate.py
index 68897ed225c2c96b0cd7284ca24bd4b4fd126d46..ef8b6cc81e9912b0d03cdcb2d0a085a3b70ba8ea 100755
--- a/Control/CalypsoExample/Simulation/scripts/faser_simulate.py
+++ b/Control/CalypsoExample/Simulation/scripts/faser_simulate.py
@@ -195,13 +195,8 @@ if __name__ == '__main__':
configFlags.addFlag("Sim.Beam.xshift", args.xshift) # Potential beam shift
configFlags.addFlag("Sim.Beam.yshift", args.yshift)
-<<<<<<< HEAD
configFlags.addFlag("Input.InitialTimeStamp", 0) # To avoid autoconfig
#configFlags.GeoModel.Align.Dynamic = False
-=======
- ConfigFlags.addFlag("Input.InitialTimeStamp", 0) # To avoid autoconfig
- #ConfigFlags.GeoModel.Align.Dynamic = False
->>>>>>> 05a628fdc98 (GeometryTest runs successfully)
# import sys
# configFlags.fillFromArgs(sys.argv[1:])
diff --git a/Control/CalypsoExample/TrackerDataAccessExample/python/TrackerDataAccessExampleConfig.py b/Control/CalypsoExample/TrackerDataAccessExample/python/TrackerDataAccessExampleConfig.py
index ace2868455677e37bba775635d8393e472e09905..97d319eebb69e595fb67e3d58b3dd6569611a215 100755
--- a/Control/CalypsoExample/TrackerDataAccessExample/python/TrackerDataAccessExampleConfig.py
+++ b/Control/CalypsoExample/TrackerDataAccessExample/python/TrackerDataAccessExampleConfig.py
@@ -36,6 +36,9 @@ if __name__ == "__main__":
# Flags for this job
<<<<<<< HEAD
+<<<<<<< HEAD
+=======
+>>>>>>> 6e1b4d4be8e (Configuration fixes)
configFlags = initConfigFlags()
configFlags.Input.isMC = False # Needed to bypass autoconfig
configFlags.IOVDb.GlobalTag = "OFLCOND-FASER-01" # Always needed; must match FaserVersion
@@ -46,6 +49,7 @@ if __name__ == "__main__":
configFlags.Input.Files = [f"{Cmake_working_dir}/../rawdata/Faser-Physics-001920-filtered.raw"] #path is set to test data for ctest
# configFlags.Output.RDOFileName = "my.RDO.pool.root"
configFlags.lock()
+<<<<<<< HEAD
=======
ConfigFlags.Input.isMC = False # Needed to bypass autoconfig
ConfigFlags.IOVDb.GlobalTag = "OFLCOND-FASER-01" # Always needed; must match FaserVersion
@@ -57,6 +61,8 @@ if __name__ == "__main__":
ConfigFlags.Output.RDOFileName = "my.RDO.pool.root"
ConfigFlags.lock()
>>>>>>> 05a628fdc98 (GeometryTest runs successfully)
+=======
+>>>>>>> 6e1b4d4be8e (Configuration fixes)
# Configure components
from CalypsoConfiguration.MainServicesConfig import MainServicesCfg
diff --git a/Control/CalypsoExample/TriggerDataAccessExample/python/TriggerDataAccessExampleConfig.py b/Control/CalypsoExample/TriggerDataAccessExample/python/TriggerDataAccessExampleConfig.py
index 50051733299bba2caac1696fdd8808358928c370..f92b2437c86d7432cdd593744f1de0477fcb764b 100755
--- a/Control/CalypsoExample/TriggerDataAccessExample/python/TriggerDataAccessExampleConfig.py
+++ b/Control/CalypsoExample/TriggerDataAccessExample/python/TriggerDataAccessExampleConfig.py
@@ -35,6 +35,9 @@ if __name__ == "__main__":
# Flags for this job
<<<<<<< HEAD
+<<<<<<< HEAD
+=======
+>>>>>>> 6e1b4d4be8e (Configuration fixes)
configFlags = initConfigFlags()
configFlags.Input.isMC = False # Needed to bypass autoconfig
configFlags.IOVDb.GlobalTag = "OFLCOND-FASER-01" # Always needed; must match FaserVersion
@@ -45,6 +48,7 @@ if __name__ == "__main__":
configFlags.Input.Files = [f"{Cmake_working_dir}/../rawdata/Faser-Physics-001920-filtered.raw"] #path is set to test data for ctest
configFlags.Output.RDOFileName = "trigger.RDO.pool.root"
configFlags.lock()
+<<<<<<< HEAD
=======
ConfigFlags.Input.isMC = False # Needed to bypass autoconfig
ConfigFlags.IOVDb.GlobalTag = "OFLCOND-FASER-01" # Always needed; must match FaserVersion
@@ -56,6 +60,8 @@ if __name__ == "__main__":
ConfigFlags.Output.RDOFileName = "trigger.RDO.pool.root"
ConfigFlags.lock()
>>>>>>> 05a628fdc98 (GeometryTest runs successfully)
+=======
+>>>>>>> 6e1b4d4be8e (Configuration fixes)
# Configure components
from CalypsoConfiguration.MainServicesConfig import MainServicesCfg
diff --git a/Control/CalypsoExample/WaveformDataAccessExample/python/WaveformDataAccessExampleConfig.py b/Control/CalypsoExample/WaveformDataAccessExample/python/WaveformDataAccessExampleConfig.py
index 36c3acddbec10618784949660bcd0a48495fa2a8..c547ca963db391c5d2f16c493783819a7f882082 100755
--- a/Control/CalypsoExample/WaveformDataAccessExample/python/WaveformDataAccessExampleConfig.py
+++ b/Control/CalypsoExample/WaveformDataAccessExample/python/WaveformDataAccessExampleConfig.py
@@ -36,6 +36,9 @@ if __name__ == "__main__":
# Flags for this job
<<<<<<< HEAD
+<<<<<<< HEAD
+=======
+>>>>>>> 6e1b4d4be8e (Configuration fixes)
configFlags = initConfigFlags()
configFlags.Input.isMC = False # Needed to bypass autoconfig
# configFlags.Input.Format = Format.BS
@@ -47,6 +50,7 @@ if __name__ == "__main__":
configFlags.Input.Files = [f"{Cmake_working_dir}/../rawdata/Faser-Physics-001920-filtered.raw"] #path is set to test data for ctest
configFlags.Output.RDOFileName = "waveform.RDO.pool.root"
configFlags.lock()
+<<<<<<< HEAD
=======
ConfigFlags.Input.isMC = False # Needed to bypass autoconfig
ConfigFlags.IOVDb.GlobalTag = "OFLCOND-FASER-01" # Always needed; must match FaserVersion
@@ -58,6 +62,8 @@ if __name__ == "__main__":
ConfigFlags.Output.RDOFileName = "waveform.RDO.pool.root"
ConfigFlags.lock()
>>>>>>> 05a628fdc98 (GeometryTest runs successfully)
+=======
+>>>>>>> 6e1b4d4be8e (Configuration fixes)
# Configure components
from CalypsoConfiguration.MainServicesConfig import MainServicesCfg
diff --git a/Derivation/DerivationAlgs/share/runDerive.py b/Derivation/DerivationAlgs/share/runDerive.py
index 947c6cb4af611cfa586803abc527a71abee62982..802f846b1ae499953161d44cf425e0d0a977b782 100644
--- a/Derivation/DerivationAlgs/share/runDerive.py
+++ b/Derivation/DerivationAlgs/share/runDerive.py
@@ -50,6 +50,9 @@ if __name__ == "__main__":
]
<<<<<<< HEAD
+<<<<<<< HEAD
+=======
+>>>>>>> 6e1b4d4be8e (Configuration fixes)
configFlags.IOVDb.GlobalTag = "OFLCOND-FASER-03" # Always needed; must match FaserVersionS
configFlags.IOVDb.DatabaseInstance = "OFLP200" # Use MC conditions for now
configFlags.Input.ProjectName = "data21" # Needed to bypass autoconfig
@@ -58,6 +61,7 @@ if __name__ == "__main__":
configFlags.Common.isOnline = False
#configFlags.GeoModel.Align.Dynamic = False
configFlags.Beam.NumberOfCollisions = 0.
+<<<<<<< HEAD
=======
ConfigFlags.IOVDb.GlobalTag = "OFLCOND-FASER-03" # Always needed; must match FaserVersionS
ConfigFlags.IOVDb.DatabaseInstance = "OFLP200" # Use MC conditions for now
@@ -68,6 +72,8 @@ if __name__ == "__main__":
#ConfigFlags.GeoModel.Align.Dynamic = False
ConfigFlags.Beam.NumberOfCollisions = 0.
>>>>>>> 05a628fdc98 (GeometryTest runs successfully)
+=======
+>>>>>>> 6e1b4d4be8e (Configuration fixes)
configFlags.Detector.GeometryFaserSCT = True
diff --git a/Derivation/DerivationAlgs/share/run_streaming.py b/Derivation/DerivationAlgs/share/run_streaming.py
index 1ad275b9de5a4031a2e8edc8bf18b14d39076609..5665c312ac08cf72cbb4e286ad5cedc78591b240 100644
--- a/Derivation/DerivationAlgs/share/run_streaming.py
+++ b/Derivation/DerivationAlgs/share/run_streaming.py
@@ -25,6 +25,9 @@ if __name__ == "__main__":
]
<<<<<<< HEAD
+<<<<<<< HEAD
+=======
+>>>>>>> 6e1b4d4be8e (Configuration fixes)
configFlags.IOVDb.GlobalTag = "OFLCOND-FASER-03" # Always needed; must match FaserVersionS
configFlags.IOVDb.DatabaseInstance = "OFLP200" # Use MC conditions for now
configFlags.Input.ProjectName = "data21" # Needed to bypass autoconfig
@@ -33,6 +36,7 @@ if __name__ == "__main__":
configFlags.Common.isOnline = False
#configFlags.GeoModel.Align.Dynamic = False
configFlags.Beam.NumberOfCollisions = 0.
+<<<<<<< HEAD
=======
ConfigFlags.IOVDb.GlobalTag = "OFLCOND-FASER-03" # Always needed; must match FaserVersionS
ConfigFlags.IOVDb.DatabaseInstance = "OFLP200" # Use MC conditions for now
@@ -43,6 +47,8 @@ if __name__ == "__main__":
#ConfigFlags.GeoModel.Align.Dynamic = False
ConfigFlags.Beam.NumberOfCollisions = 0.
>>>>>>> 05a628fdc98 (GeometryTest runs successfully)
+=======
+>>>>>>> 6e1b4d4be8e (Configuration fixes)
configFlags.Detector.GeometryFaserSCT = True
diff --git a/DetectorDescription/GeoModel/FaserGeoModel/python/ScintGMConfig.py b/DetectorDescription/GeoModel/FaserGeoModel/python/ScintGMConfig.py
index 50ba61396584fb3656f207df9cb474c0c756186b..0824a13ef269831ccfddc625a176e539e1f9a6d4 100644
--- a/DetectorDescription/GeoModel/FaserGeoModel/python/ScintGMConfig.py
+++ b/DetectorDescription/GeoModel/FaserGeoModel/python/ScintGMConfig.py
@@ -41,12 +41,16 @@ if __name__ == "__main__":
# from AthenaConfiguration.TestDefaults import defaultTestFiles
# Provide MC input
<<<<<<< HEAD
+<<<<<<< HEAD
+=======
+>>>>>>> 6e1b4d4be8e (Configuration fixes)
# configFlags.Input.Files = defaultTestFiles.HITS
configFlags.IOVDb.GlobalTag = "OFLCOND-FASER-01" # Always needed; must match FaserVersion
configFlags.Detector.GeometryVeto = True
configFlags.Detector.GeometryTrigger= True
configFlags.Detector.GeometryPreshower= True
#configFlags.GeoModel.Align.Dynamic = False
+<<<<<<< HEAD
=======
# ConfigFlags.Input.Files = defaultTestFiles.HITS
ConfigFlags.IOVDb.GlobalTag = "OFLCOND-FASER-01" # Always needed; must match FaserVersion
@@ -55,6 +59,8 @@ if __name__ == "__main__":
ConfigFlags.Detector.GeometryPreshower= True
#ConfigFlags.GeoModel.Align.Dynamic = False
>>>>>>> 05a628fdc98 (GeometryTest runs successfully)
+=======
+>>>>>>> 6e1b4d4be8e (Configuration fixes)
# Provide data input
##from AthenaConfiguration.TestDefaults import defaultTestFiles
#
diff --git a/DetectorDescription/GeoModel/FaserGeoModel/test/FaserGeometryConfig_EVNT_test.py b/DetectorDescription/GeoModel/FaserGeoModel/test/FaserGeometryConfig_EVNT_test.py
index f4ad339148a0ff8f1ec6ac560a5021789c2b6ec4..037e4db7d853d88b25599086de67be8f77121515 100644
--- a/DetectorDescription/GeoModel/FaserGeoModel/test/FaserGeometryConfig_EVNT_test.py
+++ b/DetectorDescription/GeoModel/FaserGeoModel/test/FaserGeometryConfig_EVNT_test.py
@@ -21,6 +21,9 @@ if __name__ == "__main__":
from AthenaConfiguration.TestDefaults import defaultTestFiles
# Provide MC input
<<<<<<< HEAD
+<<<<<<< HEAD
+=======
+>>>>>>> 6e1b4d4be8e (Configuration fixes)
configFlags = initConfigFlags()
configFlags.Common.ProductionStep = ProductionStep.Simulation
configFlags.Input.Files = defaultTestFiles.EVNT
@@ -28,6 +31,7 @@ if __name__ == "__main__":
configFlags.IOVDb.GlobalTag = "OFLCOND-FASER-01" # Always needed; must match FaserVersion
#configFlags.GeoModel.Align.Dynamic = False
configFlags.lock()
+<<<<<<< HEAD
=======
ConfigFlags.Common.ProductionStep = ProductionStep.Simulation
ConfigFlags.Input.Files = defaultTestFiles.EVNT
@@ -36,6 +40,8 @@ if __name__ == "__main__":
#ConfigFlags.GeoModel.Align.Dynamic = False
ConfigFlags.lock()
>>>>>>> 05a628fdc98 (GeometryTest runs successfully)
+=======
+>>>>>>> 6e1b4d4be8e (Configuration fixes)
# Construct ComponentAccumulator
acc = MainServicesCfg(configFlags)
diff --git a/Neutrino/NeutrinoDetDescr/EmulsionGeoModel/test/EmulsionGMConfig_test.py b/Neutrino/NeutrinoDetDescr/EmulsionGeoModel/test/EmulsionGMConfig_test.py
index 65f3622297b08934a3ff6838ff095bce933345de..7505d98e846d80d54fb338a43f3900aa4d71cc17 100644
--- a/Neutrino/NeutrinoDetDescr/EmulsionGeoModel/test/EmulsionGMConfig_test.py
+++ b/Neutrino/NeutrinoDetDescr/EmulsionGeoModel/test/EmulsionGMConfig_test.py
@@ -10,17 +10,23 @@ if __name__ == "__main__":
from AthenaConfiguration.TestDefaults import defaultTestFiles
<<<<<<< HEAD
+<<<<<<< HEAD
+=======
+>>>>>>> 6e1b4d4be8e (Configuration fixes)
configFlags = initConfigFlags()
configFlags.Input.Files = defaultTestFiles.HITS
configFlags.IOVDb.GlobalTag = "OFLCOND-FASER-01" # Always needed; must match FaserVersion
#configFlags.GeoModel.Align.Dynamic = False
configFlags.lock()
+<<<<<<< HEAD
=======
ConfigFlags.Input.Files = defaultTestFiles.HITS
ConfigFlags.IOVDb.GlobalTag = "OFLCOND-FASER-01" # Always needed; must match FaserVersion
#ConfigFlags.GeoModel.Align.Dynamic = False
ConfigFlags.lock()
>>>>>>> 05a628fdc98 (GeometryTest runs successfully)
+=======
+>>>>>>> 6e1b4d4be8e (Configuration fixes)
from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator
from EmulsionGeoModel.EmulsionGeoModelConfig import EmulsionGeometryCfg
diff --git a/PhysicsAnalysis/NeutrinoSearch/python/FilterSearchConfig.py b/PhysicsAnalysis/NeutrinoSearch/python/FilterSearchConfig.py
index 46f42fb4047c310e617982ada730bac7460fe61c..e5e5ed0df32dc8d42f63122fdbbc415dac974d5d 100644
--- a/PhysicsAnalysis/NeutrinoSearch/python/FilterSearchConfig.py
+++ b/PhysicsAnalysis/NeutrinoSearch/python/FilterSearchConfig.py
@@ -484,6 +484,9 @@ if __name__ == "__main__":
]
<<<<<<< HEAD
+<<<<<<< HEAD
+=======
+>>>>>>> 6e1b4d4be8e (Configuration fixes)
configFlags.IOVDb.GlobalTag = "OFLCOND-FASER-03" # Always needed; must match FaserVersionS
configFlags.IOVDb.DatabaseInstance = "OFLP200" # Use MC conditions for now
configFlags.Input.ProjectName = "data21" # Needed to bypass autoconfig
@@ -492,6 +495,7 @@ if __name__ == "__main__":
configFlags.Common.isOnline = False
#configFlags.GeoModel.Align.Dynamic = False
configFlags.Beam.NumberOfCollisions = 0.
+<<<<<<< HEAD
=======
ConfigFlags.IOVDb.GlobalTag = "OFLCOND-FASER-03" # Always needed; must match FaserVersionS
ConfigFlags.IOVDb.DatabaseInstance = "OFLP200" # Use MC conditions for now
@@ -502,6 +506,8 @@ if __name__ == "__main__":
#ConfigFlags.GeoModel.Align.Dynamic = False
ConfigFlags.Beam.NumberOfCollisions = 0.
>>>>>>> 05a628fdc98 (GeometryTest runs successfully)
+=======
+>>>>>>> 6e1b4d4be8e (Configuration fixes)
configFlags.Detector.GeometryFaserSCT = True
diff --git a/PhysicsAnalysis/NeutrinoSearch/python/FlukaSearchConfig.py b/PhysicsAnalysis/NeutrinoSearch/python/FlukaSearchConfig.py
index 83311543b7c55d54ecbb7c09aa8aef23a2a627f8..79ce4e685d0eadb2db37bec5f3c54832b40da88f 100644
--- a/PhysicsAnalysis/NeutrinoSearch/python/FlukaSearchConfig.py
+++ b/PhysicsAnalysis/NeutrinoSearch/python/FlukaSearchConfig.py
@@ -95,6 +95,9 @@ if __name__ == "__main__":
]
# Update this for samples with new field map
<<<<<<< HEAD
+<<<<<<< HEAD
+=======
+>>>>>>> 6e1b4d4be8e (Configuration fixes)
configFlags.IOVDb.GlobalTag = "OFLCOND-FASER-02" # Always needed; must match FaserVersionS
configFlags.IOVDb.DatabaseInstance = "OFLP200" # Use MC conditions for now
configFlags.Input.ProjectName = "data21" # Needed to bypass autoconfig
@@ -103,6 +106,7 @@ if __name__ == "__main__":
configFlags.Common.isOnline = False
#configFlags.GeoModel.Align.Dynamic = False
configFlags.Beam.NumberOfCollisions = 0.
+<<<<<<< HEAD
=======
ConfigFlags.IOVDb.GlobalTag = "OFLCOND-FASER-02" # Always needed; must match FaserVersionS
ConfigFlags.IOVDb.DatabaseInstance = "OFLP200" # Use MC conditions for now
@@ -113,6 +117,8 @@ if __name__ == "__main__":
#ConfigFlags.GeoModel.Align.Dynamic = False
ConfigFlags.Beam.NumberOfCollisions = 0.
>>>>>>> 05a628fdc98 (GeometryTest runs successfully)
+=======
+>>>>>>> 6e1b4d4be8e (Configuration fixes)
configFlags.Detector.GeometryFaserSCT = True
diff --git a/PhysicsAnalysis/NeutrinoSearch/python/GenieSearchConfig.py b/PhysicsAnalysis/NeutrinoSearch/python/GenieSearchConfig.py
index b83c48b755a9e563b5a0fddd53dc0d33167d6e53..1fedd7d365eec4a8b7eab20e9b194f06d9d9ce12 100644
--- a/PhysicsAnalysis/NeutrinoSearch/python/GenieSearchConfig.py
+++ b/PhysicsAnalysis/NeutrinoSearch/python/GenieSearchConfig.py
@@ -71,6 +71,9 @@ if __name__ == "__main__":
'/run/media/dcasper/Data/faser/genie/r0009/rec/./FaserMC-MDC_Genie_all_600fbInv_v1-200003-00168-00175-s0007-r0009-xAOD.root'
]
<<<<<<< HEAD
+<<<<<<< HEAD
+=======
+>>>>>>> 6e1b4d4be8e (Configuration fixes)
configFlags.IOVDb.GlobalTag = "OFLCOND-FASER-02" # Always needed; must match FaserVersionS
configFlags.IOVDb.DatabaseInstance = "OFLP200" # Use MC conditions for now
configFlags.Input.ProjectName = "data21" # Needed to bypass autoconfig
@@ -79,6 +82,7 @@ if __name__ == "__main__":
configFlags.Common.isOnline = False
#configFlags.GeoModel.Align.Dynamic = False
configFlags.Beam.NumberOfCollisions = 0.
+<<<<<<< HEAD
=======
ConfigFlags.IOVDb.GlobalTag = "OFLCOND-FASER-02" # Always needed; must match FaserVersionS
ConfigFlags.IOVDb.DatabaseInstance = "OFLP200" # Use MC conditions for now
@@ -89,6 +93,8 @@ if __name__ == "__main__":
#ConfigFlags.GeoModel.Align.Dynamic = False
ConfigFlags.Beam.NumberOfCollisions = 0.
>>>>>>> 05a628fdc98 (GeometryTest runs successfully)
+=======
+>>>>>>> 6e1b4d4be8e (Configuration fixes)
configFlags.Detector.GeometryFaserSCT = True
diff --git a/PhysicsAnalysis/NtupleDumper/scripts/analyzeRun.py b/PhysicsAnalysis/NtupleDumper/scripts/analyzeRun.py
index 81760a610177944555236001f5b08ddaf6bc379c..1687e1544cbb74940a917eabfd9ee34a25c2e02b 100755
--- a/PhysicsAnalysis/NtupleDumper/scripts/analyzeRun.py
+++ b/PhysicsAnalysis/NtupleDumper/scripts/analyzeRun.py
@@ -64,6 +64,9 @@ if __name__ == "__main__":
# Configure
<<<<<<< HEAD
+<<<<<<< HEAD
+=======
+>>>>>>> 6e1b4d4be8e (Configuration fixes)
configFlags = initConfigFlags()
configFlags.Input.Files = fileList
configFlags.IOVDb.GlobalTag = "OFLCOND-FASER-03" # Always needed; must match FaserVersionS
@@ -74,6 +77,7 @@ if __name__ == "__main__":
configFlags.Common.isOnline = False
#configFlags.GeoModel.Align.Dynamic = False
configFlags.Beam.NumberOfCollisions = 0.
+<<<<<<< HEAD
=======
ConfigFlags.Input.Files = fileList
ConfigFlags.IOVDb.GlobalTag = "OFLCOND-FASER-03" # Always needed; must match FaserVersionS
@@ -85,6 +89,8 @@ if __name__ == "__main__":
#ConfigFlags.GeoModel.Align.Dynamic = False
ConfigFlags.Beam.NumberOfCollisions = 0.
>>>>>>> 05a628fdc98 (GeometryTest runs successfully)
+=======
+>>>>>>> 6e1b4d4be8e (Configuration fixes)
configFlags.Detector.GeometryFaserSCT = True
diff --git a/PhysicsAnalysis/NtupleDumper/scripts/analyzeRunMC.py b/PhysicsAnalysis/NtupleDumper/scripts/analyzeRunMC.py
index 2dd1e76c584d9fc488f93e991e0c3f0ec291687b..4d7b42ed70f73a362fe981910837f3b6b08c3cd6 100644
--- a/PhysicsAnalysis/NtupleDumper/scripts/analyzeRunMC.py
+++ b/PhysicsAnalysis/NtupleDumper/scripts/analyzeRunMC.py
@@ -77,6 +77,9 @@ if __name__ == "__main__":
# Configure
<<<<<<< HEAD
+<<<<<<< HEAD
+=======
+>>>>>>> 6e1b4d4be8e (Configuration fixes)
configFlags = initConfigFlags()
configFlags.Input.Files = fileList
configFlags.IOVDb.GlobalTag = "OFLCOND-FASER-03" # Always needed; must match FaserVersionS
@@ -87,6 +90,7 @@ if __name__ == "__main__":
configFlags.Common.isOnline = False
#configFlags.GeoModel.Align.Dynamic = False
configFlags.Beam.NumberOfCollisions = 0.
+<<<<<<< HEAD
=======
ConfigFlags.Input.Files = fileList
ConfigFlags.IOVDb.GlobalTag = "OFLCOND-FASER-03" # Always needed; must match FaserVersionS
@@ -98,6 +102,8 @@ if __name__ == "__main__":
#ConfigFlags.GeoModel.Align.Dynamic = False
ConfigFlags.Beam.NumberOfCollisions = 0.
>>>>>>> 05a628fdc98 (GeometryTest runs successfully)
+=======
+>>>>>>> 6e1b4d4be8e (Configuration fixes)
configFlags.Detector.GeometryFaserSCT = True
diff --git a/PhysicsAnalysis/NtupleDumper/scripts/faser_ntuple_maker.py b/PhysicsAnalysis/NtupleDumper/scripts/faser_ntuple_maker.py
index 4430c68cf0a88ea1204c4959292642166ca43fe7..83d6e54c239b933b68600a1ee9d9b0f2e97e6d56 100755
--- a/PhysicsAnalysis/NtupleDumper/scripts/faser_ntuple_maker.py
+++ b/PhysicsAnalysis/NtupleDumper/scripts/faser_ntuple_maker.py
@@ -293,6 +293,7 @@ else:
configFlags.Input.ProjectName = "data21" # Needed to bypass autoconfig
+<<<<<<< HEAD
<<<<<<< HEAD
configFlags.Common.isOnline = False
configFlags.GeoModel.Align.Dynamic = False
@@ -306,6 +307,14 @@ ConfigFlags.Beam.NumberOfCollisions = 0.
ConfigFlags.Detector.GeometryFaserSCT = True
ConfigFlags.lock()
>>>>>>> 05a628fdc98 (GeometryTest runs successfully)
+=======
+configFlags.GeoModel.FaserVersion = "FASERNU-03" # FASER geometry
+configFlags.Common.isOnline = False
+#ConfigFlags.GeoModel.Align.Dynamic = False
+configFlags.Beam.NumberOfCollisions = 0.
+configFlags.Detector.GeometryFaserSCT = True
+configFlags.lock()
+>>>>>>> 6e1b4d4be8e (Configuration fixes)
# Core components
acc = MainServicesCfg(configFlags)
diff --git a/Scintillator/ScintDetDescr/PreshowerGeoModel/test/PreshowerGMConfig_test.py b/Scintillator/ScintDetDescr/PreshowerGeoModel/test/PreshowerGMConfig_test.py
index cad845b56b5f4bccc9760256f2b9cbe084682c0e..fe410a18639843732dfb4dfe08854a1bfb2febe0 100644
--- a/Scintillator/ScintDetDescr/PreshowerGeoModel/test/PreshowerGMConfig_test.py
+++ b/Scintillator/ScintDetDescr/PreshowerGeoModel/test/PreshowerGMConfig_test.py
@@ -10,17 +10,23 @@ if __name__ == "__main__":
from AthenaConfiguration.TestDefaults import defaultTestFiles
<<<<<<< HEAD
+<<<<<<< HEAD
+=======
+>>>>>>> 6e1b4d4be8e (Configuration fixes)
configFlags = initConfigFlags()
configFlags.Input.Files = defaultTestFiles.HITS
configFlags.IOVDb.GlobalTag = "OFLCOND-FASER-01" # Always needed; must match FaserVersion
#configFlags.GeoModel.Align.Dynamic = False
configFlags.lock()
+<<<<<<< HEAD
=======
ConfigFlags.Input.Files = defaultTestFiles.HITS
ConfigFlags.IOVDb.GlobalTag = "OFLCOND-FASER-01" # Always needed; must match FaserVersion
#ConfigFlags.GeoModel.Align.Dynamic = False
ConfigFlags.lock()
>>>>>>> 05a628fdc98 (GeometryTest runs successfully)
+=======
+>>>>>>> 6e1b4d4be8e (Configuration fixes)
from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator
from PreshowerGeoModel.PreshowerGeoModelConfig import PreshowerGeometryCfg
diff --git a/Scintillator/ScintDetDescr/TriggerGeoModel/test/TriggerGMConfig_test.py b/Scintillator/ScintDetDescr/TriggerGeoModel/test/TriggerGMConfig_test.py
index 205551f6d8fc9349dce6c65279cd4f747206b595..a1f700e944de8779c62342ebdeb7473ca7fa8dae 100644
--- a/Scintillator/ScintDetDescr/TriggerGeoModel/test/TriggerGMConfig_test.py
+++ b/Scintillator/ScintDetDescr/TriggerGeoModel/test/TriggerGMConfig_test.py
@@ -10,17 +10,23 @@ if __name__ == "__main__":
from AthenaConfiguration.TestDefaults import defaultTestFiles
<<<<<<< HEAD
+<<<<<<< HEAD
+=======
+>>>>>>> 6e1b4d4be8e (Configuration fixes)
configFlags = initConfigFlags()
configFlags.Input.Files = defaultTestFiles.HITS
configFlags.IOVDb.GlobalTag = "OFLCOND-FASER-01" # Always needed; must match FaserVersion
#configFlags.GeoModel.Align.Dynamic = False
configFlags.lock()
+<<<<<<< HEAD
=======
ConfigFlags.Input.Files = defaultTestFiles.HITS
ConfigFlags.IOVDb.GlobalTag = "OFLCOND-FASER-01" # Always needed; must match FaserVersion
#ConfigFlags.GeoModel.Align.Dynamic = False
ConfigFlags.lock()
>>>>>>> 05a628fdc98 (GeometryTest runs successfully)
+=======
+>>>>>>> 6e1b4d4be8e (Configuration fixes)
from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator
from TriggerGeoModel.TriggerGeoModelConfig import TriggerGeometryCfg
diff --git a/Scintillator/ScintDetDescr/VetoGeoModel/test/VetoGMConfig_test.py b/Scintillator/ScintDetDescr/VetoGeoModel/test/VetoGMConfig_test.py
index 461be91b2897bdb9c3c7bb09c1b1045279c8e8ad..b44b50b9d0323f2e5b4c7f94bbe26851b32ffab0 100644
--- a/Scintillator/ScintDetDescr/VetoGeoModel/test/VetoGMConfig_test.py
+++ b/Scintillator/ScintDetDescr/VetoGeoModel/test/VetoGMConfig_test.py
@@ -10,17 +10,23 @@ if __name__ == "__main__":
from AthenaConfiguration.TestDefaults import defaultTestFiles
<<<<<<< HEAD
+<<<<<<< HEAD
+=======
+>>>>>>> 6e1b4d4be8e (Configuration fixes)
configFlags = initConfigFlags()
configFlags.Input.Files = defaultTestFiles.HITS
configFlags.IOVDb.GlobalTag = "OFLCOND-FASER-01" # Always needed; must match FaserVersion
#configFlags.GeoModel.Align.Dynamic = False
configFlags.lock()
+<<<<<<< HEAD
=======
ConfigFlags.Input.Files = defaultTestFiles.HITS
ConfigFlags.IOVDb.GlobalTag = "OFLCOND-FASER-01" # Always needed; must match FaserVersion
#ConfigFlags.GeoModel.Align.Dynamic = False
ConfigFlags.lock()
>>>>>>> 05a628fdc98 (GeometryTest runs successfully)
+=======
+>>>>>>> 6e1b4d4be8e (Configuration fixes)
from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator
from VetoGeoModel.VetoGeoModelConfig import VetoGeometryCfg
diff --git a/Scintillator/ScintDetDescr/VetoNuGeoModel/test/VetoNuGMConfig_test.py b/Scintillator/ScintDetDescr/VetoNuGeoModel/test/VetoNuGMConfig_test.py
index 076d562ede9c3a476da3e843b8aef7d5dfe64529..f5a4ce7f47918a8c45cc6cfd10f5cefebd720309 100644
--- a/Scintillator/ScintDetDescr/VetoNuGeoModel/test/VetoNuGMConfig_test.py
+++ b/Scintillator/ScintDetDescr/VetoNuGeoModel/test/VetoNuGMConfig_test.py
@@ -10,17 +10,23 @@ if __name__ == "__main__":
from AthenaConfiguration.TestDefaults import defaultTestFiles
<<<<<<< HEAD
+<<<<<<< HEAD
+=======
+>>>>>>> 6e1b4d4be8e (Configuration fixes)
configFlags = initConfigFlags()
configFlags.Input.Files = defaultTestFiles.HITS
configFlags.IOVDb.GlobalTag = "OFLCOND-FASER-01" # Always needed; must match FaserVersion
#configFlags.GeoModel.Align.Dynamic = False
configFlags.lock()
+<<<<<<< HEAD
=======
ConfigFlags.Input.Files = defaultTestFiles.HITS
ConfigFlags.IOVDb.GlobalTag = "OFLCOND-FASER-01" # Always needed; must match FaserVersion
#ConfigFlags.GeoModel.Align.Dynamic = False
ConfigFlags.lock()
>>>>>>> 05a628fdc98 (GeometryTest runs successfully)
+=======
+>>>>>>> 6e1b4d4be8e (Configuration fixes)
from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator
from VetoNuGeoModel.VetoNuGeoModelConfig import VetoNuGeometryCfg
diff --git a/Simulation/G4Faser/G4FaserAlg/test/G4FaserAlgConfigNew_Test.py b/Simulation/G4Faser/G4FaserAlg/test/G4FaserAlgConfigNew_Test.py
index 6794e6eb196501fc2a85538f02bcfe0b074ab084..ba0c9aeea76e23300b62caecb9ab5d3e90429bb5 100755
--- a/Simulation/G4Faser/G4FaserAlg/test/G4FaserAlgConfigNew_Test.py
+++ b/Simulation/G4Faser/G4FaserAlg/test/G4FaserAlgConfigNew_Test.py
@@ -29,11 +29,18 @@ if __name__ == '__main__':
#
# All these must be specified to avoid auto-configuration
#
+<<<<<<< HEAD
configFlags.Input.RunNumbers = [12345] #Isn't updating - todo: investigate
configFlags.Input.OverrideRunNumber = True
configFlags.Input.LumiBlockNumbers = [1]
configFlags.Input.isMC = True
configFlags.Input.MCCampaign = Campaign.Unknown
+=======
+ configFlags.Input.RunNumber = [12345] #Isn't updating - todo: investigate
+ configFlags.Input.OverrideRunNumber = True
+ configFlags.Input.LumiBlockNumber = [1]
+ configFlags.Input.isMC = True
+>>>>>>> 6e1b4d4be8e (Configuration fixes)
#
# Output file name
#
@@ -41,7 +48,11 @@ if __name__ == '__main__':
#
# Sim configFlags
#
+<<<<<<< HEAD
configFlags.GeoModel.Layout = "FASER"
+=======
+ configFlags.Sim.Layout = "FASER"
+>>>>>>> 6e1b4d4be8e (Configuration fixes)
configFlags.Sim.PhysicsList = "FTFP_BERT"
configFlags.Sim.ReleaseGeoModel = False
configFlags.Sim.IncludeParentsInG4Event = True # Controls whether BeamTruthEvent is written to output HITS file
@@ -52,16 +63,22 @@ if __name__ == '__main__':
configFlags.addFlag("Sim.Beam.yshift", 0)
<<<<<<< HEAD
+<<<<<<< HEAD
+=======
+>>>>>>> 6e1b4d4be8e (Configuration fixes)
configFlags.GeoModel.FaserVersion = "FASERNU-04" # Geometry set-up
configFlags.IOVDb.GlobalTag = "OFLCOND-FASER-03" # Conditions set-up
configFlags.addFlag("Input.InitialTimeStamp", 0) # To avoid autoconfig
#configFlags.GeoModel.Align.Dynamic = False
+<<<<<<< HEAD
=======
ConfigFlags.GeoModel.FaserVersion = "FASERNU-04" # Geometry set-up
ConfigFlags.IOVDb.GlobalTag = "OFLCOND-FASER-03" # Conditions set-up
ConfigFlags.addFlag("Input.InitialTimeStamp", 0) # To avoid autoconfig
#ConfigFlags.GeoModel.Align.Dynamic = False
>>>>>>> 05a628fdc98 (GeometryTest runs successfully)
+=======
+>>>>>>> 6e1b4d4be8e (Configuration fixes)
#
# Override flags above from command line
#
diff --git a/Simulation/G4Faser/G4FaserAlg/test/runGeantinoScan.py b/Simulation/G4Faser/G4FaserAlg/test/runGeantinoScan.py
index 06fc67be10083f8b763ae3c5976466d9ad383cf7..a653a53e5e2d302a8569f759d7ed33bdf701070e 100644
--- a/Simulation/G4Faser/G4FaserAlg/test/runGeantinoScan.py
+++ b/Simulation/G4Faser/G4FaserAlg/test/runGeantinoScan.py
@@ -45,6 +45,7 @@ if __name__ == "__main__":
#
# Output settings
#
+<<<<<<< HEAD
<<<<<<< HEAD
configFlags.Output.HITSFileName = "MaterialStepCollection.root"
configFlags.GeoModel.GeoExportFile = "faserGeo.db" # Optional dump of geometry for browsing in vp1light
@@ -54,6 +55,11 @@ if __name__ == "__main__":
ConfigFlags.GeoModel.GeoExportFile = "faserGeo.db" # Optional dump of geometry for browsing in vp1light
#ConfigFlags.GeoModel.Align.Dynamic = False
>>>>>>> 05a628fdc98 (GeometryTest runs successfully)
+=======
+ configFlags.Output.HITSFileName = "MaterialStepCollection.root"
+ configFlags.GeoModel.GeoExportFile = "faserGeo.db" # Optional dump of geometry for browsing in vp1light
+ #configFlags.GeoModel.Align.Dynamic = False
+>>>>>>> 6e1b4d4be8e (Configuration fixes)
#
# Geometry-related settings
# Do not change!
diff --git a/Simulation/G4Faser/G4FaserAlg/test/runGen.py b/Simulation/G4Faser/G4FaserAlg/test/runGen.py
index 6dccde39f78b9354165d13c7ec790076118ae5b4..ff1c0cc4d66f64ea9cbcc02ae525d37103e5dfce 100755
--- a/Simulation/G4Faser/G4FaserAlg/test/runGen.py
+++ b/Simulation/G4Faser/G4FaserAlg/test/runGen.py
@@ -61,6 +61,7 @@ if __name__ == "__main__":
# detectors = ['Veto', 'Trigger', 'Preshower', 'FaserSCT', 'Dipole', 'Ecal']
# from CalypsoConfiguration.DetectorConfigFlags import setupDetectorsFromList
<<<<<<< HEAD
+<<<<<<< HEAD
# setupDetectorsFromList(configFlags, detectors, toggle_geometry=True)
#configFlags.GeoModel.Align.Dynamic = False
configFlags.Sim.ReleaseGeoModel = False
@@ -69,6 +70,11 @@ if __name__ == "__main__":
#ConfigFlags.GeoModel.Align.Dynamic = False
ConfigFlags.Sim.ReleaseGeoModel = False
>>>>>>> 05a628fdc98 (GeometryTest runs successfully)
+=======
+# setupDetectorsFromList(configFlags, detectors, toggle_geometry=True)
+ #configFlags.GeoModel.Align.Dynamic = False
+ configFlags.Sim.ReleaseGeoModel = False
+>>>>>>> 6e1b4d4be8e (Configuration fixes)
#
# All flags should be set before calling lock
#
diff --git a/Tracker/TrackerDetDescr/DipoleGeoModel/test/DipoleGMConfig_test.py b/Tracker/TrackerDetDescr/DipoleGeoModel/test/DipoleGMConfig_test.py
index 3f033e133b6d48493b8214563a110d152ada2427..f2581fa90380373760070d81c95e0bc078ea932b 100755
--- a/Tracker/TrackerDetDescr/DipoleGeoModel/test/DipoleGMConfig_test.py
+++ b/Tracker/TrackerDetDescr/DipoleGeoModel/test/DipoleGMConfig_test.py
@@ -10,17 +10,23 @@ if __name__ == "__main__":
from AthenaConfiguration.TestDefaults import defaultTestFiles
<<<<<<< HEAD
+<<<<<<< HEAD
+=======
+>>>>>>> 6e1b4d4be8e (Configuration fixes)
configFlags = initConfigFlags()
configFlags.Input.Files = defaultTestFiles.HITS
configFlags.IOVDb.GlobalTag = "OFLCOND-FASER-01" # Always needed; must match FaserVersion
#configFlags.GeoModel.Align.Dynamic = False
configFlags.lock()
+<<<<<<< HEAD
=======
ConfigFlags.Input.Files = defaultTestFiles.HITS
ConfigFlags.IOVDb.GlobalTag = "OFLCOND-FASER-01" # Always needed; must match FaserVersion
#ConfigFlags.GeoModel.Align.Dynamic = False
ConfigFlags.lock()
>>>>>>> 05a628fdc98 (GeometryTest runs successfully)
+=======
+>>>>>>> 6e1b4d4be8e (Configuration fixes)
from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator
from DipoleGeoModel.DipoleGeoModelConfig import DipoleGeometryCfg
diff --git a/Tracker/TrackerDetDescr/FaserSCT_GeoModel/test/FaserSCT_GMConfig_test.py b/Tracker/TrackerDetDescr/FaserSCT_GeoModel/test/FaserSCT_GMConfig_test.py
index cdff72d7c570473e79a807fa0e1cc30b09196664..90ae879e6faa00948cdb17c5a13d199b52612271 100755
--- a/Tracker/TrackerDetDescr/FaserSCT_GeoModel/test/FaserSCT_GMConfig_test.py
+++ b/Tracker/TrackerDetDescr/FaserSCT_GeoModel/test/FaserSCT_GMConfig_test.py
@@ -10,17 +10,23 @@ if __name__ == "__main__":
from AthenaConfiguration.TestDefaults import defaultTestFiles
<<<<<<< HEAD
+<<<<<<< HEAD
+=======
+>>>>>>> 6e1b4d4be8e (Configuration fixes)
configFlags = initConfigFlags()
configFlags.Input.Files = defaultTestFiles.HITS
configFlags.IOVDb.GlobalTag = "OFLCOND-FASER-01" # Always needed; must match FaserVersion
#configFlags.GeoModel.Align.Dynamic = False
configFlags.lock()
+<<<<<<< HEAD
=======
ConfigFlags.Input.Files = defaultTestFiles.HITS
ConfigFlags.IOVDb.GlobalTag = "OFLCOND-FASER-01" # Always needed; must match FaserVersion
#ConfigFlags.GeoModel.Align.Dynamic = False
ConfigFlags.lock()
>>>>>>> 05a628fdc98 (GeometryTest runs successfully)
+=======
+>>>>>>> 6e1b4d4be8e (Configuration fixes)
from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator
from FaserSCT_GeoModel.FaserSCT_GeoModelConfig import FaserSCT_GeometryCfg
diff --git a/Tracker/TrackerDigitization/FaserSCT_Digitization/test/FaserSCT_DigitizationDbg.py b/Tracker/TrackerDigitization/FaserSCT_Digitization/test/FaserSCT_DigitizationDbg.py
index f59177790f866b80e853a58573f3a48271a39cbe..72de05f3339243552124709c123404e6d4747482 100644
--- a/Tracker/TrackerDigitization/FaserSCT_Digitization/test/FaserSCT_DigitizationDbg.py
+++ b/Tracker/TrackerDigitization/FaserSCT_Digitization/test/FaserSCT_DigitizationDbg.py
@@ -23,6 +23,9 @@ Configurable.configurableRun3Behavior = True
# Configure
<<<<<<< HEAD
+<<<<<<< HEAD
+=======
+>>>>>>> 6e1b4d4be8e (Configuration fixes)
configFlags = initConfigFlags()
configFlags.Input.Files = ['my.HITS.pool.root']
configFlags.Output.RDOFileName = "my.RDO.pool.root"
@@ -30,6 +33,7 @@ configFlags.GeoModel.FaserVersion = "FASER-01"
configFlags.IOVDb.GlobalTag = "OFLCOND-FASER-01" # Always needed; must match FaserVersion
#configFlags.GeoModel.Align.Dynamic = False
configFlags.Beam.NumberOfCollisions = 0.
+<<<<<<< HEAD
=======
ConfigFlags.Input.Files = ['my.HITS.pool.root']
ConfigFlags.Output.RDOFileName = "my.RDO.pool.root"
@@ -38,6 +42,8 @@ ConfigFlags.IOVDb.GlobalTag = "OFLCOND-FASER-01" # Always needed; mu
#ConfigFlags.GeoModel.Align.Dynamic = False
ConfigFlags.Beam.NumberOfCollisions = 0.
>>>>>>> 05a628fdc98 (GeometryTest runs successfully)
+=======
+>>>>>>> 6e1b4d4be8e (Configuration fixes)
configFlags.Digitization.TruthOutput = True
diff --git a/Tracker/TrackerRecAlgs/FaserSpacePoints/python/FaserSpacePointsCosmics.py b/Tracker/TrackerRecAlgs/FaserSpacePoints/python/FaserSpacePointsCosmics.py
index a766efe62f5b76cefc580208da86a208ed3f342f..ef7da9528c02afddcbf35e8c0b8d246a373849d1 100644
--- a/Tracker/TrackerRecAlgs/FaserSpacePoints/python/FaserSpacePointsCosmics.py
+++ b/Tracker/TrackerRecAlgs/FaserSpacePoints/python/FaserSpacePointsCosmics.py
@@ -48,6 +48,9 @@ if __name__ == "__main__":
# Configure
<<<<<<< HEAD
+<<<<<<< HEAD
+=======
+>>>>>>> 6e1b4d4be8e (Configuration fixes)
configFlags = initConfigFlags()
configFlags.Input.Files = ['my.RDO.pool.root']
configFlags.Output.ESDFileName = "mySeeds.ESD.pool.root"
@@ -59,6 +62,7 @@ if __name__ == "__main__":
configFlags.Common.isOnline = False
#configFlags.GeoModel.Align.Dynamic = False
configFlags.Beam.NumberOfCollisions = 0.
+<<<<<<< HEAD
=======
ConfigFlags.Input.Files = ['my.RDO.pool.root']
ConfigFlags.Output.ESDFileName = "mySeeds.ESD.pool.root"
@@ -71,6 +75,8 @@ if __name__ == "__main__":
#ConfigFlags.GeoModel.Align.Dynamic = False
ConfigFlags.Beam.NumberOfCollisions = 0.
>>>>>>> 05a628fdc98 (GeometryTest runs successfully)
+=======
+>>>>>>> 6e1b4d4be8e (Configuration fixes)
configFlags.lock()
diff --git a/Tracker/TrackerRecAlgs/FaserSpacePoints/test/FaserSpacePointsDbg.py b/Tracker/TrackerRecAlgs/FaserSpacePoints/test/FaserSpacePointsDbg.py
index 445add2a2db9211288458e5b0f22c9039ae89e6a..6c6ea8504ab4df6a16e0d6e02362b03eb265a65d 100644
--- a/Tracker/TrackerRecAlgs/FaserSpacePoints/test/FaserSpacePointsDbg.py
+++ b/Tracker/TrackerRecAlgs/FaserSpacePoints/test/FaserSpacePointsDbg.py
@@ -14,6 +14,9 @@ log.setLevel(DEBUG)
Configurable.configurableRun3Behavior = True
<<<<<<< HEAD
+<<<<<<< HEAD
+=======
+>>>>>>> 6e1b4d4be8e (Configuration fixes)
configFlags = initConfigFlags()
configFlags.Input.Files = ['my.RDO.pool.root']
configFlags.Output.ESDFileName = "spacePoints.ESD.pool.root"
@@ -21,6 +24,7 @@ configFlags.IOVDb.GlobalTag = "OFLCOND-FASER-01"
#configFlags.GeoModel.Align.Dynamic = False
configFlags.Beam.NumberOfCollisions = 0.
configFlags.lock()
+<<<<<<< HEAD
=======
ConfigFlags.Input.Files = ['my.RDO.pool.root']
ConfigFlags.Output.ESDFileName = "spacePoints.ESD.pool.root"
@@ -29,6 +33,8 @@ ConfigFlags.IOVDb.GlobalTag = "OFLCOND-FASER-01"
ConfigFlags.Beam.NumberOfCollisions = 0.
ConfigFlags.lock()
>>>>>>> 05a628fdc98 (GeometryTest runs successfully)
+=======
+>>>>>>> 6e1b4d4be8e (Configuration fixes)
# Core components
acc = MainServicesCfg(configFlags)
diff --git a/Tracker/TrackerRecAlgs/MyClusters/test/MyClustersDbg.py b/Tracker/TrackerRecAlgs/MyClusters/test/MyClustersDbg.py
index 3f3b3b8632fdee612c0cf7637f226e0e53b1f2bf..43083a515dc74c8330dc79cd57c85286384aa538 100644
--- a/Tracker/TrackerRecAlgs/MyClusters/test/MyClustersDbg.py
+++ b/Tracker/TrackerRecAlgs/MyClusters/test/MyClustersDbg.py
@@ -16,6 +16,9 @@ Configurable.configurableRun3Behavior = True
# Configure
<<<<<<< HEAD
+<<<<<<< HEAD
+=======
+>>>>>>> 6e1b4d4be8e (Configuration fixes)
configFlags = initConfigFlags()
configFlags.Input.Files = ['my.RDO.pool.root']
configFlags.Output.ESDFileName = "MyClusters.ESD.root"
@@ -24,6 +27,7 @@ configFlags.IOVDb.GlobalTag = "OFLCOND-FASER-01"
#configFlags.GeoModel.Align.Dynamic = False
configFlags.Beam.NumberOfCollisions = 0.
configFlags.lock()
+<<<<<<< HEAD
=======
ConfigFlags.Input.Files = ['my.RDO.pool.root']
ConfigFlags.Output.ESDFileName = "MyClusters.ESD.root"
@@ -33,6 +37,8 @@ ConfigFlags.IOVDb.GlobalTag = "OFLCOND-FASER-01"
ConfigFlags.Beam.NumberOfCollisions = 0.
ConfigFlags.lock()
>>>>>>> 05a628fdc98 (GeometryTest runs successfully)
+=======
+>>>>>>> 6e1b4d4be8e (Configuration fixes)
acc = MainServicesCfg(configFlags)
acc.merge(PoolReadCfg(configFlags))
diff --git a/Tracker/TrackerRecAlgs/NoisyStripFinder/share/NoisyStripFinderJob.py b/Tracker/TrackerRecAlgs/NoisyStripFinder/share/NoisyStripFinderJob.py
index 5dec8838bc4deb37b885e0640a2d347a06cf0754..9ded9f204c7305a7cc44276e212fae3c3539b955 100755
--- a/Tracker/TrackerRecAlgs/NoisyStripFinder/share/NoisyStripFinderJob.py
+++ b/Tracker/TrackerRecAlgs/NoisyStripFinder/share/NoisyStripFinderJob.py
@@ -39,6 +39,9 @@ for filename in args.file:
filelist.append(filename)
<<<<<<< HEAD
+<<<<<<< HEAD
+=======
+>>>>>>> 6e1b4d4be8e (Configuration fixes)
configFlags = initConfigFlags()
configFlags.Input.Files = args.file
configFlags.IOVDb.GlobalTag = "OFLCOND-FASER-04"
@@ -52,6 +55,7 @@ configFlags.Common.isOnline = False
configFlags.Beam.NumberOfCollisions = 0.
configFlags.Detector.GeometryFaserSCT = True
configFlags.lock()
+<<<<<<< HEAD
=======
ConfigFlags.Input.Files = args.file
ConfigFlags.IOVDb.GlobalTag = "OFLCOND-FASER-04"
@@ -66,6 +70,8 @@ ConfigFlags.Beam.NumberOfCollisions = 0.
ConfigFlags.Detector.GeometryFaserSCT = True
ConfigFlags.lock()
>>>>>>> 05a628fdc98 (GeometryTest runs successfully)
+=======
+>>>>>>> 6e1b4d4be8e (Configuration fixes)
acc = MainServicesCfg(configFlags)
acc.merge(PoolWriteCfg(configFlags))
diff --git a/Tracker/TrackerRecAlgs/NoisyStripFinder/test/NoisyStripFinderDbg.py b/Tracker/TrackerRecAlgs/NoisyStripFinder/test/NoisyStripFinderDbg.py
index 42f8eace5e36ab2817da48b240918b24f8fe2143..de2ecd3237aa83b257ff2882eb2c9403ecd8b9c0 100755
--- a/Tracker/TrackerRecAlgs/NoisyStripFinder/test/NoisyStripFinderDbg.py
+++ b/Tracker/TrackerRecAlgs/NoisyStripFinder/test/NoisyStripFinderDbg.py
@@ -24,6 +24,9 @@ log.setLevel(DEBUG)
Configurable.configurableRun3Behavior = True
<<<<<<< HEAD
+<<<<<<< HEAD
+=======
+>>>>>>> 6e1b4d4be8e (Configuration fixes)
configFlags = initConfigFlags()
configFlags.Input.Files = args.file
configFlags.IOVDb.GlobalTag = "OFLCOND-FASER-03"
@@ -36,6 +39,7 @@ configFlags.Common.isOnline = False
configFlags.Beam.NumberOfCollisions = 0.
configFlags.Detector.GeometryFaserSCT = True
configFlags.lock()
+<<<<<<< HEAD
=======
ConfigFlags.Input.Files = args.file
ConfigFlags.IOVDb.GlobalTag = "OFLCOND-FASER-03"
@@ -49,6 +53,8 @@ ConfigFlags.Beam.NumberOfCollisions = 0.
ConfigFlags.Detector.GeometryFaserSCT = True
ConfigFlags.lock()
>>>>>>> 05a628fdc98 (GeometryTest runs successfully)
+=======
+>>>>>>> 6e1b4d4be8e (Configuration fixes)
acc = MainServicesCfg(configFlags)
acc.merge(PoolWriteCfg(configFlags))
diff --git a/Tracker/TrackerRecAlgs/OverlayRDO/python/HistoRDOConfig.py b/Tracker/TrackerRecAlgs/OverlayRDO/python/HistoRDOConfig.py
index db54cf93e40fe56e1840b653cbd7f84e47660c40..79dadbe4c0571c86129c3cb6fb7dfd4221a5d32e 100644
--- a/Tracker/TrackerRecAlgs/OverlayRDO/python/HistoRDOConfig.py
+++ b/Tracker/TrackerRecAlgs/OverlayRDO/python/HistoRDOConfig.py
@@ -71,6 +71,9 @@ if __name__ == "__main__":
'/home/dcasper/Work/faser/darkphoton/overlay/myNeg_Bin8RDO.pool.root',
]
<<<<<<< HEAD
+<<<<<<< HEAD
+=======
+>>>>>>> 6e1b4d4be8e (Configuration fixes)
# configFlags.Input.SecondaryFiles = [ 'Neg_RDO.pool.root' ]
# configFlags.Input.Files = [ '/eos/experiment/faser/rec/2022/r0013/009171/Faser-Physics-009171-00006-r0013-xAOD.root']
# configFlags.Input.SecondaryFiles = [ '/eos/experiment/faser/rec/2022/r0013/009166/Faser-Physics-009166-00485-r0013-xAOD.root' ]
@@ -83,6 +86,7 @@ if __name__ == "__main__":
configFlags.Common.isOnline = False
#configFlags.GeoModel.Align.Dynamic = False
configFlags.Beam.NumberOfCollisions = 0.
+<<<<<<< HEAD
=======
# ConfigFlags.Input.SecondaryFiles = [ 'Neg_RDO.pool.root' ]
# ConfigFlags.Input.Files = [ '/eos/experiment/faser/rec/2022/r0013/009171/Faser-Physics-009171-00006-r0013-xAOD.root']
@@ -97,6 +101,8 @@ if __name__ == "__main__":
#ConfigFlags.GeoModel.Align.Dynamic = False
ConfigFlags.Beam.NumberOfCollisions = 0.
>>>>>>> 05a628fdc98 (GeometryTest runs successfully)
+=======
+>>>>>>> 6e1b4d4be8e (Configuration fixes)
configFlags.Detector.GeometryFaserSCT = True
diff --git a/Tracker/TrackerRecAlgs/OverlayRDO/python/OverlayRDOConfig.py b/Tracker/TrackerRecAlgs/OverlayRDO/python/OverlayRDOConfig.py
index d75cd11def0ec40e0ea77f88815f2c781db3ab3f..64842ac68de3e96fe7a7dc5b17b39f91fc5335a6 100644
--- a/Tracker/TrackerRecAlgs/OverlayRDO/python/OverlayRDOConfig.py
+++ b/Tracker/TrackerRecAlgs/OverlayRDO/python/OverlayRDOConfig.py
@@ -47,6 +47,9 @@ if __name__ == "__main__":
# Configure
<<<<<<< HEAD
+<<<<<<< HEAD
+=======
+>>>>>>> 6e1b4d4be8e (Configuration fixes)
configFlags = initConfigFlags()
configFlags.Overlay.DataOverlay = False
configFlags.Input.Files = [ 'Pos_RDO.pool.root']
@@ -62,6 +65,7 @@ if __name__ == "__main__":
configFlags.Common.isOnline = False
#configFlags.GeoModel.Align.Dynamic = False
configFlags.Beam.NumberOfCollisions = 0.
+<<<<<<< HEAD
=======
ConfigFlags.Overlay.DataOverlay = False
ConfigFlags.Input.Files = [ 'Pos_RDO.pool.root']
@@ -78,6 +82,8 @@ if __name__ == "__main__":
#ConfigFlags.GeoModel.Align.Dynamic = False
ConfigFlags.Beam.NumberOfCollisions = 0.
>>>>>>> 05a628fdc98 (GeometryTest runs successfully)
+=======
+>>>>>>> 6e1b4d4be8e (Configuration fixes)
configFlags.Detector.GeometryFaserSCT = True
diff --git a/Tracker/TrackerRecAlgs/OverlayRDO/python/SelectRDOConfig.py b/Tracker/TrackerRecAlgs/OverlayRDO/python/SelectRDOConfig.py
index 6f9f40daa585de9ad72fb477cde13b94f1731ab4..7900268b34baca36b6d61beafdce9bbf61095d41 100644
--- a/Tracker/TrackerRecAlgs/OverlayRDO/python/SelectRDOConfig.py
+++ b/Tracker/TrackerRecAlgs/OverlayRDO/python/SelectRDOConfig.py
@@ -99,6 +99,9 @@ if __name__ == "__main__":
# configFlags.Input.Files = [ 'Faser-Physics-009171-00006-r0013-xAOD.root',
# 'Faser-Physics-009166-00485-r0013-xAOD.root']
<<<<<<< HEAD
+<<<<<<< HEAD
+=======
+>>>>>>> 6e1b4d4be8e (Configuration fixes)
# configFlags.Output.RDOFileName = chargePrefix + "RDO.pool.root"
configFlags.IOVDb.GlobalTag = "OFLCOND-FASER-03" # Always needed; must match FaserVersionS
configFlags.IOVDb.DatabaseInstance = "CONDBR3" # Use data conditions for now
@@ -108,6 +111,7 @@ if __name__ == "__main__":
configFlags.Common.isOnline = False
#configFlags.GeoModel.Align.Dynamic = False
configFlags.Beam.NumberOfCollisions = 0.
+<<<<<<< HEAD
=======
# ConfigFlags.Output.RDOFileName = chargePrefix + "RDO.pool.root"
ConfigFlags.IOVDb.GlobalTag = "OFLCOND-FASER-03" # Always needed; must match FaserVersionS
@@ -119,6 +123,8 @@ if __name__ == "__main__":
#ConfigFlags.GeoModel.Align.Dynamic = False
ConfigFlags.Beam.NumberOfCollisions = 0.
>>>>>>> 05a628fdc98 (GeometryTest runs successfully)
+=======
+>>>>>>> 6e1b4d4be8e (Configuration fixes)
configFlags.Detector.GeometryFaserSCT = True
diff --git a/Tracker/TrackerRecAlgs/PairVertex/python/PairVertexAlgConfig.py b/Tracker/TrackerRecAlgs/PairVertex/python/PairVertexAlgConfig.py
index 4e557664eb0a80d4bab41c636eea165a80bb9932..1f06dd627ba5fb13baaef7934976d65e035cc3b6 100644
--- a/Tracker/TrackerRecAlgs/PairVertex/python/PairVertexAlgConfig.py
+++ b/Tracker/TrackerRecAlgs/PairVertex/python/PairVertexAlgConfig.py
@@ -59,6 +59,9 @@ if __name__ == "__main__":
# Configure
<<<<<<< HEAD
+<<<<<<< HEAD
+=======
+>>>>>>> 6e1b4d4be8e (Configuration fixes)
configFlags = initConfigFlags()
configFlags.Input.Files = files # [ui.inputfile]
configFlags.IOVDb.GlobalTag = "OFLCOND-FASER-02" # Always needed; must match FaserVersionS
@@ -69,6 +72,7 @@ if __name__ == "__main__":
configFlags.Common.isOnline = False
#configFlags.GeoModel.Align.Dynamic = False
configFlags.Beam.NumberOfCollisions = 0.
+<<<<<<< HEAD
=======
ConfigFlags.Input.Files = files # [ui.inputfile]
ConfigFlags.IOVDb.GlobalTag = "OFLCOND-FASER-02" # Always needed; must match FaserVersionS
@@ -80,6 +84,8 @@ if __name__ == "__main__":
#ConfigFlags.GeoModel.Align.Dynamic = False
ConfigFlags.Beam.NumberOfCollisions = 0.
>>>>>>> 05a628fdc98 (GeometryTest runs successfully)
+=======
+>>>>>>> 6e1b4d4be8e (Configuration fixes)
configFlags.Detector.GeometryFaserSCT = True
diff --git a/Tracker/TrackerRecAlgs/TrackCounts/test/TrackCountsDbg.py b/Tracker/TrackerRecAlgs/TrackCounts/test/TrackCountsDbg.py
index c90104949be3154160fff26c2d2123a38b8f36a1..d52e56a8926d4730341f06d3bc3ea2f1f0c1d98a 100644
--- a/Tracker/TrackerRecAlgs/TrackCounts/test/TrackCountsDbg.py
+++ b/Tracker/TrackerRecAlgs/TrackCounts/test/TrackCountsDbg.py
@@ -26,6 +26,9 @@ configFlags.Input.Files = [
]
<<<<<<< HEAD
+<<<<<<< HEAD
+=======
+>>>>>>> 6e1b4d4be8e (Configuration fixes)
configFlags.Output.ESDFileName = "run001805_00.ESD.pool.root"
configFlags.IOVDb.GlobalTag = "OFLCOND-FASER-01"
configFlags.IOVDb.DatabaseInstance = "OFLP200"
@@ -35,6 +38,7 @@ configFlags.Common.isOnline = False
configFlags.GeoModel.FaserVersion = "FASER-01"
#configFlags.GeoModel.Align.Dynamic = False
configFlags.Beam.NumberOfCollisions = 0.
+<<<<<<< HEAD
=======
ConfigFlags.Output.ESDFileName = "run001805_00.ESD.pool.root"
ConfigFlags.IOVDb.GlobalTag = "OFLCOND-FASER-01"
@@ -46,6 +50,8 @@ ConfigFlags.GeoModel.FaserVersion = "FASER-01"
#ConfigFlags.GeoModel.Align.Dynamic = False
ConfigFlags.Beam.NumberOfCollisions = 0.
>>>>>>> 05a628fdc98 (GeometryTest runs successfully)
+=======
+>>>>>>> 6e1b4d4be8e (Configuration fixes)
configFlags.Detector.GeometryFaserSCT = True
diff --git a/Tracker/TrackerRecAlgs/TrackSeedPerformanceWriter/test/TrackSeedPerformanceWriterDbg.py b/Tracker/TrackerRecAlgs/TrackSeedPerformanceWriter/test/TrackSeedPerformanceWriterDbg.py
index 7052f42574b6d9c3a7880811ccd0a8d0cca5ba99..4e229ba1434145a8779e85520ca665ba2ec3313f 100644
--- a/Tracker/TrackerRecAlgs/TrackSeedPerformanceWriter/test/TrackSeedPerformanceWriterDbg.py
+++ b/Tracker/TrackerRecAlgs/TrackSeedPerformanceWriter/test/TrackSeedPerformanceWriterDbg.py
@@ -20,6 +20,9 @@ log.setLevel(DEBUG)
Configurable.configurableRun3Behavior = True
<<<<<<< HEAD
+<<<<<<< HEAD
+=======
+>>>>>>> 6e1b4d4be8e (Configuration fixes)
configFlags = initConfigFlags()
configFlags.Input.Files = ['my.RDO.pool.root']
configFlags.Output.ESDFileName = "seeds.ESD.pool.root"
@@ -32,6 +35,7 @@ configFlags.Common.isOnline = False
#configFlags.GeoModel.Align.Dynamic = False
configFlags.Beam.NumberOfCollisions = 0.
configFlags.lock()
+<<<<<<< HEAD
=======
ConfigFlags.Input.Files = ['my.RDO.pool.root']
ConfigFlags.Output.ESDFileName = "seeds.ESD.pool.root"
@@ -45,6 +49,8 @@ ConfigFlags.Common.isOnline = False
ConfigFlags.Beam.NumberOfCollisions = 0.
ConfigFlags.lock()
>>>>>>> 05a628fdc98 (GeometryTest runs successfully)
+=======
+>>>>>>> 6e1b4d4be8e (Configuration fixes)
acc = MainServicesCfg(configFlags)
acc.merge(PoolReadCfg(configFlags))
diff --git a/Tracker/TrackerRecAlgs/TrackerClusterFit/test/TestBeamClusterFitDbg.py b/Tracker/TrackerRecAlgs/TrackerClusterFit/test/TestBeamClusterFitDbg.py
index 56f549dacba590e0fd59d0f71d4fb8813d5660fa..c0353ef03dea110a868a0aa20654e327e6ed6f0e 100755
--- a/Tracker/TrackerRecAlgs/TrackerClusterFit/test/TestBeamClusterFitDbg.py
+++ b/Tracker/TrackerRecAlgs/TrackerClusterFit/test/TestBeamClusterFitDbg.py
@@ -94,6 +94,9 @@ configFlags.Input.Files = [
# '/eos/project-f/faser-commissioning/winter2020CosmicsStand/Run-000608/Faser-Physics-000608-00062.raw'
]
<<<<<<< HEAD
+<<<<<<< HEAD
+=======
+>>>>>>> 6e1b4d4be8e (Configuration fixes)
#configFlags.Output.ESDFileName = "run608.ESD.pool.root"
#configFlags.Output.ESDFileName = "run001332.ESD.pool.root"
configFlags.Output.ESDFileName = "tb.ESD.pool.root"
@@ -105,6 +108,7 @@ configFlags.GeoModel.FaserVersion = "FASER-TB00" # FASER geometry
configFlags.Common.isOnline = False
#configFlags.GeoModel.Align.Dynamic = False
configFlags.Beam.NumberOfCollisions = 0.
+<<<<<<< HEAD
=======
#ConfigFlags.Output.ESDFileName = "run608.ESD.pool.root"
#ConfigFlags.Output.ESDFileName = "run001332.ESD.pool.root"
@@ -118,6 +122,8 @@ ConfigFlags.Common.isOnline = False
#ConfigFlags.GeoModel.Align.Dynamic = False
ConfigFlags.Beam.NumberOfCollisions = 0.
>>>>>>> 05a628fdc98 (GeometryTest runs successfully)
+=======
+>>>>>>> 6e1b4d4be8e (Configuration fixes)
configFlags.Detector.GeometryFaserSCT = True
diff --git a/Tracker/TrackerRecAlgs/TrackerClusterFit/test/TrackerClusterFitDbg.py b/Tracker/TrackerRecAlgs/TrackerClusterFit/test/TrackerClusterFitDbg.py
index f868632eedc847ddb15f69b6d4ec70468798f207..8673cca8d476714f937079f9619ee8528510d6ea 100644
--- a/Tracker/TrackerRecAlgs/TrackerClusterFit/test/TrackerClusterFitDbg.py
+++ b/Tracker/TrackerRecAlgs/TrackerClusterFit/test/TrackerClusterFitDbg.py
@@ -93,6 +93,9 @@ configFlags.Input.Files = [
# '/eos/project-f/faser-commissioning/winter2020CosmicsStand/Run-000608/Faser-Physics-000608-00062.raw'
]
<<<<<<< HEAD
+<<<<<<< HEAD
+=======
+>>>>>>> 6e1b4d4be8e (Configuration fixes)
#configFlags.Output.ESDFileName = "run608.ESD.pool.root"
configFlags.Output.ESDFileName = "run001332.ESD.pool.root"
configFlags.IOVDb.GlobalTag = "OFLCOND-FASER-01" # Always needed; must match FaserVersion
@@ -103,6 +106,7 @@ configFlags.GeoModel.FaserVersion = "FASER-01" # FASER geometry
configFlags.Common.isOnline = False
#configFlags.GeoModel.Align.Dynamic = False
configFlags.Beam.NumberOfCollisions = 0.
+<<<<<<< HEAD
=======
#ConfigFlags.Output.ESDFileName = "run608.ESD.pool.root"
ConfigFlags.Output.ESDFileName = "run001332.ESD.pool.root"
@@ -115,6 +119,8 @@ ConfigFlags.Common.isOnline = False
#ConfigFlags.GeoModel.Align.Dynamic = False
ConfigFlags.Beam.NumberOfCollisions = 0.
>>>>>>> 05a628fdc98 (GeometryTest runs successfully)
+=======
+>>>>>>> 6e1b4d4be8e (Configuration fixes)
configFlags.Detector.GeometryFaserSCT = True
diff --git a/Tracker/TrackerRecAlgs/TrackerData/test/TI12TrackerSegmentFitDataDbg.py b/Tracker/TrackerRecAlgs/TrackerData/test/TI12TrackerSegmentFitDataDbg.py
index 7ecb2f6a0884ddf01266299b0546ddee5c9f30ec..690688843d11202660271c22ab5a3b2d71fa19b4 100644
--- a/Tracker/TrackerRecAlgs/TrackerData/test/TI12TrackerSegmentFitDataDbg.py
+++ b/Tracker/TrackerRecAlgs/TrackerData/test/TI12TrackerSegmentFitDataDbg.py
@@ -20,6 +20,9 @@ log.setLevel(DEBUG)
Configurable.configurableRun3Behavior = True
<<<<<<< HEAD
+<<<<<<< HEAD
+=======
+>>>>>>> 6e1b4d4be8e (Configuration fixes)
configFlags = initConfigFlags()
configFlags.Input.Files = ['/home/tboeckh/tmp/Faser-Physics-006470-00093.raw_middleStation.SPs']
configFlags.Output.ESDFileName = "TrackerSegmentFitData.ESD.pool.root"
@@ -34,6 +37,7 @@ configFlags.Common.isOnline = False
configFlags.Beam.NumberOfCollisions = 0.
configFlags.Detector.GeometryFaserSCT = True
configFlags.lock()
+<<<<<<< HEAD
=======
ConfigFlags.Input.Files = ['/home/tboeckh/tmp/Faser-Physics-006470-00093.raw_middleStation.SPs']
ConfigFlags.Output.ESDFileName = "TrackerSegmentFitData.ESD.pool.root"
@@ -49,6 +53,8 @@ ConfigFlags.Beam.NumberOfCollisions = 0.
ConfigFlags.Detector.GeometryFaserSCT = True
ConfigFlags.lock()
>>>>>>> 05a628fdc98 (GeometryTest runs successfully)
+=======
+>>>>>>> 6e1b4d4be8e (Configuration fixes)
acc = MainServicesCfg(configFlags)
acc.merge(FaserByteStreamCnvSvcCfg(configFlags))
diff --git a/Tracker/TrackerRecAlgs/TrackerData/test/TrackerSegmentFitDataDbg.py b/Tracker/TrackerRecAlgs/TrackerData/test/TrackerSegmentFitDataDbg.py
index 00a53788f035c0a58b18ba2055108e51f477db81..15d987d1594c7c527e69610630c13e8ea531bb08 100644
--- a/Tracker/TrackerRecAlgs/TrackerData/test/TrackerSegmentFitDataDbg.py
+++ b/Tracker/TrackerRecAlgs/TrackerData/test/TrackerSegmentFitDataDbg.py
@@ -19,6 +19,9 @@ log.setLevel(DEBUG)
Configurable.configurableRun3Behavior = True
<<<<<<< HEAD
+<<<<<<< HEAD
+=======
+>>>>>>> 6e1b4d4be8e (Configuration fixes)
configFlags = initConfigFlags()
configFlags.Input.Files = ["my.RDO.pool.root"]
configFlags.Output.ESDFileName = "TrackerSegmentFitData.ESD.pool.root"
@@ -33,6 +36,7 @@ configFlags.Beam.NumberOfCollisions = 0.
configFlags.Detector.GeometryFaserSCT = True
configFlags.addFlag("Output.xAODFileName", f"TrackerSegmentFitData_xAOD.root")
configFlags.lock()
+<<<<<<< HEAD
=======
ConfigFlags.Input.Files = ["my.RDO.pool.root"]
ConfigFlags.Output.ESDFileName = "TrackerSegmentFitData.ESD.pool.root"
@@ -48,6 +52,8 @@ ConfigFlags.Detector.GeometryFaserSCT = True
ConfigFlags.addFlag("Output.xAODFileName", f"TrackerSegmentFitData_xAOD.root")
ConfigFlags.lock()
>>>>>>> 05a628fdc98 (GeometryTest runs successfully)
+=======
+>>>>>>> 6e1b4d4be8e (Configuration fixes)
acc = MainServicesCfg(configFlags)
acc.merge(PoolReadCfg(configFlags))
diff --git a/Tracker/TrackerRecAlgs/TrackerData/test/TrackerTruthDataDbg.py b/Tracker/TrackerRecAlgs/TrackerData/test/TrackerTruthDataDbg.py
index 170542ac5281c7cf41b26b1cb234ce7bc98614ee..169f716878882805825e52518cc66dcae98f6cc1 100644
--- a/Tracker/TrackerRecAlgs/TrackerData/test/TrackerTruthDataDbg.py
+++ b/Tracker/TrackerRecAlgs/TrackerData/test/TrackerTruthDataDbg.py
@@ -15,6 +15,9 @@ log.setLevel(DEBUG)
Configurable.configurableRun3Behavior = True
<<<<<<< HEAD
+<<<<<<< HEAD
+=======
+>>>>>>> 6e1b4d4be8e (Configuration fixes)
configFlags = initConfigFlags()
configFlags.Input.Files = ["my.HITS.pool.root"]
configFlags.IOVDb.GlobalTag = "OFLCOND-FASER-01"
@@ -27,6 +30,7 @@ configFlags.Common.isOnline = False
configFlags.Beam.NumberOfCollisions = 0.
configFlags.Detector.GeometryFaserSCT = True
configFlags.lock()
+<<<<<<< HEAD
=======
ConfigFlags.Input.Files = ["my.HITS.pool.root"]
ConfigFlags.IOVDb.GlobalTag = "OFLCOND-FASER-01"
@@ -40,6 +44,8 @@ ConfigFlags.Beam.NumberOfCollisions = 0.
ConfigFlags.Detector.GeometryFaserSCT = True
ConfigFlags.lock()
>>>>>>> 05a628fdc98 (GeometryTest runs successfully)
+=======
+>>>>>>> 6e1b4d4be8e (Configuration fixes)
# Core components
acc = MainServicesCfg(configFlags)
diff --git a/Tracker/TrackerRecAlgs/TrackerPrepRawDataFormation/test/FaserSCT_ClusterizationDbg.py b/Tracker/TrackerRecAlgs/TrackerPrepRawDataFormation/test/FaserSCT_ClusterizationDbg.py
index 558d67b5baa7fedd51b5a12887221412ab94d609..3d611f997d57d4867c52ab3920f6b0dc5213da1f 100644
--- a/Tracker/TrackerRecAlgs/TrackerPrepRawDataFormation/test/FaserSCT_ClusterizationDbg.py
+++ b/Tracker/TrackerRecAlgs/TrackerPrepRawDataFormation/test/FaserSCT_ClusterizationDbg.py
@@ -23,12 +23,16 @@ Configurable.configurableRun3Behavior = True
# Configure
<<<<<<< HEAD
+<<<<<<< HEAD
+=======
+>>>>>>> 6e1b4d4be8e (Configuration fixes)
configFlags = initConfigFlags()
configFlags.Input.Files = ['my.RDO.pool.root']
configFlags.Output.ESDFileName = "myClusters.ESD.pool.root"
configFlags.IOVDb.GlobalTag = "OFLCOND-FASER-01" # Always needed; must match FaserVersion
#configFlags.GeoModel.Align.Dynamic = False
configFlags.Beam.NumberOfCollisions = 0.
+<<<<<<< HEAD
=======
ConfigFlags.Input.Files = ['my.RDO.pool.root']
ConfigFlags.Output.ESDFileName = "myClusters.ESD.pool.root"
@@ -36,6 +40,8 @@ ConfigFlags.IOVDb.GlobalTag = "OFLCOND-FASER-01" # Always needed; mu
#ConfigFlags.GeoModel.Align.Dynamic = False
ConfigFlags.Beam.NumberOfCollisions = 0.
>>>>>>> 05a628fdc98 (GeometryTest runs successfully)
+=======
+>>>>>>> 6e1b4d4be8e (Configuration fixes)
configFlags.lock()
diff --git a/Tracker/TrackerRecAlgs/TrackerPrepRawDataFormation/test/FaserSCT_ClusterizationDbgCosmics.py b/Tracker/TrackerRecAlgs/TrackerPrepRawDataFormation/test/FaserSCT_ClusterizationDbgCosmics.py
index dcc60e0d9af7ecc03d7e3f51148fceb6aea76e2b..b8a4cd30af0147ec2bead6939244ce7473b289b1 100644
--- a/Tracker/TrackerRecAlgs/TrackerPrepRawDataFormation/test/FaserSCT_ClusterizationDbgCosmics.py
+++ b/Tracker/TrackerRecAlgs/TrackerPrepRawDataFormation/test/FaserSCT_ClusterizationDbgCosmics.py
@@ -23,6 +23,9 @@ Configurable.configurableRun3Behavior = True
# Configure
<<<<<<< HEAD
+<<<<<<< HEAD
+=======
+>>>>>>> 6e1b4d4be8e (Configuration fixes)
configFlags = initConfigFlags()
configFlags.Input.Files = ['my.RDO.pool.root']
configFlags.Output.ESDFileName = "myClusters.ESD.pool.root"
@@ -34,6 +37,7 @@ configFlags.GeoModel.FaserVersion = "FASER-01" # FASER cosmic ray
configFlags.Common.isOnline = False
#configFlags.GeoModel.Align.Dynamic = False
configFlags.Beam.NumberOfCollisions = 0.
+<<<<<<< HEAD
=======
ConfigFlags.Input.Files = ['my.RDO.pool.root']
ConfigFlags.Output.ESDFileName = "myClusters.ESD.pool.root"
@@ -46,6 +50,8 @@ ConfigFlags.Common.isOnline = False
#ConfigFlags.GeoModel.Align.Dynamic = False
ConfigFlags.Beam.NumberOfCollisions = 0.
>>>>>>> 05a628fdc98 (GeometryTest runs successfully)
+=======
+>>>>>>> 6e1b4d4be8e (Configuration fixes)
configFlags.lock()
diff --git a/Tracker/TrackerRecAlgs/TrackerSPFit/python/TrackerSPFit.py b/Tracker/TrackerRecAlgs/TrackerSPFit/python/TrackerSPFit.py
index bae76bf40ef22a68904b8a2fc5dd84a7a4bc0b57..39d398cf03fa45b24ae8d6b8f4b1fda6c48f6055 100644
--- a/Tracker/TrackerRecAlgs/TrackerSPFit/python/TrackerSPFit.py
+++ b/Tracker/TrackerRecAlgs/TrackerSPFit/python/TrackerSPFit.py
@@ -62,16 +62,22 @@ if __name__ == "__main__":
configFlags.Input.isMC = True
# Needed to bypass autoconfig
<<<<<<< HEAD
+<<<<<<< HEAD
+=======
+>>>>>>> 6e1b4d4be8e (Configuration fixes)
configFlags.GeoModel.FaserVersion = "FASER-01" # FASER cosmic ray geometry (station 2 only)
configFlags.Common.isOnline = False
#configFlags.GeoModel.Align.Dynamic = False
configFlags.Beam.NumberOfCollisions = 0.
+<<<<<<< HEAD
=======
ConfigFlags.GeoModel.FaserVersion = "FASER-01" # FASER cosmic ray geometry (station 2 only)
ConfigFlags.Common.isOnline = False
#ConfigFlags.GeoModel.Align.Dynamic = False
ConfigFlags.Beam.NumberOfCollisions = 0.
>>>>>>> 05a628fdc98 (GeometryTest runs successfully)
+=======
+>>>>>>> 6e1b4d4be8e (Configuration fixes)
configFlags.lock()
diff --git a/Tracker/TrackerRecAlgs/TrackerSPFit/python/TrackerSPFitTI12Data.py b/Tracker/TrackerRecAlgs/TrackerSPFit/python/TrackerSPFitTI12Data.py
index 3d08a181248448a3a76be7bcc7c3f7028cb28648..e194b09ecde00f99a164631882cfcde3d7b8bb11 100644
--- a/Tracker/TrackerRecAlgs/TrackerSPFit/python/TrackerSPFitTI12Data.py
+++ b/Tracker/TrackerRecAlgs/TrackerSPFit/python/TrackerSPFitTI12Data.py
@@ -60,16 +60,22 @@ if __name__ == "__main__":
configFlags.Input.isMC = False
# Needed to bypass autoconfig
<<<<<<< HEAD
+<<<<<<< HEAD
+=======
+>>>>>>> 6e1b4d4be8e (Configuration fixes)
configFlags.GeoModel.FaserVersion = "FASER-01" # FASER cosmic ray geometry (station 2 only)
configFlags.Common.isOnline = False
#configFlags.GeoModel.Align.Dynamic = False
configFlags.Beam.NumberOfCollisions = 0.
+<<<<<<< HEAD
=======
ConfigFlags.GeoModel.FaserVersion = "FASER-01" # FASER cosmic ray geometry (station 2 only)
ConfigFlags.Common.isOnline = False
#ConfigFlags.GeoModel.Align.Dynamic = False
ConfigFlags.Beam.NumberOfCollisions = 0.
>>>>>>> 05a628fdc98 (GeometryTest runs successfully)
+=======
+>>>>>>> 6e1b4d4be8e (Configuration fixes)
configFlags.lock()
diff --git a/Tracker/TrackerRecAlgs/TrackerSPFit/test/TrackerSPFitDbg.py b/Tracker/TrackerRecAlgs/TrackerSPFit/test/TrackerSPFitDbg.py
index 427a28a2593444189784c588a3c021c3014ad3c2..e775bd20c3aca8c24bb4cf5b3d57b6233f87a701 100644
--- a/Tracker/TrackerRecAlgs/TrackerSPFit/test/TrackerSPFitDbg.py
+++ b/Tracker/TrackerRecAlgs/TrackerSPFit/test/TrackerSPFitDbg.py
@@ -24,12 +24,16 @@ Configurable.configurableRun3Behavior = True
# Configure
<<<<<<< HEAD
+<<<<<<< HEAD
+=======
+>>>>>>> 6e1b4d4be8e (Configuration fixes)
configFlags = initConfigFlags()
configFlags.Input.Files = ['my.RDO.pool.root']
configFlags.Output.ESDFileName = "mySpacePoints.ESD.pool.root"
configFlags.IOVDb.GlobalTag = "OFLCOND-FASER-01" # Always needed; must match FaserVersion
#configFlags.GeoModel.Align.Dynamic = False
configFlags.Beam.NumberOfCollisions = 0.
+<<<<<<< HEAD
=======
ConfigFlags.Input.Files = ['my.RDO.pool.root']
ConfigFlags.Output.ESDFileName = "mySpacePoints.ESD.pool.root"
@@ -37,6 +41,8 @@ ConfigFlags.IOVDb.GlobalTag = "OFLCOND-FASER-01" # Always needed; mu
#ConfigFlags.GeoModel.Align.Dynamic = False
ConfigFlags.Beam.NumberOfCollisions = 0.
>>>>>>> 05a628fdc98 (GeometryTest runs successfully)
+=======
+>>>>>>> 6e1b4d4be8e (Configuration fixes)
configFlags.lock()
diff --git a/Tracker/TrackerRecAlgs/TrackerSeedFinder/test/TrackerSeedFinderDbg.py b/Tracker/TrackerRecAlgs/TrackerSeedFinder/test/TrackerSeedFinderDbg.py
index d65e0ef7ec131279f5357a2f293c27c108c3bf91..648429c3080a794187d94faa9679563853391e59 100644
--- a/Tracker/TrackerRecAlgs/TrackerSeedFinder/test/TrackerSeedFinderDbg.py
+++ b/Tracker/TrackerRecAlgs/TrackerSeedFinder/test/TrackerSeedFinderDbg.py
@@ -25,6 +25,9 @@ Configurable.configurableRun3Behavior = True
# Configure
<<<<<<< HEAD
+<<<<<<< HEAD
+=======
+>>>>>>> 6e1b4d4be8e (Configuration fixes)
configFlags = initConfigFlags()
configFlags.Input.Files = ['my.RDO.pool.root']
configFlags.Output.ESDFileName = "mySeeds.ESD.pool.root"
@@ -33,6 +36,7 @@ configFlags.IOVDb.GlobalTag = "OFLCOND-FASER-01"
#configFlags.GeoModel.Align.Dynamic = False
#configFlags.Concurrency.NumThreads = 1
configFlags.Beam.NumberOfCollisions = 0.
+<<<<<<< HEAD
=======
ConfigFlags.Input.Files = ['my.RDO.pool.root']
ConfigFlags.Output.ESDFileName = "mySeeds.ESD.pool.root"
@@ -42,6 +46,8 @@ ConfigFlags.IOVDb.GlobalTag = "OFLCOND-FASER-01"
#ConfigFlags.Concurrency.NumThreads = 1
ConfigFlags.Beam.NumberOfCollisions = 0.
>>>>>>> 05a628fdc98 (GeometryTest runs successfully)
+=======
+>>>>>>> 6e1b4d4be8e (Configuration fixes)
configFlags.lock()
diff --git a/Tracker/TrackerRecAlgs/TrackerSegmentFit/test/MCTrackerSegmentFit.py b/Tracker/TrackerRecAlgs/TrackerSegmentFit/test/MCTrackerSegmentFit.py
index 0206414e5b344ced62bfd48872ea44144b280efc..233c975db748ea74ec0ce5c69a7d435e90aa8add 100644
--- a/Tracker/TrackerRecAlgs/TrackerSegmentFit/test/MCTrackerSegmentFit.py
+++ b/Tracker/TrackerRecAlgs/TrackerSegmentFit/test/MCTrackerSegmentFit.py
@@ -26,6 +26,9 @@ Configurable.configurableRun3Behavior = True
# Configure
<<<<<<< HEAD
+<<<<<<< HEAD
+=======
+>>>>>>> 6e1b4d4be8e (Configuration fixes)
configFlags = initConfigFlags()
configFlags.Input.Files = ['my.RDO.pool.root']
configFlags.Output.ESDFileName = "segmentFit.ESD.pool.root"
@@ -40,6 +43,7 @@ configFlags.Beam.NumberOfCollisions = 0.
configFlags.addFlag("Output.xAODFileName", "segmentFit.xAOD.pool.root")
# configFlags.Detector.GeometryFaserSCT = True
configFlags.lock()
+<<<<<<< HEAD
=======
ConfigFlags.Input.Files = ['my.RDO.pool.root']
ConfigFlags.Output.ESDFileName = "segmentFit.ESD.pool.root"
@@ -55,6 +59,8 @@ ConfigFlags.addFlag("Output.xAODFileName", "segmentFit.xAOD.pool.root")
# ConfigFlags.Detector.GeometryFaserSCT = True
ConfigFlags.lock()
>>>>>>> 05a628fdc98 (GeometryTest runs successfully)
+=======
+>>>>>>> 6e1b4d4be8e (Configuration fixes)
# Core components
acc = MainServicesCfg(configFlags)
diff --git a/Tracker/TrackerRecAlgs/TrackerSegmentFit/test/TestBeamSegmentFitDbg.py b/Tracker/TrackerRecAlgs/TrackerSegmentFit/test/TestBeamSegmentFitDbg.py
index c2c15e1eabd344ecd5cca7bca5b229ba85b20888..56977a2d3279160da606d7c78b46a1c1b1d8aab1 100755
--- a/Tracker/TrackerRecAlgs/TrackerSegmentFit/test/TestBeamSegmentFitDbg.py
+++ b/Tracker/TrackerRecAlgs/TrackerSegmentFit/test/TestBeamSegmentFitDbg.py
@@ -30,6 +30,9 @@ configFlags.Input.Files = [
'tbMu.raw',
]
<<<<<<< HEAD
+<<<<<<< HEAD
+=======
+>>>>>>> 6e1b4d4be8e (Configuration fixes)
configFlags.Output.ESDFileName = "tbMu.ESD.pool.root"
configFlags.IOVDb.GlobalTag = "OFLCOND-FASER-TB00" # Always needed; must match FaserVersion
configFlags.IOVDb.DatabaseInstance = "OFLP200" # Use MC conditions for now
@@ -39,6 +42,7 @@ configFlags.GeoModel.FaserVersion = "FASER-TB00" # FASER geometry
configFlags.Common.isOnline = False
#configFlags.GeoModel.Align.Dynamic = False
configFlags.Beam.NumberOfCollisions = 0.
+<<<<<<< HEAD
=======
ConfigFlags.Output.ESDFileName = "tbMu.ESD.pool.root"
ConfigFlags.IOVDb.GlobalTag = "OFLCOND-FASER-TB00" # Always needed; must match FaserVersion
@@ -50,6 +54,8 @@ ConfigFlags.Common.isOnline = False
#ConfigFlags.GeoModel.Align.Dynamic = False
ConfigFlags.Beam.NumberOfCollisions = 0.
>>>>>>> 05a628fdc98 (GeometryTest runs successfully)
+=======
+>>>>>>> 6e1b4d4be8e (Configuration fixes)
# configFlags.Detector.GeometryFaserSCT = True
diff --git a/Tracker/TrackerRecAlgs/TrackerSegmentFit/test/TrackerSegmentFitDbg.py b/Tracker/TrackerRecAlgs/TrackerSegmentFit/test/TrackerSegmentFitDbg.py
index 379f3e10a36a44f03e49ef850f06b41e4dd69f2f..18869b1ce2186277c491fc27543ee7ecec5cf070 100644
--- a/Tracker/TrackerRecAlgs/TrackerSegmentFit/test/TrackerSegmentFitDbg.py
+++ b/Tracker/TrackerRecAlgs/TrackerSegmentFit/test/TrackerSegmentFitDbg.py
@@ -30,6 +30,9 @@ configFlags.Input.Files = [
'/eos/project-f/faser-commissioning/TI12Data/Run-005684/Faser-Physics-005684-00000.raw',
]
<<<<<<< HEAD
+<<<<<<< HEAD
+=======
+>>>>>>> 6e1b4d4be8e (Configuration fixes)
configFlags.Output.ESDFileName = "run005684-00000.ESD.pool.root"
configFlags.IOVDb.GlobalTag = "OFLCOND-FASER-03" # Always needed; must match FaserVersion
configFlags.IOVDb.DatabaseInstance = "OFLP200" # Use MC conditions for now
@@ -39,6 +42,7 @@ configFlags.GeoModel.FaserVersion = "FASER-02" # FASER geometry
configFlags.Common.isOnline = False
#configFlags.GeoModel.Align.Dynamic = False
configFlags.Beam.NumberOfCollisions = 0.
+<<<<<<< HEAD
=======
ConfigFlags.Output.ESDFileName = "run005684-00000.ESD.pool.root"
ConfigFlags.IOVDb.GlobalTag = "OFLCOND-FASER-03" # Always needed; must match FaserVersion
@@ -50,6 +54,8 @@ ConfigFlags.Common.isOnline = False
#ConfigFlags.GeoModel.Align.Dynamic = False
ConfigFlags.Beam.NumberOfCollisions = 0.
>>>>>>> 05a628fdc98 (GeometryTest runs successfully)
+=======
+>>>>>>> 6e1b4d4be8e (Configuration fixes)
configFlags.Detector.GeometryFaserSCT = True
diff --git a/Tracker/TrackerRecAlgs/TrackerSpacePointFormation/test/StatisticsDbg.py b/Tracker/TrackerRecAlgs/TrackerSpacePointFormation/test/StatisticsDbg.py
index b7d2ee5866fcbfb215858ea70ee2dc15233125ee..c37be15d1e6870d7f854fcdebe7c60f25d848d4b 100644
--- a/Tracker/TrackerRecAlgs/TrackerSpacePointFormation/test/StatisticsDbg.py
+++ b/Tracker/TrackerRecAlgs/TrackerSpacePointFormation/test/StatisticsDbg.py
@@ -24,12 +24,16 @@ Configurable.configurableRun3Behavior = True
# Configure
<<<<<<< HEAD
+<<<<<<< HEAD
+=======
+>>>>>>> 6e1b4d4be8e (Configuration fixes)
configFlags = initConfigFlags()
configFlags.Input.Files = ['my.RDO.pool.root']
configFlags.Output.ESDFileName = "mySpacePoints.ESD.pool.root"
configFlags.IOVDb.GlobalTag = "OFLCOND-FASER-01" # Always needed; must match FaserVersion
#configFlags.GeoModel.Align.Dynamic = False
configFlags.Beam.NumberOfCollisions = 0.
+<<<<<<< HEAD
=======
ConfigFlags.Input.Files = ['my.RDO.pool.root']
ConfigFlags.Output.ESDFileName = "mySpacePoints.ESD.pool.root"
@@ -37,6 +41,8 @@ ConfigFlags.IOVDb.GlobalTag = "OFLCOND-FASER-01" # Always needed; mu
#ConfigFlags.GeoModel.Align.Dynamic = False
ConfigFlags.Beam.NumberOfCollisions = 0.
>>>>>>> 05a628fdc98 (GeometryTest runs successfully)
+=======
+>>>>>>> 6e1b4d4be8e (Configuration fixes)
configFlags.lock()
diff --git a/Tracker/TrackerRecAlgs/TrackerSpacePointFormation/test/TrackerSpacePointFormationDbg.py b/Tracker/TrackerRecAlgs/TrackerSpacePointFormation/test/TrackerSpacePointFormationDbg.py
index 9549bc9249c40700d82c7fd90cf560de6cb72868..732c922b5acc6179d6daac956eef55c3d7170d8e 100644
--- a/Tracker/TrackerRecAlgs/TrackerSpacePointFormation/test/TrackerSpacePointFormationDbg.py
+++ b/Tracker/TrackerRecAlgs/TrackerSpacePointFormation/test/TrackerSpacePointFormationDbg.py
@@ -24,12 +24,16 @@ Configurable.configurableRun3Behavior = True
# Configure
<<<<<<< HEAD
+<<<<<<< HEAD
+=======
+>>>>>>> 6e1b4d4be8e (Configuration fixes)
configFlags = initConfigFlags()
configFlags.Input.Files = ['my.RDO.pool.root']
configFlags.Output.ESDFileName = "mySpacePoints.ESD.pool.root"
configFlags.IOVDb.GlobalTag = "OFLCOND-FASER-01" # Always needed; must match FaserVersion
#configFlags.GeoModel.Align.Dynamic = False
configFlags.Beam.NumberOfCollisions = 0.
+<<<<<<< HEAD
=======
ConfigFlags.Input.Files = ['my.RDO.pool.root']
ConfigFlags.Output.ESDFileName = "mySpacePoints.ESD.pool.root"
@@ -37,6 +41,8 @@ ConfigFlags.IOVDb.GlobalTag = "OFLCOND-FASER-01" # Always needed; mu
#ConfigFlags.GeoModel.Align.Dynamic = False
ConfigFlags.Beam.NumberOfCollisions = 0.
>>>>>>> 05a628fdc98 (GeometryTest runs successfully)
+=======
+>>>>>>> 6e1b4d4be8e (Configuration fixes)
configFlags.lock()
diff --git a/Tracker/TrackerRecAlgs/TrackerSpacePointFormation/test/TrackerSpacePointFormationDbgCosmics.py b/Tracker/TrackerRecAlgs/TrackerSpacePointFormation/test/TrackerSpacePointFormationDbgCosmics.py
index 1bac5ad63629ff3ff236ea3dd499861662bd1f02..2d1bf79ab424c219e51a8522680a672775470bac 100644
--- a/Tracker/TrackerRecAlgs/TrackerSpacePointFormation/test/TrackerSpacePointFormationDbgCosmics.py
+++ b/Tracker/TrackerRecAlgs/TrackerSpacePointFormation/test/TrackerSpacePointFormationDbgCosmics.py
@@ -24,6 +24,9 @@ Configurable.configurableRun3Behavior = True
# Configure
<<<<<<< HEAD
+<<<<<<< HEAD
+=======
+>>>>>>> 6e1b4d4be8e (Configuration fixes)
configFlags = initConfigFlags()
configFlags.Input.Files = ['my.RDO.pool.root']
configFlags.Output.ESDFileName = "mySpacePoints.ESD.pool.root"
@@ -36,6 +39,7 @@ configFlags.GeoModel.FaserVersion = "FASER-01" # FASER cosmic ray
#configFlags.GeoModel.Align.Dynamic = False
configFlags.Beam.NumberOfCollisions = 0.
configFlags.lock()
+<<<<<<< HEAD
=======
ConfigFlags.Input.Files = ['my.RDO.pool.root']
ConfigFlags.Output.ESDFileName = "mySpacePoints.ESD.pool.root"
@@ -49,6 +53,8 @@ ConfigFlags.GeoModel.FaserVersion = "FASER-01" # FASER cosmic ray
ConfigFlags.Beam.NumberOfCollisions = 0.
ConfigFlags.lock()
>>>>>>> 05a628fdc98 (GeometryTest runs successfully)
+=======
+>>>>>>> 6e1b4d4be8e (Configuration fixes)
# Core components
acc = MainServicesCfg(configFlags)
diff --git a/Tracker/TrackerRecAlgs/TrackerTruth/test/TrackerTruthDbg.py b/Tracker/TrackerRecAlgs/TrackerTruth/test/TrackerTruthDbg.py
index 4bc1a7f39cd92c232008f6132d0b406b249de6b0..2093ef1f1337ed4cc08ff400f6f6ed5d543e12ff 100644
--- a/Tracker/TrackerRecAlgs/TrackerTruth/test/TrackerTruthDbg.py
+++ b/Tracker/TrackerRecAlgs/TrackerTruth/test/TrackerTruthDbg.py
@@ -15,6 +15,9 @@ log.setLevel(DEBUG)
Configurable.configurableRun3Behavior = True
<<<<<<< HEAD
+<<<<<<< HEAD
+=======
+>>>>>>> 6e1b4d4be8e (Configuration fixes)
configFlags = initConfigFlags()
configFlags.Input.Files = ["my.HITS.pool.root"]
configFlags.IOVDb.GlobalTag = "OFLCOND-FASER-01"
@@ -27,6 +30,7 @@ configFlags.Common.isOnline = False
configFlags.Beam.NumberOfCollisions = 0.
configFlags.Detector.GeometryFaserSCT = True
configFlags.lock()
+<<<<<<< HEAD
=======
ConfigFlags.Input.Files = ["my.HITS.pool.root"]
ConfigFlags.IOVDb.GlobalTag = "OFLCOND-FASER-01"
@@ -40,6 +44,8 @@ ConfigFlags.Beam.NumberOfCollisions = 0.
ConfigFlags.Detector.GeometryFaserSCT = True
ConfigFlags.lock()
>>>>>>> 05a628fdc98 (GeometryTest runs successfully)
+=======
+>>>>>>> 6e1b4d4be8e (Configuration fixes)
# Core components
acc = MainServicesCfg(configFlags)
diff --git a/Tracker/TrackerRecAlgs/TruthSeededTrackFinder/test/TruthSeededTrackFinderDbg.py b/Tracker/TrackerRecAlgs/TruthSeededTrackFinder/test/TruthSeededTrackFinderDbg.py
index 8094643856fd1ae1808c3ed1cece4363a7321cce..db51124d13d71e08fb7210c593bd6ee0cc2d30ad 100644
--- a/Tracker/TrackerRecAlgs/TruthSeededTrackFinder/test/TruthSeededTrackFinderDbg.py
+++ b/Tracker/TrackerRecAlgs/TruthSeededTrackFinder/test/TruthSeededTrackFinderDbg.py
@@ -25,6 +25,9 @@ Configurable.configurableRun3Behavior = True
# Configure
<<<<<<< HEAD
+<<<<<<< HEAD
+=======
+>>>>>>> 6e1b4d4be8e (Configuration fixes)
configFlags = initConfigFlags()
configFlags.Input.Files = ['my.RDO.pool.root']
configFlags.Output.ESDFileName = "mySeeds.ESD.pool.root"
@@ -32,6 +35,7 @@ configFlags.IOVDb.GlobalTag = "OFLCOND-FASER-01" # Always needed; mu
#configFlags.GeoModel.Align.Dynamic = False
#configFlags.Concurrency.NumThreads = 1
configFlags.Beam.NumberOfCollisions = 0.
+<<<<<<< HEAD
=======
ConfigFlags.Input.Files = ['my.RDO.pool.root']
ConfigFlags.Output.ESDFileName = "mySeeds.ESD.pool.root"
@@ -40,6 +44,8 @@ ConfigFlags.IOVDb.GlobalTag = "OFLCOND-FASER-01" # Always needed; mu
#ConfigFlags.Concurrency.NumThreads = 1
ConfigFlags.Beam.NumberOfCollisions = 0.
>>>>>>> 05a628fdc98 (GeometryTest runs successfully)
+=======
+>>>>>>> 6e1b4d4be8e (Configuration fixes)
configFlags.lock()
diff --git a/Tracking/Acts/FaserActsGeometry/python/FaserActsMaterialMapping_jobOptions.py b/Tracking/Acts/FaserActsGeometry/python/FaserActsMaterialMapping_jobOptions.py
index 15999491186eb6ac640a6816572927aa48a003f1..4324d477625cc10bdf52d5951fc442f2c884ec73 100644
--- a/Tracking/Acts/FaserActsGeometry/python/FaserActsMaterialMapping_jobOptions.py
+++ b/Tracking/Acts/FaserActsGeometry/python/FaserActsMaterialMapping_jobOptions.py
@@ -59,6 +59,9 @@ if "__main__" == __name__:
## Just enable ID for the moment.
<<<<<<< HEAD
+<<<<<<< HEAD
+=======
+>>>>>>> 6e1b4d4be8e (Configuration fixes)
configFlags = initConfigFlags()
configFlags.Input.isMC = True
configFlags.Beam.Type = "collisions"
@@ -66,6 +69,7 @@ if "__main__" == __name__:
configFlags.IOVDb.GlobalTag = "OFLCOND-FASER-03" # Always needed; must match FaserVersion
configFlags.TrackingGeometry.MaterialSource = "geometry-maps.json"
#configFlags.GeoModel.Align.Dynamic = False
+<<<<<<< HEAD
=======
ConfigFlags.Input.isMC = True
ConfigFlags.Beam.Type = "collisions"
@@ -74,6 +78,8 @@ if "__main__" == __name__:
ConfigFlags.TrackingGeometry.MaterialSource = "geometry-maps.json"
#ConfigFlags.GeoModel.Align.Dynamic = False
>>>>>>> 05a628fdc98 (GeometryTest runs successfully)
+=======
+>>>>>>> 6e1b4d4be8e (Configuration fixes)
configFlags.lock()
configFlags.dump()
diff --git a/Tracking/Acts/FaserActsGeometry/test/FaserActsExtrapolationAlg.py b/Tracking/Acts/FaserActsGeometry/test/FaserActsExtrapolationAlg.py
index 88aeff62ed83096eb207c872669e5f32a47042c4..07e812892240ec186b75e7d28e8f08f686c21fe5 100644
--- a/Tracking/Acts/FaserActsGeometry/test/FaserActsExtrapolationAlg.py
+++ b/Tracking/Acts/FaserActsGeometry/test/FaserActsExtrapolationAlg.py
@@ -27,6 +27,9 @@ configFlags.GeoModel.FaserVersion = "FASER-01" # Always needed
configFlags.addFlag("Input.InitialTimeStamp", 0)
# Workaround to avoid problematic ISF code
<<<<<<< HEAD
+<<<<<<< HEAD
+=======
+>>>>>>> 6e1b4d4be8e (Configuration fixes)
configFlags.GeoModel.Layout = "Development"
configFlags.Detector.GeometryFaserSCT = True
#configFlags.GeoModel.AtlasVersion = "ATLAS-R2-2016-01-00-01" # Always needed to fool autoconfig; value ignored
@@ -34,6 +37,7 @@ configFlags.Detector.GeometryFaserSCT = True
#configFlags.Concurrency.NumThreads = 1
#configFlags.Beam.NumberOfCollisions = 0.
configFlags.lock()
+<<<<<<< HEAD
=======
ConfigFlags.GeoModel.Layout = "Development"
ConfigFlags.Detector.GeometryFaserSCT = True
@@ -43,6 +47,8 @@ ConfigFlags.Detector.GeometryFaserSCT = True
#ConfigFlags.Beam.NumberOfCollisions = 0.
ConfigFlags.lock()
>>>>>>> 05a628fdc98 (GeometryTest runs successfully)
+=======
+>>>>>>> 6e1b4d4be8e (Configuration fixes)
# Core components
acc = MainServicesCfg(configFlags)
diff --git a/Tracking/Acts/FaserActsGeometry/test/FaserActsGeometryBoundary_test.py b/Tracking/Acts/FaserActsGeometry/test/FaserActsGeometryBoundary_test.py
index 56674147a4d0202ddb7091f4591549611f5337ca..429c2e38ab026c60b01ec9335be5bd3f8fdde425 100644
--- a/Tracking/Acts/FaserActsGeometry/test/FaserActsGeometryBoundary_test.py
+++ b/Tracking/Acts/FaserActsGeometry/test/FaserActsGeometryBoundary_test.py
@@ -31,6 +31,9 @@ if __name__ == "__main__":
Configurable.configurableRun3Behavior = True
<<<<<<< HEAD
+<<<<<<< HEAD
+=======
+>>>>>>> 6e1b4d4be8e (Configuration fixes)
configFlags = initConfigFlags()
configFlags.Input.isMC = False
#configFlags.GeoModel.Align.Dynamic = False
@@ -39,6 +42,7 @@ if __name__ == "__main__":
configFlags.GeoModel.FaserVersion = "FASERNU-03"
configFlags.Detector.GeometryFaserSCT = True
configFlags.lock()
+<<<<<<< HEAD
=======
ConfigFlags.Input.isMC = False
#ConfigFlags.GeoModel.Align.Dynamic = False
@@ -48,6 +52,8 @@ if __name__ == "__main__":
ConfigFlags.Detector.GeometryFaserSCT = True
ConfigFlags.lock()
>>>>>>> 05a628fdc98 (GeometryTest runs successfully)
+=======
+>>>>>>> 6e1b4d4be8e (Configuration fixes)
acc = MainServicesCfg(configFlags)
acc.merge(FaserGeometryCfg(configFlags))
diff --git a/Tracking/Acts/FaserActsGeometry/test/FaserActsWriteTrackingGeometry.py b/Tracking/Acts/FaserActsGeometry/test/FaserActsWriteTrackingGeometry.py
index f49c31fdc0fc916aaceaa0e6e93f94e71c80fcd3..1ed3c62d75057da7214c69ed9062c46be354c4d1 100644
--- a/Tracking/Acts/FaserActsGeometry/test/FaserActsWriteTrackingGeometry.py
+++ b/Tracking/Acts/FaserActsGeometry/test/FaserActsWriteTrackingGeometry.py
@@ -27,6 +27,9 @@ configFlags.GeoModel.FaserVersion = "FASERNU-03" # Always needed
configFlags.addFlag("Input.InitialTimeStamp", 0)
# Workaround to avoid problematic ISF code
<<<<<<< HEAD
+<<<<<<< HEAD
+=======
+>>>>>>> 6e1b4d4be8e (Configuration fixes)
configFlags.GeoModel.Layout = "Development"
configFlags.Detector.GeometryFaserSCT = True
#configFlags.GeoModel.AtlasVersion = "ATLAS-R2-2016-01-00-01" # Always needed to fool autoconfig; value ignored
@@ -34,6 +37,7 @@ configFlags.Detector.GeometryFaserSCT = True
#configFlags.Concurrency.NumThreads = 1
#configFlags.Beam.NumberOfCollisions = 0.
configFlags.lock()
+<<<<<<< HEAD
=======
ConfigFlags.GeoModel.Layout = "Development"
ConfigFlags.Detector.GeometryFaserSCT = True
@@ -43,6 +47,8 @@ ConfigFlags.Detector.GeometryFaserSCT = True
#ConfigFlags.Beam.NumberOfCollisions = 0.
ConfigFlags.lock()
>>>>>>> 05a628fdc98 (GeometryTest runs successfully)
+=======
+>>>>>>> 6e1b4d4be8e (Configuration fixes)
# Core components
acc = MainServicesCfg(configFlags)
diff --git a/Tracking/Acts/FaserActsKalmanFilter/python/CKF2Alignment.py b/Tracking/Acts/FaserActsKalmanFilter/python/CKF2Alignment.py
index 7c397b93dbabf3c111bcd217bda6cd58f86eef25..44d1d8cd2de93d8de9f65cc20c636daf137a84ff 100644
--- a/Tracking/Acts/FaserActsKalmanFilter/python/CKF2Alignment.py
+++ b/Tracking/Acts/FaserActsKalmanFilter/python/CKF2Alignment.py
@@ -107,6 +107,9 @@ if __name__ == "__main__":
# Configure
<<<<<<< HEAD
+<<<<<<< HEAD
+=======
+>>>>>>> 6e1b4d4be8e (Configuration fixes)
configFlags = initConfigFlags()
configFlags.Input.Files = [ '' ] #input RDO
configFlags.IOVDb.GlobalTag = "OFLCOND-FASER-03"
@@ -124,6 +127,7 @@ if __name__ == "__main__":
configFlags.fillFromArgs(sys.argv[1:])
configFlags.dump()
configFlags.lock()
+<<<<<<< HEAD
=======
ConfigFlags.Input.Files = [ '' ] #input RDO
ConfigFlags.IOVDb.GlobalTag = "OFLCOND-FASER-03"
@@ -142,6 +146,8 @@ if __name__ == "__main__":
ConfigFlags.dump()
ConfigFlags.lock()
>>>>>>> 05a628fdc98 (GeometryTest runs successfully)
+=======
+>>>>>>> 6e1b4d4be8e (Configuration fixes)
from FaserGeoModel.FaserGeoModelConfig import FaserGeometryCfg
# Core components
diff --git a/Tracking/Acts/FaserActsKalmanFilter/test/CKF2.py b/Tracking/Acts/FaserActsKalmanFilter/test/CKF2.py
index 4fabe1c04eb01a1775de0ebdfb7de4e0300344a8..19f8fa1c0eda0b5e9d91a52623321f564876f988 100644
--- a/Tracking/Acts/FaserActsKalmanFilter/test/CKF2.py
+++ b/Tracking/Acts/FaserActsKalmanFilter/test/CKF2.py
@@ -25,6 +25,9 @@ log.setLevel(DEBUG)
Configurable.configurableRun3Behavior = True
<<<<<<< HEAD
+<<<<<<< HEAD
+=======
+>>>>>>> 6e1b4d4be8e (Configuration fixes)
configFlags = initConfigFlags()
configFlags.Input.Files = args.file
configFlags.addFlag("Output.xAODFileName", f"CKF.xAOD.root")
@@ -36,6 +39,7 @@ configFlags.Beam.NumberOfCollisions = 0.
configFlags.TrackingGeometry.MaterialSource = "geometry-maps.json"
configFlags.Input.isMC = True
configFlags.lock()
+<<<<<<< HEAD
=======
ConfigFlags.Input.Files = args.file
ConfigFlags.addFlag("Output.xAODFileName", f"CKF.xAOD.root")
@@ -48,6 +52,8 @@ ConfigFlags.TrackingGeometry.MaterialSource = "geometry-maps.json"
ConfigFlags.Input.isMC = True
ConfigFlags.lock()
>>>>>>> 05a628fdc98 (GeometryTest runs successfully)
+=======
+>>>>>>> 6e1b4d4be8e (Configuration fixes)
acc = MainServicesCfg(configFlags)
acc.merge(FaserGeometryCfg(configFlags))
diff --git a/Tracking/Acts/FaserActsKalmanFilter/test/CombinatorialKalmanFilterAlg.py b/Tracking/Acts/FaserActsKalmanFilter/test/CombinatorialKalmanFilterAlg.py
index 23ed855ce446b829a24a38b7b5fd5787fb54d80b..97752f062722565bdaf9caf7d39cec818e539cb5 100644
--- a/Tracking/Acts/FaserActsKalmanFilter/test/CombinatorialKalmanFilterAlg.py
+++ b/Tracking/Acts/FaserActsKalmanFilter/test/CombinatorialKalmanFilterAlg.py
@@ -17,6 +17,9 @@ log.setLevel(DEBUG)
Configurable.configurableRun3Behavior = True
<<<<<<< HEAD
+<<<<<<< HEAD
+=======
+>>>>>>> 6e1b4d4be8e (Configuration fixes)
configFlags = initConfigFlags()
configFlags.Input.Files = ['my.RDO.pool.root']
configFlags.Output.ESDFileName = "CKF.ESD.pool.root"
@@ -26,6 +29,7 @@ configFlags.GeoModel.FaserVersion = "FASER-01"
configFlags.Beam.NumberOfCollisions = 0.
# configFlags.TrackingGeometry.MaterialSource = "Input"
configFlags.lock()
+<<<<<<< HEAD
=======
ConfigFlags.Input.Files = ['my.RDO.pool.root']
ConfigFlags.Output.ESDFileName = "CKF.ESD.pool.root"
@@ -36,6 +40,8 @@ ConfigFlags.Beam.NumberOfCollisions = 0.
# ConfigFlags.TrackingGeometry.MaterialSource = "Input"
ConfigFlags.lock()
>>>>>>> 05a628fdc98 (GeometryTest runs successfully)
+=======
+>>>>>>> 6e1b4d4be8e (Configuration fixes)
acc = MainServicesCfg(configFlags)
acc.merge(PoolReadCfg(configFlags))
diff --git a/Tracking/Acts/FaserActsKalmanFilter/test/CombinatorialKalmanFilterAlg_Data.py b/Tracking/Acts/FaserActsKalmanFilter/test/CombinatorialKalmanFilterAlg_Data.py
index 4c0c4edfca9417d90c5b5fd3f604cd2f5c7afad9..9e198df3f1ed1da7bdc924d77cbd914b30a936d0 100644
--- a/Tracking/Acts/FaserActsKalmanFilter/test/CombinatorialKalmanFilterAlg_Data.py
+++ b/Tracking/Acts/FaserActsKalmanFilter/test/CombinatorialKalmanFilterAlg_Data.py
@@ -16,6 +16,9 @@ log.setLevel(DEBUG)
Configurable.configurableRun3Behavior = True
<<<<<<< HEAD
+<<<<<<< HEAD
+=======
+>>>>>>> 6e1b4d4be8e (Configuration fixes)
configFlags = initConfigFlags()
configFlags.Input.Files = ['/home/tboeckh/Documents/data/raw/TI12/MiddleStationTrack.raw']
configFlags.Output.ESDFileName = "CKF.ESD.pool.root"
@@ -30,6 +33,7 @@ configFlags.Common.isOnline = False
configFlags.Beam.NumberOfCollisions = 0.
configFlags.Detector.GeometryFaserSCT = True
configFlags.lock()
+<<<<<<< HEAD
=======
ConfigFlags.Input.Files = ['/home/tboeckh/Documents/data/raw/TI12/MiddleStationTrack.raw']
ConfigFlags.Output.ESDFileName = "CKF.ESD.pool.root"
@@ -45,6 +49,8 @@ ConfigFlags.Beam.NumberOfCollisions = 0.
ConfigFlags.Detector.GeometryFaserSCT = True
ConfigFlags.lock()
>>>>>>> 05a628fdc98 (GeometryTest runs successfully)
+=======
+>>>>>>> 6e1b4d4be8e (Configuration fixes)
acc = MainServicesCfg(configFlags)
acc.merge(PoolWriteCfg(configFlags))
diff --git a/Tracking/Acts/FaserActsKalmanFilter/test/FaserActsKalmanFilterAlg.py b/Tracking/Acts/FaserActsKalmanFilter/test/FaserActsKalmanFilterAlg.py
index 8a940341fdfcb96d67c010649ad52cc25736b438..f92c929dd16668f0c05beda6f27ec1346afd3976 100644
--- a/Tracking/Acts/FaserActsKalmanFilter/test/FaserActsKalmanFilterAlg.py
+++ b/Tracking/Acts/FaserActsKalmanFilter/test/FaserActsKalmanFilterAlg.py
@@ -22,6 +22,9 @@ Configurable.configurableRun3Behavior = True
# Configure
<<<<<<< HEAD
+<<<<<<< HEAD
+=======
+>>>>>>> 6e1b4d4be8e (Configuration fixes)
configFlags = initConfigFlags()
configFlags.Input.Files = ['../my.RDO.pool.root']
configFlags.Output.ESDFileName = "FaserActsKalmanFilter.ESD.root"
@@ -31,6 +34,7 @@ configFlags.IOVDb.GlobalTag = "OFLCOND-FASER-01"
configFlags.Beam.NumberOfCollisions = 0.
#configFlags.Concurrency.NumThreads = 1
configFlags.lock()
+<<<<<<< HEAD
=======
ConfigFlags.Input.Files = ['../my.RDO.pool.root']
ConfigFlags.Output.ESDFileName = "FaserActsKalmanFilter.ESD.root"
@@ -41,6 +45,8 @@ ConfigFlags.Beam.NumberOfCollisions = 0.
#ConfigFlags.Concurrency.NumThreads = 1
ConfigFlags.lock()
>>>>>>> 05a628fdc98 (GeometryTest runs successfully)
+=======
+>>>>>>> 6e1b4d4be8e (Configuration fixes)
# Core components
acc = MainServicesCfg(configFlags)
diff --git a/Tracking/Acts/FaserActsKalmanFilter/test/GhostBusters.py b/Tracking/Acts/FaserActsKalmanFilter/test/GhostBusters.py
index 93e49997eec8310064ae5d697e48eea90ec1ea46..974d5fe370d95ba7d68c66a748e798f4393028fb 100644
--- a/Tracking/Acts/FaserActsKalmanFilter/test/GhostBusters.py
+++ b/Tracking/Acts/FaserActsKalmanFilter/test/GhostBusters.py
@@ -18,6 +18,9 @@ log.setLevel(DEBUG)
Configurable.configurableRun3Behavior = True
<<<<<<< HEAD
+<<<<<<< HEAD
+=======
+>>>>>>> 6e1b4d4be8e (Configuration fixes)
configFlags = initConfigFlags()
configFlags.Input.Files = ['my.RDO.pool.root']
configFlags.Output.ESDFileName = "ghosts.ESD.pool.root"
@@ -27,6 +30,7 @@ configFlags.GeoModel.FaserVersion = "FASER-01"
configFlags.Beam.NumberOfCollisions = 0.
# configFlags.TrackingGeometry.MaterialSource = "Input"
configFlags.lock()
+<<<<<<< HEAD
=======
ConfigFlags.Input.Files = ['my.RDO.pool.root']
ConfigFlags.Output.ESDFileName = "ghosts.ESD.pool.root"
@@ -37,6 +41,8 @@ ConfigFlags.Beam.NumberOfCollisions = 0.
# ConfigFlags.TrackingGeometry.MaterialSource = "Input"
ConfigFlags.lock()
>>>>>>> 05a628fdc98 (GeometryTest runs successfully)
+=======
+>>>>>>> 6e1b4d4be8e (Configuration fixes)
acc = MainServicesCfg(configFlags)
acc.merge(PoolReadCfg(configFlags))
diff --git a/Tracking/Acts/FaserActsKalmanFilter/test/SeedingDbg.py b/Tracking/Acts/FaserActsKalmanFilter/test/SeedingDbg.py
index 8e0b8f980e220578917c9e106b5e476f5a21d80e..4c75e2523b8054c4afd52b46d8cd3f6740b3452c 100644
--- a/Tracking/Acts/FaserActsKalmanFilter/test/SeedingDbg.py
+++ b/Tracking/Acts/FaserActsKalmanFilter/test/SeedingDbg.py
@@ -17,6 +17,9 @@ log.setLevel(DEBUG)
Configurable.configurableRun3Behavior = True
<<<<<<< HEAD
+<<<<<<< HEAD
+=======
+>>>>>>> 6e1b4d4be8e (Configuration fixes)
configFlags = initConfigFlags()
configFlags.Input.Files = ['my.RDO.pool.root']
configFlags.Output.ESDFileName = "circleFitSeeding.ESD.pool.root"
@@ -26,6 +29,7 @@ configFlags.GeoModel.FaserVersion = "FASER-01"
configFlags.Beam.NumberOfCollisions = 0.
# configFlags.TrackingGeometry.MaterialSource = "Input"
configFlags.lock()
+<<<<<<< HEAD
=======
ConfigFlags.Input.Files = ['my.RDO.pool.root']
ConfigFlags.Output.ESDFileName = "circleFitSeeding.ESD.pool.root"
@@ -36,6 +40,8 @@ ConfigFlags.Beam.NumberOfCollisions = 0.
# ConfigFlags.TrackingGeometry.MaterialSource = "Input"
ConfigFlags.lock()
>>>>>>> 05a628fdc98 (GeometryTest runs successfully)
+=======
+>>>>>>> 6e1b4d4be8e (Configuration fixes)
acc = MainServicesCfg(configFlags)
acc.merge(PoolReadCfg(configFlags))
diff --git a/Tracking/Acts/FaserActsKalmanFilter/test/TI12CKF2.py b/Tracking/Acts/FaserActsKalmanFilter/test/TI12CKF2.py
index f65b0bc60fe9d83eb97143bd6e65ca27a8285fe7..6fe418e15804e02b6746f64ee78fe81d9b237aee 100644
--- a/Tracking/Acts/FaserActsKalmanFilter/test/TI12CKF2.py
+++ b/Tracking/Acts/FaserActsKalmanFilter/test/TI12CKF2.py
@@ -28,6 +28,9 @@ log.setLevel(DEBUG)
Configurable.configurableRun3Behavior = True
<<<<<<< HEAD
+<<<<<<< HEAD
+=======
+>>>>>>> 6e1b4d4be8e (Configuration fixes)
configFlags = initConfigFlags()
configFlags.Input.Files = args.file
configFlags.Output.ESDFileName = "CKF.ESD.pool.root"
@@ -43,6 +46,7 @@ configFlags.Beam.NumberOfCollisions = 0.
configFlags.Detector.GeometryFaserSCT = True
configFlags.TrackingGeometry.MaterialSource = "geometry-maps.json"
configFlags.lock()
+<<<<<<< HEAD
=======
ConfigFlags.Input.Files = args.file
ConfigFlags.Output.ESDFileName = "CKF.ESD.pool.root"
@@ -59,6 +63,8 @@ ConfigFlags.Detector.GeometryFaserSCT = True
ConfigFlags.TrackingGeometry.MaterialSource = "geometry-maps.json"
ConfigFlags.lock()
>>>>>>> 05a628fdc98 (GeometryTest runs successfully)
+=======
+>>>>>>> 6e1b4d4be8e (Configuration fixes)
acc = MainServicesCfg(configFlags)
acc.merge(FaserGeometryCfg(configFlags))
diff --git a/Tracking/Acts/FaserActsKalmanFilter/test/TI12KalmanFilter.py b/Tracking/Acts/FaserActsKalmanFilter/test/TI12KalmanFilter.py
index 6013a03a56c894b61153528d6e5710cf422481dd..995a7f2c0cb7c3438fe75b896232b522e34056fe 100644
--- a/Tracking/Acts/FaserActsKalmanFilter/test/TI12KalmanFilter.py
+++ b/Tracking/Acts/FaserActsKalmanFilter/test/TI12KalmanFilter.py
@@ -22,6 +22,9 @@ Configurable.configurableRun3Behavior = True
# Configure
<<<<<<< HEAD
+<<<<<<< HEAD
+=======
+>>>>>>> 6e1b4d4be8e (Configuration fixes)
configFlags = initConfigFlags()
configFlags.Input.Files = ['/home/tboeckh/tmp/Faser-Physics-006470-00093.raw_middleStation.SPs']
configFlags.Output.ESDFileName = "MiddleStation-KalmanFilter.ESD.pool.root"
@@ -36,6 +39,7 @@ configFlags.Common.isOnline = False
configFlags.Beam.NumberOfCollisions = 0.
configFlags.Detector.GeometryFaserSCT = True
configFlags.lock()
+<<<<<<< HEAD
=======
ConfigFlags.Input.Files = ['/home/tboeckh/tmp/Faser-Physics-006470-00093.raw_middleStation.SPs']
ConfigFlags.Output.ESDFileName = "MiddleStation-KalmanFilter.ESD.pool.root"
@@ -51,6 +55,8 @@ ConfigFlags.Beam.NumberOfCollisions = 0.
ConfigFlags.Detector.GeometryFaserSCT = True
ConfigFlags.lock()
>>>>>>> 05a628fdc98 (GeometryTest runs successfully)
+=======
+>>>>>>> 6e1b4d4be8e (Configuration fixes)
# Core components
acc = MainServicesCfg(configFlags)
diff --git a/Waveform/WaveDigiTools/share/WaveformDigiAndRecoExample_jobOptions.py b/Waveform/WaveDigiTools/share/WaveformDigiAndRecoExample_jobOptions.py
index 3c555ef8f2f711676cd1bf912c169b1ef830c308..10d54662c47fe199c4c0d90bf50eb21cf7793b0d 100644
--- a/Waveform/WaveDigiTools/share/WaveformDigiAndRecoExample_jobOptions.py
+++ b/Waveform/WaveDigiTools/share/WaveformDigiAndRecoExample_jobOptions.py
@@ -22,6 +22,9 @@ if __name__ == "__main__":
log.setLevel(VERBOSE)
<<<<<<< HEAD
+<<<<<<< HEAD
+=======
+>>>>>>> 6e1b4d4be8e (Configuration fixes)
configFlags = initConfigFlags()
configFlags.IOVDb.GlobalTag = "OFLCOND-FASER-03" # Always needed; must match FaserVersion
configFlags.IOVDb.DatabaseInstance = "OFLP200" # Use MC conditions for now
@@ -30,6 +33,7 @@ if __name__ == "__main__":
configFlags.GeoModel.FaserVersion = "FASER-TB00" # FASER geometry
configFlags.Common.isOnline = False
#configFlags.GeoModel.Align.Dynamic = False
+<<<<<<< HEAD
=======
ConfigFlags.IOVDb.GlobalTag = "OFLCOND-FASER-03" # Always needed; must match FaserVersion
ConfigFlags.IOVDb.DatabaseInstance = "OFLP200" # Use MC conditions for now
@@ -39,6 +43,8 @@ if __name__ == "__main__":
ConfigFlags.Common.isOnline = False
#ConfigFlags.GeoModel.Align.Dynamic = False
>>>>>>> 05a628fdc98 (GeometryTest runs successfully)
+=======
+>>>>>>> 6e1b4d4be8e (Configuration fixes)
configFlags.Input.Files = [
"/eos/project-f/faser-commissioning/Simulation/Test/TB.Elec.200GeV.SIM.root"
diff --git a/Waveform/WaveRecAlgs/share/PseudoSimToWaveformRecExample_jobOptions.py b/Waveform/WaveRecAlgs/share/PseudoSimToWaveformRecExample_jobOptions.py
index 999c0ddf6df3ae01c3d701a58935565a84ac713d..42ebb45a7e29f7ce75726050fcf697ac90d7f7ea 100644
--- a/Waveform/WaveRecAlgs/share/PseudoSimToWaveformRecExample_jobOptions.py
+++ b/Waveform/WaveRecAlgs/share/PseudoSimToWaveformRecExample_jobOptions.py
@@ -17,6 +17,9 @@ if __name__ == "__main__":
log.setLevel(INFO)
<<<<<<< HEAD
+<<<<<<< HEAD
+=======
+>>>>>>> 6e1b4d4be8e (Configuration fixes)
configFlags = initConfigFlags()
configFlags.IOVDb.GlobalTag = "OFLCOND-FASER-TB00" # Always needed; must match FaserVersion
configFlags.IOVDb.DatabaseInstance = "OFLP200" # Use MC conditions for now
@@ -25,6 +28,7 @@ if __name__ == "__main__":
configFlags.GeoModel.FaserVersion = "FASER-TB00" # FASER geometry
configFlags.Common.isOnline = False
#configFlags.GeoModel.Align.Dynamic = False
+<<<<<<< HEAD
=======
ConfigFlags.IOVDb.GlobalTag = "OFLCOND-FASER-TB00" # Always needed; must match FaserVersion
ConfigFlags.IOVDb.DatabaseInstance = "OFLP200" # Use MC conditions for now
@@ -34,6 +38,8 @@ if __name__ == "__main__":
ConfigFlags.Common.isOnline = False
#ConfigFlags.GeoModel.Align.Dynamic = False
>>>>>>> 05a628fdc98 (GeometryTest runs successfully)
+=======
+>>>>>>> 6e1b4d4be8e (Configuration fixes)
configFlags.Input.Files = [
"my.HITS.pool.root"