Fix compiler warnings and change LCIO_LIBRARIES to LCIO::lcio

CMakeLists.txt

@@ -31,7 +31,7 @@ FIND_PACKAGE( GEAR REQUIRED )
 # export Marlin_DEPENDS_INCLUDE_DIRS to MarlinConfig.cmake
 SET( Marlin_DEPENDS_INCLUDE_DIRS ${LCIO_INCLUDE_DIRS} ${GEAR_INCLUDE_DIRS} ${streamlog_INCLUDE_DIRS} )
 SET( Marlin_DEPENDS_LIBRARY_DIRS ${LCIO_LIBRARY_DIRS} ${GEAR_LIBRARY_DIRS} ${streamlog_LIBRARY_DIRS} )
-SET( Marlin_DEPENDS_LIBRARIES ${LCIO_LIBRARIES} ${GEAR_LIBRARIES} ${streamlog_LIBRARIES} )
+SET( Marlin_DEPENDS_LIBRARIES LCIO::lcio ${GEAR_LIBRARIES} ${streamlog_LIBRARIES} )
 
 INCLUDE_DIRECTORIES( SYSTEM ${Marlin_DEPENDS_INCLUDE_DIRS} )
 

source/include/marlin/CCProcessor.h

@@ -169,8 +169,8 @@ namespace marlin {
     std::shared_ptr<StringParameters> _param;	    // parameters from processor
     Processor* _proc;		    // associated Marlin processor
 
-    const StringVec _error_desc{ "Processor has no Parameters", "Processor not available!", "Some Collections have Errors"}; // error descriptions for all processors
-    StringVec _errors{};	    // list of errors found in a processor
+    const EVENT::StringVec _error_desc{ "Processor has no Parameters", "Processor not available!", "Some Collections have Errors"}; // error descriptions for all processors
+    EVENT::StringVec _errors{};	    // list of errors found in a processor
 
     sSet _conditions;		    // processor's conditions
 

source/include/marlin/CMProcessor.h

@@ -68,7 +68,7 @@ namespace marlin{
 	bool isInstalled( const std::string& type );
 
 	//utility function to tokenize strings
-	void tokenize( const std::string str, StringVec& tokens, const std::string& delimiters = " " );
+        void tokenize( const std::string str, EVENT::StringVec& tokens, const std::string& delimiters = " " );
 
     private:
 	// Constructor

source/include/marlin/ConditionsProcessor.h

@@ -15,8 +15,6 @@ namespace lccd{
     class IConditionsChangeListener;
 }
 
-using namespace lcio ;
-
 namespace marlin{
 
 
@@ -73,7 +71,7 @@ class ConditionsProcessor : public Processor {
 
   /** Updates all registered conditions handlers and adds the data to the event.
    */
-  virtual void processEvent( LCEvent * evt ) ; 
+  virtual void processEvent( EVENT::LCEvent * evt ) ; 
 
 
 //   virtual void check( LCEvent * evt ) ; 
@@ -88,19 +86,19 @@ class ConditionsProcessor : public Processor {
   std::string _dbInit="";
 
   /** initialization of SimpleFileHandlers */
-  StringVec _simpleHandlerInit{};
+  EVENT::StringVec _simpleHandlerInit{};
 
   /** initialization of DBCondHandlers */
-  StringVec _dbcondHandlerInit{};
+  EVENT::StringVec _dbcondHandlerInit{};
 
   /** initialization of DBFileHandlers */
-  StringVec _dbfileHandlerInit{};
+  EVENT::StringVec _dbfileHandlerInit{};
 
   /** initialization of DataFileHandlers */
-  StringVec _datafileHandlerInit{};
+  EVENT::StringVec _datafileHandlerInit{};
 
   /** the names of all handlers */
-  StringVec _condHandlerNames{};
+  EVENT::StringVec _condHandlerNames{};
 
   int _nRun=-1;
   int _nEvt=-1;

source/include/marlin/DataSourceProcessor.h

@@ -3,8 +3,6 @@
 
 #include "marlin/Processor.h"
 
-using namespace lcio ;
-
 
 namespace marlin{
 

source/include/marlin/EventSelector.h

@@ -8,9 +8,6 @@
 #include <set>
 #include <map>  // pair
 
-using namespace lcio ;
-using namespace marlin ;
-
 
 /** Simple event selector processor. Returns true if the given event 
  *  was specified in the EvenList parameter.
@@ -42,15 +39,15 @@ namespace marlin {
 
     /** Called for every run.
      */
-    virtual void processRunHeader( LCRunHeader* run ) ;
+    virtual void processRunHeader( EVENT::LCRunHeader* run ) ;
 
     /** Called for every event - the working horse.
      */
-    virtual void processEvent( LCEvent * evt ) ;
+    virtual void processEvent( EVENT::LCEvent * evt ) ;
 
-    virtual void check( LCEvent * evt ) ;
+    virtual void check( EVENT::LCEvent * evt ) ;
 
-    virtual void modifyEvent( LCEvent *evt ) ;
+    virtual void modifyEvent( EVENT::LCEvent *evt ) ;
 
     /** Called after data processing for clean up.
      */
@@ -63,7 +60,7 @@ namespace marlin {
 
     /** Input collection name.
      */
-    IntVec _evtList{};
+    EVENT::IntVec _evtList{};
     SET _evtSet{};
 
     int _nRun=-1;

source/include/marlin/Exceptions.h

@@ -18,7 +18,8 @@ namespace marlin{
   protected:
     ParseException() {  /*no_op*/ ; } 
   public: 
-    virtual ~ParseException() throw() { /*no_op*/; } 
+    virtual ~ParseException() noexcept { /*no_op*/; } 
+    ParseException( const ParseException& e ) = default ;
 
     ParseException( std::string text ){
       message = "marlin::ParseException: " + text ;
@@ -40,7 +41,7 @@ namespace marlin{
     SkipEventException(const Processor* proc){
       message = proc->name()  ;
     }
-    virtual ~SkipEventException() throw() { /*no_op*/; } 
+    virtual ~SkipEventException() noexcept { /*no_op*/; } 
 
   }; 
 
@@ -58,7 +59,7 @@ namespace marlin{
     StopProcessingException(const Processor* proc){
       message = proc->name()  ;
     }
-    virtual ~StopProcessingException() throw() { /*no_op*/; } 
+    virtual ~StopProcessingException() noexcept { /*no_op*/; } 
 
   }; 
 
@@ -76,7 +77,7 @@ namespace marlin{
     RewindDataFilesException(const Processor* proc){
       message = proc->name()  ;
     }
-    virtual ~RewindDataFilesException() throw() { /*no_op*/; } 
+    virtual ~RewindDataFilesException() noexcept { /*no_op*/; } 
 
   }; 
 

source/include/marlin/IFourVectorSmearer.h

@@ -8,7 +8,6 @@
 #include "CLHEP/Vector/LorentzVector.h"
 
 namespace CLHEP{}    // declare namespace CLHEP for backward compatibility
-using namespace CLHEP ;
 
 
 namespace marlin{
@@ -29,7 +28,7 @@ namespace marlin{
 
     /** Smears the given four vector 
      */ 
-    virtual HepLorentzVector smearedFourVector( const HepLorentzVector& v, int pdgCode ) = 0 ;
+    virtual CLHEP::HepLorentzVector smearedFourVector( const CLHEP::HepLorentzVector& v, int pdgCode ) = 0 ;
 
   } ;
 

source/include/marlin/LCIOOutputProcessor.h

@@ -6,8 +6,6 @@
 #include "IO/LCWriter.h"
 
 
-using namespace lcio ;
-
 namespace IMPL{
   class LCCollectionVec ;
 }
@@ -47,7 +45,7 @@ namespace marlin{
    */
   class LCIOOutputProcessor : public Processor {
 
-    typedef std::vector< LCCollectionVec* > SubSetVec ;
+    typedef std::vector< lcio::LCCollectionVec* > SubSetVec ;
 
 
   public:  
@@ -70,11 +68,11 @@ namespace marlin{
 
     /** Write every run header.
      */
-    virtual void processRunHeader( LCRunHeader* run) ;
+    virtual void processRunHeader( EVENT::LCRunHeader* run) ;
 
     /** Write every event.
      */
-    virtual void processEvent( LCEvent * evt ) ; 
+    virtual void processEvent( EVENT::LCEvent * evt ) ; 
 
     /** Close outputfile.
      */
@@ -83,24 +81,24 @@ namespace marlin{
     /** Drops the collections specified in the steering file parameters DropCollectionNames and 
      *  DropCollectionTypes. 
      */
-    void dropCollections( LCEvent * evt ) ;
+    void dropCollections( EVENT::LCEvent * evt ) ;
 
 
   protected:
 
     std::string _lcioOutputFile="";
     std::string _lcioWriteMode="";
 
-    StringVec _dropCollectionNames{};
-    StringVec _dropCollectionTypes{};
-    StringVec _keepCollectionNames{};
-    StringVec _fullSubsetCollections{};
+    EVENT::StringVec _dropCollectionNames{};
+    EVENT::StringVec _dropCollectionTypes{};
+    EVENT::StringVec _keepCollectionNames{};
+    EVENT::StringVec _fullSubsetCollections{};
 
     int _splitFileSizekB=1992294;
 
     SubSetVec _subSets{};
 
-    LCWriter* _lcWrt=NULL;
+    lcio::LCWriter* _lcWrt=NULL;
     int _nRun=-1;
     int _nEvt=-1;
     int _compressionLevel{6};

source/include/marlin/LogicalExpressions.h

@@ -127,9 +127,6 @@ namespace marlin{
       _last = c ;
     }
 
-    ~Tokenizer(){
-    }
-
     std::vector<Expression> & result()  { 
 
       return _tokens ; 

source/include/marlin/MarlinSteerCheck.h

@@ -101,7 +101,7 @@ namespace marlin {
     ColVec& getLCIOCols() const;
 
     /** Returns the names of the LCIO files found in the global section*/
-    StringVec& getLCIOFiles(){ return _lcioFiles; }
+    EVENT::StringVec& getLCIOFiles(){ return _lcioFiles; }
 
     /** Returns a list of all available Collections for a given type, name and processor (to use in a ComboBox) */
     sSet& getColsSet( const std::string& type, const std::string& name, CCProcessor* proc );
@@ -227,7 +227,7 @@ namespace marlin {
     ProcVec _aProc{};			//active processors
     ProcVec _iProc{};			//inactive processors
     sColVecMap _lcioCols{};		//LCIO collections
-    StringVec _lcioFiles{};		//LCIO filenames
+    EVENT::StringVec _lcioFiles{};		//LCIO filenames
 
     sSet _colValues{};			//all available collection values for a given type (use in ComboBox)
 

source/include/marlin/MemoryMonitor.h

@@ -8,9 +8,6 @@
 #include "stdio.h"
 #include "string.h"
 
-using namespace lcio ;
-using namespace marlin ;
-
 
 /** MemoryMonitor is a memory monitoring application for Marlin
  *  <h4>Input - Prerequisites</h4>
@@ -24,7 +21,7 @@ using namespace marlin ;
  * @author N. Nikiforou, CERN,
  */
 
-class MemoryMonitor : public Processor {
+class MemoryMonitor : public marlin::Processor {
 
 public:
 
@@ -36,13 +33,13 @@ class MemoryMonitor : public Processor {
 	virtual void init() ;
 
 	// Called at the beginning of every run
-	virtual void processRunHeader( LCRunHeader* run ) ;
+       virtual void processRunHeader( EVENT::LCRunHeader* run ) ;
 
 	// Run over each event - the main algorithm
-	virtual void processEvent( LCEvent * evt ) ;
+        virtual void processEvent( EVENT::LCEvent * evt ) ;
 
   // Run at the end of each event
-	virtual void check( LCEvent * evt ) ;
+        virtual void check( EVENT::LCEvent * evt ) ;
 
 	// Called at the very end for cleanup, histogram saving, etc.
 	virtual void end() ;

source/include/marlin/Parser.h

@@ -113,9 +113,6 @@ class LCTokenizer{
 
   } 
 
-  ~LCTokenizer(){
-  }
-
   std::vector<std::string> & result()  { 
 
     return _tokens ; 

source/include/marlin/PatchCollections.h

@@ -9,9 +9,6 @@
 #include <utility>  // pair
 #include <memory>
 
-using namespace lcio ;
-using namespace marlin ;
-
 namespace UTIL{
   class CheckCollections ;
 }
@@ -56,13 +53,13 @@ namespace marlin {
 
     /** Called for every run.
      */
-    virtual void processRunHeader( LCRunHeader* run ) ;
+    virtual void processRunHeader( EVENT::LCRunHeader* run ) ;
 
     /** Called for every event - the working horse.
      */
-    virtual void processEvent( LCEvent * evt ) ;
+    virtual void processEvent( EVENT::LCEvent * evt ) ;
 
-    virtual void check( LCEvent * evt ) ;
+    virtual void check( EVENT::LCEvent * evt ) ;
 
 //    virtual void modifyEvent( LCEvent *evt ) ;
 
@@ -75,7 +72,7 @@ namespace marlin {
 
   protected:
 
-    StringVec _colList{};
+    EVENT::StringVec _colList{};
     Vector _patchCols{};
     bool _parseFiles = false ;
 

source/include/marlin/Processor.h

@@ -32,8 +32,6 @@
 
 class MarlinProcessorWrapper;
 
-using namespace lcio ;
-
 
 namespace marlin{
 /** Helper class that gives an external processor manager access to private
@@ -117,17 +115,17 @@ struct ExternalProcessorMgrAccessor {
     /** Called for every run, e.g. overwrite to initialize run dependent 
      *  histograms.
      */
-    virtual void processRunHeader( LCRunHeader* ) { } 
+    virtual void processRunHeader( EVENT::LCRunHeader* ) { } 
 
     /** Called for every event - the working horse. 
      */
-    virtual void processEvent( LCEvent * ) { }
+    virtual void processEvent( EVENT::LCEvent * ) { }
 
     /** Called for every event - right after processEvent()
      *  has been called for  this processor.
      *  Use to check processing and/or produce check plots.
      */
-    virtual void check( LCEvent* ) { }
+    virtual void check( EVENT::LCEvent* ) { }
 
     /**
      * Public overload of setFirstEvent for use in external processor managers
@@ -316,8 +314,8 @@ struct ExternalProcessorMgrAccessor {
     void registerInputCollections(const std::string& collectionType,
 				  const std::string& parameterName, 
 				  const std::string& parameterDescription,
-				  StringVec& parameter,
-				  const StringVec& defaultVal,
+				  EVENT::StringVec& parameter,
+				  const EVENT::StringVec& defaultVal,
 				  int setSize=0 ) {
 
       setLCIOInType( parameterName , collectionType ) ;