Merge branch 'replace-savannah-links-s24' into 'stripping24-patches'

Replace savannah bugs by corresponding JIRA tasks (@pkoppenb)

See merge request !697

(cherry picked from commit c668e465)

b120fd19 Replace savannah bugs by corresponding JIRA tasks (@pkoppenb)

Phys/DecayTreeTuple/src/TupleToolBremInfo.cpp

-// $Id: TupleToolBremInfo.cpp
+/*****************************************************************************\
+* (c) Copyright 2000-2020 CERN for the benefit of the LHCb Collaboration      *
+*                                                                             *
+* This software is distributed under the terms of the GNU General Public      *
+* Licence version 3 (GPL Version 3), copied verbatim in the file "COPYING".   *
+*                                                                             *
+* In applying this licence, CERN does not waive the privileges and immunities *
+* granted to it by virtue of its status as an Intergovernmental Organization  *
+* or submit itself to any jurisdiction.                                       *
+\*****************************************************************************/
 // Include files
 
 // from Gaudi
@@ -77,12 +86,12 @@ StatusCode TupleToolBremInfo::fill(const Particle*,
 
   
   bool filltuple = true;
-  if( P->isBasicParticle() && P->proto() != NULL && P->proto()->track() != NULL ){
-    LHCb::CaloMomentum brem =m_adder->bremMomentum( P, Gaudi::Utils::toString(P->particleID().pid()) );
-    if ( msgLevel(MSG::VERBOSE) ){ // https://savannah.cern.ch/bugs/?92524
-      verbose() << "Multi : " << brem.multiplicity() << endmsg ;
-      verbose() << " Brem P : " << brem.momentum() << endmsg ;
-      verbose() << " Origin : " << brem.referencePoint() << endmsg ;
+  if ( P->isBasicParticle() && P->proto() != NULL && P->proto()->track() != NULL ) {
+    LHCb::CaloMomentum brem = m_adder->bremMomentum( P, Gaudi::Utils::toString( P->particleID().pid() ) );
+    if ( msgLevel( MSG::VERBOSE ) ) { // https://its.cern.ch/jira/browse/LHCBPS-598
+      verbose() << "Multi : " << brem.multiplicity() << endmsg;
+      verbose() << " Brem P : " << brem.momentum() << endmsg;
+      verbose() << " Origin : " << brem.referencePoint() << endmsg;
     }
     
     //brem info from the particle (from creation)

Phys/DecayTreeTuple/src/TupleToolGeometry.cpp

-// $Id: TupleToolGeometry.cpp,v 1.17 2010-05-12 20:01:40 jpalac Exp $
+/*****************************************************************************\
+* (c) Copyright 2000-2020 CERN for the benefit of the LHCb Collaboration      *
+*                                                                             *
+* This software is distributed under the terms of the GNU General Public      *
+* Licence version 3 (GPL Version 3), copied verbatim in the file "COPYING".   *
+*                                                                             *
+* In applying this licence, CERN does not waive the privileges and immunities *
+* granted to it by virtue of its status as an Intergovernmental Organization  *
+* or submit itself to any jurisdiction.                                       *
+\*****************************************************************************/
 // Include files
 
 // from Gaudi
@@ -116,11 +125,10 @@ StatusCode TupleToolGeometry::fill( const Particle* mother
       verbose() << "No need to look for endVertex of " << prefix << endmsg ;
   } else {
     //=========================================================================
-    if ( msgLevel(MSG::VERBOSE) && P->endVertex() )
-    { // https://savannah.cern.ch/bugs/?92524
-      verbose() << "Before cast : " << P->endVertex() << endmsg ;
-      verbose() << "Container " << P->endVertex()->parent()->registry()->identifier()
-                << " key " << P->endVertex()->key() << endmsg ;
+    if ( msgLevel( MSG::VERBOSE ) && P->endVertex() ) { // https://its.cern.ch/jira/browse/LHCBPS-598
+      verbose() << "Before cast : " << P->endVertex() << endmsg;
+      verbose() << "Container " << P->endVertex()->parent()->registry()->identifier() << " key "
+                << P->endVertex()->key() << endmsg;
     }
 
     const VertexBase* evtx = P->endVertex();
@@ -131,12 +139,10 @@ StatusCode TupleToolGeometry::fill( const Particle* mother
       fatal() << "See https://twiki.cern.ch/twiki/bin/view/LHCb/DaVinciTutorial7#Branches" << endmsg ;
       return StatusCode::FAILURE ;
     }
-      
-    if ( msgLevel(MSG::VERBOSE) )
-    { // https://savannah.cern.ch/bugs/?92524
-      verbose() << "End Vertex : " << *evtx << endmsg ;
-      verbose() << "Container " << evtx->parent()->registry()->identifier()
-                << " key " << evtx->key() << endmsg ;
+
+    if ( msgLevel( MSG::VERBOSE ) ) { // https://its.cern.ch/jira/browse/LHCBPS-598
+      verbose() << "End Vertex : " << *evtx << endmsg;
+      verbose() << "Container " << evtx->parent()->registry()->identifier() << " key " << evtx->key() << endmsg;
     }
     // end vertex
     sc = fillVertex(evtx,prefix+"_ENDVERTEX",tuple);

Phys/DecayTreeTupleBase/DecayTreeTupleBase/DecayTreeTupleBaseTemplates.icpp

+/*****************************************************************************\
+* (c) Copyright 2000-2020 CERN for the benefit of the LHCb Collaboration      *
+*                                                                             *
+* This software is distributed under the terms of the GNU General Public      *
+* Licence version 3 (GPL Version 3), copied verbatim in the file "COPYING".   *
+*                                                                             *
+* In applying this licence, CERN does not waive the privileges and immunities *
+* granted to it by virtue of its status as an Intergovernmental Organization  *
+* or submit itself to any jurisdiction.                                       *
+\*****************************************************************************/
 /** @file DecayTreeTupleBaseTemplates.icpp
  *
  * All templates methods in DecayTreeTupleBase that need to be included
@@ -9,7 +19,6 @@
  * \date 2009-01-20
  */
 //=============================================================================
-//=============================================================================
 //! Trigger all fill procedures
 template<class PARTICLEVECTOR,class DECAYFINDER>
 StatusCode fillTuple( Tuples::Tuple& tuple
@@ -36,13 +45,11 @@ StatusCode fillTuple( Tuples::Tuple& tuple
       tuple->column( "totCandidates", (unsigned long long)heads.size()).ignore();
       tuple->column( "EventInSequence", (unsigned long long)counter("Event").nEntries()).ignore();
       ++nCandidates;
-    }
-    else
-    {
-      fatal() << "Failed to fill a candidate. Please fix your options." << endmsg ;
-      fatal() << "### NOTE : This is a new behaviour since bug https://savannah.cern.ch/bugs/?102616" << endmsg ;
-      fatal() << "### NOTE : If you think this is wrong, report to lhcb-davinci@cern.ch" << endmsg ;
-      return StatusCode::FAILURE ;
+    } else {
+      fatal() << "Failed to fill a candidate. Please fix your options." << endmsg;
+      fatal() << "### NOTE : This is a new behaviour since bug https://its.cern.ch/jira/browse/LHCBPS-690" << endmsg;
+      fatal() << "### NOTE : If you think this is wrong, report to lhcb-davinci@cern.ch" << endmsg;
+      return StatusCode::FAILURE;
     }
 
     test = fillEventRelatedVariables( tuple );
@@ -84,10 +91,10 @@ StatusCode fillTuple( typename Tuple::Tuple& tuple
       tuple->column( "EventInSequence", (unsigned long long)counter("Event").nEntries()).ignore();
       ++nCandidates;
     } else {
-      fatal() << "Failed to fill a candidate. Please fix your options." << endmsg ;
-      fatal() << "### NOTE : This is a new behaviour since bug https://savannah.cern.ch/bugs/?102616" << endmsg ;
-      fatal() << "### NOTE : If you think this is wrong, report to lhcb-davinci@cern.ch" << endmsg ;
-      return StatusCode::FAILURE ;
+      fatal() << "Failed to fill a candidate. Please fix your options." << endmsg;
+      fatal() << "### NOTE : This is a new behaviour since bug https://its.cern.ch/jira/browse/LHCBPS-690" << endmsg;
+      fatal() << "### NOTE : If you think this is wrong, report to lhcb-davinci@cern.ch" << endmsg;
+      return StatusCode::FAILURE;
     }
 
     test = fillEventRelatedVariables( tuple );