From 7bd902376d9818354fe83a497cc3ead710f76846 Mon Sep 17 00:00:00 2001 From: Jürgen Knödlseder Date: Sat, 13 Oct 2012 23:25:43 +0200 Subject: [PATCH] Remove ostream and GLog friends. --- include/GCaldb.hpp | 5 ----- include/GDerivative.hpp | 5 ----- include/GEbounds.hpp | 5 ----- include/GEvent.hpp | 6 ------ include/GEvents.hpp | 6 ------ include/GFitsHeader.hpp | 6 ------ include/GGti.hpp | 10 ++-------- include/GInstDir.hpp | 6 ------ include/GIntegral.hpp | 6 ------ include/GModel.hpp | 6 ------ include/GModelPar.hpp | 6 ------ include/GModelSpatial.hpp | 6 ------ include/GModelSpectral.hpp | 6 ------ include/GModelTemporal.hpp | 6 ------ include/GNodeArray.hpp | 5 ----- include/GObservation.hpp | 9 --------- src/fits/GFitsHeader.cpp | 43 ++----------------------------------------- src/model/GModel.cpp | 38 -------------------------------------- src/model/GModelPar.cpp | 42 ++---------------------------------------- src/model/GModelSpatial.cpp | 42 ++---------------------------------------- src/model/GModelSpectral.cpp | 42 ++---------------------------------------- src/model/GModelTemporal.cpp | 42 ++---------------------------------------- src/numerics/GDerivative.cpp | 40 +--------------------------------------- src/numerics/GIntegral.cpp | 40 +--------------------------------------- src/obs/GCaldb.cpp | 42 ++---------------------------------------- src/obs/GEbounds.cpp | 44 +++----------------------------------------- src/obs/GEvent.cpp | 44 ++------------------------------------------ src/obs/GEvents.cpp | 42 ++---------------------------------------- src/obs/GGti.cpp | 43 ++----------------------------------------- src/obs/GInstDir.cpp | 42 ++---------------------------------------- src/obs/GObservation.cpp | 38 -------------------------------------- src/support/GNodeArray.cpp | 41 +---------------------------------------- 32 files changed, 28 insertions(+), 736 deletions(-) diff --git a/include/GCaldb.hpp b/include/GCaldb.hpp index cad35d5..efaa348 100644 --- a/include/GCaldb.hpp +++ b/include/GCaldb.hpp @@ -31,7 +31,6 @@ #include #include #include "GBase.hpp" -#include "GLog.hpp" #include "GFits.hpp" #include "GFitsBinTable.hpp" @@ -60,10 +59,6 @@ ***************************************************************************/ class GCaldb : public GBase { - // I/O friends - friend std::ostream& operator<<(std::ostream& os, const GCaldb& caldb); - friend GLog& operator<<(GLog& log, const GCaldb& caldb); - public: // Constructors and destructors GCaldb(void); diff --git a/include/GDerivative.hpp b/include/GDerivative.hpp index e397aa1..7122f3d 100644 --- a/include/GDerivative.hpp +++ b/include/GDerivative.hpp @@ -31,7 +31,6 @@ #include #include #include "GBase.hpp" -#include "GLog.hpp" #include "GFunction.hpp" @@ -46,10 +45,6 @@ ***************************************************************************/ class GDerivative : public GBase { - // I/O friends - friend std::ostream& operator<<(std::ostream& os, const GDerivative& dx); - friend GLog& operator<<(GLog& log, const GDerivative& dx); - public: // Constructors and destructors diff --git a/include/GEbounds.hpp b/include/GEbounds.hpp index 2a0ac5d..9675bfd 100644 --- a/include/GEbounds.hpp +++ b/include/GEbounds.hpp @@ -31,7 +31,6 @@ #include #include #include "GBase.hpp" -#include "GLog.hpp" #include "GFits.hpp" #include "GFitsTable.hpp" #include "GEnergy.hpp" @@ -46,10 +45,6 @@ ***************************************************************************/ class GEbounds : public GBase { - // I/O friends - friend std::ostream& operator<<(std::ostream& os, const GEbounds& ebds); - friend GLog& operator<<(GLog& log, const GEbounds& ebds); - public: // Constructors and destructors GEbounds(void); diff --git a/include/GEvent.hpp b/include/GEvent.hpp index 4811914..ace1b6e 100644 --- a/include/GEvent.hpp +++ b/include/GEvent.hpp @@ -29,9 +29,7 @@ /* __ Includes ___________________________________________________________ */ #include -#include #include "GBase.hpp" -#include "GLog.hpp" #include "GInstDir.hpp" #include "GEnergy.hpp" #include "GTime.hpp" @@ -72,10 +70,6 @@ ***************************************************************************/ class GEvent : public GBase { - // I/O friends - friend std::ostream& operator<< (std::ostream& os, const GEvent& event); - friend GLog& operator<< (GLog& log, const GEvent& event); - public: // Constructors and destructors GEvent(void); diff --git a/include/GEvents.hpp b/include/GEvents.hpp index 49ee6a3..512bfd0 100644 --- a/include/GEvents.hpp +++ b/include/GEvents.hpp @@ -29,9 +29,7 @@ /* __ Includes ___________________________________________________________ */ #include -#include #include "GBase.hpp" -#include "GLog.hpp" #include "GEvent.hpp" #include "GFits.hpp" #include "GEbounds.hpp" @@ -64,10 +62,6 @@ ***************************************************************************/ class GEvents : public GBase { - // I/O friends - friend std::ostream& operator<<(std::ostream& os, const GEvents& events); - friend GLog& operator<<(GLog& log, const GEvents& events); - public: // Constructors and destructors GEvents(void); diff --git a/include/GFitsHeader.hpp b/include/GFitsHeader.hpp index a700773..f730df3 100644 --- a/include/GFitsHeader.hpp +++ b/include/GFitsHeader.hpp @@ -28,9 +28,7 @@ #define GFITSHEADER_HPP /* __ Includes ___________________________________________________________ */ -#include #include "GBase.hpp" -#include "GLog.hpp" #include "GFitsHeaderCard.hpp" @@ -47,10 +45,6 @@ ***************************************************************************/ class GFitsHeader : public GBase { - // I/O friends - friend std::ostream& operator<< (std::ostream& os, const GFitsHeader& header); - friend GLog& operator<< (GLog& log, const GFitsHeader& header); - public: // Constructors and destructors GFitsHeader(void); diff --git a/include/GGti.hpp b/include/GGti.hpp index 112786d..ca1376f 100644 --- a/include/GGti.hpp +++ b/include/GGti.hpp @@ -1,7 +1,7 @@ /*************************************************************************** * GGti.hpp - Good time interval class * * ----------------------------------------------------------------------- * - * copyright (C) 2008-2011 by Juergen Knoedlseder * + * copyright (C) 2008-2012 by Juergen Knoedlseder * * ----------------------------------------------------------------------- * * * * This program is free software: you can redistribute it and/or modify * @@ -21,7 +21,7 @@ /** * @file GGti.hpp * @brief Good time interval class interface definition - * @author J. Knoedlseder + * @author Juergen Knoedlseder */ #ifndef GGTI_HPP @@ -29,9 +29,7 @@ /* __ Includes ___________________________________________________________ */ #include -#include #include "GBase.hpp" -#include "GLog.hpp" #include "GFits.hpp" #include "GFitsTable.hpp" #include "GTime.hpp" @@ -47,10 +45,6 @@ ***************************************************************************/ class GGti : public GBase { - // I/O friends - friend std::ostream& operator<< (std::ostream& os, const GGti& gti); - friend GLog& operator<< (GLog& log, const GGti& gti); - public: // Constructors and destructors GGti(void); diff --git a/include/GInstDir.hpp b/include/GInstDir.hpp index 7abb35f..142db8c 100644 --- a/include/GInstDir.hpp +++ b/include/GInstDir.hpp @@ -29,9 +29,7 @@ /* __ Includes ___________________________________________________________ */ #include -#include #include "GBase.hpp" -#include "GLog.hpp" /***********************************************************************//** @@ -48,10 +46,6 @@ ***************************************************************************/ class GInstDir : public GBase { - // I/O friends - friend std::ostream& operator<< (std::ostream& os, const GInstDir& dir); - friend GLog& operator<< (GLog& log, const GInstDir& dir); - public: // Constructors and destructors GInstDir(void); diff --git a/include/GIntegral.hpp b/include/GIntegral.hpp index e4df685..3dc03c7 100644 --- a/include/GIntegral.hpp +++ b/include/GIntegral.hpp @@ -29,9 +29,7 @@ /* __ Includes ___________________________________________________________ */ #include -#include #include "GBase.hpp" -#include "GLog.hpp" #include "GIntegrand.hpp" @@ -45,10 +43,6 @@ ***************************************************************************/ class GIntegral : public GBase { - // I/O friends - friend std::ostream& operator<<(std::ostream& os, const GIntegral& integral); - friend GLog& operator<<(GLog& log, const GIntegral& integral); - public: // Constructors and destructors diff --git a/include/GModel.hpp b/include/GModel.hpp index 6d3f13b..76871df 100644 --- a/include/GModel.hpp +++ b/include/GModel.hpp @@ -30,9 +30,7 @@ /* __ Includes ___________________________________________________________ */ #include #include -#include #include "GBase.hpp" -#include "GLog.hpp" #include "GModelPar.hpp" #include "GXmlElement.hpp" #include "GEnergy.hpp" @@ -65,10 +63,6 @@ class GObservation; ***************************************************************************/ class GModel : public GBase { - // I/O friends - friend std::ostream& operator<< (std::ostream& os, const GModel& model); - friend GLog& operator<< (GLog& log, const GModel& model); - public: // Constructors and destructors GModel(void); diff --git a/include/GModelPar.hpp b/include/GModelPar.hpp index 22c8c32..45a7f08 100644 --- a/include/GModelPar.hpp +++ b/include/GModelPar.hpp @@ -29,9 +29,7 @@ /* __ Includes ___________________________________________________________ */ #include -#include #include "GBase.hpp" -#include "GLog.hpp" #include "GException.hpp" #include "GXmlElement.hpp" @@ -57,10 +55,6 @@ ***************************************************************************/ class GModelPar : public GBase { - // I/O friends - friend std::ostream& operator<<(std::ostream& os, const GModelPar& par); - friend GLog& operator<<(GLog& log, const GModelPar& par); - public: // Constructors and destructors GModelPar(void); diff --git a/include/GModelSpatial.hpp b/include/GModelSpatial.hpp index 113f52a..317fc36 100644 --- a/include/GModelSpatial.hpp +++ b/include/GModelSpatial.hpp @@ -30,9 +30,7 @@ /* __ Includes ___________________________________________________________ */ #include #include -#include #include "GBase.hpp" -#include "GLog.hpp" #include "GModelPar.hpp" #include "GSkyDir.hpp" #include "GXmlElement.hpp" @@ -50,10 +48,6 @@ ***************************************************************************/ class GModelSpatial : public GBase { - // I/O friends - friend std::ostream& operator<<(std::ostream& os, const GModelSpatial& model); - friend GLog& operator<<(GLog& log, const GModelSpatial& model); - public: // Constructors and destructors GModelSpatial(void); diff --git a/include/GModelSpectral.hpp b/include/GModelSpectral.hpp index ebbe1e3..46bf0a6 100644 --- a/include/GModelSpectral.hpp +++ b/include/GModelSpectral.hpp @@ -30,9 +30,7 @@ /* __ Includes ___________________________________________________________ */ #include #include -#include #include "GBase.hpp" -#include "GLog.hpp" #include "GModelPar.hpp" #include "GEnergy.hpp" #include "GRan.hpp" @@ -49,10 +47,6 @@ ***************************************************************************/ class GModelSpectral : public GBase { - // I/O friends - friend std::ostream& operator<<(std::ostream& os, const GModelSpectral& model); - friend GLog& operator<<(GLog& log, const GModelSpectral& model); - public: // Constructors and destructors GModelSpectral(void); diff --git a/include/GModelTemporal.hpp b/include/GModelTemporal.hpp index 2012fae..1968db0 100644 --- a/include/GModelTemporal.hpp +++ b/include/GModelTemporal.hpp @@ -30,9 +30,7 @@ /* __ Includes ___________________________________________________________ */ #include #include -#include #include "GBase.hpp" -#include "GLog.hpp" #include "GModelPar.hpp" #include "GTime.hpp" #include "GRan.hpp" @@ -51,10 +49,6 @@ ***************************************************************************/ class GModelTemporal : public GBase { - // I/O friends - friend std::ostream& operator<<(std::ostream& os, const GModelTemporal& model); - friend GLog& operator<<(GLog& log, const GModelTemporal& model); - public: // Constructors and destructors GModelTemporal(void); diff --git a/include/GNodeArray.hpp b/include/GNodeArray.hpp index 4093bd8..3080d40 100644 --- a/include/GNodeArray.hpp +++ b/include/GNodeArray.hpp @@ -32,7 +32,6 @@ #include #include #include "GBase.hpp" -#include "GLog.hpp" #include "GVector.hpp" @@ -56,10 +55,6 @@ ***************************************************************************/ class GNodeArray : public GBase { - // I/O friends - friend std::ostream& operator<<(std::ostream& os, const GNodeArray& array); - friend GLog& operator<<(GLog& log, const GNodeArray& array); - public: // Constructors and destructors GNodeArray(void); diff --git a/include/GObservation.hpp b/include/GObservation.hpp index fc5aa0c..e255d43 100644 --- a/include/GObservation.hpp +++ b/include/GObservation.hpp @@ -29,9 +29,7 @@ /* __ Includes ___________________________________________________________ */ #include -#include #include "GBase.hpp" -#include "GLog.hpp" #include "GEvents.hpp" #include "GResponse.hpp" #include "GPointing.hpp" @@ -62,13 +60,6 @@ ***************************************************************************/ class GObservation : public GBase { - // Friend classes - //friend class GObservations; - - // I/O friends - friend std::ostream& operator<< (std::ostream& os, const GObservation& obs); - friend GLog& operator<< (GLog& log, const GObservation& obs); - public: // Constructors and destructors GObservation(void); diff --git a/src/fits/GFitsHeader.cpp b/src/fits/GFitsHeader.cpp index 5b6ed92..611839d 100644 --- a/src/fits/GFitsHeader.cpp +++ b/src/fits/GFitsHeader.cpp @@ -1,7 +1,7 @@ /*************************************************************************** * GFitsHeader.cpp - FITS header handling class * * ----------------------------------------------------------------------- * - * copyright (C) 2008-2011 by Juergen Knoedlseder * + * copyright (C) 2008-2012 by Juergen Knoedlseder * * ----------------------------------------------------------------------- * * * * This program is free software: you can redistribute it and/or modify * @@ -21,14 +21,13 @@ /** * @file GFitsHeader.cpp * @brief FITS header class implementation - * @author J. Knoedlseder + * @author Juergen Knoedlseder */ /* __ Includes ___________________________________________________________ */ #ifdef HAVE_CONFIG_H #include #endif -#include #include "GException.hpp" #include "GFitsCfitsio.hpp" #include "GFitsHeader.hpp" @@ -636,41 +635,3 @@ GFitsHeaderCard* GFitsHeader::card_ptr(const std::string& keyname) const // Return pointer return ptr; } - - -/*========================================================================== - = = - = GFitsHeader friends = - = = - ==========================================================================*/ - -/***********************************************************************//** - * @brief Output operator - * - * @param[in] os Output stream. - * @param[in] header FITS header. - ***************************************************************************/ -std::ostream& operator<< (std::ostream& os, const GFitsHeader& header) -{ - // Write header in output stream - os << header.print(); - - // Return output stream - return os; -} - - -/***********************************************************************//** - * @brief Log operator - * - * @param[in] log Logger. - * @param[in] header FITS header. - ***************************************************************************/ -GLog& operator<< (GLog& log, const GFitsHeader& header) -{ - // Write header in logger - log << header.print(); - - // Return logger - return log; -} diff --git a/src/model/GModel.cpp b/src/model/GModel.cpp index a8f4e26..003d19b 100644 --- a/src/model/GModel.cpp +++ b/src/model/GModel.cpp @@ -415,41 +415,3 @@ std::string GModel::print_name_instrument(void) const // Return result return result; } - - -/*========================================================================== - = = - = Friends = - = = - ==========================================================================*/ - -/***********************************************************************//** - * @brief Output operator - * - * @param[in] os Output stream. - * @param[in] model Model. - ***************************************************************************/ -std::ostream& operator<< (std::ostream& os, const GModel& model) -{ - // Write spectrum in output stream - os << model.print(); - - // Return output stream - return os; -} - - -/***********************************************************************//** - * @brief Log operator - * - * @param[in] log Logger. - * @param[in] model Model. - ***************************************************************************/ -GLog& operator<< (GLog& log, const GModel& model) -{ - // Write spectrum into logger - log << model.print(); - - // Return logger - return log; -} diff --git a/src/model/GModelPar.cpp b/src/model/GModelPar.cpp index 823c77f..a80495c 100644 --- a/src/model/GModelPar.cpp +++ b/src/model/GModelPar.cpp @@ -1,7 +1,7 @@ /*************************************************************************** * GModelPar.cpp - Model parameter class * * ----------------------------------------------------------------------- * - * copyright (C) 2009-2011 by Jurgen Knodlseder * + * copyright (C) 2009-2012 by Juergen Knoedlseder * * ----------------------------------------------------------------------- * * * * This program is free software: you can redistribute it and/or modify * @@ -21,7 +21,7 @@ /** * @file GModelPar.cpp * @brief GModelPar class implementation. - * @author J. Knodlseder + * @author Juergen Knoedlseder */ /* __ Includes ___________________________________________________________ */ @@ -532,41 +532,3 @@ void GModelPar::free_members(void) // Return return; } - - -/*========================================================================== - = = - = Friends = - = = - ==========================================================================*/ - -/***********************************************************************//** - * @brief Output operator - * - * @param[in] os Output stream. - * @param[in] par Model parameter. - ***************************************************************************/ -std::ostream& operator<< (std::ostream& os, const GModelPar& par) -{ - // Write spectrum in output stream - os << par.print(); - - // Return output stream - return os; -} - - -/***********************************************************************//** - * @brief Log operator - * - * @param[in] log Logger. - * @param[in] par Model parameter. - ***************************************************************************/ -GLog& operator<< (GLog& log, const GModelPar& par) -{ - // Write spectrum into logger - log << par.print(); - - // Return logger - return log; -} diff --git a/src/model/GModelSpatial.cpp b/src/model/GModelSpatial.cpp index 95569c4..097f8c3 100644 --- a/src/model/GModelSpatial.cpp +++ b/src/model/GModelSpatial.cpp @@ -1,7 +1,7 @@ /*************************************************************************** * GModelSpatial.cpp - Abstract spatial model base class * * ----------------------------------------------------------------------- * - * copyright (C) 2009-2010 by Jurgen Knodlseder * + * copyright (C) 2009-2012 by Juergen Knoedlseder * * ----------------------------------------------------------------------- * * * * This program is free software: you can redistribute it and/or modify * @@ -21,7 +21,7 @@ /** * @file GModelSpatial.cpp * @brief Abstract spatial model base class implementation - * @author J. Knodlseder + * @author Juergen Knoedlseder */ /* __ Includes ___________________________________________________________ */ @@ -266,41 +266,3 @@ void GModelSpatial::free_members(void) // Return return; } - - -/*========================================================================== - = = - = Friends = - = = - ==========================================================================*/ - -/***********************************************************************//** - * @brief Output operator - * - * @param[in] os Output stream. - * @param[in] model Spatial model. - ***************************************************************************/ -std::ostream& operator<<(std::ostream& os, const GModelSpatial& model) -{ - // Write model in output stream - os << model.print(); - - // Return output stream - return os; -} - - -/***********************************************************************//** - * @brief Log operator - * - * @param[in] log Logger. - * @param[in] model Spatial model. - ***************************************************************************/ -GLog& operator<<(GLog& log, const GModelSpatial& model) -{ - // Write model into logger - log << model.print(); - - // Return logger - return log; -} diff --git a/src/model/GModelSpectral.cpp b/src/model/GModelSpectral.cpp index 15312bd..efca959 100644 --- a/src/model/GModelSpectral.cpp +++ b/src/model/GModelSpectral.cpp @@ -1,7 +1,7 @@ /*************************************************************************** * GModelSpectral.cpp - Abstract spectral model base class * * ----------------------------------------------------------------------- * - * copyright (C) 2009-2011 by Jurgen Knodlseder * + * copyright (C) 2009-2012 by Juergen Knoedlseder * * ----------------------------------------------------------------------- * * * * This program is free software: you can redistribute it and/or modify * @@ -21,7 +21,7 @@ /** * @file GModelSpectral.cpp * @brief Abstract spectral model base class implementation - * @author J. Knodlseder + * @author Juergen Knoedlseder */ /* __ Includes ___________________________________________________________ */ @@ -266,41 +266,3 @@ void GModelSpectral::free_members(void) // Return return; } - - -/*========================================================================== - = = - = Friends = - = = - ==========================================================================*/ - -/***********************************************************************//** - * @brief Output operator - * - * @param[in] os Output stream. - * @param[in] model Spectral model. - ***************************************************************************/ -std::ostream& operator<< (std::ostream& os, const GModelSpectral& model) -{ - // Write model in output stream - os << model.print(); - - // Return output stream - return os; -} - - -/***********************************************************************//** - * @brief Log operator - * - * @param[in] log Logger. - * @param[in] model Spectral model. - ***************************************************************************/ -GLog& operator<< (GLog& log, const GModelSpectral& model) -{ - // Write model into logger - log << model.print(); - - // Return logger - return log; -} diff --git a/src/model/GModelTemporal.cpp b/src/model/GModelTemporal.cpp index 79f56c8..1c1d7c9 100644 --- a/src/model/GModelTemporal.cpp +++ b/src/model/GModelTemporal.cpp @@ -1,7 +1,7 @@ /*************************************************************************** * GModelTemporal.cpp - Abstract temporal model base class * * ----------------------------------------------------------------------- * - * copyright (C) 2009-2010 by Jurgen Knodlseder * + * copyright (C) 2009-2012 by Juergen Knoedlseder * * ----------------------------------------------------------------------- * * * * This program is free software: you can redistribute it and/or modify * @@ -21,7 +21,7 @@ /** * @file GModelTemporal.cpp * @brief Abstract temporal model base class implementation - * @author J. Knodlseder + * @author Juergen Knoedlseder */ /* __ Includes ___________________________________________________________ */ @@ -266,41 +266,3 @@ void GModelTemporal::free_members(void) // Return return; } - - -/*========================================================================== - = = - = Friends = - = = - ==========================================================================*/ - -/***********************************************************************//** - * @brief Output operator - * - * @param[in] os Output stream. - * @param[in] model Temporal model. - ***************************************************************************/ -std::ostream& operator<<(std::ostream& os, const GModelTemporal& model) -{ - // Write model in output stream - os << model.print(); - - // Return output stream - return os; -} - - -/***********************************************************************//** - * @brief Log operator - * - * @param[in] log Logger. - * @param[in] model Temporal model. - ***************************************************************************/ -GLog& operator<<(GLog& log, const GModelTemporal& model) -{ - // Write model into logger - log << model.print(); - - // Return logger - return log; -} diff --git a/src/numerics/GDerivative.cpp b/src/numerics/GDerivative.cpp index 3d25743..eda9939 100644 --- a/src/numerics/GDerivative.cpp +++ b/src/numerics/GDerivative.cpp @@ -21,7 +21,7 @@ /** * @file GDerivative.cpp * @brief GDerivative class implementation. - * @author J. Knoedlseder + * @author Juergen Knoedlseder */ /* __ Includes ___________________________________________________________ */ @@ -658,41 +658,3 @@ double GDerivative::tiny::operator()(double eps) const // Return result return result; } - - -/*========================================================================== - = = - = Friends = - = = - ==========================================================================*/ - -/***********************************************************************//** - * @brief Output operator - * - * @param[in] os Output stream. - * @param[in] dx Derivative. - ***************************************************************************/ -std::ostream& operator<< (std::ostream& os, const GDerivative& dx) -{ - // Write derivative in output stream - os << dx.print(); - - // Return output stream - return os; -} - - -/***********************************************************************//** - * @brief Log operator - * - * @param[in] log Logger. - * @param[in] dx Derivative. - ***************************************************************************/ -GLog& operator<< (GLog& log, const GDerivative& dx) -{ - // Write derivative into logger - log << dx.print(); - - // Return logger - return log; -} diff --git a/src/numerics/GIntegral.cpp b/src/numerics/GIntegral.cpp index b13fe47..b4c9d57 100644 --- a/src/numerics/GIntegral.cpp +++ b/src/numerics/GIntegral.cpp @@ -21,7 +21,7 @@ /** * @file GIntegral.cpp * @brief Integration class implementation - * @author J. Knoedlseder + * @author Juergen Knoedlseder */ /* __ Includes ___________________________________________________________ */ @@ -507,41 +507,3 @@ double GIntegral::polint(double* xa, double* ya, int n, double x, double *dy) // Return return y; } - - -/*========================================================================== - = = - = Friends = - = = - ==========================================================================*/ - -/***********************************************************************//** - * @brief Output operator - * - * @param[in] os Output stream. - * @param[in] integral Integral. - ***************************************************************************/ -std::ostream& operator<< (std::ostream& os, const GIntegral& integral) -{ - // Write integral in output stream - os << integral.print(); - - // Return output stream - return os; -} - - -/***********************************************************************//** - * @brief Log operator - * - * @param[in] log Logger. - * @param[in] integral Integral. - ***************************************************************************/ -GLog& operator<< (GLog& log, const GIntegral& integral) -{ - // Write integral into logger - log << integral.print(); - - // Return logger - return log; -} diff --git a/src/obs/GCaldb.cpp b/src/obs/GCaldb.cpp index 25dc3a0..7380b01 100644 --- a/src/obs/GCaldb.cpp +++ b/src/obs/GCaldb.cpp @@ -1,7 +1,7 @@ /*************************************************************************** * GCaldb.cpp - Calibration database class * * ----------------------------------------------------------------------- * - * copyright (C) 2011 by Juergen Knoedlseder * + * copyright (C) 2011-2012 by Juergen Knoedlseder * * ----------------------------------------------------------------------- * * * * This program is free software: you can redistribute it and/or modify * @@ -21,7 +21,7 @@ /** * @file GCaldb.cpp * @brief Calibration database class implementation. - * @author J. Knoedlseder + * @author Juergen Knoedlseder */ /* __ Includes ___________________________________________________________ */ @@ -558,41 +558,3 @@ std::string GCaldb::cifname(const std::string& mission, const std::string& instr // Return cif return cif; } - - -/*========================================================================== - = = - = Friends = - = = - ==========================================================================*/ - -/***********************************************************************//** - * @brief Output operator - * - * @param[in] os Output stream. - * @param[in] caldb Calibration database. - ***************************************************************************/ -std::ostream& operator<< (std::ostream& os, const GCaldb& caldb) -{ - // Write calibration database in output stream - os << caldb.print(); - - // Return output stream - return os; -} - - -/***********************************************************************//** - * @brief Log operator - * - * @param[in] log Logger. - * @param[in] caldb Calibration database. - ***************************************************************************/ -GLog& operator<< (GLog& log, const GCaldb& caldb) -{ - // Write calibration database into logger - log << caldb.print(); - - // Return logger - return log; -} diff --git a/src/obs/GEbounds.cpp b/src/obs/GEbounds.cpp index 0c25534..aa7d9a6 100644 --- a/src/obs/GEbounds.cpp +++ b/src/obs/GEbounds.cpp @@ -1,7 +1,7 @@ /*************************************************************************** * GEbounds.cpp - Energy boundary class * * ----------------------------------------------------------------------- * - * copyright (C) 2009-2011 by Jurgen Knodlseder * + * copyright (C) 2009-2012 by Juergen Knoedlseder * * ----------------------------------------------------------------------- * * * * This program is free software: you can redistribute it and/or modify * @@ -21,7 +21,7 @@ /** * @file GEbounds.cpp * @brief Energy boundary class implementation. - * @author J. Knodlseder + * @author Juergen Knoedlseder */ /* __ Includes ___________________________________________________________ */ @@ -61,7 +61,7 @@ /***********************************************************************//** * @brief Constructor ***************************************************************************/ -GEbounds::GEbounds(void) +GEbounds::GEbounds(void) : GBase() { // Initialise class members for clean destruction init_members(); @@ -825,41 +825,3 @@ void GEbounds::merge_engs(void) // Return return; } - - -/*========================================================================== - = = - = Friends = - = = - ==========================================================================*/ - -/***********************************************************************//** - * @brief Output operator - * - * @param[in] os Output stream. - * @param[in] ebds Energy boundaries. - ***************************************************************************/ -std::ostream& operator<< (std::ostream& os, const GEbounds& ebds) -{ - // Write energy boundaries in output stream - os << ebds.print(); - - // Return output stream - return os; -} - - -/***********************************************************************//** - * @brief Log operator - * - * @param[in] log Logger. - * @param[in] ebds Energy boundaries. - ***************************************************************************/ -GLog& operator<< (GLog& log, const GEbounds& ebds) -{ - // Write energy boundaries into logger - log << ebds.print(); - - // Return logger - return log; -} diff --git a/src/obs/GEvent.cpp b/src/obs/GEvent.cpp index 563b557..fc8dfe1 100644 --- a/src/obs/GEvent.cpp +++ b/src/obs/GEvent.cpp @@ -1,7 +1,7 @@ /*************************************************************************** * GEvent.cpp - Event abstract base class * * ----------------------------------------------------------------------- * - * copyright (C) 2009-2010 by Jurgen Knodlseder * + * copyright (C) 2009-2012 by Juergen Knoedlseder * * ----------------------------------------------------------------------- * * * * This program is free software: you can redistribute it and/or modify * @@ -21,15 +21,13 @@ /** * @file GEvent.cpp * @brief GEvent abstract base class implementation. - * @author J. Knodlseder + * @author Juergen Knoedlseder */ /* __ Includes ___________________________________________________________ */ #ifdef HAVE_CONFIG_H #include #endif -#include -#include #include "GException.hpp" #include "GEvent.hpp" @@ -166,41 +164,3 @@ void GEvent::free_members(void) // Return return; } - - -/*========================================================================== - = = - = Friends = - = = - ==========================================================================*/ - - /***********************************************************************//** - * @brief Output operator - * - * @param[in] os Output stream. - * @param[in] event Event. - ***************************************************************************/ -std::ostream& operator<< (std::ostream& os, const GEvent& event) -{ - // Write event in output stream - os << event.print(); - - // Return output stream - return os; -} - - -/***********************************************************************//** - * @brief Log operator - * - * @param[in] log Logger. - * @param[in] event Event. - ***************************************************************************/ -GLog& operator<< (GLog& log, const GEvent& event) -{ - // Write event into logger - log << event.print(); - - // Return logger - return log; -} diff --git a/src/obs/GEvents.cpp b/src/obs/GEvents.cpp index 717d6b5..97008e5 100644 --- a/src/obs/GEvents.cpp +++ b/src/obs/GEvents.cpp @@ -1,7 +1,7 @@ /*************************************************************************** * GEvents.cpp - Abstract Event container class * * ----------------------------------------------------------------------- * - * copyright (C) 2008-2011 by Juergen Knoedlseder * + * copyright (C) 2008-2012 by Juergen Knoedlseder * * ----------------------------------------------------------------------- * * * * This program is free software: you can redistribute it and/or modify * @@ -21,7 +21,7 @@ /** * @file GEvents.cpp * @brief Abstract event container class implementation - * @author J. Knoedlseder + * @author Juergen Knoedlseder */ /* __ Includes ___________________________________________________________ */ @@ -291,41 +291,3 @@ void GEvents::free_members(void) // Return return; } - - -/*========================================================================== - = = - = Friends = - = = - ==========================================================================*/ - -/***********************************************************************//** - * @brief Output operator - * - * @param[in] os Output stream. - * @param[in] events Event container. - ***************************************************************************/ -std::ostream& operator<< (std::ostream& os, const GEvents& events) -{ - // Write events in output stream - os << events.print(); - - // Return output stream - return os; -} - - -/***********************************************************************//** - * @brief Log operator - * - * @param[in] log Logger. - * @param[in] events Event container. - ***************************************************************************/ -GLog& operator<< (GLog& log, const GEvents& events) -{ - // Write events into logger - log << events.print(); - - // Return logger - return log; -} diff --git a/src/obs/GGti.cpp b/src/obs/GGti.cpp index dd54f0f..c92722e 100644 --- a/src/obs/GGti.cpp +++ b/src/obs/GGti.cpp @@ -1,7 +1,7 @@ /*************************************************************************** * GGti.cpp - Good time interval class * * ----------------------------------------------------------------------- * - * copyright (C) 2008-2011 by Juergen Knoedlseder * + * copyright (C) 2008-2012 by Juergen Knoedlseder * * ----------------------------------------------------------------------- * * * * This program is free software: you can redistribute it and/or modify * @@ -21,7 +21,7 @@ /** * @file GGti.cpp * @brief Good time interval class implementation. - * @author J. Knoedlseder + * @author Juergen Knoedlseder */ /* __ Includes ___________________________________________________________ */ @@ -779,42 +779,3 @@ void GGti::merge_gtis(void) // Return return; } - - -/*========================================================================== - = = - = Friends = - = = - ==========================================================================*/ - - -/***********************************************************************//** - * @brief Output operator - * - * @param[in] os Output stream. - * @param[in] gti Good Time Intervals. - ***************************************************************************/ -std::ostream& operator<< (std::ostream& os, const GGti& gti) -{ - // Write GTIs in output stream - os << gti.print(); - - // Return output stream - return os; -} - - -/***********************************************************************//** - * @brief Log operator - * - * @param[in] log Logger. - * @param[in] gti Good Time Intervals. - ***************************************************************************/ -GLog& operator<< (GLog& log, const GGti& gti) -{ - // Write GTIs into logger - log << gti.print(); - - // Return logger - return log; -} diff --git a/src/obs/GInstDir.cpp b/src/obs/GInstDir.cpp index 966efd5..a71eb3c 100644 --- a/src/obs/GInstDir.cpp +++ b/src/obs/GInstDir.cpp @@ -1,7 +1,7 @@ /*************************************************************************** * GInstDir.cpp - Instrument direction class * * ----------------------------------------------------------------------- * - * copyright (C) 2010-2011 by Jurgen Knodlseder * + * copyright (C) 2010-2012 by Juergen Knoedlseder * * ----------------------------------------------------------------------- * * * * This program is free software: you can redistribute it and/or modify * @@ -21,7 +21,7 @@ /** * @file GInstDir.cpp * @brief Abstract instrument direction class implementation - * @author J. Knodlseder + * @author Juergen Knoedlseder */ /* __ Includes ___________________________________________________________ */ @@ -164,41 +164,3 @@ void GInstDir::free_members(void) // Return return; } - - -/*========================================================================== - = = - = Friends = - = = - ==========================================================================*/ - -/***********************************************************************//** - * @brief Output operator - * - * @param[in] os Output stream. - * @param[in] dir Instrument direction. - ***************************************************************************/ -std::ostream& operator<< (std::ostream& os, const GInstDir& dir) -{ - // Write instrument direction in output stream - os << dir.print(); - - // Return output stream - return os; -} - - -/***********************************************************************//** - * @brief Log operator - * - * @param[in] log Logger. - * @param[in] dir Instrument direction. - ***************************************************************************/ -GLog& operator<< (GLog& log, const GInstDir& dir) -{ - // Write instrument direction into logger - log << dir.print(); - - // Return logger - return log; -} diff --git a/src/obs/GObservation.cpp b/src/obs/GObservation.cpp index 99ef044..d32a586 100644 --- a/src/obs/GObservation.cpp +++ b/src/obs/GObservation.cpp @@ -963,41 +963,3 @@ double GObservation::npred_spec_kern::eval(double x) // Return value return value; } - - -/*========================================================================== - = = - = Friends = - = = - ==========================================================================*/ - -/***********************************************************************//** - * @brief Output operator - * - * @param[in] os Output stream. - * @param[in] obs Observation. - ***************************************************************************/ -std::ostream& operator<< (std::ostream& os, const GObservation& obs) -{ - // Write observation in output stream - os << obs.print(); - - // Return output stream - return os; -} - - -/***********************************************************************//** - * @brief Log operator - * - * @param[in] log Logger. - * @param[in] obs Observation. - ***************************************************************************/ -GLog& operator<< (GLog& log, const GObservation& obs) -{ - // Write observation into logger - log << obs.print(); - - // Return logger - return log; -} diff --git a/src/support/GNodeArray.cpp b/src/support/GNodeArray.cpp index 30dd13c..819f706 100644 --- a/src/support/GNodeArray.cpp +++ b/src/support/GNodeArray.cpp @@ -21,7 +21,7 @@ /** * @file GNodeArray.cpp * @brief Node array class implementation - * @author J. Knoedlseder + * @author Juergen Knoedlseder */ /* __ Includes ___________________________________________________________ */ @@ -598,42 +598,3 @@ void GNodeArray::setup(void) // Return return; } - - -/*========================================================================== - = = - = Friends = - = = - ==========================================================================*/ - - -/***********************************************************************//** - * @brief Output operator - * - * @param[in] os Output stream. - * @param[in] array Node array. - ***************************************************************************/ -std::ostream& operator<<(std::ostream& os, const GNodeArray& array) -{ - // Write array in output stream - os << array.print(); - - // Return output stream - return os; -} - - -/***********************************************************************//** - * @brief Log operator - * - * @param[in] log Logger. - * @param[in] array Node array. - ***************************************************************************/ -GLog& operator<<(GLog& log, const GNodeArray& array) -{ - // Write array into logger - log << array.print(); - - // Return logger - return log; -} -- libgit2 0.21.4