For Wrapping processors inside Gaudi

source/include/marlin/EventSelector.h

@@ -23,55 +23,54 @@ using namespace marlin ;
  * @author F. Gaede, DESY
  * @version $Id:$ 
  */
+namespace marlin {
 
-class EventSelector : public Processor, public marlin::EventModifier {
-
-  typedef std::set< std::pair< int, int > > SET ;
-
- public:
-
-  virtual Processor*  newProcessor() { return new EventSelector ; }
-
-
-  EventSelector() ;
-
-  /** Called at the begin of the job before anything is read.
-   * Use to initialize the processor, e.g. book histograms.
-   */
-  virtual void init() ;
-
-  /** Called for every run.
-   */
-  virtual void processRunHeader( LCRunHeader* run ) ;
-
-  /** Called for every event - the working horse.
-   */
-  virtual void processEvent( LCEvent * evt ) ; 
-
-
-  virtual void check( LCEvent * evt ) ; 
-
-
-  virtual void modifyEvent( LCEvent *evt ) ;
-
-
-  /** Called after data processing for clean up.
-   */
-  virtual void end() ;
-
-  virtual const std::string & name() const { return Processor::name() ; }
-
-
- protected:
-
-  /** Input collection name.
-   */
-  IntVec _evtList{};
-  SET _evtSet{};
-
-  int _nRun=-1;
-  int _nEvt=-1;
-} ;
+  class EventSelector : public Processor, public marlin::EventModifier {
+
+    typedef std::set< std::pair< int, int > > SET ;
+
+  public:
+
+    virtual Processor*  newProcessor() { return new EventSelector ; }
+
+    EventSelector() ;
+
+    /** Called at the begin of the job before anything is read.
+     * Use to initialize the processor, e.g. book histograms.
+     */
+    virtual void init() ;
+
+    /** Called for every run.
+     */
+    virtual void processRunHeader( LCRunHeader* run ) ;
+
+    /** Called for every event - the working horse.
+     */
+    virtual void processEvent( LCEvent * evt ) ;
+
+    virtual void check( LCEvent * evt ) ;
+
+    virtual void modifyEvent( LCEvent *evt ) ;
+
+    /** Called after data processing for clean up.
+     */
+    virtual void end() ;
+
+    virtual const std::string & name() const { return Processor::name() ; }
+
+
+  protected:
+
+    /** Input collection name.
+     */
+    IntVec _evtList{};
+    SET _evtSet{};
+
+    int _nRun=-1;
+    int _nEvt=-1;
+  } ;
+
+} // namespace marlin
 
 #endif
 

source/include/marlin/Processor.h

@@ -220,6 +220,12 @@ namespace marlin{
 //      */
 //     ProcessorParameter* getProcessorParameter( const std::string name) ;
 
+    /** Initialize the parameters */
+    virtual void setParameters( std::shared_ptr<StringParameters> parameters) ;
+
+    /** Set processor name */
+    virtual void setName( const std::string & processorName) { _processorName = processorName ; }
+
   protected:
 
     /** Set the return value for this processor - typically at end of processEvent(). 
@@ -409,12 +415,6 @@ namespace marlin{
 
     /** Allow friend class CCProcessor to update processor parameters */
     virtual void updateParameters();
-
-    /** Set processor name */
-    virtual void setName( const std::string & processorName) { _processorName = processorName ; }
-
-    /** Initialize the parameters */
-    virtual void setParameters( std::shared_ptr<StringParameters> parameters) ;
 
     /** Sets the registered steering parameters before calling init() 
      */