Merge branch 'recodev' into 'master'

Update production to latest master

See merge request faser/calypso!173

Control/CalypsoExample/Reconstruction/CMakeLists.txt

@@ -12,12 +12,15 @@ atlas_subdir( Reconstruction )
 #                     INCLUDE_DIRS ${GEOMODEL_INCLUDE_DIRS}
 #                     LINK_LIBRARIES ${GEOMODEL_LIBRARIES} AthenaBaseComps GeoModelFaserUtilities ScintReadoutGeometry TrackerReadoutGeometry MagFieldInterfaces MagFieldElements MagFieldConditions )
 
-#atlas_add_test( ReconstructionTest
-#                SCRIPT python ${CMAKE_CURRENT_SOURCE_DIR}/python/GeoModelTestConfig.py
-#                PROPERTIES WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
-#                PROPERTIES TIMEOUT 300 )
-
 # Install files from the package:
 #atlas_install_joboptions( share/*.py )
 #atlas_install_python_modules( python/*.py )
 atlas_install_scripts( scripts/*.sh scripts/*.py )
+
+atlas_add_test( ProdRecoTI12
+    SCRIPT scripts/faser_reco.py ${CMAKE_CURRENT_SOURCE_DIR}/../rawdata/Faser-Physics-001920-filtered.raw TI12Data
+    PROPERTIES TIMEOUT 300 )
+atlas_add_test( ProdRecoTestBeam
+    SCRIPT scripts/faser_reco.py ${CMAKE_CURRENT_SOURCE_DIR}/../RAWDATA/Faser-Physics-003613-filtered.raw TestBeamData
+    PROPERTIES TIMEOUT 300 )
+

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)