Merge branch 'remove-incidentlistener-from-rndmengine' into 'master'

remove unused IIncidentListener inheritance from RndmEngine

See merge request !573

GaudiSvc/src/RndmGenSvc/RndmEngine.cpp

@@ -27,35 +27,14 @@
 #include "GaudiKernel/MsgStream.h"
 #include "RndmEngine.h"
 
-/// Standard Service constructor
-RndmEngine::RndmEngine( const std::string& name, ISvcLocator* loc ) : base_class( name, loc ) {}
-
-/// Standard Service destructor
-RndmEngine::~RndmEngine() {}
-
 /// Service override: initialization
 StatusCode RndmEngine::initialize()
 {
-  StatusCode status = Service::initialize();
-  if ( status.isSuccess() ) {
-    status = setProperties();
-    if ( status.isSuccess() ) {
-      m_pIncidentSvc = serviceLocator()->service( "IncidentSvc" );
-      if ( !m_pIncidentSvc ) {
-        status = StatusCode::FAILURE;
-      }
-    }
-  }
+  StatusCode status                = Service::initialize();
+  if ( status.isSuccess() ) status = setProperties();
   return status;
 }
 
-/// Service override: finalization
-StatusCode RndmEngine::finalize()
-{
-  m_pIncidentSvc = 0; // release
-  return Service::finalize();
-}
-
 /** IRndmEngine interface implementation  */
 /// Input serialization from stream buffer. Restores the status of the generator engine.
 StreamBuffer& RndmEngine::serialize( StreamBuffer& str ) { return str; }
@@ -66,9 +45,6 @@ StreamBuffer& RndmEngine::serialize( StreamBuffer& str ) const { return str; }
 /// Single shot returning single random number
 double RndmEngine::rndm() const { return DBL_MAX; }
 
-/// Single shot returning single random number
-void RndmEngine::handle( const Incident& /* inc */ ) {}
-
 /** Multiple shots returning vector with flat random numbers.
     @param  array    Array containing random numbers
     @param  howmany  fill 'howmany' random numbers into array
@@ -77,10 +53,7 @@ void RndmEngine::handle( const Incident& /* inc */ ) {}
 */
 StatusCode RndmEngine::rndmArray( std::vector<double>& array, long howmany, long start ) const
 {
-  long cnt = start;
   array.resize( start + howmany );
-  for ( long i = start, num = start + howmany; i < num; i++ ) {
-    array[cnt++] = rndm();
-  }
+  std::generate_n( std::next( array.begin(), start ), howmany, [&]() { return this->rndm(); } );
   return StatusCode::SUCCESS;
 }

GaudiSvc/src/RndmGenSvc/RndmEngine.h

@@ -12,14 +12,10 @@
 #include <vector>
 
 // Framework include files
-#include "GaudiKernel/IIncidentListener.h"
 #include "GaudiKernel/IRndmEngine.h"
 #include "GaudiKernel/ISerialize.h"
 #include "GaudiKernel/Service.h"
 
-// Forward declarations
-class IIncidentSvc;
-
 /** Random Generator engine definition
 
     Description:
@@ -43,22 +39,15 @@ class IIncidentSvc;
     Author:  M.Frank
     Version: 1.0
 */
-class RndmEngine : public extends<Service, IRndmEngine, ISerialize, IIncidentListener>
+class RndmEngine : public extends<Service, IRndmEngine, ISerialize>
 {
 protected:
-  /// Reference to the incident service
-  SmartIF<IIncidentSvc> m_pIncidentSvc;
-
   /// Standard Constructor
-  RndmEngine( const std::string& name, ISvcLocator* loc );
-  /// Standard Destructor
-  ~RndmEngine() override;
+  using extends::extends;
 
 public:
   /// Service override: initialization
   StatusCode initialize() override;
-  /// Service override: finalization
-  StatusCode finalize() override;
   /// Single shot returning single random number
   double rndm() const override;
   /** Multiple shots returning vector with flat random numbers.
@@ -78,8 +67,6 @@ public:
       @return  Reference to read stream buffer
   */
   StreamBuffer& serialize( StreamBuffer& str ) const override;
-  /// Inform that a new incident has occurred
-  void handle( const Incident& inc ) override;
 };
 
 #endif // GAUDI_RNDMGENSVC_RNDMENGINE_H