Merge branch 'revert-1541b2d3' into 'master'

Revert "Merge branch 'dhcroft-VPChanIDFix' into 'master'"

See merge request !4805

Det/VPDet/src/Lib/legacy/DeVPSensor.cpp

@@ -209,8 +209,7 @@ bool DeVPSensor::pointToChannel( const Gaudi::XYZPoint& point, const bool local,
         row = int( localPoint.y() / m_cache.pixelSize );
         if ( row >= m_cache.nRows ) row = m_cache.nRows - 1;
       }
-      channel.setCol( LHCb::Detector::VPChannelID::ColumnID{col} );
-      channel.setRow( LHCb::Detector::VPChannelID::RowID{row} );
+      channel.setCol( LHCb::Detector::VPChannelID::ColumnID{col} ).setRow( LHCb::Detector::VPChannelID::RowID{row} );
       break;
     }
     x0 += m_cache.chipSize + m_cache.interChipDist;