Merge branch 'bsreader' into 'master'

InDetBeamSpotReader: Create component and make vertex optional

See merge request atlas/athena!27216

InnerDetector/InDetCalibAlgs/InDetBeamSpotFinder/src/InDetBeamSpotReader.cxx

@@ -16,7 +16,7 @@ StatusCode InDet::InDetBeamSpotReader::initialize() {
   ATH_CHECK( m_beamSpotKey.initialize() );
 
   ATH_CHECK( m_eventInfo.initialize() );
-  ATH_CHECK( m_vxContainer.initialize() );
+  ATH_CHECK( m_vxContainer.initialize(!m_vxContainer.empty()) );
 
   return StatusCode::SUCCESS;
 }
@@ -37,24 +37,26 @@ StatusCode InDet::InDetBeamSpotReader::execute(const EventContext& ctx) const {
     ATH_MSG_INFO("BeamSpot Tilt\n\t"
 		   << beamSpotHandle->beamTilt(0) << "\n\t"
 		   << beamSpotHandle->beamTilt(1) << "\n\t");
-    ATH_MSG_INFO("Beamspot position at PV z-position");
 
   //get list of PVs
-  SG::ReadHandle<VxContainer> importedVxContainer(m_vxContainer, ctx);
-  VxContainer::const_iterator vtxItr;
-  for(vtxItr=importedVxContainer->begin();
-      vtxItr!=importedVxContainer->end(); ++vtxItr) {
-    if (static_cast<int>((*vtxItr)->vxTrackAtVertex()->size())==0) continue;
-    if (msgLvl(MSG::INFO)) ATH_MSG_INFO("PV position:  "
-				 << (*vtxItr)->recVertex().position() );
-    double z = (*vtxItr)->recVertex().position().z();
-    if (msgLvl(MSG::INFO)) ATH_MSG_INFO("\n\t"
-	  << beamSpotHandle->beamPos()(0)
-      + (z - beamSpotHandle->beamPos()(2))
-      *beamSpotHandle->beamTilt(0) << "\n\t"
-	  << beamSpotHandle->beamPos()(1)
-      + (z - beamSpotHandle->beamPos()(2))
-      *beamSpotHandle->beamTilt(1) );
+  if (!m_vxContainer.empty()) {
+    ATH_MSG_INFO("Beamspot position at PV z-position");
+    SG::ReadHandle<VxContainer> importedVxContainer(m_vxContainer, ctx);
+    VxContainer::const_iterator vtxItr;
+    for(vtxItr=importedVxContainer->begin();
+        vtxItr!=importedVxContainer->end(); ++vtxItr) {
+      if (static_cast<int>((*vtxItr)->vxTrackAtVertex()->size())==0) continue;
+      if (msgLvl(MSG::INFO)) ATH_MSG_INFO("PV position:  "
+                                          << (*vtxItr)->recVertex().position() );
+      double z = (*vtxItr)->recVertex().position().z();
+      if (msgLvl(MSG::INFO)) ATH_MSG_INFO("\n\t"
+                                          << beamSpotHandle->beamPos()(0)
+                                          + (z - beamSpotHandle->beamPos()(2))
+                                          *beamSpotHandle->beamTilt(0) << "\n\t"
+                                          << beamSpotHandle->beamPos()(1)
+                                          + (z - beamSpotHandle->beamPos()(2))
+                                          *beamSpotHandle->beamTilt(1) );
+    }
   }
 
   return StatusCode::SUCCESS;

InnerDetector/InDetCalibAlgs/InDetBeamSpotFinder/src/components/InDetBeamSpotFinder_entries.cxx

 #include "../InDetBeamSpotFinder.h"
 #include "../InDetBeamSpotRooFit.h"
+#include "../InDetBeamSpotReader.h"
 #include "../InDetBeamSpotVertex.h"
 #include "../RefitTracksAndVertex.h"
 
-
 DECLARE_COMPONENT( InDet::InDetBeamSpotFinder )
 DECLARE_COMPONENT( InDet::InDetBeamSpotVertex )
 DECLARE_COMPONENT( InDet::InDetBeamSpotRooFit )
+DECLARE_COMPONENT( InDet::InDetBeamSpotReader )
 DECLARE_COMPONENT( RefitTracksAndVertex )
-