diff --git a/Control/CalypsoExample/Digitization/scripts/faserMDC_digi.py b/Control/CalypsoExample/Digitization/scripts/faserMDC_digi.py
index 8fb575c0caa6afa0b6e9ee0e08b0d8a22b199f61..fc426f2a7216f8d7afcdd14f9c0d1de39738d5ca 100755
--- a/Control/CalypsoExample/Digitization/scripts/faserMDC_digi.py
+++ b/Control/CalypsoExample/Digitization/scripts/faserMDC_digi.py
@@ -64,10 +64,17 @@ configFlags = initConfigFlags()
configFlags.Input.isMC = True # Needed to bypass autoconfig
configFlags.IOVDb.DatabaseInstance = "OFLP200" # Use MC conditions for now
+<<<<<<< HEAD
configFlags.Input.ProjectName = "mc20"
#configFlags.GeoModel.Align.Dynamic = False
configFlags.Beam.NumberOfCollisions = 0.
configFlags.Digitization.TruthOutput = True
+=======
+ConfigFlags.Input.ProjectName = "mc20"
+#ConfigFlags.GeoModel.Align.Dynamic = False
+ConfigFlags.Beam.NumberOfCollisions = 0.
+ConfigFlags.Digitization.TruthOutput = True
+>>>>>>> 05a628fdc98 (GeometryTest runs successfully)
# 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 b73fc7ee8c768973a9c33c714dce14884fb40bbd..b9c9804cf0fb32204fbae2620f904fd34d04c1d5 100755
--- a/Control/CalypsoExample/Digitization/scripts/faserMDC_digi_merge.py
+++ b/Control/CalypsoExample/Digitization/scripts/faserMDC_digi_merge.py
@@ -137,10 +137,17 @@ configFlags = initConfigFlags()
configFlags.Input.isMC = True # Needed to bypass autoconfig
configFlags.IOVDb.DatabaseInstance = "OFLP200" # Use MC conditions for now
+<<<<<<< HEAD
configFlags.Input.ProjectName = "mc20"
#configFlags.GeoModel.Align.Dynamic = False
configFlags.Beam.NumberOfCollisions = 0.
configFlags.Digitization.TruthOutput = True
+=======
+ConfigFlags.Input.ProjectName = "mc20"
+#ConfigFlags.GeoModel.Align.Dynamic = False
+ConfigFlags.Beam.NumberOfCollisions = 0.
+ConfigFlags.Digitization.TruthOutput = True
+>>>>>>> 05a628fdc98 (GeometryTest runs successfully)
# 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 cdd58d611d21159b5e8f378f58182855bb477194..346fe972f75edc9b18d3f68ccd668325559e625d 100755
--- a/Control/CalypsoExample/Digitization/scripts/faser_digi.py
+++ b/Control/CalypsoExample/Digitization/scripts/faser_digi.py
@@ -67,10 +67,17 @@ configFlags = initConfigFlags()
configFlags.Input.isMC = True # Needed to bypass autoconfig
configFlags.IOVDb.DatabaseInstance = "OFLP200" # Use MC conditions for now
+<<<<<<< HEAD
configFlags.Input.ProjectName = "mc20"
#configFlags.GeoModel.Align.Dynamic = False
configFlags.Beam.NumberOfCollisions = 0.
configFlags.Digitization.TruthOutput = True
+=======
+ConfigFlags.Input.ProjectName = "mc20"
+#ConfigFlags.GeoModel.Align.Dynamic = False
+ConfigFlags.Beam.NumberOfCollisions = 0.
+ConfigFlags.Digitization.TruthOutput = True
+>>>>>>> 05a628fdc98 (GeometryTest runs successfully)
# 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 4a496b7d8cfe6847046c56b75f3c76aba6946e84..1cd4a2739b7754e1692168493503f466d576ef5a 100755
--- a/Control/CalypsoExample/Digitization/scripts/faser_digi_merge.py
+++ b/Control/CalypsoExample/Digitization/scripts/faser_digi_merge.py
@@ -177,10 +177,17 @@ configFlags = initConfigFlags()
configFlags.Input.isMC = True # Needed to bypass autoconfig
configFlags.IOVDb.DatabaseInstance = "OFLP200" # Use MC conditions for now
+<<<<<<< HEAD
configFlags.Input.ProjectName = "mc20"
#configFlags.GeoModel.Align.Dynamic = False
configFlags.Beam.NumberOfCollisions = 0.
configFlags.Digitization.TruthOutput = True
+=======
+ConfigFlags.Input.ProjectName = "mc20"
+#ConfigFlags.GeoModel.Align.Dynamic = False
+ConfigFlags.Beam.NumberOfCollisions = 0.
+ConfigFlags.Digitization.TruthOutput = True
+>>>>>>> 05a628fdc98 (GeometryTest runs successfully)
# TI12 old geometry
if runtype == "TI12OldMC":
diff --git a/Control/CalypsoExample/Generation/scripts/faserMDC_foresee.py b/Control/CalypsoExample/Generation/scripts/faserMDC_foresee.py
index 28911a5b0053f5cae295d5481f2f3e1599c71a36..1172cbbe0b825323f2db9bbccc1c0fbae753e3f2 100755
--- a/Control/CalypsoExample/Generation/scripts/faserMDC_foresee.py
+++ b/Control/CalypsoExample/Generation/scripts/faserMDC_foresee.py
@@ -77,10 +77,17 @@ if __name__ == '__main__':
configFlags.addFlag("Sim.Beam.xshift", 0) # Potential beam shift
configFlags.addFlag("Sim.Beam.yshift", 12.)
+<<<<<<< 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
+=======
+ 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)
#
# Preset particle gun parameters
diff --git a/Control/CalypsoExample/Generation/scripts/faserMDC_particlegun.py b/Control/CalypsoExample/Generation/scripts/faserMDC_particlegun.py
index 3f22cd3dbd564ce31bc52bc37affb7ea2b23dc8b..27b8ec3d7fdb02c310cf4b4458a167b49f62a245 100755
--- a/Control/CalypsoExample/Generation/scripts/faserMDC_particlegun.py
+++ b/Control/CalypsoExample/Generation/scripts/faserMDC_particlegun.py
@@ -73,10 +73,17 @@ if __name__ == '__main__':
configFlags.addFlag("Sim.Beam.xshift", 0) # Potential beam shift
configFlags.addFlag("Sim.Beam.yshift", 0)
+<<<<<<< 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
+=======
+ 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)
#
# Preset particle gun parameters
diff --git a/Control/CalypsoExample/Generation/scripts/faser_particlegun.py b/Control/CalypsoExample/Generation/scripts/faser_particlegun.py
index 7cf0fdc33b5274129f309fff1d62a805aabce96b..84792f9f0873003fda5e5c89361f598b544bb7fe 100755
--- a/Control/CalypsoExample/Generation/scripts/faser_particlegun.py
+++ b/Control/CalypsoExample/Generation/scripts/faser_particlegun.py
@@ -103,8 +103,13 @@ if __name__ == '__main__':
print(f"Unknown geometry {args.geom}!")
sys.exit(1)
+<<<<<<< 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)
#
# Preset particle gun parameters
#
diff --git a/Control/CalypsoExample/GeoModelTest/python/Faser04TestConfig.py b/Control/CalypsoExample/GeoModelTest/python/Faser04TestConfig.py
index d4760e48e384802490de06fd679a3aac49dc0a9e..8fafafd90bf371165dfe624d2c48a28f3c78258f 100644
--- a/Control/CalypsoExample/GeoModelTest/python/Faser04TestConfig.py
+++ b/Control/CalypsoExample/GeoModelTest/python/Faser04TestConfig.py
@@ -4,7 +4,11 @@
import sys
from AthenaCommon.Constants import VERBOSE, INFO
from Campaigns.Utils import Campaign
+<<<<<<< HEAD
from AthenaConfiguration.ComponentFactory import CompFactory, isComponentAccumulatorCfg
+=======
+from AthenaConfiguration.ComponentFactory import CompFactory
+>>>>>>> 05a628fdc98 (GeometryTest runs successfully)
def GeoModelTestCfg(flags, name="GeoModelTestAlg", **kwargs):
@@ -38,6 +42,7 @@ if __name__ == "__main__":
# print("Configurable._useGlobalInstances", Configurable._useGlobalInstances)
# Flags for this job
+<<<<<<< HEAD
configFlags = initConfigFlags()
configFlags.Input.isMC = True # Needed to bypass autoconfig
configFlags.Input.MCCampaign = Campaign.Unknown
@@ -55,6 +60,24 @@ if __name__ == "__main__":
# configFlags.Detector.EnableDownstreamDipole = True
# configFlags.Detector.EnableEcal = True
configFlags.lock()
+=======
+ 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)
# 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 37b04ea5ad7fdab6194445b05de1d51662d64a7b..4e7e48051ef4c003ff373c470f3c0c3de4a79c1c 100755
--- a/Control/CalypsoExample/NeutrinoHits/scripts/faser_dumpnu.py
+++ b/Control/CalypsoExample/NeutrinoHits/scripts/faser_dumpnu.py
@@ -60,9 +60,15 @@ configFlags = initConfigFlags()
configFlags.Input.isMC = True # Needed to bypass autoconfig
configFlags.IOVDb.DatabaseInstance = "OFLP200" # Use MC conditions for now
+<<<<<<< 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)
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 b5bd3bb9d07d8890736c7a500eb50695dea6b027..8bc27b33e1743feba44ed93b467034551366ff43 100755
--- a/Control/CalypsoExample/Reconstruction/scripts/faserMDC_reco.py
+++ b/Control/CalypsoExample/Reconstruction/scripts/faserMDC_reco.py
@@ -70,8 +70,13 @@ configFlags = initConfigFlags()
configFlags.Input.isMC = args.isMC # Needed to bypass autoconfig
configFlags.IOVDb.DatabaseInstance = "OFLP200" # Use MC conditions for now
+<<<<<<< HEAD
configFlags.Input.ProjectName = "data20"
#configFlags.GeoModel.Align.Dynamic = False
+=======
+ConfigFlags.Input.ProjectName = "data20"
+#ConfigFlags.GeoModel.Align.Dynamic = False
+>>>>>>> 05a628fdc98 (GeometryTest runs successfully)
# For tracking
configFlags.TrackingGeometry.MaterialSource = "/cvmfs/faser.cern.ch/repo/sw/database/DBRelease/current/acts/material-maps.json"
diff --git a/Control/CalypsoExample/Reconstruction/scripts/faser_reco.py b/Control/CalypsoExample/Reconstruction/scripts/faser_reco.py
index 4945daafcb11fa251c30a45a8f9082736f8f2031..c420f6a83eff8dfb05d4687ba1b50725aff3b652 100755
--- a/Control/CalypsoExample/Reconstruction/scripts/faser_reco.py
+++ b/Control/CalypsoExample/Reconstruction/scripts/faser_reco.py
@@ -110,8 +110,13 @@ if args.isMC:
else:
configFlags.IOVDb.DatabaseInstance = "CONDBR3" # Use data conditions
+<<<<<<< HEAD
configFlags.Input.ProjectName = "data20"
#configFlags.GeoModel.Align.Dynamic = False
+=======
+ConfigFlags.Input.ProjectName = "data20"
+#ConfigFlags.GeoModel.Align.Dynamic = False
+>>>>>>> 05a628fdc98 (GeometryTest runs successfully)
configFlags.Exec.SkipEvents = args.skip
diff --git a/Control/CalypsoExample/Simulation/scripts/faserMDC_simulate.py b/Control/CalypsoExample/Simulation/scripts/faserMDC_simulate.py
index 9fb68f723e59b0a027b7fca0368662f77c92fcb0..c92877364d818c5d23ecc89bcd6a2265c9133c2b 100755
--- a/Control/CalypsoExample/Simulation/scripts/faserMDC_simulate.py
+++ b/Control/CalypsoExample/Simulation/scripts/faserMDC_simulate.py
@@ -147,10 +147,17 @@ if __name__ == '__main__':
configFlags.addFlag("Sim.Beam.xshift", args.xshift) # Potential beam shift
configFlags.addFlag("Sim.Beam.yshift", args.yshift)
+<<<<<<< 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
+=======
+ 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)
# import sys
# configFlags.fillFromArgs(sys.argv[1:])
diff --git a/Control/CalypsoExample/Simulation/scripts/faser_simulate.py b/Control/CalypsoExample/Simulation/scripts/faser_simulate.py
index ef8b6cc81e9912b0d03cdcb2d0a085a3b70ba8ea..68897ed225c2c96b0cd7284ca24bd4b4fd126d46 100755
--- a/Control/CalypsoExample/Simulation/scripts/faser_simulate.py
+++ b/Control/CalypsoExample/Simulation/scripts/faser_simulate.py
@@ -195,8 +195,13 @@ if __name__ == '__main__':
configFlags.addFlag("Sim.Beam.xshift", args.xshift) # Potential beam shift
configFlags.addFlag("Sim.Beam.yshift", args.yshift)
+<<<<<<< HEAD
configFlags.addFlag("Input.InitialTimeStamp", 0) # To avoid autoconfig
#configFlags.GeoModel.Align.Dynamic = False
+=======
+ ConfigFlags.addFlag("Input.InitialTimeStamp", 0) # To avoid autoconfig
+ #ConfigFlags.GeoModel.Align.Dynamic = False
+>>>>>>> 05a628fdc98 (GeometryTest runs successfully)
# import sys
# configFlags.fillFromArgs(sys.argv[1:])
diff --git a/Control/CalypsoExample/TrackerDataAccessExample/python/TrackerDataAccessExampleConfig.py b/Control/CalypsoExample/TrackerDataAccessExample/python/TrackerDataAccessExampleConfig.py
index 77f28abde96ff89b8726c439b39942f556a02a16..ace2868455677e37bba775635d8393e472e09905 100755
--- a/Control/CalypsoExample/TrackerDataAccessExample/python/TrackerDataAccessExampleConfig.py
+++ b/Control/CalypsoExample/TrackerDataAccessExample/python/TrackerDataAccessExampleConfig.py
@@ -35,6 +35,7 @@ if __name__ == "__main__":
Configurable.configurableRun3Behavior = True
# Flags for this job
+<<<<<<< HEAD
configFlags = initConfigFlags()
configFlags.Input.isMC = False # Needed to bypass autoconfig
configFlags.IOVDb.GlobalTag = "OFLCOND-FASER-01" # Always needed; must match FaserVersion
@@ -45,6 +46,17 @@ 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()
+=======
+ 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)
# Configure components
from CalypsoConfiguration.MainServicesConfig import MainServicesCfg
diff --git a/Control/CalypsoExample/TriggerDataAccessExample/python/TriggerDataAccessExampleConfig.py b/Control/CalypsoExample/TriggerDataAccessExample/python/TriggerDataAccessExampleConfig.py
index a4c2d3fad3b787adc96ca884a5b4495963c91aaa..50051733299bba2caac1696fdd8808358928c370 100755
--- a/Control/CalypsoExample/TriggerDataAccessExample/python/TriggerDataAccessExampleConfig.py
+++ b/Control/CalypsoExample/TriggerDataAccessExample/python/TriggerDataAccessExampleConfig.py
@@ -34,6 +34,7 @@ if __name__ == "__main__":
Configurable.configurableRun3Behavior = True
# Flags for this job
+<<<<<<< HEAD
configFlags = initConfigFlags()
configFlags.Input.isMC = False # Needed to bypass autoconfig
configFlags.IOVDb.GlobalTag = "OFLCOND-FASER-01" # Always needed; must match FaserVersion
@@ -44,6 +45,17 @@ 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()
+=======
+ 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)
# Configure components
from CalypsoConfiguration.MainServicesConfig import MainServicesCfg
diff --git a/Control/CalypsoExample/WaveformDataAccessExample/python/WaveformDataAccessExampleConfig.py b/Control/CalypsoExample/WaveformDataAccessExample/python/WaveformDataAccessExampleConfig.py
index cdabb3d753f0ef266448db441a99f29dc0a55062..36c3acddbec10618784949660bcd0a48495fa2a8 100755
--- a/Control/CalypsoExample/WaveformDataAccessExample/python/WaveformDataAccessExampleConfig.py
+++ b/Control/CalypsoExample/WaveformDataAccessExample/python/WaveformDataAccessExampleConfig.py
@@ -35,6 +35,7 @@ if __name__ == "__main__":
Configurable.configurableRun3Behavior = True
# Flags for this job
+<<<<<<< HEAD
configFlags = initConfigFlags()
configFlags.Input.isMC = False # Needed to bypass autoconfig
# configFlags.Input.Format = Format.BS
@@ -46,6 +47,17 @@ 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()
+=======
+ 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)
# Configure components
from CalypsoConfiguration.MainServicesConfig import MainServicesCfg
diff --git a/Derivation/DerivationAlgs/share/runDerive.py b/Derivation/DerivationAlgs/share/runDerive.py
index b09e92e94fba1bc208045e323a0acaa53aa60cfe..947c6cb4af611cfa586803abc527a71abee62982 100644
--- a/Derivation/DerivationAlgs/share/runDerive.py
+++ b/Derivation/DerivationAlgs/share/runDerive.py
@@ -49,6 +49,7 @@ if __name__ == "__main__":
#"/bundle/data/FASER/Ti12data/filter/r0008/007983/Faser-Physics-007983-TrigMask08-r0008-xAOD.root"
]
+<<<<<<< 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
@@ -57,6 +58,16 @@ if __name__ == "__main__":
configFlags.Common.isOnline = False
#configFlags.GeoModel.Align.Dynamic = False
configFlags.Beam.NumberOfCollisions = 0.
+=======
+ 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)
configFlags.Detector.GeometryFaserSCT = True
diff --git a/Derivation/DerivationAlgs/share/run_streaming.py b/Derivation/DerivationAlgs/share/run_streaming.py
index 2719dc3485115a5ba11b7a21e28dc50fcfb47775..1ad275b9de5a4031a2e8edc8bf18b14d39076609 100644
--- a/Derivation/DerivationAlgs/share/run_streaming.py
+++ b/Derivation/DerivationAlgs/share/run_streaming.py
@@ -24,6 +24,7 @@ if __name__ == "__main__":
"/eos/experiment/faser/rec/2022/p0008/007984/Faser-Physics-007984-00000-p0008-xAOD.root"
]
+<<<<<<< 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
@@ -32,6 +33,16 @@ if __name__ == "__main__":
configFlags.Common.isOnline = False
#configFlags.GeoModel.Align.Dynamic = False
configFlags.Beam.NumberOfCollisions = 0.
+=======
+ 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)
configFlags.Detector.GeometryFaserSCT = True
diff --git a/DetectorDescription/GeoModel/FaserGeoModel/python/ScintGMConfig.py b/DetectorDescription/GeoModel/FaserGeoModel/python/ScintGMConfig.py
index 45a8f7011d12cb2cebfaeb04eb374a0032704acc..50ba61396584fb3656f207df9cb474c0c756186b 100644
--- a/DetectorDescription/GeoModel/FaserGeoModel/python/ScintGMConfig.py
+++ b/DetectorDescription/GeoModel/FaserGeoModel/python/ScintGMConfig.py
@@ -40,12 +40,21 @@ if __name__ == "__main__":
# from AthenaConfiguration.TestDefaults import defaultTestFiles
# Provide MC input
+<<<<<<< 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
+=======
+ # 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)
# Provide data input
##from AthenaConfiguration.TestDefaults import defaultTestFiles
#
diff --git a/DetectorDescription/GeoModel/FaserGeoModel/test/FaserGeometryConfig_EVNT_test.py b/DetectorDescription/GeoModel/FaserGeoModel/test/FaserGeometryConfig_EVNT_test.py
index 9da38d9078a9b80604fdf9cfa5130f611ac5b48f..f4ad339148a0ff8f1ec6ac560a5021789c2b6ec4 100644
--- a/DetectorDescription/GeoModel/FaserGeoModel/test/FaserGeometryConfig_EVNT_test.py
+++ b/DetectorDescription/GeoModel/FaserGeoModel/test/FaserGeometryConfig_EVNT_test.py
@@ -20,6 +20,7 @@ if __name__ == "__main__":
from AthenaConfiguration.TestDefaults import defaultTestFiles
# Provide MC input
+<<<<<<< HEAD
configFlags = initConfigFlags()
configFlags.Common.ProductionStep = ProductionStep.Simulation
configFlags.Input.Files = defaultTestFiles.EVNT
@@ -27,6 +28,14 @@ if __name__ == "__main__":
configFlags.IOVDb.GlobalTag = "OFLCOND-FASER-01" # Always needed; must match FaserVersion
#configFlags.GeoModel.Align.Dynamic = False
configFlags.lock()
+=======
+ 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)
# Construct ComponentAccumulator
acc = MainServicesCfg(configFlags)
diff --git a/Neutrino/NeutrinoDetDescr/EmulsionGeoModel/test/EmulsionGMConfig_test.py b/Neutrino/NeutrinoDetDescr/EmulsionGeoModel/test/EmulsionGMConfig_test.py
index a9573925c8191748ae6f7ca960ff16f6223a17bb..65f3622297b08934a3ff6838ff095bce933345de 100644
--- a/Neutrino/NeutrinoDetDescr/EmulsionGeoModel/test/EmulsionGMConfig_test.py
+++ b/Neutrino/NeutrinoDetDescr/EmulsionGeoModel/test/EmulsionGMConfig_test.py
@@ -9,11 +9,18 @@ if __name__ == "__main__":
from CalypsoConfiguration.AllConfigFlags import initConfigFlags
from AthenaConfiguration.TestDefaults import defaultTestFiles
+<<<<<<< HEAD
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()
+=======
+ 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)
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 8115f324f22b328b3bdae054ca85702d4850a7d7..46f42fb4047c310e617982ada730bac7460fe61c 100644
--- a/PhysicsAnalysis/NeutrinoSearch/python/FilterSearchConfig.py
+++ b/PhysicsAnalysis/NeutrinoSearch/python/FilterSearchConfig.py
@@ -483,6 +483,7 @@ if __name__ == "__main__":
]
+<<<<<<< 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
@@ -491,6 +492,16 @@ if __name__ == "__main__":
configFlags.Common.isOnline = False
#configFlags.GeoModel.Align.Dynamic = False
configFlags.Beam.NumberOfCollisions = 0.
+=======
+ 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)
configFlags.Detector.GeometryFaserSCT = True
diff --git a/PhysicsAnalysis/NeutrinoSearch/python/FlukaSearchConfig.py b/PhysicsAnalysis/NeutrinoSearch/python/FlukaSearchConfig.py
index 9c36f692e32d4d2e83b1e1772906019bc80fa5c5..83311543b7c55d54ecbb7c09aa8aef23a2a627f8 100644
--- a/PhysicsAnalysis/NeutrinoSearch/python/FlukaSearchConfig.py
+++ b/PhysicsAnalysis/NeutrinoSearch/python/FlukaSearchConfig.py
@@ -94,6 +94,7 @@ 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
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
@@ -102,6 +103,16 @@ if __name__ == "__main__":
configFlags.Common.isOnline = False
#configFlags.GeoModel.Align.Dynamic = False
configFlags.Beam.NumberOfCollisions = 0.
+=======
+ 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)
configFlags.Detector.GeometryFaserSCT = True
diff --git a/PhysicsAnalysis/NeutrinoSearch/python/GenieSearchConfig.py b/PhysicsAnalysis/NeutrinoSearch/python/GenieSearchConfig.py
index 072ac03ee89f2d9537fc6d13394fa68139131ab3..b83c48b755a9e563b5a0fddd53dc0d33167d6e53 100644
--- a/PhysicsAnalysis/NeutrinoSearch/python/GenieSearchConfig.py
+++ b/PhysicsAnalysis/NeutrinoSearch/python/GenieSearchConfig.py
@@ -70,6 +70,7 @@ 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
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
@@ -78,6 +79,16 @@ if __name__ == "__main__":
configFlags.Common.isOnline = False
#configFlags.GeoModel.Align.Dynamic = False
configFlags.Beam.NumberOfCollisions = 0.
+=======
+ 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)
configFlags.Detector.GeometryFaserSCT = True
diff --git a/PhysicsAnalysis/NtupleDumper/scripts/analyzeRun.py b/PhysicsAnalysis/NtupleDumper/scripts/analyzeRun.py
index c8ec3766d4907d5c9fddc614e15e1544badc9e7d..81760a610177944555236001f5b08ddaf6bc379c 100755
--- a/PhysicsAnalysis/NtupleDumper/scripts/analyzeRun.py
+++ b/PhysicsAnalysis/NtupleDumper/scripts/analyzeRun.py
@@ -63,6 +63,7 @@ if __name__ == "__main__":
outName=f"Faser-Physics-{runno:06d}-{start:05d}-{(end-1):05d}-{ptag}-PHYS.root"
# Configure
+<<<<<<< HEAD
configFlags = initConfigFlags()
configFlags.Input.Files = fileList
configFlags.IOVDb.GlobalTag = "OFLCOND-FASER-03" # Always needed; must match FaserVersionS
@@ -73,6 +74,17 @@ if __name__ == "__main__":
configFlags.Common.isOnline = False
#configFlags.GeoModel.Align.Dynamic = False
configFlags.Beam.NumberOfCollisions = 0.
+=======
+ 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)
configFlags.Detector.GeometryFaserSCT = True
diff --git a/PhysicsAnalysis/NtupleDumper/scripts/analyzeRunMC.py b/PhysicsAnalysis/NtupleDumper/scripts/analyzeRunMC.py
index bfadba95907dc8307e99418dd8dea4f0e2098a82..2dd1e76c584d9fc488f93e991e0c3f0ec291687b 100644
--- a/PhysicsAnalysis/NtupleDumper/scripts/analyzeRunMC.py
+++ b/PhysicsAnalysis/NtupleDumper/scripts/analyzeRunMC.py
@@ -76,6 +76,7 @@ if __name__ == "__main__":
outName=f"MC-tuple-{runno:06d}-{num:05d}-{filesPerJob}.root"
# Configure
+<<<<<<< HEAD
configFlags = initConfigFlags()
configFlags.Input.Files = fileList
configFlags.IOVDb.GlobalTag = "OFLCOND-FASER-03" # Always needed; must match FaserVersionS
@@ -86,6 +87,17 @@ if __name__ == "__main__":
configFlags.Common.isOnline = False
#configFlags.GeoModel.Align.Dynamic = False
configFlags.Beam.NumberOfCollisions = 0.
+=======
+ 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)
configFlags.Detector.GeometryFaserSCT = True
diff --git a/PhysicsAnalysis/NtupleDumper/scripts/faser_ntuple_maker.py b/PhysicsAnalysis/NtupleDumper/scripts/faser_ntuple_maker.py
index f7f02b158f9d753111e7f49e2c968d6f6c1dc9e6..4430c68cf0a88ea1204c4959292642166ca43fe7 100755
--- a/PhysicsAnalysis/NtupleDumper/scripts/faser_ntuple_maker.py
+++ b/PhysicsAnalysis/NtupleDumper/scripts/faser_ntuple_maker.py
@@ -293,11 +293,19 @@ else:
configFlags.Input.ProjectName = "data21" # Needed to bypass autoconfig
+<<<<<<< HEAD
configFlags.Common.isOnline = False
configFlags.GeoModel.Align.Dynamic = False
configFlags.Beam.NumberOfCollisions = 0.
configFlags.Detector.GeometryFaserSCT = True
configFlags.lock()
+=======
+ConfigFlags.Common.isOnline = False
+#ConfigFlags.GeoModel.Align.Dynamic = False
+ConfigFlags.Beam.NumberOfCollisions = 0.
+ConfigFlags.Detector.GeometryFaserSCT = True
+ConfigFlags.lock()
+>>>>>>> 05a628fdc98 (GeometryTest runs successfully)
# Core components
acc = MainServicesCfg(configFlags)
diff --git a/Scintillator/ScintDetDescr/PreshowerGeoModel/test/PreshowerGMConfig_test.py b/Scintillator/ScintDetDescr/PreshowerGeoModel/test/PreshowerGMConfig_test.py
index 3727679b62ba323f0c59009eb211c1741f12c13c..cad845b56b5f4bccc9760256f2b9cbe084682c0e 100644
--- a/Scintillator/ScintDetDescr/PreshowerGeoModel/test/PreshowerGMConfig_test.py
+++ b/Scintillator/ScintDetDescr/PreshowerGeoModel/test/PreshowerGMConfig_test.py
@@ -9,11 +9,18 @@ if __name__ == "__main__":
from CalypsoConfiguration.AllConfigFlags import initConfigFlags
from AthenaConfiguration.TestDefaults import defaultTestFiles
+<<<<<<< HEAD
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()
+=======
+ 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)
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 46633f98fe63af28ad88a923015a534390484ca3..205551f6d8fc9349dce6c65279cd4f747206b595 100644
--- a/Scintillator/ScintDetDescr/TriggerGeoModel/test/TriggerGMConfig_test.py
+++ b/Scintillator/ScintDetDescr/TriggerGeoModel/test/TriggerGMConfig_test.py
@@ -9,11 +9,18 @@ if __name__ == "__main__":
from CalypsoConfiguration.AllConfigFlags import initConfigFlags
from AthenaConfiguration.TestDefaults import defaultTestFiles
+<<<<<<< HEAD
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()
+=======
+ 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)
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 a1f7a79e117412b71e073556c7f93a7c7cdec2d4..461be91b2897bdb9c3c7bb09c1b1045279c8e8ad 100644
--- a/Scintillator/ScintDetDescr/VetoGeoModel/test/VetoGMConfig_test.py
+++ b/Scintillator/ScintDetDescr/VetoGeoModel/test/VetoGMConfig_test.py
@@ -9,11 +9,18 @@ if __name__ == "__main__":
from CalypsoConfiguration.AllConfigFlags import initConfigFlags
from AthenaConfiguration.TestDefaults import defaultTestFiles
+<<<<<<< HEAD
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()
+=======
+ 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)
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 99d97bb1c649fbf46882d5a265cb2c05aa53315d..076d562ede9c3a476da3e843b8aef7d5dfe64529 100644
--- a/Scintillator/ScintDetDescr/VetoNuGeoModel/test/VetoNuGMConfig_test.py
+++ b/Scintillator/ScintDetDescr/VetoNuGeoModel/test/VetoNuGMConfig_test.py
@@ -9,11 +9,18 @@ if __name__ == "__main__":
from CalypsoConfiguration.AllConfigFlags import initConfigFlags
from AthenaConfiguration.TestDefaults import defaultTestFiles
+<<<<<<< HEAD
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()
+=======
+ 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)
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 201775807ff70e9ecbd4d30da8c84bb18ab294d1..6794e6eb196501fc2a85538f02bcfe0b074ab084 100755
--- a/Simulation/G4Faser/G4FaserAlg/test/G4FaserAlgConfigNew_Test.py
+++ b/Simulation/G4Faser/G4FaserAlg/test/G4FaserAlgConfigNew_Test.py
@@ -51,10 +51,17 @@ if __name__ == '__main__':
configFlags.addFlag("Sim.Beam.xshift", 0) # Potential beam shift
configFlags.addFlag("Sim.Beam.yshift", 0)
+<<<<<<< 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
+=======
+ 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)
#
# Override flags above from command line
#
diff --git a/Simulation/G4Faser/G4FaserAlg/test/runGeantinoScan.py b/Simulation/G4Faser/G4FaserAlg/test/runGeantinoScan.py
index 262cadc9dac13b3bbb244ffb2ff2e106ee5018f4..06fc67be10083f8b763ae3c5976466d9ad383cf7 100644
--- a/Simulation/G4Faser/G4FaserAlg/test/runGeantinoScan.py
+++ b/Simulation/G4Faser/G4FaserAlg/test/runGeantinoScan.py
@@ -45,9 +45,15 @@ if __name__ == "__main__":
#
# Output settings
#
+<<<<<<< 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)
#
# Geometry-related settings
# Do not change!
diff --git a/Simulation/G4Faser/G4FaserAlg/test/runGen.py b/Simulation/G4Faser/G4FaserAlg/test/runGen.py
index 685e64d5c73f2e625a7c607ef46a7c72a0fd42e6..6dccde39f78b9354165d13c7ec790076118ae5b4 100755
--- a/Simulation/G4Faser/G4FaserAlg/test/runGen.py
+++ b/Simulation/G4Faser/G4FaserAlg/test/runGen.py
@@ -60,9 +60,15 @@ if __name__ == "__main__":
#
# detectors = ['Veto', 'Trigger', 'Preshower', 'FaserSCT', 'Dipole', 'Ecal']
# from CalypsoConfiguration.DetectorConfigFlags import setupDetectorsFromList
+<<<<<<< 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)
#
# 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 6e7c6feed6018da9c5c40298b35aaf7ee1fc7203..a512a370cd9fef26ff919ec0a734ddbf6df361ec 100644
--- a/Simulation/G4Utilities/G4FaserUserActions/src/CalypsoTrackingAction.cxx
+++ b/Simulation/G4Utilities/G4FaserUserActions/src/CalypsoTrackingAction.cxx
@@ -24,7 +24,11 @@ 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 6efe0fb52ede7dc5f3960929f5c61adf954dc170..3218f3e38c4a5aca09b05898ec0b1a9b3bc29b24 100644
--- a/Simulation/G4Utilities/G4FaserUserActions/src/CalypsoTrackingAction.h
+++ b/Simulation/G4Utilities/G4FaserUserActions/src/CalypsoTrackingAction.h
@@ -15,7 +15,11 @@ 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 7904b02d982960ac5ee77abea51ed4955d7080bf..3f033e133b6d48493b8214563a110d152ada2427 100755
--- a/Tracker/TrackerDetDescr/DipoleGeoModel/test/DipoleGMConfig_test.py
+++ b/Tracker/TrackerDetDescr/DipoleGeoModel/test/DipoleGMConfig_test.py
@@ -9,11 +9,18 @@ if __name__ == "__main__":
from CalypsoConfiguration.AllConfigFlags import initConfigFlags
from AthenaConfiguration.TestDefaults import defaultTestFiles
+<<<<<<< HEAD
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()
+=======
+ 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)
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 4657bf3b7a31d428dd89ff651a79e31e031a7606..cdff72d7c570473e79a807fa0e1cc30b09196664 100755
--- a/Tracker/TrackerDetDescr/FaserSCT_GeoModel/test/FaserSCT_GMConfig_test.py
+++ b/Tracker/TrackerDetDescr/FaserSCT_GeoModel/test/FaserSCT_GMConfig_test.py
@@ -9,11 +9,18 @@ if __name__ == "__main__":
from CalypsoConfiguration.AllConfigFlags import initConfigFlags
from AthenaConfiguration.TestDefaults import defaultTestFiles
+<<<<<<< HEAD
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()
+=======
+ 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)
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 400d5a249af3abd4eceeeaa1daa97c8751196531..f59177790f866b80e853a58573f3a48271a39cbe 100644
--- a/Tracker/TrackerDigitization/FaserSCT_Digitization/test/FaserSCT_DigitizationDbg.py
+++ b/Tracker/TrackerDigitization/FaserSCT_Digitization/test/FaserSCT_DigitizationDbg.py
@@ -22,6 +22,7 @@ log.setLevel(DEBUG)
Configurable.configurableRun3Behavior = True
# Configure
+<<<<<<< HEAD
configFlags = initConfigFlags()
configFlags.Input.Files = ['my.HITS.pool.root']
configFlags.Output.RDOFileName = "my.RDO.pool.root"
@@ -29,6 +30,14 @@ 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.
+=======
+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)
configFlags.Digitization.TruthOutput = True
diff --git a/Tracker/TrackerRecAlgs/FaserSpacePoints/python/FaserSpacePointsCosmics.py b/Tracker/TrackerRecAlgs/FaserSpacePoints/python/FaserSpacePointsCosmics.py
index 924d1ce7235b9f50e4d25ec46faf357b2aaf70f2..a766efe62f5b76cefc580208da86a208ed3f342f 100644
--- a/Tracker/TrackerRecAlgs/FaserSpacePoints/python/FaserSpacePointsCosmics.py
+++ b/Tracker/TrackerRecAlgs/FaserSpacePoints/python/FaserSpacePointsCosmics.py
@@ -47,6 +47,7 @@ if __name__ == "__main__":
Configurable.configurableRun3Behavior = True
# Configure
+<<<<<<< HEAD
configFlags = initConfigFlags()
configFlags.Input.Files = ['my.RDO.pool.root']
configFlags.Output.ESDFileName = "mySeeds.ESD.pool.root"
@@ -58,6 +59,18 @@ if __name__ == "__main__":
configFlags.Common.isOnline = False
#configFlags.GeoModel.Align.Dynamic = False
configFlags.Beam.NumberOfCollisions = 0.
+=======
+ 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)
configFlags.lock()
diff --git a/Tracker/TrackerRecAlgs/FaserSpacePoints/test/FaserSpacePointsDbg.py b/Tracker/TrackerRecAlgs/FaserSpacePoints/test/FaserSpacePointsDbg.py
index 78f6a2fb759db6da5ffc94485f08353374cfad76..445add2a2db9211288458e5b0f22c9039ae89e6a 100644
--- a/Tracker/TrackerRecAlgs/FaserSpacePoints/test/FaserSpacePointsDbg.py
+++ b/Tracker/TrackerRecAlgs/FaserSpacePoints/test/FaserSpacePointsDbg.py
@@ -13,6 +13,7 @@ from FaserSpacePoints.FaserSpacePointsConfig import FaserSpacePointsCfg
log.setLevel(DEBUG)
Configurable.configurableRun3Behavior = True
+<<<<<<< HEAD
configFlags = initConfigFlags()
configFlags.Input.Files = ['my.RDO.pool.root']
configFlags.Output.ESDFileName = "spacePoints.ESD.pool.root"
@@ -20,6 +21,14 @@ configFlags.IOVDb.GlobalTag = "OFLCOND-FASER-01"
#configFlags.GeoModel.Align.Dynamic = False
configFlags.Beam.NumberOfCollisions = 0.
configFlags.lock()
+=======
+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)
# Core components
acc = MainServicesCfg(configFlags)
diff --git a/Tracker/TrackerRecAlgs/MyClusters/test/MyClustersDbg.py b/Tracker/TrackerRecAlgs/MyClusters/test/MyClustersDbg.py
index a715070105a84a855a852d52f299ed92870f707e..3f3b3b8632fdee612c0cf7637f226e0e53b1f2bf 100644
--- a/Tracker/TrackerRecAlgs/MyClusters/test/MyClustersDbg.py
+++ b/Tracker/TrackerRecAlgs/MyClusters/test/MyClustersDbg.py
@@ -15,6 +15,7 @@ log.setLevel(DEBUG)
Configurable.configurableRun3Behavior = True
# Configure
+<<<<<<< HEAD
configFlags = initConfigFlags()
configFlags.Input.Files = ['my.RDO.pool.root']
configFlags.Output.ESDFileName = "MyClusters.ESD.root"
@@ -23,6 +24,15 @@ configFlags.IOVDb.GlobalTag = "OFLCOND-FASER-01"
#configFlags.GeoModel.Align.Dynamic = False
configFlags.Beam.NumberOfCollisions = 0.
configFlags.lock()
+=======
+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)
acc = MainServicesCfg(configFlags)
acc.merge(PoolReadCfg(configFlags))
diff --git a/Tracker/TrackerRecAlgs/NoisyStripFinder/share/NoisyStripFinderJob.py b/Tracker/TrackerRecAlgs/NoisyStripFinder/share/NoisyStripFinderJob.py
index 6235c83623c8be6434af009a71aff25b624f91c1..5dec8838bc4deb37b885e0640a2d347a06cf0754 100755
--- a/Tracker/TrackerRecAlgs/NoisyStripFinder/share/NoisyStripFinderJob.py
+++ b/Tracker/TrackerRecAlgs/NoisyStripFinder/share/NoisyStripFinderJob.py
@@ -38,6 +38,7 @@ for filename in args.file:
else:
filelist.append(filename)
+<<<<<<< HEAD
configFlags = initConfigFlags()
configFlags.Input.Files = args.file
configFlags.IOVDb.GlobalTag = "OFLCOND-FASER-04"
@@ -51,6 +52,20 @@ configFlags.Common.isOnline = False
configFlags.Beam.NumberOfCollisions = 0.
configFlags.Detector.GeometryFaserSCT = True
configFlags.lock()
+=======
+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)
acc = MainServicesCfg(configFlags)
acc.merge(PoolWriteCfg(configFlags))
diff --git a/Tracker/TrackerRecAlgs/NoisyStripFinder/test/NoisyStripFinderDbg.py b/Tracker/TrackerRecAlgs/NoisyStripFinder/test/NoisyStripFinderDbg.py
index 8579477f236895a8a72a46f3539e5d6ec6e2cd24..42f8eace5e36ab2817da48b240918b24f8fe2143 100755
--- a/Tracker/TrackerRecAlgs/NoisyStripFinder/test/NoisyStripFinderDbg.py
+++ b/Tracker/TrackerRecAlgs/NoisyStripFinder/test/NoisyStripFinderDbg.py
@@ -23,6 +23,7 @@ args = parser.parse_args()
log.setLevel(DEBUG)
Configurable.configurableRun3Behavior = True
+<<<<<<< HEAD
configFlags = initConfigFlags()
configFlags.Input.Files = args.file
configFlags.IOVDb.GlobalTag = "OFLCOND-FASER-03"
@@ -35,6 +36,19 @@ configFlags.Common.isOnline = False
configFlags.Beam.NumberOfCollisions = 0.
configFlags.Detector.GeometryFaserSCT = True
configFlags.lock()
+=======
+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)
acc = MainServicesCfg(configFlags)
acc.merge(PoolWriteCfg(configFlags))
diff --git a/Tracker/TrackerRecAlgs/OverlayRDO/python/HistoRDOConfig.py b/Tracker/TrackerRecAlgs/OverlayRDO/python/HistoRDOConfig.py
index 3a3f26e81aba1c4efc8e3af4f9d105840bac6dd6..db54cf93e40fe56e1840b653cbd7f84e47660c40 100644
--- a/Tracker/TrackerRecAlgs/OverlayRDO/python/HistoRDOConfig.py
+++ b/Tracker/TrackerRecAlgs/OverlayRDO/python/HistoRDOConfig.py
@@ -70,6 +70,7 @@ if __name__ == "__main__":
'/home/dcasper/Work/faser/darkphoton/overlay/myNeg_Bin7RDO.pool.root',
'/home/dcasper/Work/faser/darkphoton/overlay/myNeg_Bin8RDO.pool.root',
]
+<<<<<<< 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' ]
@@ -82,6 +83,20 @@ if __name__ == "__main__":
configFlags.Common.isOnline = False
#configFlags.GeoModel.Align.Dynamic = False
configFlags.Beam.NumberOfCollisions = 0.
+=======
+ # 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)
configFlags.Detector.GeometryFaserSCT = True
diff --git a/Tracker/TrackerRecAlgs/OverlayRDO/python/OverlayRDOConfig.py b/Tracker/TrackerRecAlgs/OverlayRDO/python/OverlayRDOConfig.py
index 74f739c78fcafb684214d5ea54242e0f140002f6..d75cd11def0ec40e0ea77f88815f2c781db3ab3f 100644
--- a/Tracker/TrackerRecAlgs/OverlayRDO/python/OverlayRDOConfig.py
+++ b/Tracker/TrackerRecAlgs/OverlayRDO/python/OverlayRDOConfig.py
@@ -46,6 +46,7 @@ if __name__ == "__main__":
Configurable.configurableRun3Behavior = True
# Configure
+<<<<<<< HEAD
configFlags = initConfigFlags()
configFlags.Overlay.DataOverlay = False
configFlags.Input.Files = [ 'Pos_RDO.pool.root']
@@ -61,6 +62,22 @@ if __name__ == "__main__":
configFlags.Common.isOnline = False
#configFlags.GeoModel.Align.Dynamic = False
configFlags.Beam.NumberOfCollisions = 0.
+=======
+ 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)
configFlags.Detector.GeometryFaserSCT = True
diff --git a/Tracker/TrackerRecAlgs/OverlayRDO/python/SelectRDOConfig.py b/Tracker/TrackerRecAlgs/OverlayRDO/python/SelectRDOConfig.py
index 50c2a654b77db435fb1031dacca250cc836ee2cc..6f9f40daa585de9ad72fb477cde13b94f1731ab4 100644
--- a/Tracker/TrackerRecAlgs/OverlayRDO/python/SelectRDOConfig.py
+++ b/Tracker/TrackerRecAlgs/OverlayRDO/python/SelectRDOConfig.py
@@ -98,6 +98,7 @@ if __name__ == "__main__":
]
# configFlags.Input.Files = [ 'Faser-Physics-009171-00006-r0013-xAOD.root',
# 'Faser-Physics-009166-00485-r0013-xAOD.root']
+<<<<<<< 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
@@ -107,6 +108,17 @@ if __name__ == "__main__":
configFlags.Common.isOnline = False
#configFlags.GeoModel.Align.Dynamic = False
configFlags.Beam.NumberOfCollisions = 0.
+=======
+ # 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)
configFlags.Detector.GeometryFaserSCT = True
diff --git a/Tracker/TrackerRecAlgs/PairVertex/python/PairVertexAlgConfig.py b/Tracker/TrackerRecAlgs/PairVertex/python/PairVertexAlgConfig.py
index 8ae4f309a1283d50a6ad3a889bcb15213d1f7902..4e557664eb0a80d4bab41c636eea165a80bb9932 100644
--- a/Tracker/TrackerRecAlgs/PairVertex/python/PairVertexAlgConfig.py
+++ b/Tracker/TrackerRecAlgs/PairVertex/python/PairVertexAlgConfig.py
@@ -58,6 +58,7 @@ if __name__ == "__main__":
Configurable.configurableRun3Behavior = True
# Configure
+<<<<<<< HEAD
configFlags = initConfigFlags()
configFlags.Input.Files = files # [ui.inputfile]
configFlags.IOVDb.GlobalTag = "OFLCOND-FASER-02" # Always needed; must match FaserVersionS
@@ -68,6 +69,17 @@ if __name__ == "__main__":
configFlags.Common.isOnline = False
#configFlags.GeoModel.Align.Dynamic = False
configFlags.Beam.NumberOfCollisions = 0.
+=======
+ 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)
configFlags.Detector.GeometryFaserSCT = True
diff --git a/Tracker/TrackerRecAlgs/TrackCounts/test/TrackCountsDbg.py b/Tracker/TrackerRecAlgs/TrackCounts/test/TrackCountsDbg.py
index a3214b1e7ecfc16ed657a48b97d5bad4aecb4cb3..c90104949be3154160fff26c2d2123a38b8f36a1 100644
--- a/Tracker/TrackerRecAlgs/TrackCounts/test/TrackCountsDbg.py
+++ b/Tracker/TrackerRecAlgs/TrackCounts/test/TrackCountsDbg.py
@@ -25,6 +25,7 @@ configFlags.Input.Files = [
'/eos/project/f/faser-commissioning/TI12Data/Run-001805/Faser-Physics-001805-00000.raw',
]
+<<<<<<< HEAD
configFlags.Output.ESDFileName = "run001805_00.ESD.pool.root"
configFlags.IOVDb.GlobalTag = "OFLCOND-FASER-01"
configFlags.IOVDb.DatabaseInstance = "OFLP200"
@@ -34,6 +35,17 @@ configFlags.Common.isOnline = False
configFlags.GeoModel.FaserVersion = "FASER-01"
#configFlags.GeoModel.Align.Dynamic = False
configFlags.Beam.NumberOfCollisions = 0.
+=======
+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)
configFlags.Detector.GeometryFaserSCT = True
diff --git a/Tracker/TrackerRecAlgs/TrackSeedPerformanceWriter/test/TrackSeedPerformanceWriterDbg.py b/Tracker/TrackerRecAlgs/TrackSeedPerformanceWriter/test/TrackSeedPerformanceWriterDbg.py
index dbff23478901c971a968af29debedb87a68cd8bf..7052f42574b6d9c3a7880811ccd0a8d0cca5ba99 100644
--- a/Tracker/TrackerRecAlgs/TrackSeedPerformanceWriter/test/TrackSeedPerformanceWriterDbg.py
+++ b/Tracker/TrackerRecAlgs/TrackSeedPerformanceWriter/test/TrackSeedPerformanceWriterDbg.py
@@ -19,6 +19,7 @@ from TrackSeedPerformanceWriter.TrackSeedPerformanceWriterConfig import TrackSee
log.setLevel(DEBUG)
Configurable.configurableRun3Behavior = True
+<<<<<<< HEAD
configFlags = initConfigFlags()
configFlags.Input.Files = ['my.RDO.pool.root']
configFlags.Output.ESDFileName = "seeds.ESD.pool.root"
@@ -31,6 +32,19 @@ configFlags.Common.isOnline = False
#configFlags.GeoModel.Align.Dynamic = False
configFlags.Beam.NumberOfCollisions = 0.
configFlags.lock()
+=======
+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)
acc = MainServicesCfg(configFlags)
acc.merge(PoolReadCfg(configFlags))
diff --git a/Tracker/TrackerRecAlgs/TrackerClusterFit/test/TestBeamClusterFitDbg.py b/Tracker/TrackerRecAlgs/TrackerClusterFit/test/TestBeamClusterFitDbg.py
index 9a5d5d0e8884b4ab9a006d2be82a91cd2593ee80..56f549dacba590e0fd59d0f71d4fb8813d5660fa 100755
--- a/Tracker/TrackerRecAlgs/TrackerClusterFit/test/TestBeamClusterFitDbg.py
+++ b/Tracker/TrackerRecAlgs/TrackerClusterFit/test/TestBeamClusterFitDbg.py
@@ -93,6 +93,7 @@ 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
#configFlags.Output.ESDFileName = "run608.ESD.pool.root"
#configFlags.Output.ESDFileName = "run001332.ESD.pool.root"
configFlags.Output.ESDFileName = "tb.ESD.pool.root"
@@ -104,6 +105,19 @@ configFlags.GeoModel.FaserVersion = "FASER-TB00" # FASER geometry
configFlags.Common.isOnline = False
#configFlags.GeoModel.Align.Dynamic = False
configFlags.Beam.NumberOfCollisions = 0.
+=======
+#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)
configFlags.Detector.GeometryFaserSCT = True
diff --git a/Tracker/TrackerRecAlgs/TrackerClusterFit/test/TrackerClusterFitDbg.py b/Tracker/TrackerRecAlgs/TrackerClusterFit/test/TrackerClusterFitDbg.py
index 7be169f1c3fd740442da062bbfdb7c1734c55678..f868632eedc847ddb15f69b6d4ec70468798f207 100644
--- a/Tracker/TrackerRecAlgs/TrackerClusterFit/test/TrackerClusterFitDbg.py
+++ b/Tracker/TrackerRecAlgs/TrackerClusterFit/test/TrackerClusterFitDbg.py
@@ -92,6 +92,7 @@ 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
#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
@@ -102,6 +103,18 @@ configFlags.GeoModel.FaserVersion = "FASER-01" # FASER geometry
configFlags.Common.isOnline = False
#configFlags.GeoModel.Align.Dynamic = False
configFlags.Beam.NumberOfCollisions = 0.
+=======
+#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)
configFlags.Detector.GeometryFaserSCT = True
diff --git a/Tracker/TrackerRecAlgs/TrackerData/test/TI12TrackerSegmentFitDataDbg.py b/Tracker/TrackerRecAlgs/TrackerData/test/TI12TrackerSegmentFitDataDbg.py
index 72eb45a6dd2b9f2a7c693472e4767c0c2f8e26ac..7ecb2f6a0884ddf01266299b0546ddee5c9f30ec 100644
--- a/Tracker/TrackerRecAlgs/TrackerData/test/TI12TrackerSegmentFitDataDbg.py
+++ b/Tracker/TrackerRecAlgs/TrackerData/test/TI12TrackerSegmentFitDataDbg.py
@@ -19,6 +19,7 @@ from TrackerData.TrackerSegmentFitDataConfig import TrackerSegmentFitDataCfg
log.setLevel(DEBUG)
Configurable.configurableRun3Behavior = True
+<<<<<<< HEAD
configFlags = initConfigFlags()
configFlags.Input.Files = ['/home/tboeckh/tmp/Faser-Physics-006470-00093.raw_middleStation.SPs']
configFlags.Output.ESDFileName = "TrackerSegmentFitData.ESD.pool.root"
@@ -33,6 +34,21 @@ configFlags.Common.isOnline = False
configFlags.Beam.NumberOfCollisions = 0.
configFlags.Detector.GeometryFaserSCT = True
configFlags.lock()
+=======
+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)
acc = MainServicesCfg(configFlags)
acc.merge(FaserByteStreamCnvSvcCfg(configFlags))
diff --git a/Tracker/TrackerRecAlgs/TrackerData/test/TrackerSegmentFitDataDbg.py b/Tracker/TrackerRecAlgs/TrackerData/test/TrackerSegmentFitDataDbg.py
index 8e9ac7fdf0dda2820bb304f337f6433376ddfb60..00a53788f035c0a58b18ba2055108e51f477db81 100644
--- a/Tracker/TrackerRecAlgs/TrackerData/test/TrackerSegmentFitDataDbg.py
+++ b/Tracker/TrackerRecAlgs/TrackerData/test/TrackerSegmentFitDataDbg.py
@@ -18,6 +18,7 @@ from TrackerData.TrackerSegmentFitDataConfig import TrackerSegmentFitDataCfg
log.setLevel(DEBUG)
Configurable.configurableRun3Behavior = True
+<<<<<<< HEAD
configFlags = initConfigFlags()
configFlags.Input.Files = ["my.RDO.pool.root"]
configFlags.Output.ESDFileName = "TrackerSegmentFitData.ESD.pool.root"
@@ -32,6 +33,21 @@ configFlags.Beam.NumberOfCollisions = 0.
configFlags.Detector.GeometryFaserSCT = True
configFlags.addFlag("Output.xAODFileName", f"TrackerSegmentFitData_xAOD.root")
configFlags.lock()
+=======
+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)
acc = MainServicesCfg(configFlags)
acc.merge(PoolReadCfg(configFlags))
diff --git a/Tracker/TrackerRecAlgs/TrackerData/test/TrackerTruthDataDbg.py b/Tracker/TrackerRecAlgs/TrackerData/test/TrackerTruthDataDbg.py
index cfa31792b3a402ef0b8cc0f66d630b13781ad1ef..170542ac5281c7cf41b26b1cb234ce7bc98614ee 100644
--- a/Tracker/TrackerRecAlgs/TrackerData/test/TrackerTruthDataDbg.py
+++ b/Tracker/TrackerRecAlgs/TrackerData/test/TrackerTruthDataDbg.py
@@ -14,6 +14,7 @@ from TrackerData.TrackerTruthDataConfig import TrackerTruthDataCfg
log.setLevel(DEBUG)
Configurable.configurableRun3Behavior = True
+<<<<<<< HEAD
configFlags = initConfigFlags()
configFlags.Input.Files = ["my.HITS.pool.root"]
configFlags.IOVDb.GlobalTag = "OFLCOND-FASER-01"
@@ -26,6 +27,19 @@ configFlags.Common.isOnline = False
configFlags.Beam.NumberOfCollisions = 0.
configFlags.Detector.GeometryFaserSCT = True
configFlags.lock()
+=======
+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)
# Core components
acc = MainServicesCfg(configFlags)
diff --git a/Tracker/TrackerRecAlgs/TrackerPrepRawDataFormation/test/FaserSCT_ClusterizationDbg.py b/Tracker/TrackerRecAlgs/TrackerPrepRawDataFormation/test/FaserSCT_ClusterizationDbg.py
index 15d44ce2d946a10a1d5e47c0c0fe3133644a5530..558d67b5baa7fedd51b5a12887221412ab94d609 100644
--- a/Tracker/TrackerRecAlgs/TrackerPrepRawDataFormation/test/FaserSCT_ClusterizationDbg.py
+++ b/Tracker/TrackerRecAlgs/TrackerPrepRawDataFormation/test/FaserSCT_ClusterizationDbg.py
@@ -22,12 +22,20 @@ log.setLevel(DEBUG)
Configurable.configurableRun3Behavior = True
# Configure
+<<<<<<< HEAD
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.
+=======
+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)
configFlags.lock()
diff --git a/Tracker/TrackerRecAlgs/TrackerPrepRawDataFormation/test/FaserSCT_ClusterizationDbgCosmics.py b/Tracker/TrackerRecAlgs/TrackerPrepRawDataFormation/test/FaserSCT_ClusterizationDbgCosmics.py
index 135a06f6dc0622e588414467eac933b93f25bcc3..dcc60e0d9af7ecc03d7e3f51148fceb6aea76e2b 100644
--- a/Tracker/TrackerRecAlgs/TrackerPrepRawDataFormation/test/FaserSCT_ClusterizationDbgCosmics.py
+++ b/Tracker/TrackerRecAlgs/TrackerPrepRawDataFormation/test/FaserSCT_ClusterizationDbgCosmics.py
@@ -22,6 +22,7 @@ log.setLevel(DEBUG)
Configurable.configurableRun3Behavior = True
# Configure
+<<<<<<< HEAD
configFlags = initConfigFlags()
configFlags.Input.Files = ['my.RDO.pool.root']
configFlags.Output.ESDFileName = "myClusters.ESD.pool.root"
@@ -33,6 +34,18 @@ configFlags.GeoModel.FaserVersion = "FASER-01" # FASER cosmic ray
configFlags.Common.isOnline = False
#configFlags.GeoModel.Align.Dynamic = False
configFlags.Beam.NumberOfCollisions = 0.
+=======
+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)
configFlags.lock()
diff --git a/Tracker/TrackerRecAlgs/TrackerSPFit/python/TrackerSPFit.py b/Tracker/TrackerRecAlgs/TrackerSPFit/python/TrackerSPFit.py
index 1502a5eed20e01e7cbd1459f744403956c261288..bae76bf40ef22a68904b8a2fc5dd84a7a4bc0b57 100644
--- a/Tracker/TrackerRecAlgs/TrackerSPFit/python/TrackerSPFit.py
+++ b/Tracker/TrackerRecAlgs/TrackerSPFit/python/TrackerSPFit.py
@@ -61,10 +61,17 @@ if __name__ == "__main__":
# configFlags.Input.ProjectName = "data20" # Needed to bypass autoconfig
configFlags.Input.isMC = True
# Needed to bypass autoconfig
+<<<<<<< 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.
+=======
+ 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)
configFlags.lock()
diff --git a/Tracker/TrackerRecAlgs/TrackerSPFit/python/TrackerSPFitTI12Data.py b/Tracker/TrackerRecAlgs/TrackerSPFit/python/TrackerSPFitTI12Data.py
index 621120955f1ee1940fa8010ab348a3b037c2cf9a..3d08a181248448a3a76be7bcc7c3f7028cb28648 100644
--- a/Tracker/TrackerRecAlgs/TrackerSPFit/python/TrackerSPFitTI12Data.py
+++ b/Tracker/TrackerRecAlgs/TrackerSPFit/python/TrackerSPFitTI12Data.py
@@ -59,10 +59,17 @@ if __name__ == "__main__":
configFlags.Input.ProjectName = "data21" # Needed to bypass autoconfig
configFlags.Input.isMC = False
# Needed to bypass autoconfig
+<<<<<<< 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.
+=======
+ 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)
configFlags.lock()
diff --git a/Tracker/TrackerRecAlgs/TrackerSPFit/test/TrackerSPFitDbg.py b/Tracker/TrackerRecAlgs/TrackerSPFit/test/TrackerSPFitDbg.py
index ca3832b3f93ce68d121bc99e7a022f5616484ae2..427a28a2593444189784c588a3c021c3014ad3c2 100644
--- a/Tracker/TrackerRecAlgs/TrackerSPFit/test/TrackerSPFitDbg.py
+++ b/Tracker/TrackerRecAlgs/TrackerSPFit/test/TrackerSPFitDbg.py
@@ -23,12 +23,20 @@ log.setLevel(DEBUG)
Configurable.configurableRun3Behavior = True
# Configure
+<<<<<<< HEAD
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.
+=======
+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)
configFlags.lock()
diff --git a/Tracker/TrackerRecAlgs/TrackerSeedFinder/test/TrackerSeedFinderDbg.py b/Tracker/TrackerRecAlgs/TrackerSeedFinder/test/TrackerSeedFinderDbg.py
index 280d1047203076e1cd6fca3676e6450b7cd0fdc5..d65e0ef7ec131279f5357a2f293c27c108c3bf91 100644
--- a/Tracker/TrackerRecAlgs/TrackerSeedFinder/test/TrackerSeedFinderDbg.py
+++ b/Tracker/TrackerRecAlgs/TrackerSeedFinder/test/TrackerSeedFinderDbg.py
@@ -24,6 +24,7 @@ log.setLevel(DEBUG)
Configurable.configurableRun3Behavior = True
# Configure
+<<<<<<< HEAD
configFlags = initConfigFlags()
configFlags.Input.Files = ['my.RDO.pool.root']
configFlags.Output.ESDFileName = "mySeeds.ESD.pool.root"
@@ -32,6 +33,15 @@ configFlags.IOVDb.GlobalTag = "OFLCOND-FASER-01"
#configFlags.GeoModel.Align.Dynamic = False
#configFlags.Concurrency.NumThreads = 1
configFlags.Beam.NumberOfCollisions = 0.
+=======
+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)
configFlags.lock()
diff --git a/Tracker/TrackerRecAlgs/TrackerSegmentFit/test/MCTrackerSegmentFit.py b/Tracker/TrackerRecAlgs/TrackerSegmentFit/test/MCTrackerSegmentFit.py
index c7f067081dab4816733364494dc89a1b489b1e0d..0206414e5b344ced62bfd48872ea44144b280efc 100644
--- a/Tracker/TrackerRecAlgs/TrackerSegmentFit/test/MCTrackerSegmentFit.py
+++ b/Tracker/TrackerRecAlgs/TrackerSegmentFit/test/MCTrackerSegmentFit.py
@@ -25,6 +25,7 @@ log.setLevel(DEBUG)
Configurable.configurableRun3Behavior = True
# Configure
+<<<<<<< HEAD
configFlags = initConfigFlags()
configFlags.Input.Files = ['my.RDO.pool.root']
configFlags.Output.ESDFileName = "segmentFit.ESD.pool.root"
@@ -39,6 +40,21 @@ configFlags.Beam.NumberOfCollisions = 0.
configFlags.addFlag("Output.xAODFileName", "segmentFit.xAOD.pool.root")
# configFlags.Detector.GeometryFaserSCT = True
configFlags.lock()
+=======
+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)
# Core components
acc = MainServicesCfg(configFlags)
diff --git a/Tracker/TrackerRecAlgs/TrackerSegmentFit/test/TestBeamSegmentFitDbg.py b/Tracker/TrackerRecAlgs/TrackerSegmentFit/test/TestBeamSegmentFitDbg.py
index 50b63999eb150045329c2b4b45a30ee8d5d8ca6b..c2c15e1eabd344ecd5cca7bca5b229ba85b20888 100755
--- a/Tracker/TrackerRecAlgs/TrackerSegmentFit/test/TestBeamSegmentFitDbg.py
+++ b/Tracker/TrackerRecAlgs/TrackerSegmentFit/test/TestBeamSegmentFitDbg.py
@@ -29,6 +29,7 @@ configFlags = initConfigFlags()
configFlags.Input.Files = [
'tbMu.raw',
]
+<<<<<<< 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
@@ -38,6 +39,17 @@ configFlags.GeoModel.FaserVersion = "FASER-TB00" # FASER geometry
configFlags.Common.isOnline = False
#configFlags.GeoModel.Align.Dynamic = False
configFlags.Beam.NumberOfCollisions = 0.
+=======
+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)
# configFlags.Detector.GeometryFaserSCT = True
diff --git a/Tracker/TrackerRecAlgs/TrackerSegmentFit/test/TrackerSegmentFitDbg.py b/Tracker/TrackerRecAlgs/TrackerSegmentFit/test/TrackerSegmentFitDbg.py
index 882f1cf778cce3f8ffc6849def7d10888fe07ba8..379f3e10a36a44f03e49ef850f06b41e4dd69f2f 100644
--- a/Tracker/TrackerRecAlgs/TrackerSegmentFit/test/TrackerSegmentFitDbg.py
+++ b/Tracker/TrackerRecAlgs/TrackerSegmentFit/test/TrackerSegmentFitDbg.py
@@ -29,6 +29,7 @@ configFlags = initConfigFlags()
configFlags.Input.Files = [
'/eos/project-f/faser-commissioning/TI12Data/Run-005684/Faser-Physics-005684-00000.raw',
]
+<<<<<<< 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
@@ -38,6 +39,17 @@ configFlags.GeoModel.FaserVersion = "FASER-02" # FASER geometry
configFlags.Common.isOnline = False
#configFlags.GeoModel.Align.Dynamic = False
configFlags.Beam.NumberOfCollisions = 0.
+=======
+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)
configFlags.Detector.GeometryFaserSCT = True
diff --git a/Tracker/TrackerRecAlgs/TrackerSpacePointFormation/test/StatisticsDbg.py b/Tracker/TrackerRecAlgs/TrackerSpacePointFormation/test/StatisticsDbg.py
index efde3d6f8c91b9e152bc72a48fd540c2241d7a4b..b7d2ee5866fcbfb215858ea70ee2dc15233125ee 100644
--- a/Tracker/TrackerRecAlgs/TrackerSpacePointFormation/test/StatisticsDbg.py
+++ b/Tracker/TrackerRecAlgs/TrackerSpacePointFormation/test/StatisticsDbg.py
@@ -23,12 +23,20 @@ log.setLevel(DEBUG)
Configurable.configurableRun3Behavior = True
# Configure
+<<<<<<< HEAD
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.
+=======
+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)
configFlags.lock()
diff --git a/Tracker/TrackerRecAlgs/TrackerSpacePointFormation/test/TrackerSpacePointFormationDbg.py b/Tracker/TrackerRecAlgs/TrackerSpacePointFormation/test/TrackerSpacePointFormationDbg.py
index 47a983a85b3e9047ef3d4e1a873bb7235c71cffc..9549bc9249c40700d82c7fd90cf560de6cb72868 100644
--- a/Tracker/TrackerRecAlgs/TrackerSpacePointFormation/test/TrackerSpacePointFormationDbg.py
+++ b/Tracker/TrackerRecAlgs/TrackerSpacePointFormation/test/TrackerSpacePointFormationDbg.py
@@ -23,12 +23,20 @@ log.setLevel(DEBUG)
Configurable.configurableRun3Behavior = True
# Configure
+<<<<<<< HEAD
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.
+=======
+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)
configFlags.lock()
diff --git a/Tracker/TrackerRecAlgs/TrackerSpacePointFormation/test/TrackerSpacePointFormationDbgCosmics.py b/Tracker/TrackerRecAlgs/TrackerSpacePointFormation/test/TrackerSpacePointFormationDbgCosmics.py
index 86cbb34e9e39c20df326384512aba49eda79b646..1bac5ad63629ff3ff236ea3dd499861662bd1f02 100644
--- a/Tracker/TrackerRecAlgs/TrackerSpacePointFormation/test/TrackerSpacePointFormationDbgCosmics.py
+++ b/Tracker/TrackerRecAlgs/TrackerSpacePointFormation/test/TrackerSpacePointFormationDbgCosmics.py
@@ -23,6 +23,7 @@ log.setLevel(DEBUG)
Configurable.configurableRun3Behavior = True
# Configure
+<<<<<<< HEAD
configFlags = initConfigFlags()
configFlags.Input.Files = ['my.RDO.pool.root']
configFlags.Output.ESDFileName = "mySpacePoints.ESD.pool.root"
@@ -35,6 +36,19 @@ configFlags.GeoModel.FaserVersion = "FASER-01" # FASER cosmic ray
#configFlags.GeoModel.Align.Dynamic = False
configFlags.Beam.NumberOfCollisions = 0.
configFlags.lock()
+=======
+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)
# Core components
acc = MainServicesCfg(configFlags)
diff --git a/Tracker/TrackerRecAlgs/TrackerTruth/test/TrackerTruthDbg.py b/Tracker/TrackerRecAlgs/TrackerTruth/test/TrackerTruthDbg.py
index 464c698237bb8ea9b7a9fdf5844c8e19e5f463f6..4bc1a7f39cd92c232008f6132d0b406b249de6b0 100644
--- a/Tracker/TrackerRecAlgs/TrackerTruth/test/TrackerTruthDbg.py
+++ b/Tracker/TrackerRecAlgs/TrackerTruth/test/TrackerTruthDbg.py
@@ -14,6 +14,7 @@ from TrackerTruth.TrackerTruthConfig import TrackerTruthCfg
log.setLevel(DEBUG)
Configurable.configurableRun3Behavior = True
+<<<<<<< HEAD
configFlags = initConfigFlags()
configFlags.Input.Files = ["my.HITS.pool.root"]
configFlags.IOVDb.GlobalTag = "OFLCOND-FASER-01"
@@ -26,6 +27,19 @@ configFlags.Common.isOnline = False
configFlags.Beam.NumberOfCollisions = 0.
configFlags.Detector.GeometryFaserSCT = True
configFlags.lock()
+=======
+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)
# Core components
acc = MainServicesCfg(configFlags)
diff --git a/Tracker/TrackerRecAlgs/TruthSeededTrackFinder/test/TruthSeededTrackFinderDbg.py b/Tracker/TrackerRecAlgs/TruthSeededTrackFinder/test/TruthSeededTrackFinderDbg.py
index 72d292eeb81273293992b76b5682bfb33840e4ea..8094643856fd1ae1808c3ed1cece4363a7321cce 100644
--- a/Tracker/TrackerRecAlgs/TruthSeededTrackFinder/test/TruthSeededTrackFinderDbg.py
+++ b/Tracker/TrackerRecAlgs/TruthSeededTrackFinder/test/TruthSeededTrackFinderDbg.py
@@ -24,6 +24,7 @@ log.setLevel(DEBUG)
Configurable.configurableRun3Behavior = True
# Configure
+<<<<<<< HEAD
configFlags = initConfigFlags()
configFlags.Input.Files = ['my.RDO.pool.root']
configFlags.Output.ESDFileName = "mySeeds.ESD.pool.root"
@@ -31,6 +32,14 @@ configFlags.IOVDb.GlobalTag = "OFLCOND-FASER-01" # Always needed; mu
#configFlags.GeoModel.Align.Dynamic = False
#configFlags.Concurrency.NumThreads = 1
configFlags.Beam.NumberOfCollisions = 0.
+=======
+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)
configFlags.lock()
diff --git a/Tracking/Acts/FaserActsGeometry/python/FaserActsMaterialMapping_jobOptions.py b/Tracking/Acts/FaserActsGeometry/python/FaserActsMaterialMapping_jobOptions.py
index f940b402d58f6282a4d7fd47f97ecb1a5e74fbaa..15999491186eb6ac640a6816572927aa48a003f1 100644
--- a/Tracking/Acts/FaserActsGeometry/python/FaserActsMaterialMapping_jobOptions.py
+++ b/Tracking/Acts/FaserActsGeometry/python/FaserActsMaterialMapping_jobOptions.py
@@ -58,6 +58,7 @@ if "__main__" == __name__:
Configurable.configurableRun3Behavior = True
## Just enable ID for the moment.
+<<<<<<< HEAD
configFlags = initConfigFlags()
configFlags.Input.isMC = True
configFlags.Beam.Type = "collisions"
@@ -65,6 +66,14 @@ 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
+=======
+ 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)
configFlags.lock()
configFlags.dump()
diff --git a/Tracking/Acts/FaserActsGeometry/test/FaserActsExtrapolationAlg.py b/Tracking/Acts/FaserActsGeometry/test/FaserActsExtrapolationAlg.py
index 8983754cc64df32ca484e020d25a25b3a3cc6236..88aeff62ed83096eb207c872669e5f32a47042c4 100644
--- a/Tracking/Acts/FaserActsGeometry/test/FaserActsExtrapolationAlg.py
+++ b/Tracking/Acts/FaserActsGeometry/test/FaserActsExtrapolationAlg.py
@@ -26,6 +26,7 @@ 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
configFlags.GeoModel.Layout = "Development"
configFlags.Detector.GeometryFaserSCT = True
#configFlags.GeoModel.AtlasVersion = "ATLAS-R2-2016-01-00-01" # Always needed to fool autoconfig; value ignored
@@ -33,6 +34,15 @@ configFlags.Detector.GeometryFaserSCT = True
#configFlags.Concurrency.NumThreads = 1
#configFlags.Beam.NumberOfCollisions = 0.
configFlags.lock()
+=======
+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)
# Core components
acc = MainServicesCfg(configFlags)
diff --git a/Tracking/Acts/FaserActsGeometry/test/FaserActsGeometryBoundary_test.py b/Tracking/Acts/FaserActsGeometry/test/FaserActsGeometryBoundary_test.py
index 63ff7f8a904a7c11e0e35a8899985eedd84c892c..56674147a4d0202ddb7091f4591549611f5337ca 100644
--- a/Tracking/Acts/FaserActsGeometry/test/FaserActsGeometryBoundary_test.py
+++ b/Tracking/Acts/FaserActsGeometry/test/FaserActsGeometryBoundary_test.py
@@ -30,6 +30,7 @@ if __name__ == "__main__":
from FaserGeoModel.FaserGeoModelConfig import FaserGeometryCfg
Configurable.configurableRun3Behavior = True
+<<<<<<< HEAD
configFlags = initConfigFlags()
configFlags.Input.isMC = False
#configFlags.GeoModel.Align.Dynamic = False
@@ -38,6 +39,15 @@ if __name__ == "__main__":
configFlags.GeoModel.FaserVersion = "FASERNU-03"
configFlags.Detector.GeometryFaserSCT = True
configFlags.lock()
+=======
+ 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)
acc = MainServicesCfg(configFlags)
acc.merge(FaserGeometryCfg(configFlags))
diff --git a/Tracking/Acts/FaserActsGeometry/test/FaserActsWriteTrackingGeometry.py b/Tracking/Acts/FaserActsGeometry/test/FaserActsWriteTrackingGeometry.py
index 3a50176906f6c2233ff4a6363f8ebc2987fdda5a..f49c31fdc0fc916aaceaa0e6e93f94e71c80fcd3 100644
--- a/Tracking/Acts/FaserActsGeometry/test/FaserActsWriteTrackingGeometry.py
+++ b/Tracking/Acts/FaserActsGeometry/test/FaserActsWriteTrackingGeometry.py
@@ -26,6 +26,7 @@ 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
configFlags.GeoModel.Layout = "Development"
configFlags.Detector.GeometryFaserSCT = True
#configFlags.GeoModel.AtlasVersion = "ATLAS-R2-2016-01-00-01" # Always needed to fool autoconfig; value ignored
@@ -33,6 +34,15 @@ configFlags.Detector.GeometryFaserSCT = True
#configFlags.Concurrency.NumThreads = 1
#configFlags.Beam.NumberOfCollisions = 0.
configFlags.lock()
+=======
+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)
# Core components
acc = MainServicesCfg(configFlags)
diff --git a/Tracking/Acts/FaserActsKalmanFilter/python/CKF2Alignment.py b/Tracking/Acts/FaserActsKalmanFilter/python/CKF2Alignment.py
index c36e0f9af097528f1a5c67d30c718e49941e40d1..7c397b93dbabf3c111bcd217bda6cd58f86eef25 100644
--- a/Tracking/Acts/FaserActsKalmanFilter/python/CKF2Alignment.py
+++ b/Tracking/Acts/FaserActsKalmanFilter/python/CKF2Alignment.py
@@ -106,6 +106,7 @@ if __name__ == "__main__":
Configurable.configurableRun3Behavior = True
# Configure
+<<<<<<< HEAD
configFlags = initConfigFlags()
configFlags.Input.Files = [ '' ] #input RDO
configFlags.IOVDb.GlobalTag = "OFLCOND-FASER-03"
@@ -123,6 +124,24 @@ if __name__ == "__main__":
configFlags.fillFromArgs(sys.argv[1:])
configFlags.dump()
configFlags.lock()
+=======
+ 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)
from FaserGeoModel.FaserGeoModelConfig import FaserGeometryCfg
# Core components
diff --git a/Tracking/Acts/FaserActsKalmanFilter/test/CKF2.py b/Tracking/Acts/FaserActsKalmanFilter/test/CKF2.py
index 0a356ccfe6d177a3442d9517d356c11891e03b4f..4fabe1c04eb01a1775de0ebdfb7de4e0300344a8 100644
--- a/Tracking/Acts/FaserActsKalmanFilter/test/CKF2.py
+++ b/Tracking/Acts/FaserActsKalmanFilter/test/CKF2.py
@@ -24,6 +24,7 @@ args = parser.parse_args()
log.setLevel(DEBUG)
Configurable.configurableRun3Behavior = True
+<<<<<<< HEAD
configFlags = initConfigFlags()
configFlags.Input.Files = args.file
configFlags.addFlag("Output.xAODFileName", f"CKF.xAOD.root")
@@ -35,6 +36,18 @@ configFlags.Beam.NumberOfCollisions = 0.
configFlags.TrackingGeometry.MaterialSource = "geometry-maps.json"
configFlags.Input.isMC = True
configFlags.lock()
+=======
+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)
acc = MainServicesCfg(configFlags)
acc.merge(FaserGeometryCfg(configFlags))
diff --git a/Tracking/Acts/FaserActsKalmanFilter/test/CombinatorialKalmanFilterAlg.py b/Tracking/Acts/FaserActsKalmanFilter/test/CombinatorialKalmanFilterAlg.py
index f7acdd95effa7469fbdbd60c8455b9fecf0bb320..23ed855ce446b829a24a38b7b5fd5787fb54d80b 100644
--- a/Tracking/Acts/FaserActsKalmanFilter/test/CombinatorialKalmanFilterAlg.py
+++ b/Tracking/Acts/FaserActsKalmanFilter/test/CombinatorialKalmanFilterAlg.py
@@ -16,6 +16,7 @@ from FaserActsKalmanFilter.CombinatorialKalmanFilterConfig import CombinatorialK
log.setLevel(DEBUG)
Configurable.configurableRun3Behavior = True
+<<<<<<< HEAD
configFlags = initConfigFlags()
configFlags.Input.Files = ['my.RDO.pool.root']
configFlags.Output.ESDFileName = "CKF.ESD.pool.root"
@@ -25,6 +26,16 @@ configFlags.GeoModel.FaserVersion = "FASER-01"
configFlags.Beam.NumberOfCollisions = 0.
# configFlags.TrackingGeometry.MaterialSource = "Input"
configFlags.lock()
+=======
+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)
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 22d4696ee482dd9fb62f45fda82d3a1a9d4b4df6..4c0c4edfca9417d90c5b5fd3f604cd2f5c7afad9 100644
--- a/Tracking/Acts/FaserActsKalmanFilter/test/CombinatorialKalmanFilterAlg_Data.py
+++ b/Tracking/Acts/FaserActsKalmanFilter/test/CombinatorialKalmanFilterAlg_Data.py
@@ -15,6 +15,7 @@ from TrackerSegmentFit.TrackerSegmentFitConfig import SegmentFitAlgCfg
log.setLevel(DEBUG)
Configurable.configurableRun3Behavior = True
+<<<<<<< HEAD
configFlags = initConfigFlags()
configFlags.Input.Files = ['/home/tboeckh/Documents/data/raw/TI12/MiddleStationTrack.raw']
configFlags.Output.ESDFileName = "CKF.ESD.pool.root"
@@ -29,6 +30,21 @@ configFlags.Common.isOnline = False
configFlags.Beam.NumberOfCollisions = 0.
configFlags.Detector.GeometryFaserSCT = True
configFlags.lock()
+=======
+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)
acc = MainServicesCfg(configFlags)
acc.merge(PoolWriteCfg(configFlags))
diff --git a/Tracking/Acts/FaserActsKalmanFilter/test/FaserActsKalmanFilterAlg.py b/Tracking/Acts/FaserActsKalmanFilter/test/FaserActsKalmanFilterAlg.py
index 8eb06fa8a08c038de6a5e1e1a4b22712d68edae2..8a940341fdfcb96d67c010649ad52cc25736b438 100644
--- a/Tracking/Acts/FaserActsKalmanFilter/test/FaserActsKalmanFilterAlg.py
+++ b/Tracking/Acts/FaserActsKalmanFilter/test/FaserActsKalmanFilterAlg.py
@@ -21,6 +21,7 @@ log.setLevel(DEBUG)
Configurable.configurableRun3Behavior = True
# Configure
+<<<<<<< HEAD
configFlags = initConfigFlags()
configFlags.Input.Files = ['../my.RDO.pool.root']
configFlags.Output.ESDFileName = "FaserActsKalmanFilter.ESD.root"
@@ -30,6 +31,16 @@ configFlags.IOVDb.GlobalTag = "OFLCOND-FASER-01"
configFlags.Beam.NumberOfCollisions = 0.
#configFlags.Concurrency.NumThreads = 1
configFlags.lock()
+=======
+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)
# Core components
acc = MainServicesCfg(configFlags)
diff --git a/Tracking/Acts/FaserActsKalmanFilter/test/GhostBusters.py b/Tracking/Acts/FaserActsKalmanFilter/test/GhostBusters.py
index 8b7e36ca4dc5f6574244b700bbe4a3c421f4942c..93e49997eec8310064ae5d697e48eea90ec1ea46 100644
--- a/Tracking/Acts/FaserActsKalmanFilter/test/GhostBusters.py
+++ b/Tracking/Acts/FaserActsKalmanFilter/test/GhostBusters.py
@@ -17,6 +17,7 @@ from FaserActsKalmanFilter.GhostBustersConfig import GhostBustersCfg
log.setLevel(DEBUG)
Configurable.configurableRun3Behavior = True
+<<<<<<< HEAD
configFlags = initConfigFlags()
configFlags.Input.Files = ['my.RDO.pool.root']
configFlags.Output.ESDFileName = "ghosts.ESD.pool.root"
@@ -26,6 +27,16 @@ configFlags.GeoModel.FaserVersion = "FASER-01"
configFlags.Beam.NumberOfCollisions = 0.
# configFlags.TrackingGeometry.MaterialSource = "Input"
configFlags.lock()
+=======
+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)
acc = MainServicesCfg(configFlags)
acc.merge(PoolReadCfg(configFlags))
diff --git a/Tracking/Acts/FaserActsKalmanFilter/test/SeedingDbg.py b/Tracking/Acts/FaserActsKalmanFilter/test/SeedingDbg.py
index c07bf40c190e0cab77a7638968d1b121f1d849cf..8e0b8f980e220578917c9e106b5e476f5a21d80e 100644
--- a/Tracking/Acts/FaserActsKalmanFilter/test/SeedingDbg.py
+++ b/Tracking/Acts/FaserActsKalmanFilter/test/SeedingDbg.py
@@ -16,6 +16,7 @@ from FaserActsKalmanFilter.SeedingConfig import SeedingCfg
log.setLevel(DEBUG)
Configurable.configurableRun3Behavior = True
+<<<<<<< HEAD
configFlags = initConfigFlags()
configFlags.Input.Files = ['my.RDO.pool.root']
configFlags.Output.ESDFileName = "circleFitSeeding.ESD.pool.root"
@@ -25,6 +26,16 @@ configFlags.GeoModel.FaserVersion = "FASER-01"
configFlags.Beam.NumberOfCollisions = 0.
# configFlags.TrackingGeometry.MaterialSource = "Input"
configFlags.lock()
+=======
+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)
acc = MainServicesCfg(configFlags)
acc.merge(PoolReadCfg(configFlags))
diff --git a/Tracking/Acts/FaserActsKalmanFilter/test/TI12CKF2.py b/Tracking/Acts/FaserActsKalmanFilter/test/TI12CKF2.py
index 822b6faa1b81332dec36d69105111e6db90f51a6..f65b0bc60fe9d83eb97143bd6e65ca27a8285fe7 100644
--- a/Tracking/Acts/FaserActsKalmanFilter/test/TI12CKF2.py
+++ b/Tracking/Acts/FaserActsKalmanFilter/test/TI12CKF2.py
@@ -27,6 +27,7 @@ args = parser.parse_args()
log.setLevel(DEBUG)
Configurable.configurableRun3Behavior = True
+<<<<<<< HEAD
configFlags = initConfigFlags()
configFlags.Input.Files = args.file
configFlags.Output.ESDFileName = "CKF.ESD.pool.root"
@@ -42,6 +43,22 @@ configFlags.Beam.NumberOfCollisions = 0.
configFlags.Detector.GeometryFaserSCT = True
configFlags.TrackingGeometry.MaterialSource = "geometry-maps.json"
configFlags.lock()
+=======
+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)
acc = MainServicesCfg(configFlags)
acc.merge(FaserGeometryCfg(configFlags))
diff --git a/Tracking/Acts/FaserActsKalmanFilter/test/TI12KalmanFilter.py b/Tracking/Acts/FaserActsKalmanFilter/test/TI12KalmanFilter.py
index 568e65b039ae56860ab82536f85865345a1bb593..6013a03a56c894b61153528d6e5710cf422481dd 100644
--- a/Tracking/Acts/FaserActsKalmanFilter/test/TI12KalmanFilter.py
+++ b/Tracking/Acts/FaserActsKalmanFilter/test/TI12KalmanFilter.py
@@ -21,6 +21,7 @@ log.setLevel(DEBUG)
Configurable.configurableRun3Behavior = True
# Configure
+<<<<<<< HEAD
configFlags = initConfigFlags()
configFlags.Input.Files = ['/home/tboeckh/tmp/Faser-Physics-006470-00093.raw_middleStation.SPs']
configFlags.Output.ESDFileName = "MiddleStation-KalmanFilter.ESD.pool.root"
@@ -35,6 +36,21 @@ configFlags.Common.isOnline = False
configFlags.Beam.NumberOfCollisions = 0.
configFlags.Detector.GeometryFaserSCT = True
configFlags.lock()
+=======
+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)
# Core components
acc = MainServicesCfg(configFlags)
diff --git a/Waveform/WaveDigiTools/share/WaveformDigiAndRecoExample_jobOptions.py b/Waveform/WaveDigiTools/share/WaveformDigiAndRecoExample_jobOptions.py
index a01a46eb4a33c0e4b25ad2269dfa413efb3df510..3c555ef8f2f711676cd1bf912c169b1ef830c308 100644
--- a/Waveform/WaveDigiTools/share/WaveformDigiAndRecoExample_jobOptions.py
+++ b/Waveform/WaveDigiTools/share/WaveformDigiAndRecoExample_jobOptions.py
@@ -21,6 +21,7 @@ if __name__ == "__main__":
log.setLevel(VERBOSE)
+<<<<<<< HEAD
configFlags = initConfigFlags()
configFlags.IOVDb.GlobalTag = "OFLCOND-FASER-03" # Always needed; must match FaserVersion
configFlags.IOVDb.DatabaseInstance = "OFLP200" # Use MC conditions for now
@@ -29,6 +30,15 @@ if __name__ == "__main__":
configFlags.GeoModel.FaserVersion = "FASER-TB00" # FASER geometry
configFlags.Common.isOnline = False
#configFlags.GeoModel.Align.Dynamic = False
+=======
+ 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)
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 757db8b3f120907bc67c2f8c3d19cf267c8e1406..999c0ddf6df3ae01c3d701a58935565a84ac713d 100644
--- a/Waveform/WaveRecAlgs/share/PseudoSimToWaveformRecExample_jobOptions.py
+++ b/Waveform/WaveRecAlgs/share/PseudoSimToWaveformRecExample_jobOptions.py
@@ -16,6 +16,7 @@ if __name__ == "__main__":
log.setLevel(INFO)
+<<<<<<< HEAD
configFlags = initConfigFlags()
configFlags.IOVDb.GlobalTag = "OFLCOND-FASER-TB00" # Always needed; must match FaserVersion
configFlags.IOVDb.DatabaseInstance = "OFLP200" # Use MC conditions for now
@@ -24,6 +25,15 @@ if __name__ == "__main__":
configFlags.GeoModel.FaserVersion = "FASER-TB00" # FASER geometry
configFlags.Common.isOnline = False
#configFlags.GeoModel.Align.Dynamic = False
+=======
+ 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)
configFlags.Input.Files = [
"my.HITS.pool.root"
diff --git a/package_filters.txt b/package_filters.txt
index 7835fa42791e9e7752815974c87c68827ad78285..fc25595ed9ba20d8c227f41603dfff01c1098488 100644
--- a/package_filters.txt
+++ b/package_filters.txt
@@ -15,9 +15,12 @@
+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
@@ -63,6 +66,7 @@
#+Neutrino/NeutrinoSimEvent
+Neutrino/.*
-PhysicsAnalysis/.*
+<<<<<<< HEAD
#+Scintillator/ScintDetDescr/PreshowerGeoModel
#+Scintillator/ScintDetDescr/ScintGeoModelUtils
#+Scintillator/ScintDetDescr/ScintIdDictFiles
@@ -93,6 +97,30 @@
#+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
@@ -117,6 +145,7 @@
+Tracker/TrackerG4/FaserSCT_G4_SD
+Tracker/TrackerRawEvent/TrackerRawData
+Tracker/TrackerRawEvent/TrackerSimData
+<<<<<<< HEAD
+Tracker/TrackerRecAlgs/FaserSpacePoints
+Tracker/TrackerRecAlgs/NoisyStripFinder
+Tracker/TrackerRecAlgs/OverlayRDO
@@ -135,6 +164,9 @@
+Tracker/TrackerRecTools/FaserSiClusterizationTool
+Tracker/TrackerRecTools/FaserSiSpacePointTool
+Tracker/TrackerRecTools/TruthSeededTrackFinderTool
+=======
+#+Tracker/TrackerRecTools/FaserSiClusterizationTool
+>>>>>>> 05a628fdc98 (GeometryTest runs successfully)
+Tracker/TrackerSimEvent
-Tracker/.*
##+Tracking/Acts/FaserActsGeometry