Skip to content
Snippets Groups Projects
Commit dfde5ae2 authored by Eric Torrence's avatar Eric Torrence
Browse files

Fix minor merge issues

parents 927b152d 6a2db2d8
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Database/ConnectionManagement/FaserAuthentication/data/dblookup.xml
+ 2
− 2
View file @ dfde5ae2
...@@ -27,8 +27,8 @@ ...@@ -27,8 +27,8 @@
</logicalservice> </logicalservice>
<logicalservice name="COOLOFL_INDET"> <logicalservice name="COOLOFL_INDET">
<service name="sqlite_file:data/sqlite200/noisy_strips.db" accessMode="read" /> <service name="sqlite_file:data/sqlite200/noisy_strips.db" accessMode="read" />
<service name="sqlite_file:///cvmfs/faser.cern.ch/repo/sw/database/DBRelease/current/sqlite200/ALLP200.db" accessMode="read" /> <service name="sqlite_file:///cvmfs/faser.cern.ch/repo/sw/database/DBRelease/current/sqlite200/ALLP200.db" accessMode="read" />
</logicalservice> </logicalservice>
<logicalservice name="COOLOFL_TRIGGER"> <logicalservice name="COOLOFL_TRIGGER">
......
Tracking/Acts/FaserActsKalmanFilter/test/TI12CKF2.py
+ 1
− 1
View file @ dfde5ae2
...@@ -39,7 +39,7 @@ ConfigFlags.Common.isOnline = False ...@@ -39,7 +39,7 @@ ConfigFlags.Common.isOnline = False
ConfigFlags.GeoModel.Align.Dynamic = False ConfigFlags.GeoModel.Align.Dynamic = False
ConfigFlags.Beam.NumberOfCollisions = 0. ConfigFlags.Beam.NumberOfCollisions = 0.
ConfigFlags.Detector.GeometryFaserSCT = True ConfigFlags.Detector.GeometryFaserSCT = True
# ConfigFlags.TrackingGeometry.MaterialSource = "geometry-maps.json" ConfigFlags.TrackingGeometry.MaterialSource = "geometry-maps.json"
ConfigFlags.lock() ConfigFlags.lock()
acc = MainServicesCfg(ConfigFlags) acc = MainServicesCfg(ConfigFlags)
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment