Update production to latest master

Update the production reconstruction scripts to work with the new spacepoint and conditions code.

Spacepoints are now turned on in the xAOD output. Unit tests added to check that the production data reconstruction script works with TI12 and TestBeam data.

Control/CalypsoExample/Reconstruction/scripts/faser_reco.py

@@ -61,8 +61,8 @@ from CalypsoConfiguration.AllConfigFlags import ConfigFlags
 Configurable.configurableRun3Behavior = True
     
 # Flags for this job
-ConfigFlags.Input.isMC = False                               # Needed to bypass autoconfig
-ConfigFlags.IOVDb.DatabaseInstance = "OFLP200"               # Use MC conditions for now
+ConfigFlags.Input.isMC = False                   # Needed to bypass autoconfig
+ConfigFlags.IOVDb.DatabaseInstance = "OFLP200"   # Use MC conditions for now
 
 ConfigFlags.Input.ProjectName = "data20"
 ConfigFlags.GeoModel.Align.Dynamic    = False
@@ -125,9 +125,9 @@ acc.merge(WaveformReconstructionCfg(ConfigFlags))
 from TrackerPrepRawDataFormation.TrackerPrepRawDataFormationConfig import FaserSCT_ClusterizationCfg
 acc.merge(FaserSCT_ClusterizationCfg(ConfigFlags))
 
-# ... try SpacePoints
-#from TrackerSpacePointFormation.TrackerSpacePointFormationConfig import TrackerSpacePointFinderCfg
-#acc.merge(TrackerSpacePointFinderCfg(ConfigFlags))
+# SpacePoints
+from TrackerSpacePointFormation.TrackerSpacePointFormationConfig import TrackerSpacePointFinderCfg
+acc.merge(TrackerSpacePointFinderCfg(ConfigFlags))
 
 # Try Dave's fitter
 from TrackerClusterFit.TrackerClusterFitConfig import ClusterFitAlgCfg
@@ -142,13 +142,13 @@ itemList = [ "xAOD::EventInfo#*"
              , "xAOD::FaserTriggerDataAux#*"
              , "FaserSCT_RDO_Container#*"
              , "Tracker::FaserSCT_ClusterContainer#*"
-             #, "Tracker::SCT_SpacePointContainer#*"
-             #, "Tracker::SCT_SpacePointOverlapCollection#*"
+             , "FaserSCT_SpacePointContainer#*"
+             #, "FaserSCT_SpacePointOverlapCollection#*"
              , "TrackCollection#*"
 ]
 acc.merge(OutputStreamCfg(ConfigFlags, "xAOD", itemList))
 
-# Waveform reconstruction
+# Waveform reconstruction output
 from WaveRecAlgs.WaveRecAlgsConfig import WaveformReconstructionOutputCfg    
 acc.merge(WaveformReconstructionOutputCfg(ConfigFlags))
 
@@ -156,6 +156,13 @@ acc.merge(WaveformReconstructionOutputCfg(ConfigFlags))
 print( "Writing out xAOD objects:" )
 print( acc.getEventAlgo("OutputStreamxAOD").ItemList )
 
+# Hack to avoid problem with our use of MC databases when isMC = False
+replicaSvc = acc.getService("DBReplicaSvc")
+replicaSvc.COOLSQLiteVetoPattern = ""
+replicaSvc.UseCOOLSQLite = True
+replicaSvc.UseCOOLFrontier = False
+replicaSvc.UseGeomSQLite = True
+
 # Configure verbosity    
 # ConfigFlags.dump()
 # logging.getLogger('forcomps').setLevel(VERBOSE)