From e6b74698c9e4958d1ebf7456aabdd0d5ea08dafb Mon Sep 17 00:00:00 2001
From: Dave Casper <dcasper@uci.edu>
Date: Mon, 11 Mar 2024 07:08:45 -0700
Subject: [PATCH] Configuration fixes
---
.../Digitization/scripts/faserMDC_digi.py | 6 ++++++
.../scripts/faserMDC_digi_merge.py | 6 ++++++
.../Digitization/scripts/faser_digi.py | 6 ++++++
.../Digitization/scripts/faser_digi_merge.py | 6 ++++++
.../Generation/scripts/faserMDC_foresee.py | 10 ++++++++++
.../Generation/scripts/faserMDC_particlegun.py | 10 ++++++++++
.../Generation/scripts/faser_particlegun.py | 9 +++++++++
.../GeoModelTest/python/Faser04TestConfig.py | 18 ++++++++++++++++++
.../NeutrinoHits/scripts/faser_dumpnu.py | 6 ++++++
.../Reconstruction/scripts/faserMDC_reco.py | 5 +++++
.../Reconstruction/scripts/faser_reco.py | 5 +++++
.../Simulation/scripts/faserMDC_simulate.py | 10 ++++++++++
.../Simulation/scripts/faser_simulate.py | 5 -----
.../python/TrackerDataAccessExampleConfig.py | 6 ++++++
.../python/TriggerDataAccessExampleConfig.py | 6 ++++++
.../python/WaveformDataAccessExampleConfig.py | 6 ++++++
Derivation/DerivationAlgs/share/runDerive.py | 6 ++++++
.../DerivationAlgs/share/run_streaming.py | 6 ++++++
.../FaserGeoModel/python/ScintGMConfig.py | 6 ++++++
.../test/FaserGeometryConfig_EVNT_test.py | 6 ++++++
.../test/EmulsionGMConfig_test.py | 6 ++++++
.../python/FilterSearchConfig.py | 6 ++++++
.../NeutrinoSearch/python/FlukaSearchConfig.py | 6 ++++++
.../NeutrinoSearch/python/GenieSearchConfig.py | 6 ++++++
.../NtupleDumper/scripts/analyzeRun.py | 6 ++++++
.../NtupleDumper/scripts/analyzeRunMC.py | 6 ++++++
.../NtupleDumper/scripts/faser_ntuple_maker.py | 9 +++++++++
.../test/PreshowerGMConfig_test.py | 6 ++++++
.../test/TriggerGMConfig_test.py | 6 ++++++
.../VetoGeoModel/test/VetoGMConfig_test.py | 6 ++++++
.../VetoNuGeoModel/test/VetoNuGMConfig_test.py | 6 ++++++
.../test/G4FaserAlgConfigNew_Test.py | 17 +++++++++++++++++
.../G4Faser/G4FaserAlg/test/runGeantinoScan.py | 6 ++++++
Simulation/G4Faser/G4FaserAlg/test/runGen.py | 6 ++++++
.../DipoleGeoModel/test/DipoleGMConfig_test.py | 6 ++++++
.../test/FaserSCT_GMConfig_test.py | 6 ++++++
.../test/FaserSCT_DigitizationDbg.py | 6 ++++++
.../python/FaserSpacePointsCosmics.py | 6 ++++++
.../test/FaserSpacePointsDbg.py | 6 ++++++
.../MyClusters/test/MyClustersDbg.py | 6 ++++++
.../share/NoisyStripFinderJob.py | 6 ++++++
.../test/NoisyStripFinderDbg.py | 6 ++++++
.../OverlayRDO/python/HistoRDOConfig.py | 6 ++++++
.../OverlayRDO/python/OverlayRDOConfig.py | 6 ++++++
.../OverlayRDO/python/SelectRDOConfig.py | 6 ++++++
.../PairVertex/python/PairVertexAlgConfig.py | 6 ++++++
.../TrackCounts/test/TrackCountsDbg.py | 6 ++++++
.../test/TrackSeedPerformanceWriterDbg.py | 6 ++++++
.../test/TestBeamClusterFitDbg.py | 6 ++++++
.../test/TrackerClusterFitDbg.py | 6 ++++++
.../test/TI12TrackerSegmentFitDataDbg.py | 6 ++++++
.../test/TrackerSegmentFitDataDbg.py | 6 ++++++
.../TrackerData/test/TrackerTruthDataDbg.py | 6 ++++++
.../test/FaserSCT_ClusterizationDbg.py | 6 ++++++
.../test/FaserSCT_ClusterizationDbgCosmics.py | 6 ++++++
.../TrackerSPFit/python/TrackerSPFit.py | 6 ++++++
.../python/TrackerSPFitTI12Data.py | 6 ++++++
.../TrackerSPFit/test/TrackerSPFitDbg.py | 6 ++++++
.../test/TrackerSeedFinderDbg.py | 6 ++++++
.../test/MCTrackerSegmentFit.py | 6 ++++++
.../test/TestBeamSegmentFitDbg.py | 6 ++++++
.../test/TrackerSegmentFitDbg.py | 6 ++++++
.../test/StatisticsDbg.py | 6 ++++++
.../test/TrackerSpacePointFormationDbg.py | 6 ++++++
.../TrackerSpacePointFormationDbgCosmics.py | 6 ++++++
.../TrackerTruth/test/TrackerTruthDbg.py | 6 ++++++
.../test/TruthSeededTrackFinderDbg.py | 6 ++++++
.../FaserActsMaterialMapping_jobOptions.py | 6 ++++++
.../test/FaserActsExtrapolationAlg.py | 6 ++++++
.../test/FaserActsGeometryBoundary_test.py | 6 ++++++
.../test/FaserActsWriteTrackingGeometry.py | 6 ++++++
.../python/CKF2Alignment.py | 6 ++++++
.../Acts/FaserActsKalmanFilter/test/CKF2.py | 6 ++++++
.../test/CombinatorialKalmanFilterAlg.py | 6 ++++++
.../test/CombinatorialKalmanFilterAlg_Data.py | 6 ++++++
.../test/FaserActsKalmanFilterAlg.py | 6 ++++++
.../FaserActsKalmanFilter/test/GhostBusters.py | 6 ++++++
.../FaserActsKalmanFilter/test/SeedingDbg.py | 6 ++++++
.../FaserActsKalmanFilter/test/TI12CKF2.py | 6 ++++++
.../test/TI12KalmanFilter.py | 6 ++++++
.../WaveformDigiAndRecoExample_jobOptions.py | 6 ++++++
...PseudoSimToWaveformRecExample_jobOptions.py | 6 ++++++
82 files changed, 525 insertions(+), 5 deletions(-)
diff --git a/Control/CalypsoExample/Digitization/scripts/faserMDC_digi.py b/Control/CalypsoExample/Digitization/scripts/faserMDC_digi.py
index fc426f2a7..b57bbb5d0 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 b9c9804cf..51ad97c4e 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 346fe972f..d1542c9b1 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 1cd4a2739..3285f3888 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 1172cbbe0..dd1106962 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 27b8ec3d7..22a8a4dd4 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 84792f9f0..80b68f52f 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 8fafafd90..33faa5ac8 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 4e7e48051..f14d9bcac 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 8bc27b33e..447f54f26 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 c420f6a83..2527c427e 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 c92877364..b84e81dd3 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 68897ed22..ef8b6cc81 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 ace286845..97d319eeb 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 500517332..f92b2437c 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 36c3acddb..c547ca963 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 947c6cb4a..802f846b1 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 1ad275b9d..5665c312a 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 50ba61396..0824a13ef 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 f4ad33914..037e4db7d 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 65f362229..7505d98e8 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 46f42fb40..e5e5ed0df 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 83311543b..79ce4e685 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 b83c48b75..1fedd7d36 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 81760a610..1687e1544 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 2dd1e76c5..4d7b42ed7 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 4430c68cf..83d6e54c2 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 cad845b56..fe410a186 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 205551f6d..a1f700e94 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 461be91b2..b44b50b9d 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 076d562ed..f5a4ce7f4 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 6794e6eb1..ba0c9aeea 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 06fc67be1..a653a53e5 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 6dccde39f..ff1c0cc4d 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 3f033e133..f2581fa90 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 cdff72d7c..90ae879e6 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 f59177790..72de05f33 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 a766efe62..ef7da9528 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 445add2a2..6c6ea8504 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 3f3b3b863..43083a515 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 5dec8838b..9ded9f204 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 42f8eace5..de2ecd323 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 db54cf93e..79dadbe4c 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 d75cd11de..64842ac68 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 6f9f40daa..7900268b3 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 4e557664e..1f06dd627 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 c90104949..d52e56a89 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 7052f4257..4e229ba14 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 56f549dac..c0353ef03 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 f868632ee..8673cca8d 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 7ecb2f6a0..690688843 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 00a53788f..15d987d15 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 170542ac5..169f71687 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 558d67b5b..3d611f997 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 dcc60e0d9..b8a4cd30a 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 bae76bf40..39d398cf0 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 3d08a1812..e194b09ec 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 427a28a25..e775bd20c 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 d65e0ef7e..648429c30 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 0206414e5..233c975db 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 c2c15e1ea..56977a2d3 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 379f3e10a..18869b1ce 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 b7d2ee586..c37be15d1 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 9549bc924..732c922b5 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 1bac5ad63..2d1bf79ab 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 4bc1a7f39..2093ef1f1 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 809464385..db51124d1 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 159994911..4324d4776 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 88aeff62e..07e812892 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 56674147a..429c2e38a 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 f49c31fdc..1ed3c62d7 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 7c397b93d..44d1d8cd2 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 4fabe1c04..19f8fa1c0 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 23ed855ce..97752f062 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 4c0c4edfc..9e198df3f 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 8a940341f..f92c929dd 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 93e49997e..974d5fe37 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 8e0b8f980..4c75e2523 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 f65b0bc60..6fe418e15 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 6013a03a5..995a7f2c0 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 3c555ef8f..10d54662c 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 999c0ddf6..42ebb45a7 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"
--
GitLab