From 98ac0ee23b75415d7d1d7774d32da98b94e24ff0 Mon Sep 17 00:00:00 2001
From: Dave Casper <dcasper@uci.edu>
Date: Sun, 5 May 2024 04:50:44 -0700
Subject: [PATCH] Fix unhandled conflicts
---
.../Digitization/scripts/faserMDC_digi.py | 13 ------
.../scripts/faserMDC_digi_merge.py | 13 ------
.../Digitization/scripts/faser_digi.py | 13 ------
.../Digitization/scripts/faser_digi_merge.py | 14 -------
.../Generation/scripts/faserMDC_foresee.py | 18 --------
.../scripts/faserMDC_particlegun.py | 18 --------
.../Generation/scripts/faser_particlegun.py | 14 -------
.../GeoModelTest/python/Faser04TestConfig.py | 41 -------------------
.../NeutrinoHits/scripts/faser_dumpnu.py | 12 ------
.../Reconstruction/scripts/faserMDC_reco.py | 10 -----
.../Simulation/scripts/faserMDC_simulate.py | 17 --------
.../python/TrackerDataAccessExampleConfig.py | 19 ---------
.../python/TriggerDataAccessExampleConfig.py | 18 --------
.../python/WaveformDataAccessExampleConfig.py | 18 --------
Derivation/DerivationAlgs/share/runDerive.py | 18 --------
.../DerivationAlgs/share/run_streaming.py | 18 --------
.../FaserGeoModel/python/ScintGMConfig.py | 16 --------
.../test/FaserGeometryConfig_EVNT_test.py | 15 -------
.../test/EmulsionGMConfig_test.py | 13 ------
.../python/FilterSearchConfig.py | 18 --------
.../python/FlukaSearchConfig.py | 18 --------
.../python/GenieSearchConfig.py | 18 --------
.../NtupleDumper/scripts/analyzeRun.py | 19 ---------
.../NtupleDumper/scripts/analyzeRunMC.py | 19 ---------
README.md | 2 +-
.../test/PreshowerGMConfig_test.py | 13 ------
.../test/TriggerGMConfig_test.py | 13 ------
.../VetoGeoModel/test/VetoGMConfig_test.py | 13 ------
.../test/VetoNuGMConfig_test.py | 13 ------
.../test/G4FaserAlgConfigNew_Test.py | 24 -----------
.../G4FaserAlg/test/runGeantinoScan.py | 12 ------
Simulation/G4Faser/G4FaserAlg/test/runGen.py | 12 ------
.../src/CalypsoTrackingAction.cxx | 4 --
.../src/CalypsoTrackingAction.h | 4 --
.../test/DipoleGMConfig_test.py | 13 ------
.../test/FaserSCT_GMConfig_test.py | 13 ------
.../test/FaserSCT_DigitizationDbg.py | 16 --------
.../python/FaserSpacePointsCosmics.py | 19 ---------
.../test/FaserSpacePointsDbg.py | 15 -------
.../MyClusters/test/MyClustersDbg.py | 16 --------
.../share/NoisyStripFinderJob.py | 21 ----------
.../test/NoisyStripFinderDbg.py | 20 ---------
.../OverlayRDO/python/HistoRDOConfig.py | 22 ----------
.../OverlayRDO/python/OverlayRDOConfig.py | 24 -----------
.../OverlayRDO/python/SelectRDOConfig.py | 19 ---------
.../PairVertex/python/PairVertexAlgConfig.py | 19 ---------
.../TrackCounts/test/TrackCountsDbg.py | 19 ---------
.../test/TrackSeedPerformanceWriterDbg.py | 20 ---------
.../test/TestBeamClusterFitDbg.py | 21 ----------
.../test/TrackerClusterFitDbg.py | 20 ---------
.../test/TI12TrackerSegmentFitDataDbg.py | 22 ----------
.../test/TrackerSegmentFitDataDbg.py | 22 ----------
.../TrackerData/test/TrackerTruthDataDbg.py | 20 ---------
.../test/FaserSCT_ClusterizationDbg.py | 15 -------
.../test/FaserSCT_ClusterizationDbgCosmics.py | 20 ---------
.../TrackerSPFit/python/TrackerSPFit.py | 14 -------
.../python/TrackerSPFitTI12Data.py | 14 -------
.../TrackerSPFit/test/TrackerSPFitDbg.py | 15 -------
.../test/TrackerSeedFinderDbg.py | 17 --------
.../test/MCTrackerSegmentFit.py | 22 ----------
.../test/TestBeamSegmentFitDbg.py | 19 ---------
.../test/TrackerSegmentFitDbg.py | 19 ---------
.../test/StatisticsDbg.py | 15 -------
.../test/TrackerSpacePointFormationDbg.py | 15 -------
.../TrackerSpacePointFormationDbgCosmics.py | 20 ---------
.../TrackerTruth/test/TrackerTruthDbg.py | 20 ---------
.../test/TruthSeededTrackFinderDbg.py | 16 --------
.../FaserActsMaterialMapping_jobOptions.py | 16 --------
.../test/FaserActsExtrapolationAlg.py | 16 --------
.../test/FaserActsGeometryBoundary_test.py | 16 --------
.../test/FaserActsWriteTrackingGeometry.py | 16 --------
.../python/CKF2Alignment.py | 25 -----------
.../Acts/FaserActsKalmanFilter/test/CKF2.py | 19 ---------
.../test/CombinatorialKalmanFilterAlg.py | 17 --------
.../test/CombinatorialKalmanFilterAlg_Data.py | 22 ----------
.../test/FaserActsKalmanFilterAlg.py | 17 --------
.../test/GhostBusters.py | 17 --------
.../FaserActsKalmanFilter/test/SeedingDbg.py | 17 --------
.../FaserActsKalmanFilter/test/TI12CKF2.py | 23 -----------
.../test/TI12KalmanFilter.py | 22 ----------
.../WaveformDigiAndRecoExample_jobOptions.py | 16 --------
...seudoSimToWaveformRecExample_jobOptions.py | 16 --------
package_filters.txt | 32 ---------------
83 files changed, 1 insertion(+), 1428 deletions(-)
diff --git a/Control/CalypsoExample/Digitization/scripts/faserMDC_digi.py b/Control/CalypsoExample/Digitization/scripts/faserMDC_digi.py
index b57bbb5d..8fb575c0 100755
--- a/Control/CalypsoExample/Digitization/scripts/faserMDC_digi.py
+++ b/Control/CalypsoExample/Digitization/scripts/faserMDC_digi.py
@@ -64,23 +64,10 @@ configFlags = initConfigFlags()
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 51ad97c4..b73fc7ee 100755
--- a/Control/CalypsoExample/Digitization/scripts/faserMDC_digi_merge.py
+++ b/Control/CalypsoExample/Digitization/scripts/faserMDC_digi_merge.py
@@ -137,23 +137,10 @@ configFlags = initConfigFlags()
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 d1542c9b..cdd58d61 100755
--- a/Control/CalypsoExample/Digitization/scripts/faser_digi.py
+++ b/Control/CalypsoExample/Digitization/scripts/faser_digi.py
@@ -67,23 +67,10 @@ configFlags = initConfigFlags()
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 3285f388..926dfdd4 100755
--- a/Control/CalypsoExample/Digitization/scripts/faser_digi_merge.py
+++ b/Control/CalypsoExample/Digitization/scripts/faser_digi_merge.py
@@ -177,24 +177,10 @@ configFlags = initConfigFlags()
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":
configFlags.GeoModel.FaserVersion = "FASER-01"
diff --git a/Control/CalypsoExample/Generation/scripts/faserMDC_foresee.py b/Control/CalypsoExample/Generation/scripts/faserMDC_foresee.py
index dd110696..b276a6fb 100755
--- a/Control/CalypsoExample/Generation/scripts/faserMDC_foresee.py
+++ b/Control/CalypsoExample/Generation/scripts/faserMDC_foresee.py
@@ -63,11 +63,7 @@ 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
@@ -81,24 +77,10 @@ if __name__ == '__main__':
configFlags.addFlag("Sim.Beam.xshift", 0) # Potential beam shift
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 22a8a4dd..4da91d1d 100755
--- a/Control/CalypsoExample/Generation/scripts/faserMDC_particlegun.py
+++ b/Control/CalypsoExample/Generation/scripts/faserMDC_particlegun.py
@@ -63,11 +63,7 @@ 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
@@ -77,24 +73,10 @@ if __name__ == '__main__':
configFlags.addFlag("Sim.Beam.xshift", 0) # Potential beam shift
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 80b68f52..7cf0fdc3 100755
--- a/Control/CalypsoExample/Generation/scripts/faser_particlegun.py
+++ b/Control/CalypsoExample/Generation/scripts/faser_particlegun.py
@@ -66,11 +66,7 @@ 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
@@ -107,18 +103,8 @@ 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
-=======
- 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 33faa5ac..afc970b0 100644
--- a/Control/CalypsoExample/GeoModelTest/python/Faser04TestConfig.py
+++ b/Control/CalypsoExample/GeoModelTest/python/Faser04TestConfig.py
@@ -4,15 +4,7 @@
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):
@@ -38,17 +30,6 @@ if __name__ == "__main__":
from AthenaCommon.Configurable import Configurable
from CalypsoConfiguration.AllConfigFlags import initConfigFlags
-<<<<<<< HEAD
- # # Configurable.configurableRun3Behavior = True
-
- # print("CACfg = ", isComponentAccumulatorCfg())
-
- # print("AthenaCommon.Include", "AthenaCommon.Include" in sys.modules)
- # print("Configurable._useGlobalInstances", Configurable._useGlobalInstances)
-
-# Flags for this job
-<<<<<<< HEAD
-=======
# Configurable.configurableRun3Behavior = True
print("CACfg = ", isComponentAccumulatorCfg())
@@ -57,7 +38,6 @@ if __name__ == "__main__":
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
@@ -75,27 +55,6 @@ 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
- ConfigFlags.IOVDb.GlobalTag = "OFLCOND-FASER-03" # Always needed; must match FaserVersion
- ConfigFlags.GeoModel.FaserVersion = "FASERNU-04" # Default FASER geometry
- ConfigFlags.GeoModel.GeoExportFile = "FaserNu04.db" # Writes out a GeoModel file with the full geometry tree (optional, comment out to skip)
- ConfigFlags.Detector.GeometryEmulsion = True
- ConfigFlags.Detector.GeometryTrench = True
- # ConfigFlags.Detector.EnableVeto = True
- # ConfigFlags.Detector.EnableTrigger = True
- # ConfigFlags.Detector.EnablePreshower= True
- # ConfigFlags.Detector.EnableFaserSCT = True
- # ConfigFlags.Detector.EnableUpstreamDipole = True
- # ConfigFlags.Detector.EnableCentralDipole = True
- # ConfigFlags.Detector.EnableDownstreamDipole = True
- # 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 f14d9bca..37b04ea5 100755
--- a/Control/CalypsoExample/NeutrinoHits/scripts/faser_dumpnu.py
+++ b/Control/CalypsoExample/NeutrinoHits/scripts/faser_dumpnu.py
@@ -60,21 +60,9 @@ 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
configFlags.Beam.NumberOfCollisions = 0.
-=======
-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 447f54f2..b5bd3bb9 100755
--- a/Control/CalypsoExample/Reconstruction/scripts/faserMDC_reco.py
+++ b/Control/CalypsoExample/Reconstruction/scripts/faserMDC_reco.py
@@ -70,18 +70,8 @@ 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
-=======
-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/Simulation/scripts/faserMDC_simulate.py b/Control/CalypsoExample/Simulation/scripts/faserMDC_simulate.py
index b84e81dd..9fb68f72 100755
--- a/Control/CalypsoExample/Simulation/scripts/faserMDC_simulate.py
+++ b/Control/CalypsoExample/Simulation/scripts/faserMDC_simulate.py
@@ -136,11 +136,7 @@ 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
@@ -151,23 +147,10 @@ if __name__ == '__main__':
configFlags.addFlag("Sim.Beam.xshift", args.xshift) # Potential beam shift
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/TrackerDataAccessExample/python/TrackerDataAccessExampleConfig.py b/Control/CalypsoExample/TrackerDataAccessExample/python/TrackerDataAccessExampleConfig.py
index 97d319ee..9b2df67d 100755
--- a/Control/CalypsoExample/TrackerDataAccessExample/python/TrackerDataAccessExampleConfig.py
+++ b/Control/CalypsoExample/TrackerDataAccessExample/python/TrackerDataAccessExampleConfig.py
@@ -35,10 +35,6 @@ if __name__ == "__main__":
Configurable.configurableRun3Behavior = True
# 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
@@ -49,21 +45,6 @@ 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
- ConfigFlags.IOVDb.DatabaseInstance = "OFLP200" # Use MC conditions for now
- ConfigFlags.GeoModel.FaserVersion = "FASER-01" # FASER geometry
- ConfigFlags.Input.ProjectName = "data20" # Needed to bypass autoconfig
- #ConfigFlags.GeoModel.Align.Dynamic = False
- 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()
->>>>>>> 05a628fdc98 (GeometryTest runs successfully)
-=======
->>>>>>> 6e1b4d4be8e (Configuration fixes)
-
# Configure components
from CalypsoConfiguration.MainServicesConfig import MainServicesCfg
# from AthenaPoolCnvSvc.PoolWriteConfig import PoolWriteCfg
diff --git a/Control/CalypsoExample/TriggerDataAccessExample/python/TriggerDataAccessExampleConfig.py b/Control/CalypsoExample/TriggerDataAccessExample/python/TriggerDataAccessExampleConfig.py
index f92b2437..a4c2d3fa 100755
--- a/Control/CalypsoExample/TriggerDataAccessExample/python/TriggerDataAccessExampleConfig.py
+++ b/Control/CalypsoExample/TriggerDataAccessExample/python/TriggerDataAccessExampleConfig.py
@@ -34,10 +34,6 @@ if __name__ == "__main__":
Configurable.configurableRun3Behavior = True
# 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
@@ -48,20 +44,6 @@ 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
- ConfigFlags.IOVDb.DatabaseInstance = "OFLP200" # Use MC conditions for now
- ConfigFlags.GeoModel.FaserVersion = "FASER-01" # Default FASER geometry
- ConfigFlags.Input.ProjectName = "data20"
- #ConfigFlags.GeoModel.Align.Dynamic = False
- 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()
->>>>>>> 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 c547ca96..cdabb3d7 100755
--- a/Control/CalypsoExample/WaveformDataAccessExample/python/WaveformDataAccessExampleConfig.py
+++ b/Control/CalypsoExample/WaveformDataAccessExample/python/WaveformDataAccessExampleConfig.py
@@ -35,10 +35,6 @@ if __name__ == "__main__":
Configurable.configurableRun3Behavior = True
# Flags for this job
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
->>>>>>> 6e1b4d4be8e (Configuration fixes)
configFlags = initConfigFlags()
configFlags.Input.isMC = False # Needed to bypass autoconfig
# configFlags.Input.Format = Format.BS
@@ -50,20 +46,6 @@ 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
- ConfigFlags.IOVDb.DatabaseInstance = "OFLP200" # Use MC conditions for now
- ConfigFlags.GeoModel.FaserVersion = "FASER-01" # Default FASER geometry
- ConfigFlags.Input.ProjectName = "data20"
- #ConfigFlags.GeoModel.Align.Dynamic = False
- 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()
->>>>>>> 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 802f846b..38e87af9 100644
--- a/Derivation/DerivationAlgs/share/runDerive.py
+++ b/Derivation/DerivationAlgs/share/runDerive.py
@@ -49,10 +49,6 @@ if __name__ == "__main__":
#"/bundle/data/FASER/Ti12data/filter/r0008/007983/Faser-Physics-007983-TrigMask08-r0008-xAOD.root"
]
-<<<<<<< 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
@@ -61,20 +57,6 @@ 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
- ConfigFlags.Input.ProjectName = "data21" # Needed to bypass autoconfig
- ConfigFlags.Input.isMC = False # Needed to bypass autoconfig
- ConfigFlags.GeoModel.FaserVersion = "FASERNU-03" # FASER geometry
- ConfigFlags.Common.isOnline = False
- #ConfigFlags.GeoModel.Align.Dynamic = False
- ConfigFlags.Beam.NumberOfCollisions = 0.
->>>>>>> 05a628fdc98 (GeometryTest runs successfully)
-=======
->>>>>>> 6e1b4d4be8e (Configuration fixes)
-
configFlags.Detector.GeometryFaserSCT = True
configFlags.addFlag("Output.AODSTREAM1FileName", "my.STREAM1.xAOD.root")
diff --git a/Derivation/DerivationAlgs/share/run_streaming.py b/Derivation/DerivationAlgs/share/run_streaming.py
index 5665c312..78be3e28 100644
--- a/Derivation/DerivationAlgs/share/run_streaming.py
+++ b/Derivation/DerivationAlgs/share/run_streaming.py
@@ -24,10 +24,6 @@ if __name__ == "__main__":
"/eos/experiment/faser/rec/2022/p0008/007984/Faser-Physics-007984-00000-p0008-xAOD.root"
]
-<<<<<<< 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
@@ -36,20 +32,6 @@ 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
- ConfigFlags.Input.ProjectName = "data21" # Needed to bypass autoconfig
- ConfigFlags.Input.isMC = False # Needed to bypass autoconfig
- ConfigFlags.GeoModel.FaserVersion = "FASERNU-03" # FASER geometry
- ConfigFlags.Common.isOnline = False
- #ConfigFlags.GeoModel.Align.Dynamic = False
- ConfigFlags.Beam.NumberOfCollisions = 0.
->>>>>>> 05a628fdc98 (GeometryTest runs successfully)
-=======
->>>>>>> 6e1b4d4be8e (Configuration fixes)
-
configFlags.Detector.GeometryFaserSCT = True
for stream in ["STREAM1", "STREAM2", "STREAM3"]:
diff --git a/DetectorDescription/GeoModel/FaserGeoModel/python/ScintGMConfig.py b/DetectorDescription/GeoModel/FaserGeoModel/python/ScintGMConfig.py
index 0824a13e..d2b9de90 100644
--- a/DetectorDescription/GeoModel/FaserGeoModel/python/ScintGMConfig.py
+++ b/DetectorDescription/GeoModel/FaserGeoModel/python/ScintGMConfig.py
@@ -40,28 +40,12 @@ 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
- ConfigFlags.Detector.GeometryVeto = True
- ConfigFlags.Detector.GeometryTrigger= True
- ConfigFlags.Detector.GeometryPreshower= True
- #ConfigFlags.GeoModel.Align.Dynamic = False
->>>>>>> 05a628fdc98 (GeometryTest runs successfully)
-=======
->>>>>>> 6e1b4d4be8e (Configuration fixes)
- # Provide data input
##from AthenaConfiguration.TestDefaults import defaultTestFiles
#
configFlags.lock()
diff --git a/DetectorDescription/GeoModel/FaserGeoModel/test/FaserGeometryConfig_EVNT_test.py b/DetectorDescription/GeoModel/FaserGeoModel/test/FaserGeometryConfig_EVNT_test.py
index 037e4db7..9da38d90 100644
--- a/DetectorDescription/GeoModel/FaserGeoModel/test/FaserGeometryConfig_EVNT_test.py
+++ b/DetectorDescription/GeoModel/FaserGeoModel/test/FaserGeometryConfig_EVNT_test.py
@@ -20,10 +20,6 @@ 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
@@ -31,17 +27,6 @@ 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
- ConfigFlags.GeoModel.FaserVersion = "FASER-01"
- 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)
# Construct ComponentAccumulator
acc = MainServicesCfg(configFlags)
diff --git a/Neutrino/NeutrinoDetDescr/EmulsionGeoModel/test/EmulsionGMConfig_test.py b/Neutrino/NeutrinoDetDescr/EmulsionGeoModel/test/EmulsionGMConfig_test.py
index 7505d98e..a9573925 100644
--- a/Neutrino/NeutrinoDetDescr/EmulsionGeoModel/test/EmulsionGMConfig_test.py
+++ b/Neutrino/NeutrinoDetDescr/EmulsionGeoModel/test/EmulsionGMConfig_test.py
@@ -9,24 +9,11 @@ if __name__ == "__main__":
from CalypsoConfiguration.AllConfigFlags import initConfigFlags
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 e5e5ed0d..94912925 100644
--- a/PhysicsAnalysis/NeutrinoSearch/python/FilterSearchConfig.py
+++ b/PhysicsAnalysis/NeutrinoSearch/python/FilterSearchConfig.py
@@ -483,10 +483,6 @@ 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
@@ -495,20 +491,6 @@ 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
- ConfigFlags.Input.ProjectName = "data21" # Needed to bypass autoconfig
- ConfigFlags.Input.isMC = False # Needed to bypass autoconfig
- ConfigFlags.GeoModel.FaserVersion = "FASERNU-03" # FASER geometry
- ConfigFlags.Common.isOnline = False
- #ConfigFlags.GeoModel.Align.Dynamic = False
- ConfigFlags.Beam.NumberOfCollisions = 0.
->>>>>>> 05a628fdc98 (GeometryTest runs successfully)
-=======
->>>>>>> 6e1b4d4be8e (Configuration fixes)
-
configFlags.Detector.GeometryFaserSCT = True
configFlags.lock()
diff --git a/PhysicsAnalysis/NeutrinoSearch/python/FlukaSearchConfig.py b/PhysicsAnalysis/NeutrinoSearch/python/FlukaSearchConfig.py
index 79ce4e68..0faf6ac0 100644
--- a/PhysicsAnalysis/NeutrinoSearch/python/FlukaSearchConfig.py
+++ b/PhysicsAnalysis/NeutrinoSearch/python/FlukaSearchConfig.py
@@ -94,10 +94,6 @@ if __name__ == "__main__":
'/run/media/dcasper/Data/faser/fluka/210001/rec/r0009/./FaserMC-MDC_Fluka_unit30_Nm_71m_m3750_v3-210001-00002-s0007-r0009-xAOD.root'
]
# 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
@@ -106,20 +102,6 @@ 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
- ConfigFlags.Input.ProjectName = "data21" # Needed to bypass autoconfig
- ConfigFlags.Input.isMC = True # Needed to bypass autoconfig
- ConfigFlags.GeoModel.FaserVersion = "FASERNU-03" # FASER geometry
- ConfigFlags.Common.isOnline = False
- #ConfigFlags.GeoModel.Align.Dynamic = False
- ConfigFlags.Beam.NumberOfCollisions = 0.
->>>>>>> 05a628fdc98 (GeometryTest runs successfully)
-=======
->>>>>>> 6e1b4d4be8e (Configuration fixes)
-
configFlags.Detector.GeometryFaserSCT = True
configFlags.lock()
diff --git a/PhysicsAnalysis/NeutrinoSearch/python/GenieSearchConfig.py b/PhysicsAnalysis/NeutrinoSearch/python/GenieSearchConfig.py
index 1fedd7d3..48094770 100644
--- a/PhysicsAnalysis/NeutrinoSearch/python/GenieSearchConfig.py
+++ b/PhysicsAnalysis/NeutrinoSearch/python/GenieSearchConfig.py
@@ -70,10 +70,6 @@ if __name__ == "__main__":
'/run/media/dcasper/Data/faser/genie/r0009/rec/./FaserMC-MDC_Genie_all_600fbInv_v1-200003-00016-00023-s0007-r0009-xAOD.root',
'/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
@@ -82,20 +78,6 @@ 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
- ConfigFlags.Input.ProjectName = "data21" # Needed to bypass autoconfig
- ConfigFlags.Input.isMC = True # Needed to bypass autoconfig
- ConfigFlags.GeoModel.FaserVersion = "FASERNU-03" # FASER geometry
- ConfigFlags.Common.isOnline = False
- #ConfigFlags.GeoModel.Align.Dynamic = False
- ConfigFlags.Beam.NumberOfCollisions = 0.
->>>>>>> 05a628fdc98 (GeometryTest runs successfully)
-=======
->>>>>>> 6e1b4d4be8e (Configuration fixes)
-
configFlags.Detector.GeometryFaserSCT = True
configFlags.lock()
diff --git a/PhysicsAnalysis/NtupleDumper/scripts/analyzeRun.py b/PhysicsAnalysis/NtupleDumper/scripts/analyzeRun.py
index 1687e154..4b627d3c 100755
--- a/PhysicsAnalysis/NtupleDumper/scripts/analyzeRun.py
+++ b/PhysicsAnalysis/NtupleDumper/scripts/analyzeRun.py
@@ -63,10 +63,6 @@ if __name__ == "__main__":
outName=f"Faser-Physics-{runno:06d}-{start:05d}-{(end-1):05d}-{ptag}-PHYS.root"
# Configure
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
->>>>>>> 6e1b4d4be8e (Configuration fixes)
configFlags = initConfigFlags()
configFlags.Input.Files = fileList
configFlags.IOVDb.GlobalTag = "OFLCOND-FASER-03" # Always needed; must match FaserVersionS
@@ -77,21 +73,6 @@ 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
- ConfigFlags.IOVDb.DatabaseInstance = "OFLP200" # Use MC conditions for now
- ConfigFlags.Input.ProjectName = "data21" # Needed to bypass autoconfig
- ConfigFlags.Input.isMC = False # Needed to bypass autoconfig
- ConfigFlags.GeoModel.FaserVersion = "FASERNU-03" # FASER geometry
- ConfigFlags.Common.isOnline = False
- #ConfigFlags.GeoModel.Align.Dynamic = False
- ConfigFlags.Beam.NumberOfCollisions = 0.
->>>>>>> 05a628fdc98 (GeometryTest runs successfully)
-=======
->>>>>>> 6e1b4d4be8e (Configuration fixes)
-
configFlags.Detector.GeometryFaserSCT = True
configFlags.lock()
diff --git a/PhysicsAnalysis/NtupleDumper/scripts/analyzeRunMC.py b/PhysicsAnalysis/NtupleDumper/scripts/analyzeRunMC.py
index 4d7b42ed..059404de 100644
--- a/PhysicsAnalysis/NtupleDumper/scripts/analyzeRunMC.py
+++ b/PhysicsAnalysis/NtupleDumper/scripts/analyzeRunMC.py
@@ -76,10 +76,6 @@ if __name__ == "__main__":
outName=f"MC-tuple-{runno:06d}-{num:05d}-{filesPerJob}.root"
# Configure
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
->>>>>>> 6e1b4d4be8e (Configuration fixes)
configFlags = initConfigFlags()
configFlags.Input.Files = fileList
configFlags.IOVDb.GlobalTag = "OFLCOND-FASER-03" # Always needed; must match FaserVersionS
@@ -90,21 +86,6 @@ 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
- ConfigFlags.IOVDb.DatabaseInstance = "OFLP200" # Use MC conditions for now
- ConfigFlags.Input.ProjectName = "data21" # Needed to bypass autoconfig
- ConfigFlags.Input.isMC = True # Needed to bypass autoconfig
- ConfigFlags.GeoModel.FaserVersion = "FASERNU-03" # FASER geometry
- ConfigFlags.Common.isOnline = False
- #ConfigFlags.GeoModel.Align.Dynamic = False
- ConfigFlags.Beam.NumberOfCollisions = 0.
->>>>>>> 05a628fdc98 (GeometryTest runs successfully)
-=======
->>>>>>> 6e1b4d4be8e (Configuration fixes)
-
configFlags.Detector.GeometryFaserSCT = True
configFlags.lock()
diff --git a/README.md b/README.md
index f4d5bf64..27be6738 100644
--- a/README.md
+++ b/README.md
@@ -10,7 +10,7 @@ git clone --recursive https://:@gitlab.cern.ch:8443/$USERNAME/calypso.git
#The next three lines are used to setup the ATLAS release environment
export ATLAS_LOCAL_ROOT_BASE=/cvmfs/atlas.cern.ch/repo/ATLASLocalRootBase
source ${ATLAS_LOCAL_ROOT_BASE}/user/atlasLocalSetup.sh
-asetup --input=calypso/asetup.faser Athena,22.0.49
+asetup --input=calypso/asetup.faser Athena,24.0.34
#create build directory
mkdir build
diff --git a/Scintillator/ScintDetDescr/PreshowerGeoModel/test/PreshowerGMConfig_test.py b/Scintillator/ScintDetDescr/PreshowerGeoModel/test/PreshowerGMConfig_test.py
index fe410a18..3727679b 100644
--- a/Scintillator/ScintDetDescr/PreshowerGeoModel/test/PreshowerGMConfig_test.py
+++ b/Scintillator/ScintDetDescr/PreshowerGeoModel/test/PreshowerGMConfig_test.py
@@ -9,24 +9,11 @@ if __name__ == "__main__":
from CalypsoConfiguration.AllConfigFlags import initConfigFlags
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 a1f700e9..46633f98 100644
--- a/Scintillator/ScintDetDescr/TriggerGeoModel/test/TriggerGMConfig_test.py
+++ b/Scintillator/ScintDetDescr/TriggerGeoModel/test/TriggerGMConfig_test.py
@@ -9,24 +9,11 @@ if __name__ == "__main__":
from CalypsoConfiguration.AllConfigFlags import initConfigFlags
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 b44b50b9..a1f7a79e 100644
--- a/Scintillator/ScintDetDescr/VetoGeoModel/test/VetoGMConfig_test.py
+++ b/Scintillator/ScintDetDescr/VetoGeoModel/test/VetoGMConfig_test.py
@@ -9,24 +9,11 @@ if __name__ == "__main__":
from CalypsoConfiguration.AllConfigFlags import initConfigFlags
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 f5a4ce7f..99d97bb1 100644
--- a/Scintillator/ScintDetDescr/VetoNuGeoModel/test/VetoNuGMConfig_test.py
+++ b/Scintillator/ScintDetDescr/VetoNuGeoModel/test/VetoNuGMConfig_test.py
@@ -9,24 +9,11 @@ if __name__ == "__main__":
from CalypsoConfiguration.AllConfigFlags import initConfigFlags
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 ba0c9aee..20177580 100755
--- a/Simulation/G4Faser/G4FaserAlg/test/G4FaserAlgConfigNew_Test.py
+++ b/Simulation/G4Faser/G4FaserAlg/test/G4FaserAlgConfigNew_Test.py
@@ -29,18 +29,11 @@ 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
#
@@ -48,11 +41,7 @@ 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
@@ -62,23 +51,10 @@ if __name__ == '__main__':
configFlags.addFlag("Sim.Beam.xshift", 0) # Potential beam shift
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 a653a53e..262cadc9 100644
--- a/Simulation/G4Faser/G4FaserAlg/test/runGeantinoScan.py
+++ b/Simulation/G4Faser/G4FaserAlg/test/runGeantinoScan.py
@@ -45,21 +45,9 @@ 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
#configFlags.GeoModel.Align.Dynamic = False
-=======
- ConfigFlags.Output.HITSFileName = "MaterialStepCollection.root"
- 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 ff1c0cc4..685e64d5 100755
--- a/Simulation/G4Faser/G4FaserAlg/test/runGen.py
+++ b/Simulation/G4Faser/G4FaserAlg/test/runGen.py
@@ -60,21 +60,9 @@ 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
-=======
-# setupDetectorsFromList(ConfigFlags, detectors, toggle_geometry=True)
- #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/Simulation/G4Utilities/G4FaserUserActions/src/CalypsoTrackingAction.cxx b/Simulation/G4Utilities/G4FaserUserActions/src/CalypsoTrackingAction.cxx
index a512a370..6e7c6fee 100644
--- a/Simulation/G4Utilities/G4FaserUserActions/src/CalypsoTrackingAction.cxx
+++ b/Simulation/G4Utilities/G4FaserUserActions/src/CalypsoTrackingAction.cxx
@@ -24,11 +24,7 @@ namespace G4UA
//---------------------------------------------------------------------------
CalypsoTrackingAction::CalypsoTrackingAction(MSG::Level lvl,
int secondarySavingLevel, int subDetVolLevel)
-<<<<<<< HEAD:Simulation/G4Utilities/G4FaserUserActions/src/CalypsoTrackingAction.cxx
: AthMessaging("CalypsoTrackingAction")
-=======
- : AthMessaging("AthenaTrackingAction")
->>>>>>> 05a628fdc98 (GeometryTest runs successfully):Simulation/G4Utilities/G4UserActions/src/AthenaTrackingAction.cxx
, m_secondarySavingLevel(secondarySavingLevel)
, m_subDetVolLevel(subDetVolLevel)
{
diff --git a/Simulation/G4Utilities/G4FaserUserActions/src/CalypsoTrackingAction.h b/Simulation/G4Utilities/G4FaserUserActions/src/CalypsoTrackingAction.h
index 3218f3e3..6efe0fb5 100644
--- a/Simulation/G4Utilities/G4FaserUserActions/src/CalypsoTrackingAction.h
+++ b/Simulation/G4Utilities/G4FaserUserActions/src/CalypsoTrackingAction.h
@@ -15,11 +15,7 @@ namespace G4UA
/// @class CalypsoTrackingAction
/// @brief User action for pre/post tracking truth handling.
///
-<<<<<<< HEAD:Simulation/G4Utilities/G4FaserUserActions/src/CalypsoTrackingAction.h
class CalypsoTrackingAction : public G4UserTrackingAction, public AthMessaging
-=======
- class AthenaTrackingAction : public G4UserTrackingAction, public AthMessaging
->>>>>>> 05a628fdc98 (GeometryTest runs successfully):Simulation/G4Utilities/G4UserActions/src/AthenaTrackingAction.h
{
public:
diff --git a/Tracker/TrackerDetDescr/DipoleGeoModel/test/DipoleGMConfig_test.py b/Tracker/TrackerDetDescr/DipoleGeoModel/test/DipoleGMConfig_test.py
index f2581fa9..7904b02d 100755
--- a/Tracker/TrackerDetDescr/DipoleGeoModel/test/DipoleGMConfig_test.py
+++ b/Tracker/TrackerDetDescr/DipoleGeoModel/test/DipoleGMConfig_test.py
@@ -9,24 +9,11 @@ if __name__ == "__main__":
from CalypsoConfiguration.AllConfigFlags import initConfigFlags
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 90ae879e..4657bf3b 100755
--- a/Tracker/TrackerDetDescr/FaserSCT_GeoModel/test/FaserSCT_GMConfig_test.py
+++ b/Tracker/TrackerDetDescr/FaserSCT_GeoModel/test/FaserSCT_GMConfig_test.py
@@ -9,24 +9,11 @@ if __name__ == "__main__":
from CalypsoConfiguration.AllConfigFlags import initConfigFlags
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 72de05f3..1abfe2f9 100644
--- a/Tracker/TrackerDigitization/FaserSCT_Digitization/test/FaserSCT_DigitizationDbg.py
+++ b/Tracker/TrackerDigitization/FaserSCT_Digitization/test/FaserSCT_DigitizationDbg.py
@@ -22,10 +22,6 @@ log.setLevel(DEBUG)
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"
@@ -33,18 +29,6 @@ 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"
-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.
->>>>>>> 05a628fdc98 (GeometryTest runs successfully)
-=======
->>>>>>> 6e1b4d4be8e (Configuration fixes)
-
configFlags.Digitization.TruthOutput = True
configFlags.lock()
diff --git a/Tracker/TrackerRecAlgs/FaserSpacePoints/python/FaserSpacePointsCosmics.py b/Tracker/TrackerRecAlgs/FaserSpacePoints/python/FaserSpacePointsCosmics.py
index ef7da952..924d1ce7 100644
--- a/Tracker/TrackerRecAlgs/FaserSpacePoints/python/FaserSpacePointsCosmics.py
+++ b/Tracker/TrackerRecAlgs/FaserSpacePoints/python/FaserSpacePointsCosmics.py
@@ -47,10 +47,6 @@ if __name__ == "__main__":
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"
@@ -62,21 +58,6 @@ 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"
- ConfigFlags.IOVDb.GlobalTag = "OFLCOND-FASER-01" # Always needed; must match FaserVersion
- ConfigFlags.IOVDb.DatabaseInstance = "OFLP200" # Use MC conditions for now
- ConfigFlags.Input.ProjectName = "data20" # Needed to bypass autoconfig
- ConfigFlags.Input.isMC = False # Needed to bypass autoconfig
- 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/FaserSpacePoints/test/FaserSpacePointsDbg.py b/Tracker/TrackerRecAlgs/FaserSpacePoints/test/FaserSpacePointsDbg.py
index 6c6ea850..78f6a2fb 100644
--- a/Tracker/TrackerRecAlgs/FaserSpacePoints/test/FaserSpacePointsDbg.py
+++ b/Tracker/TrackerRecAlgs/FaserSpacePoints/test/FaserSpacePointsDbg.py
@@ -13,10 +13,6 @@ from FaserSpacePoints.FaserSpacePointsConfig import FaserSpacePointsCfg
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"
@@ -24,17 +20,6 @@ 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"
-ConfigFlags.IOVDb.GlobalTag = "OFLCOND-FASER-01"
-#ConfigFlags.GeoModel.Align.Dynamic = False
-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 43083a51..a7150701 100644
--- a/Tracker/TrackerRecAlgs/MyClusters/test/MyClustersDbg.py
+++ b/Tracker/TrackerRecAlgs/MyClusters/test/MyClustersDbg.py
@@ -15,10 +15,6 @@ log.setLevel(DEBUG)
Configurable.configurableRun3Behavior = True
# Configure
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
->>>>>>> 6e1b4d4be8e (Configuration fixes)
configFlags = initConfigFlags()
configFlags.Input.Files = ['my.RDO.pool.root']
configFlags.Output.ESDFileName = "MyClusters.ESD.root"
@@ -27,18 +23,6 @@ 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"
-ConfigFlags.Output.AODFileName = "MyClsuters.AOD.pool.root"
-ConfigFlags.IOVDb.GlobalTag = "OFLCOND-FASER-01"
-#ConfigFlags.GeoModel.Align.Dynamic = 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/NoisyStripFinder/share/NoisyStripFinderJob.py b/Tracker/TrackerRecAlgs/NoisyStripFinder/share/NoisyStripFinderJob.py
index 9ded9f20..6235c836 100755
--- a/Tracker/TrackerRecAlgs/NoisyStripFinder/share/NoisyStripFinderJob.py
+++ b/Tracker/TrackerRecAlgs/NoisyStripFinder/share/NoisyStripFinderJob.py
@@ -38,10 +38,6 @@ for filename in args.file:
else:
filelist.append(filename)
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
->>>>>>> 6e1b4d4be8e (Configuration fixes)
configFlags = initConfigFlags()
configFlags.Input.Files = args.file
configFlags.IOVDb.GlobalTag = "OFLCOND-FASER-04"
@@ -55,23 +51,6 @@ 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"
-#ConfigFlags.IOVDb.DatabaseInstance = "OFLP200"
-ConfigFlags.IOVDb.DatabaseInstance = "CONDBR3"
-ConfigFlags.Input.ProjectName = "data22"
-ConfigFlags.Input.isMC = False
-ConfigFlags.GeoModel.FaserVersion = "FASERNU-03"
-ConfigFlags.Common.isOnline = False
-#ConfigFlags.GeoModel.Align.Dynamic = False
-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 de2ecd32..8579477f 100755
--- a/Tracker/TrackerRecAlgs/NoisyStripFinder/test/NoisyStripFinderDbg.py
+++ b/Tracker/TrackerRecAlgs/NoisyStripFinder/test/NoisyStripFinderDbg.py
@@ -23,10 +23,6 @@ args = parser.parse_args()
log.setLevel(DEBUG)
Configurable.configurableRun3Behavior = True
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
->>>>>>> 6e1b4d4be8e (Configuration fixes)
configFlags = initConfigFlags()
configFlags.Input.Files = args.file
configFlags.IOVDb.GlobalTag = "OFLCOND-FASER-03"
@@ -39,22 +35,6 @@ 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"
-ConfigFlags.IOVDb.DatabaseInstance = "OFLP200"
-ConfigFlags.Input.ProjectName = "data21"
-ConfigFlags.Input.isMC = False
-ConfigFlags.GeoModel.FaserVersion = "FASERNU-03"
-ConfigFlags.Common.isOnline = False
-#ConfigFlags.GeoModel.Align.Dynamic = False
-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 79dadbe4..0a9ca2a4 100644
--- a/Tracker/TrackerRecAlgs/OverlayRDO/python/HistoRDOConfig.py
+++ b/Tracker/TrackerRecAlgs/OverlayRDO/python/HistoRDOConfig.py
@@ -70,10 +70,6 @@ if __name__ == "__main__":
'/home/dcasper/Work/faser/darkphoton/overlay/myNeg_Bin7RDO.pool.root',
'/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' ]
@@ -86,24 +82,6 @@ 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']
- # ConfigFlags.Input.SecondaryFiles = [ '/eos/experiment/faser/rec/2022/r0013/009166/Faser-Physics-009166-00485-r0013-xAOD.root' ]
- # ConfigFlags.Output.RDOFileName = "Overlay.RDO.pool.root"
- ConfigFlags.IOVDb.GlobalTag = "OFLCOND-FASER-03" # Always needed; must match FaserVersionS
- ConfigFlags.IOVDb.DatabaseInstance = "CONDBR3" # Use data conditions for now
- ConfigFlags.Input.ProjectName = "data21" # Needed to bypass autoconfig
- ConfigFlags.Input.isMC = False # Needed to bypass autoconfig
- ConfigFlags.GeoModel.FaserVersion = "FASERNU-03" # FASER geometry
- ConfigFlags.Common.isOnline = False
- #ConfigFlags.GeoModel.Align.Dynamic = False
- ConfigFlags.Beam.NumberOfCollisions = 0.
->>>>>>> 05a628fdc98 (GeometryTest runs successfully)
-=======
->>>>>>> 6e1b4d4be8e (Configuration fixes)
-
configFlags.Detector.GeometryFaserSCT = True
configFlags.lock()
diff --git a/Tracker/TrackerRecAlgs/OverlayRDO/python/OverlayRDOConfig.py b/Tracker/TrackerRecAlgs/OverlayRDO/python/OverlayRDOConfig.py
index 64842ac6..3d1b2746 100644
--- a/Tracker/TrackerRecAlgs/OverlayRDO/python/OverlayRDOConfig.py
+++ b/Tracker/TrackerRecAlgs/OverlayRDO/python/OverlayRDOConfig.py
@@ -46,10 +46,6 @@ if __name__ == "__main__":
Configurable.configurableRun3Behavior = True
# Configure
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
->>>>>>> 6e1b4d4be8e (Configuration fixes)
configFlags = initConfigFlags()
configFlags.Overlay.DataOverlay = False
configFlags.Input.Files = [ 'Pos_RDO.pool.root']
@@ -65,26 +61,6 @@ 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']
- 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' ]
- ConfigFlags.Output.RDOFileName = "Overlay.RDO.pool.root"
- ConfigFlags.IOVDb.GlobalTag = "OFLCOND-FASER-03" # Always needed; must match FaserVersionS
- ConfigFlags.IOVDb.DatabaseInstance = "CONDBR3" # Use data conditions for now
- ConfigFlags.Input.ProjectName = "data21" # Needed to bypass autoconfig
- ConfigFlags.Input.isMC = False # Needed to bypass autoconfig
- ConfigFlags.GeoModel.FaserVersion = "FASERNU-03" # FASER geometry
- ConfigFlags.Common.isOnline = False
- #ConfigFlags.GeoModel.Align.Dynamic = False
- ConfigFlags.Beam.NumberOfCollisions = 0.
->>>>>>> 05a628fdc98 (GeometryTest runs successfully)
-=======
->>>>>>> 6e1b4d4be8e (Configuration fixes)
-
configFlags.Detector.GeometryFaserSCT = True
configFlags.lock()
diff --git a/Tracker/TrackerRecAlgs/OverlayRDO/python/SelectRDOConfig.py b/Tracker/TrackerRecAlgs/OverlayRDO/python/SelectRDOConfig.py
index 7900268b..d6daa1a1 100644
--- a/Tracker/TrackerRecAlgs/OverlayRDO/python/SelectRDOConfig.py
+++ b/Tracker/TrackerRecAlgs/OverlayRDO/python/SelectRDOConfig.py
@@ -98,10 +98,6 @@ 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
@@ -111,21 +107,6 @@ 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
- ConfigFlags.IOVDb.DatabaseInstance = "CONDBR3" # Use data conditions for now
- ConfigFlags.Input.ProjectName = "data21" # Needed to bypass autoconfig
- ConfigFlags.Input.isMC = False # Needed to bypass autoconfig
- ConfigFlags.GeoModel.FaserVersion = "FASERNU-03" # FASER geometry
- ConfigFlags.Common.isOnline = False
- #ConfigFlags.GeoModel.Align.Dynamic = False
- ConfigFlags.Beam.NumberOfCollisions = 0.
->>>>>>> 05a628fdc98 (GeometryTest runs successfully)
-=======
->>>>>>> 6e1b4d4be8e (Configuration fixes)
-
configFlags.Detector.GeometryFaserSCT = True
configFlags.lock()
diff --git a/Tracker/TrackerRecAlgs/PairVertex/python/PairVertexAlgConfig.py b/Tracker/TrackerRecAlgs/PairVertex/python/PairVertexAlgConfig.py
index 1f06dd62..a21ee4c8 100644
--- a/Tracker/TrackerRecAlgs/PairVertex/python/PairVertexAlgConfig.py
+++ b/Tracker/TrackerRecAlgs/PairVertex/python/PairVertexAlgConfig.py
@@ -58,10 +58,6 @@ if __name__ == "__main__":
Configurable.configurableRun3Behavior = True
# 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
@@ -72,21 +68,6 @@ 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
- ConfigFlags.IOVDb.DatabaseInstance = "OFLP200" # Use MC conditions for now
- ConfigFlags.Input.ProjectName = "data21" # Needed to bypass autoconfig
- ConfigFlags.Input.isMC = inputIsMC # Needed to bypass autoconfig
- ConfigFlags.GeoModel.FaserVersion = "FASERNU-03" # FASER geometry
- ConfigFlags.Common.isOnline = False
- #ConfigFlags.GeoModel.Align.Dynamic = False
- ConfigFlags.Beam.NumberOfCollisions = 0.
->>>>>>> 05a628fdc98 (GeometryTest runs successfully)
-=======
->>>>>>> 6e1b4d4be8e (Configuration fixes)
-
configFlags.Detector.GeometryFaserSCT = True
configFlags.lock()
diff --git a/Tracker/TrackerRecAlgs/TrackCounts/test/TrackCountsDbg.py b/Tracker/TrackerRecAlgs/TrackCounts/test/TrackCountsDbg.py
index d52e56a8..d2a67440 100644
--- a/Tracker/TrackerRecAlgs/TrackCounts/test/TrackCountsDbg.py
+++ b/Tracker/TrackerRecAlgs/TrackCounts/test/TrackCountsDbg.py
@@ -25,10 +25,6 @@ configFlags.Input.Files = [
'/eos/project/f/faser-commissioning/TI12Data/Run-001805/Faser-Physics-001805-00000.raw',
]
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
->>>>>>> 6e1b4d4be8e (Configuration fixes)
configFlags.Output.ESDFileName = "run001805_00.ESD.pool.root"
configFlags.IOVDb.GlobalTag = "OFLCOND-FASER-01"
configFlags.IOVDb.DatabaseInstance = "OFLP200"
@@ -38,21 +34,6 @@ 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"
-ConfigFlags.IOVDb.DatabaseInstance = "OFLP200"
-ConfigFlags.Input.ProjectName = "data21"
-ConfigFlags.Input.isMC = False
-ConfigFlags.Common.isOnline = False
-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
configFlags.lock()
diff --git a/Tracker/TrackerRecAlgs/TrackSeedPerformanceWriter/test/TrackSeedPerformanceWriterDbg.py b/Tracker/TrackerRecAlgs/TrackSeedPerformanceWriter/test/TrackSeedPerformanceWriterDbg.py
index 4e229ba1..dbff2347 100644
--- a/Tracker/TrackerRecAlgs/TrackSeedPerformanceWriter/test/TrackSeedPerformanceWriterDbg.py
+++ b/Tracker/TrackerRecAlgs/TrackSeedPerformanceWriter/test/TrackSeedPerformanceWriterDbg.py
@@ -19,10 +19,6 @@ from TrackSeedPerformanceWriter.TrackSeedPerformanceWriterConfig import TrackSee
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"
@@ -35,22 +31,6 @@ 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"
-ConfigFlags.IOVDb.GlobalTag = "OFLCOND-FASER-01"
-ConfigFlags.IOVDb.DatabaseInstance = "OFLP200"
-ConfigFlags.Input.ProjectName = "data21"
-ConfigFlags.Input.isMC = True
-ConfigFlags.GeoModel.FaserVersion = "FASER-01"
-ConfigFlags.Common.isOnline = False
-#ConfigFlags.GeoModel.Align.Dynamic = 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 c0353ef0..4345adb0 100755
--- a/Tracker/TrackerRecAlgs/TrackerClusterFit/test/TestBeamClusterFitDbg.py
+++ b/Tracker/TrackerRecAlgs/TrackerClusterFit/test/TestBeamClusterFitDbg.py
@@ -93,10 +93,6 @@ configFlags.Input.Files = [
# '/eos/project-f/faser-commissioning/winter2020CosmicsStand/Run-000608/Faser-Physics-000608-00061.raw',
# '/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"
@@ -108,23 +104,6 @@ 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"
-ConfigFlags.Output.ESDFileName = "tb.ESD.pool.root"
-ConfigFlags.IOVDb.GlobalTag = "OFLCOND-FASER-TB00" # Always needed; must match FaserVersion
-ConfigFlags.IOVDb.DatabaseInstance = "OFLP200" # Use MC conditions for now
-ConfigFlags.Input.ProjectName = "data21" # Needed to bypass autoconfig
-ConfigFlags.Input.isMC = False # Needed to bypass autoconfig
-ConfigFlags.GeoModel.FaserVersion = "FASER-TB00" # FASER geometry
-ConfigFlags.Common.isOnline = False
-#ConfigFlags.GeoModel.Align.Dynamic = False
-ConfigFlags.Beam.NumberOfCollisions = 0.
->>>>>>> 05a628fdc98 (GeometryTest runs successfully)
-=======
->>>>>>> 6e1b4d4be8e (Configuration fixes)
-
configFlags.Detector.GeometryFaserSCT = True
configFlags.lock()
diff --git a/Tracker/TrackerRecAlgs/TrackerClusterFit/test/TrackerClusterFitDbg.py b/Tracker/TrackerRecAlgs/TrackerClusterFit/test/TrackerClusterFitDbg.py
index 8673cca8..633674df 100644
--- a/Tracker/TrackerRecAlgs/TrackerClusterFit/test/TrackerClusterFitDbg.py
+++ b/Tracker/TrackerRecAlgs/TrackerClusterFit/test/TrackerClusterFitDbg.py
@@ -92,10 +92,6 @@ configFlags.Input.Files = [
# '/eos/project-f/faser-commissioning/winter2020CosmicsStand/Run-000608/Faser-Physics-000608-00061.raw',
# '/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
@@ -106,22 +102,6 @@ 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"
-ConfigFlags.IOVDb.GlobalTag = "OFLCOND-FASER-01" # Always needed; must match FaserVersion
-ConfigFlags.IOVDb.DatabaseInstance = "OFLP200" # Use MC conditions for now
-ConfigFlags.Input.ProjectName = "data21" # Needed to bypass autoconfig
-ConfigFlags.Input.isMC = False # Needed to bypass autoconfig
-ConfigFlags.GeoModel.FaserVersion = "FASER-01" # FASER geometry
-ConfigFlags.Common.isOnline = False
-#ConfigFlags.GeoModel.Align.Dynamic = False
-ConfigFlags.Beam.NumberOfCollisions = 0.
->>>>>>> 05a628fdc98 (GeometryTest runs successfully)
-=======
->>>>>>> 6e1b4d4be8e (Configuration fixes)
-
configFlags.Detector.GeometryFaserSCT = True
configFlags.lock()
diff --git a/Tracker/TrackerRecAlgs/TrackerData/test/TI12TrackerSegmentFitDataDbg.py b/Tracker/TrackerRecAlgs/TrackerData/test/TI12TrackerSegmentFitDataDbg.py
index 69068884..72eb45a6 100644
--- a/Tracker/TrackerRecAlgs/TrackerData/test/TI12TrackerSegmentFitDataDbg.py
+++ b/Tracker/TrackerRecAlgs/TrackerData/test/TI12TrackerSegmentFitDataDbg.py
@@ -19,10 +19,6 @@ from TrackerData.TrackerSegmentFitDataConfig import TrackerSegmentFitDataCfg
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"
@@ -37,24 +33,6 @@ 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"
-ConfigFlags.addFlag("Output.xAODFileName", f"TrackerSegmentFitData_xAOD.root")
-ConfigFlags.IOVDb.GlobalTag = "OFLCOND-FASER-03"
-ConfigFlags.IOVDb.DatabaseInstance = "OFLP200"
-ConfigFlags.Input.ProjectName = "data21"
-ConfigFlags.Input.isMC = False
-ConfigFlags.GeoModel.FaserVersion = "FASER-02"
-ConfigFlags.Common.isOnline = False
-#ConfigFlags.GeoModel.Align.Dynamic = False
-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 15d987d1..8e9ac7fd 100644
--- a/Tracker/TrackerRecAlgs/TrackerData/test/TrackerSegmentFitDataDbg.py
+++ b/Tracker/TrackerRecAlgs/TrackerData/test/TrackerSegmentFitDataDbg.py
@@ -18,10 +18,6 @@ from TrackerData.TrackerSegmentFitDataConfig import TrackerSegmentFitDataCfg
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"
@@ -36,24 +32,6 @@ 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"
-ConfigFlags.IOVDb.GlobalTag = "OFLCOND-FASER-01"
-ConfigFlags.IOVDb.DatabaseInstance = "OFLP200"
-ConfigFlags.Input.ProjectName = "data22"
-ConfigFlags.Input.isMC = True
-ConfigFlags.GeoModel.FaserVersion = "FASER-01"
-ConfigFlags.Common.isOnline = False
-#ConfigFlags.GeoModel.Align.Dynamic = False
-ConfigFlags.Beam.NumberOfCollisions = 0.
-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 169f7168..cfa31792 100644
--- a/Tracker/TrackerRecAlgs/TrackerData/test/TrackerTruthDataDbg.py
+++ b/Tracker/TrackerRecAlgs/TrackerData/test/TrackerTruthDataDbg.py
@@ -14,10 +14,6 @@ from TrackerData.TrackerTruthDataConfig import TrackerTruthDataCfg
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"
@@ -30,22 +26,6 @@ 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"
-ConfigFlags.IOVDb.DatabaseInstance = "OFLP200"
-ConfigFlags.Input.ProjectName = "data22"
-ConfigFlags.Input.isMC = True
-ConfigFlags.GeoModel.FaserVersion = "FASER-01"
-ConfigFlags.Common.isOnline = False
-#ConfigFlags.GeoModel.Align.Dynamic = False
-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 3d611f99..e34865dd 100644
--- a/Tracker/TrackerRecAlgs/TrackerPrepRawDataFormation/test/FaserSCT_ClusterizationDbg.py
+++ b/Tracker/TrackerRecAlgs/TrackerPrepRawDataFormation/test/FaserSCT_ClusterizationDbg.py
@@ -22,27 +22,12 @@ log.setLevel(DEBUG)
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"
-ConfigFlags.IOVDb.GlobalTag = "OFLCOND-FASER-01" # Always needed; must match FaserVersion
-#ConfigFlags.GeoModel.Align.Dynamic = False
-ConfigFlags.Beam.NumberOfCollisions = 0.
->>>>>>> 05a628fdc98 (GeometryTest runs successfully)
-=======
->>>>>>> 6e1b4d4be8e (Configuration fixes)
-
configFlags.lock()
# Core components
diff --git a/Tracker/TrackerRecAlgs/TrackerPrepRawDataFormation/test/FaserSCT_ClusterizationDbgCosmics.py b/Tracker/TrackerRecAlgs/TrackerPrepRawDataFormation/test/FaserSCT_ClusterizationDbgCosmics.py
index b8a4cd30..6964f0e2 100644
--- a/Tracker/TrackerRecAlgs/TrackerPrepRawDataFormation/test/FaserSCT_ClusterizationDbgCosmics.py
+++ b/Tracker/TrackerRecAlgs/TrackerPrepRawDataFormation/test/FaserSCT_ClusterizationDbgCosmics.py
@@ -22,10 +22,6 @@ log.setLevel(DEBUG)
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"
@@ -37,22 +33,6 @@ 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"
-ConfigFlags.IOVDb.GlobalTag = "OFLCOND-FASER-01" # Always needed; must match FaserVersion
-ConfigFlags.IOVDb.DatabaseInstance = "OFLP200" # Use MC conditions for now
-ConfigFlags.Input.ProjectName = "data20" # Needed to bypass autoconfig
-ConfigFlags.Input.isMC = False # Needed to bypass autoconfig
-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()
# Core components
diff --git a/Tracker/TrackerRecAlgs/TrackerSPFit/python/TrackerSPFit.py b/Tracker/TrackerRecAlgs/TrackerSPFit/python/TrackerSPFit.py
index 39d398cf..879bee23 100644
--- a/Tracker/TrackerRecAlgs/TrackerSPFit/python/TrackerSPFit.py
+++ b/Tracker/TrackerRecAlgs/TrackerSPFit/python/TrackerSPFit.py
@@ -61,24 +61,10 @@ if __name__ == "__main__":
# configFlags.Input.ProjectName = "data20" # Needed to bypass autoconfig
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()
# Core components
diff --git a/Tracker/TrackerRecAlgs/TrackerSPFit/python/TrackerSPFitTI12Data.py b/Tracker/TrackerRecAlgs/TrackerSPFit/python/TrackerSPFitTI12Data.py
index e194b09e..a4e91525 100644
--- a/Tracker/TrackerRecAlgs/TrackerSPFit/python/TrackerSPFitTI12Data.py
+++ b/Tracker/TrackerRecAlgs/TrackerSPFit/python/TrackerSPFitTI12Data.py
@@ -59,24 +59,10 @@ if __name__ == "__main__":
configFlags.Input.ProjectName = "data21" # Needed to bypass autoconfig
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()
# Core components
diff --git a/Tracker/TrackerRecAlgs/TrackerSPFit/test/TrackerSPFitDbg.py b/Tracker/TrackerRecAlgs/TrackerSPFit/test/TrackerSPFitDbg.py
index e775bd20..3f50d396 100644
--- a/Tracker/TrackerRecAlgs/TrackerSPFit/test/TrackerSPFitDbg.py
+++ b/Tracker/TrackerRecAlgs/TrackerSPFit/test/TrackerSPFitDbg.py
@@ -23,27 +23,12 @@ log.setLevel(DEBUG)
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"
-ConfigFlags.IOVDb.GlobalTag = "OFLCOND-FASER-01" # Always needed; must match FaserVersion
-#ConfigFlags.GeoModel.Align.Dynamic = False
-ConfigFlags.Beam.NumberOfCollisions = 0.
->>>>>>> 05a628fdc98 (GeometryTest runs successfully)
-=======
->>>>>>> 6e1b4d4be8e (Configuration fixes)
-
configFlags.lock()
# Core components
diff --git a/Tracker/TrackerRecAlgs/TrackerSeedFinder/test/TrackerSeedFinderDbg.py b/Tracker/TrackerRecAlgs/TrackerSeedFinder/test/TrackerSeedFinderDbg.py
index 648429c3..90001e9f 100644
--- a/Tracker/TrackerRecAlgs/TrackerSeedFinder/test/TrackerSeedFinderDbg.py
+++ b/Tracker/TrackerRecAlgs/TrackerSeedFinder/test/TrackerSeedFinderDbg.py
@@ -24,10 +24,6 @@ log.setLevel(DEBUG)
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"
@@ -36,19 +32,6 @@ 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"
-ConfigFlags.IOVDb.GlobalTag = "OFLCOND-FASER-01"
-# ConfigFlags.GeoModel.FaserVersion = "FASER-01"
-#ConfigFlags.GeoModel.Align.Dynamic = False
-#ConfigFlags.Concurrency.NumThreads = 1
-ConfigFlags.Beam.NumberOfCollisions = 0.
->>>>>>> 05a628fdc98 (GeometryTest runs successfully)
-=======
->>>>>>> 6e1b4d4be8e (Configuration fixes)
-
configFlags.lock()
# Core components
diff --git a/Tracker/TrackerRecAlgs/TrackerSegmentFit/test/MCTrackerSegmentFit.py b/Tracker/TrackerRecAlgs/TrackerSegmentFit/test/MCTrackerSegmentFit.py
index 233c975d..c7f06708 100644
--- a/Tracker/TrackerRecAlgs/TrackerSegmentFit/test/MCTrackerSegmentFit.py
+++ b/Tracker/TrackerRecAlgs/TrackerSegmentFit/test/MCTrackerSegmentFit.py
@@ -25,10 +25,6 @@ log.setLevel(DEBUG)
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"
@@ -43,24 +39,6 @@ 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"
-ConfigFlags.IOVDb.GlobalTag = "OFLCOND-FASER-01"
-ConfigFlags.IOVDb.DatabaseInstance = "OFLP200"
-ConfigFlags.Input.ProjectName = "data21"
-ConfigFlags.Input.isMC = True
-ConfigFlags.GeoModel.FaserVersion = "FASER-01"
-ConfigFlags.Common.isOnline = False
-#ConfigFlags.GeoModel.Align.Dynamic = False
-ConfigFlags.Beam.NumberOfCollisions = 0.
-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 56977a2d..8dd14a87 100755
--- a/Tracker/TrackerRecAlgs/TrackerSegmentFit/test/TestBeamSegmentFitDbg.py
+++ b/Tracker/TrackerRecAlgs/TrackerSegmentFit/test/TestBeamSegmentFitDbg.py
@@ -29,10 +29,6 @@ configFlags = initConfigFlags()
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
@@ -42,21 +38,6 @@ 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
-ConfigFlags.IOVDb.DatabaseInstance = "OFLP200" # Use MC conditions for now
-ConfigFlags.Input.ProjectName = "data21" # Needed to bypass autoconfig
-ConfigFlags.Input.isMC = False # Needed to bypass autoconfig
-ConfigFlags.GeoModel.FaserVersion = "FASER-TB00" # FASER geometry
-ConfigFlags.Common.isOnline = False
-#ConfigFlags.GeoModel.Align.Dynamic = False
-ConfigFlags.Beam.NumberOfCollisions = 0.
->>>>>>> 05a628fdc98 (GeometryTest runs successfully)
-=======
->>>>>>> 6e1b4d4be8e (Configuration fixes)
-
# configFlags.Detector.GeometryFaserSCT = True
configFlags.lock()
diff --git a/Tracker/TrackerRecAlgs/TrackerSegmentFit/test/TrackerSegmentFitDbg.py b/Tracker/TrackerRecAlgs/TrackerSegmentFit/test/TrackerSegmentFitDbg.py
index 18869b1c..0a6a101e 100644
--- a/Tracker/TrackerRecAlgs/TrackerSegmentFit/test/TrackerSegmentFitDbg.py
+++ b/Tracker/TrackerRecAlgs/TrackerSegmentFit/test/TrackerSegmentFitDbg.py
@@ -29,10 +29,6 @@ configFlags = initConfigFlags()
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
@@ -42,21 +38,6 @@ 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
-ConfigFlags.IOVDb.DatabaseInstance = "OFLP200" # Use MC conditions for now
-ConfigFlags.Input.ProjectName = "data21" # Needed to bypass autoconfig
-ConfigFlags.Input.isMC = False # Needed to bypass autoconfig
-ConfigFlags.GeoModel.FaserVersion = "FASER-02" # FASER geometry
-ConfigFlags.Common.isOnline = False
-#ConfigFlags.GeoModel.Align.Dynamic = False
-ConfigFlags.Beam.NumberOfCollisions = 0.
->>>>>>> 05a628fdc98 (GeometryTest runs successfully)
-=======
->>>>>>> 6e1b4d4be8e (Configuration fixes)
-
configFlags.Detector.GeometryFaserSCT = True
configFlags.lock()
diff --git a/Tracker/TrackerRecAlgs/TrackerSpacePointFormation/test/StatisticsDbg.py b/Tracker/TrackerRecAlgs/TrackerSpacePointFormation/test/StatisticsDbg.py
index c37be15d..ed3ff9fb 100644
--- a/Tracker/TrackerRecAlgs/TrackerSpacePointFormation/test/StatisticsDbg.py
+++ b/Tracker/TrackerRecAlgs/TrackerSpacePointFormation/test/StatisticsDbg.py
@@ -23,27 +23,12 @@ log.setLevel(DEBUG)
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"
-ConfigFlags.IOVDb.GlobalTag = "OFLCOND-FASER-01" # Always needed; must match FaserVersion
-#ConfigFlags.GeoModel.Align.Dynamic = False
-ConfigFlags.Beam.NumberOfCollisions = 0.
->>>>>>> 05a628fdc98 (GeometryTest runs successfully)
-=======
->>>>>>> 6e1b4d4be8e (Configuration fixes)
-
configFlags.lock()
# Core components
diff --git a/Tracker/TrackerRecAlgs/TrackerSpacePointFormation/test/TrackerSpacePointFormationDbg.py b/Tracker/TrackerRecAlgs/TrackerSpacePointFormation/test/TrackerSpacePointFormationDbg.py
index 732c922b..e3f0e2e9 100644
--- a/Tracker/TrackerRecAlgs/TrackerSpacePointFormation/test/TrackerSpacePointFormationDbg.py
+++ b/Tracker/TrackerRecAlgs/TrackerSpacePointFormation/test/TrackerSpacePointFormationDbg.py
@@ -23,27 +23,12 @@ log.setLevel(DEBUG)
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"
-ConfigFlags.IOVDb.GlobalTag = "OFLCOND-FASER-01" # Always needed; must match FaserVersion
-#ConfigFlags.GeoModel.Align.Dynamic = False
-ConfigFlags.Beam.NumberOfCollisions = 0.
->>>>>>> 05a628fdc98 (GeometryTest runs successfully)
-=======
->>>>>>> 6e1b4d4be8e (Configuration fixes)
-
configFlags.lock()
# Core components
diff --git a/Tracker/TrackerRecAlgs/TrackerSpacePointFormation/test/TrackerSpacePointFormationDbgCosmics.py b/Tracker/TrackerRecAlgs/TrackerSpacePointFormation/test/TrackerSpacePointFormationDbgCosmics.py
index 2d1bf79a..86cbb34e 100644
--- a/Tracker/TrackerRecAlgs/TrackerSpacePointFormation/test/TrackerSpacePointFormationDbgCosmics.py
+++ b/Tracker/TrackerRecAlgs/TrackerSpacePointFormation/test/TrackerSpacePointFormationDbgCosmics.py
@@ -23,10 +23,6 @@ log.setLevel(DEBUG)
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"
@@ -39,22 +35,6 @@ 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"
-ConfigFlags.IOVDb.GlobalTag = "OFLCOND-FASER-01" # Always needed; must match FaserVersion
-ConfigFlags.IOVDb.DatabaseInstance = "OFLP200" # Use MC conditions for now
-ConfigFlags.Input.ProjectName = "data20" # Needed to bypass autoconfig
-ConfigFlags.Input.isMC = False # Needed to bypass autoconfig
-ConfigFlags.Common.isOnline = False
-ConfigFlags.GeoModel.FaserVersion = "FASER-01" # FASER cosmic ray geometry (station 2 only)
-#ConfigFlags.GeoModel.Align.Dynamic = False
-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 2093ef1f..464c6982 100644
--- a/Tracker/TrackerRecAlgs/TrackerTruth/test/TrackerTruthDbg.py
+++ b/Tracker/TrackerRecAlgs/TrackerTruth/test/TrackerTruthDbg.py
@@ -14,10 +14,6 @@ from TrackerTruth.TrackerTruthConfig import TrackerTruthCfg
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"
@@ -30,22 +26,6 @@ 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"
-ConfigFlags.IOVDb.DatabaseInstance = "OFLP200"
-ConfigFlags.Input.ProjectName = "data22"
-ConfigFlags.Input.isMC = True
-ConfigFlags.GeoModel.FaserVersion = "FASER-01"
-ConfigFlags.Common.isOnline = False
-#ConfigFlags.GeoModel.Align.Dynamic = False
-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 db51124d..972a54ec 100644
--- a/Tracker/TrackerRecAlgs/TruthSeededTrackFinder/test/TruthSeededTrackFinderDbg.py
+++ b/Tracker/TrackerRecAlgs/TruthSeededTrackFinder/test/TruthSeededTrackFinderDbg.py
@@ -24,10 +24,6 @@ log.setLevel(DEBUG)
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"
@@ -35,18 +31,6 @@ 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"
-ConfigFlags.IOVDb.GlobalTag = "OFLCOND-FASER-01" # Always needed; must match FaserVersion
-#ConfigFlags.GeoModel.Align.Dynamic = False
-#ConfigFlags.Concurrency.NumThreads = 1
-ConfigFlags.Beam.NumberOfCollisions = 0.
->>>>>>> 05a628fdc98 (GeometryTest runs successfully)
-=======
->>>>>>> 6e1b4d4be8e (Configuration fixes)
-
configFlags.lock()
# Core components
diff --git a/Tracking/Acts/FaserActsGeometry/python/FaserActsMaterialMapping_jobOptions.py b/Tracking/Acts/FaserActsGeometry/python/FaserActsMaterialMapping_jobOptions.py
index 4324d477..d67c288c 100644
--- a/Tracking/Acts/FaserActsGeometry/python/FaserActsMaterialMapping_jobOptions.py
+++ b/Tracking/Acts/FaserActsGeometry/python/FaserActsMaterialMapping_jobOptions.py
@@ -58,10 +58,6 @@ if "__main__" == __name__:
Configurable.configurableRun3Behavior = True
## Just enable ID for the moment.
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
->>>>>>> 6e1b4d4be8e (Configuration fixes)
configFlags = initConfigFlags()
configFlags.Input.isMC = True
configFlags.Beam.Type = "collisions"
@@ -69,18 +65,6 @@ 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"
- ConfigFlags.GeoModel.FaserVersion = "FASERNU-03"
- ConfigFlags.IOVDb.GlobalTag = "OFLCOND-FASER-03" # Always needed; must match FaserVersion
- 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 07e81289..8983754c 100644
--- a/Tracking/Acts/FaserActsGeometry/test/FaserActsExtrapolationAlg.py
+++ b/Tracking/Acts/FaserActsGeometry/test/FaserActsExtrapolationAlg.py
@@ -26,10 +26,6 @@ configFlags.GeoModel.FaserVersion = "FASER-01" # Always needed
# Workaround for bug/missing flag; unimportant otherwise
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
@@ -37,18 +33,6 @@ configFlags.Detector.GeometryFaserSCT = True
#configFlags.Concurrency.NumThreads = 1
#configFlags.Beam.NumberOfCollisions = 0.
configFlags.lock()
-<<<<<<< HEAD
-=======
-ConfigFlags.GeoModel.Layout = "Development"
-ConfigFlags.Detector.GeometryFaserSCT = True
-#ConfigFlags.GeoModel.AtlasVersion = "ATLAS-R2-2016-01-00-01" # Always needed to fool autoconfig; value ignored
-#ConfigFlags.GeoModel.Align.Dynamic = False
-#ConfigFlags.Concurrency.NumThreads = 1
-#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 429c2e38..63ff7f8a 100644
--- a/Tracking/Acts/FaserActsGeometry/test/FaserActsGeometryBoundary_test.py
+++ b/Tracking/Acts/FaserActsGeometry/test/FaserActsGeometryBoundary_test.py
@@ -30,10 +30,6 @@ if __name__ == "__main__":
from FaserGeoModel.FaserGeoModelConfig import FaserGeometryCfg
Configurable.configurableRun3Behavior = True
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
->>>>>>> 6e1b4d4be8e (Configuration fixes)
configFlags = initConfigFlags()
configFlags.Input.isMC = False
#configFlags.GeoModel.Align.Dynamic = False
@@ -42,18 +38,6 @@ if __name__ == "__main__":
configFlags.GeoModel.FaserVersion = "FASERNU-03"
configFlags.Detector.GeometryFaserSCT = True
configFlags.lock()
-<<<<<<< HEAD
-=======
- ConfigFlags.Input.isMC = False
- #ConfigFlags.GeoModel.Align.Dynamic = False
- ConfigFlags.IOVDb.DatabaseInstance = "CONDBR3"
- ConfigFlags.IOVDb.GlobalTag = "OFLCOND-FASER-04"
- ConfigFlags.GeoModel.FaserVersion = "FASERNU-03"
- 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 1ed3c62d..3a501769 100644
--- a/Tracking/Acts/FaserActsGeometry/test/FaserActsWriteTrackingGeometry.py
+++ b/Tracking/Acts/FaserActsGeometry/test/FaserActsWriteTrackingGeometry.py
@@ -26,10 +26,6 @@ configFlags.GeoModel.FaserVersion = "FASERNU-03" # Always needed
# Workaround for bug/missing flag; unimportant otherwise
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
@@ -37,18 +33,6 @@ configFlags.Detector.GeometryFaserSCT = True
#configFlags.Concurrency.NumThreads = 1
#configFlags.Beam.NumberOfCollisions = 0.
configFlags.lock()
-<<<<<<< HEAD
-=======
-ConfigFlags.GeoModel.Layout = "Development"
-ConfigFlags.Detector.GeometryFaserSCT = True
-#ConfigFlags.GeoModel.AtlasVersion = "ATLAS-R2-2016-01-00-01" # Always needed to fool autoconfig; value ignored
-#ConfigFlags.GeoModel.Align.Dynamic = False
-#ConfigFlags.Concurrency.NumThreads = 1
-#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 44d1d8cd..c36e0f9a 100644
--- a/Tracking/Acts/FaserActsKalmanFilter/python/CKF2Alignment.py
+++ b/Tracking/Acts/FaserActsKalmanFilter/python/CKF2Alignment.py
@@ -106,10 +106,6 @@ if __name__ == "__main__":
Configurable.configurableRun3Behavior = True
# Configure
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
->>>>>>> 6e1b4d4be8e (Configuration fixes)
configFlags = initConfigFlags()
configFlags.Input.Files = [ '' ] #input RDO
configFlags.IOVDb.GlobalTag = "OFLCOND-FASER-03"
@@ -127,27 +123,6 @@ if __name__ == "__main__":
configFlags.fillFromArgs(sys.argv[1:])
configFlags.dump()
configFlags.lock()
-<<<<<<< HEAD
-=======
- ConfigFlags.Input.Files = [ '' ] #input RDO
- ConfigFlags.IOVDb.GlobalTag = "OFLCOND-FASER-03"
- ConfigFlags.GeoModel.FaserVersion = "FASERNU-03" # FASER cosmic ray geometry (station 2 only)
- ConfigFlags.TrackingGeometry.MaterialSource = "material-maps.json" # material map
- ConfigFlags.Input.isMC = True
- #ConfigFlags.GeoModel.Align.Dynamic = False
- ConfigFlags.Input.ProjectName = "data21" # Needed to bypass autoconfig
- ConfigFlags.Beam.NumberOfCollisions = 0.
- ConfigFlags.addFlag("Input.InitialTimeStamp", 0)
- ConfigFlags.Exec.MaxEvents = -1
- ConfigFlags.Output.doWriteESD = False
- #ConfigFlags.Concurrency.NumThreads = 1
-# ConfigFlags.addFlag("Alignment.Output", "ckf_alignment.root")
- ConfigFlags.fillFromArgs(sys.argv[1:])
- 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 19f8fa1c..0a356ccf 100644
--- a/Tracking/Acts/FaserActsKalmanFilter/test/CKF2.py
+++ b/Tracking/Acts/FaserActsKalmanFilter/test/CKF2.py
@@ -24,10 +24,6 @@ args = parser.parse_args()
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")
@@ -39,21 +35,6 @@ 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")
-ConfigFlags.Output.ESDFileName = "CKF.ESD.pool.root"
-ConfigFlags.IOVDb.GlobalTag = "OFLCOND-FASER-03"
-ConfigFlags.GeoModel.FaserVersion = "FASERNU-03"
-#ConfigFlags.GeoModel.Align.Dynamic = False
-ConfigFlags.Beam.NumberOfCollisions = 0.
-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 97752f06..f7acdd95 100644
--- a/Tracking/Acts/FaserActsKalmanFilter/test/CombinatorialKalmanFilterAlg.py
+++ b/Tracking/Acts/FaserActsKalmanFilter/test/CombinatorialKalmanFilterAlg.py
@@ -16,10 +16,6 @@ from FaserActsKalmanFilter.CombinatorialKalmanFilterConfig import CombinatorialK
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"
@@ -29,19 +25,6 @@ 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"
-ConfigFlags.IOVDb.GlobalTag = "OFLCOND-FASER-01"
-ConfigFlags.GeoModel.FaserVersion = "FASER-01"
-#ConfigFlags.GeoModel.Align.Dynamic = False
-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 9e198df3..22d4696e 100644
--- a/Tracking/Acts/FaserActsKalmanFilter/test/CombinatorialKalmanFilterAlg_Data.py
+++ b/Tracking/Acts/FaserActsKalmanFilter/test/CombinatorialKalmanFilterAlg_Data.py
@@ -15,10 +15,6 @@ from TrackerSegmentFit.TrackerSegmentFitConfig import SegmentFitAlgCfg
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"
@@ -33,24 +29,6 @@ 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"
-ConfigFlags.addFlag("Output.xAODFileName", f"CKF.xAOD.root")
-ConfigFlags.IOVDb.GlobalTag = "OFLCOND-FASER-01"
-ConfigFlags.IOVDb.DatabaseInstance = "OFLP200"
-ConfigFlags.Input.ProjectName = "data21"
-ConfigFlags.Input.isMC = False
-ConfigFlags.GeoModel.FaserVersion = "FASER-01"
-ConfigFlags.Common.isOnline = False
-#ConfigFlags.GeoModel.Align.Dynamic = False
-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 f92c929d..8eb06fa8 100644
--- a/Tracking/Acts/FaserActsKalmanFilter/test/FaserActsKalmanFilterAlg.py
+++ b/Tracking/Acts/FaserActsKalmanFilter/test/FaserActsKalmanFilterAlg.py
@@ -21,10 +21,6 @@ log.setLevel(DEBUG)
Configurable.configurableRun3Behavior = True
# Configure
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
->>>>>>> 6e1b4d4be8e (Configuration fixes)
configFlags = initConfigFlags()
configFlags.Input.Files = ['../my.RDO.pool.root']
configFlags.Output.ESDFileName = "FaserActsKalmanFilter.ESD.root"
@@ -34,19 +30,6 @@ 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"
-ConfigFlags.Output.AODFileName = "FaserActsKalmanFilter.AOD.pool.root"
-ConfigFlags.IOVDb.GlobalTag = "OFLCOND-FASER-01"
-#ConfigFlags.GeoModel.Align.Dynamic = False
-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 974d5fe3..8b7e36ca 100644
--- a/Tracking/Acts/FaserActsKalmanFilter/test/GhostBusters.py
+++ b/Tracking/Acts/FaserActsKalmanFilter/test/GhostBusters.py
@@ -17,10 +17,6 @@ from FaserActsKalmanFilter.GhostBustersConfig import GhostBustersCfg
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"
@@ -30,19 +26,6 @@ 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"
-ConfigFlags.IOVDb.GlobalTag = "OFLCOND-FASER-01"
-ConfigFlags.GeoModel.FaserVersion = "FASER-01"
-#ConfigFlags.GeoModel.Align.Dynamic = False
-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 4c75e252..c07bf40c 100644
--- a/Tracking/Acts/FaserActsKalmanFilter/test/SeedingDbg.py
+++ b/Tracking/Acts/FaserActsKalmanFilter/test/SeedingDbg.py
@@ -16,10 +16,6 @@ from FaserActsKalmanFilter.SeedingConfig import SeedingCfg
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"
@@ -29,19 +25,6 @@ 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"
-ConfigFlags.IOVDb.GlobalTag = "OFLCOND-FASER-01"
-ConfigFlags.GeoModel.FaserVersion = "FASER-01"
-#ConfigFlags.GeoModel.Align.Dynamic = False
-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 6fe418e1..822b6faa 100644
--- a/Tracking/Acts/FaserActsKalmanFilter/test/TI12CKF2.py
+++ b/Tracking/Acts/FaserActsKalmanFilter/test/TI12CKF2.py
@@ -27,10 +27,6 @@ args = parser.parse_args()
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"
@@ -46,25 +42,6 @@ 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"
-ConfigFlags.addFlag("Output.xAODFileName", f"CKF.xAOD.root")
-ConfigFlags.IOVDb.GlobalTag = "OFLCOND-FASER-03"
-ConfigFlags.IOVDb.DatabaseInstance = "OFLP200"
-ConfigFlags.Input.ProjectName = "data22"
-ConfigFlags.Input.isMC = False
-ConfigFlags.GeoModel.FaserVersion = "FASERNU-03"
-ConfigFlags.Common.isOnline = False
-#ConfigFlags.GeoModel.Align.Dynamic = False
-ConfigFlags.Beam.NumberOfCollisions = 0.
-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 995a7f2c..568e65b0 100644
--- a/Tracking/Acts/FaserActsKalmanFilter/test/TI12KalmanFilter.py
+++ b/Tracking/Acts/FaserActsKalmanFilter/test/TI12KalmanFilter.py
@@ -21,10 +21,6 @@ log.setLevel(DEBUG)
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"
@@ -39,24 +35,6 @@ 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"
-ConfigFlags.Output.AODFileName = "MiddleStation-KalmanFilter.AOD.pool.root"
-ConfigFlags.IOVDb.GlobalTag = "OFLCOND-FASER-03"
-ConfigFlags.IOVDb.DatabaseInstance = "OFLP200"
-ConfigFlags.Input.ProjectName = "data21"
-ConfigFlags.Input.isMC = False
-ConfigFlags.GeoModel.FaserVersion = "FASER-02"
-ConfigFlags.Common.isOnline = False
-#ConfigFlags.GeoModel.Align.Dynamic = False
-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 10d54662..a01a46eb 100644
--- a/Waveform/WaveDigiTools/share/WaveformDigiAndRecoExample_jobOptions.py
+++ b/Waveform/WaveDigiTools/share/WaveformDigiAndRecoExample_jobOptions.py
@@ -21,10 +21,6 @@ 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
@@ -33,18 +29,6 @@ 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
- ConfigFlags.Input.ProjectName = "mc21" # Needed to bypass autoconfig
- ConfigFlags.Input.isMC = True # Needed to bypass autoconfig
- ConfigFlags.GeoModel.FaserVersion = "FASER-TB00" # FASER geometry
- 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 42ebb45a..757db8b3 100644
--- a/Waveform/WaveRecAlgs/share/PseudoSimToWaveformRecExample_jobOptions.py
+++ b/Waveform/WaveRecAlgs/share/PseudoSimToWaveformRecExample_jobOptions.py
@@ -16,10 +16,6 @@ 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
@@ -28,18 +24,6 @@ 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
- ConfigFlags.Input.ProjectName = "mc21" # Needed to bypass autoconfig
- ConfigFlags.Input.isMC = True # Needed to bypass autoconfig
- ConfigFlags.GeoModel.FaserVersion = "FASER-TB00" # FASER geometry
- ConfigFlags.Common.isOnline = False
- #ConfigFlags.GeoModel.Align.Dynamic = False
->>>>>>> 05a628fdc98 (GeometryTest runs successfully)
-=======
->>>>>>> 6e1b4d4be8e (Configuration fixes)
configFlags.Input.Files = [
"my.HITS.pool.root"
diff --git a/package_filters.txt b/package_filters.txt
index fc25595e..7835fa42 100644
--- a/package_filters.txt
+++ b/package_filters.txt
@@ -15,12 +15,9 @@
+Control/CalypsoConfiguration
+Control/CalypsoExample/GenEventExample
+Control/CalypsoExample/GeoModelTest
-<<<<<<< HEAD
+Control/CalypsoExample/RDOReadExample
+Control/CalypsoExample/SimHitExample
+Control/CalypsoExample/TrackerDataAccessExample
-=======
->>>>>>> 05a628fdc98 (GeometryTest runs successfully)
+Control/CalypsoExample/TriggerDataAccessExample
+Control/CalypsoExample/WaveformAnalysisExample
+Control/CalypsoExample/WaveformDataAccessExample
@@ -66,7 +63,6 @@
#+Neutrino/NeutrinoSimEvent
+Neutrino/.*
-PhysicsAnalysis/.*
-<<<<<<< HEAD
#+Scintillator/ScintDetDescr/PreshowerGeoModel
#+Scintillator/ScintDetDescr/ScintGeoModelUtils
#+Scintillator/ScintDetDescr/ScintIdDictFiles
@@ -97,30 +93,6 @@
#+Simulation/ISF/ISF_HepMC/FaserISF_HepMC_Interfaces
#+Simulation/ISF/ISF_HepMC/FaserISF_HepMC_Tools
+Simulation/.*
-=======
-+Scintillator/ScintDetDescr/PreshowerGeoModel
-+Scintillator/ScintDetDescr/ScintGeoModelUtils
-+Scintillator/ScintDetDescr/ScintIdDictFiles
-+Scintillator/ScintDetDescr/ScintIdentifier
-+Scintillator/ScintDetDescr/ScintReadoutGeometry
-+Scintillator/ScintDetDescr/TriggerGeoModel
-+Scintillator/ScintDetDescr/VetoGeoModel
-+Scintillator/ScintDetDescr/VetoNuGeoModel
-+Scintillator/ScintDetDescrCnv/ScintIdCnv
-+Scintillator/ScintSimEvent
--Scintillator/.*
-##+Simulation/G4Extensions/Pythia8Decayer
-##+Simulation/G4Faser/G4FaserAlg
-##+Simulation/G4Sim/FaserMCTruth
-+Simulation/G4Utilities/Geo2G4
-+Simulation/G4Utilities/GeoMaterial2G4
-##+Simulation/G4Utilities/G4UserActions
-##+Simulation/ISF/ISF_Core/FaserISF_Event
-+Simulation/ISF/ISF_Core/FaserISF_Interfaces
-+Simulation/ISF/ISF_HepMC/FaserISF_HepMC_Interfaces
-##+Simulation/ISF/ISF_HepMC/FaserISF_HepMC_Tools
--Simulation/.*
->>>>>>> 05a628fdc98 (GeometryTest runs successfully)
+Tracker/TrackerAlignTools/TrackerAlignGenTools
+Tracker/TrackerConditions/FaserSCT_ConditionsAlgorithms
+Tracker/TrackerConditions/FaserSCT_ConditionsData
@@ -145,7 +117,6 @@
+Tracker/TrackerG4/FaserSCT_G4_SD
+Tracker/TrackerRawEvent/TrackerRawData
+Tracker/TrackerRawEvent/TrackerSimData
-<<<<<<< HEAD
+Tracker/TrackerRecAlgs/FaserSpacePoints
+Tracker/TrackerRecAlgs/NoisyStripFinder
+Tracker/TrackerRecAlgs/OverlayRDO
@@ -164,9 +135,6 @@
+Tracker/TrackerRecTools/FaserSiClusterizationTool
+Tracker/TrackerRecTools/FaserSiSpacePointTool
+Tracker/TrackerRecTools/TruthSeededTrackFinderTool
-=======
-#+Tracker/TrackerRecTools/FaserSiClusterizationTool
->>>>>>> 05a628fdc98 (GeometryTest runs successfully)
+Tracker/TrackerSimEvent
-Tracker/.*
##+Tracking/Acts/FaserActsGeometry
--
GitLab