Maria Haupt / gammalib

Commit 7bd902376d9818354fe83a497cc3ead710f76846

Authored by Jürgen Knödlseder
1 parent c1559330

Remove ostream and GLog friends. 

The ostream and GLog functions are not defined at the GBase level.
Inline Side-by-side
Showing 32 changed files with 28 additions and 736 deletions
include/GCaldb.hpp
  View file @7bd9023
... ... @@ -31,7 +31,6 @@
31 31 #include <iostream>
32 32 #include <string>
33 33 #include "GBase.hpp"
34   -#include "GLog.hpp"
35 34 #include "GFits.hpp"
36 35 #include "GFitsBinTable.hpp"
37 36  
... ... @@ -60,10 +59,6 @@
60 59 ***************************************************************************/
61 60 class GCaldb : public GBase {
62 61  
63   - // I/O friends
64   - friend std::ostream& operator<<(std::ostream& os, const GCaldb& caldb);
65   - friend GLog& operator<<(GLog& log, const GCaldb& caldb);
66   -
67 62 public:
68 63 // Constructors and destructors
69 64 GCaldb(void);
... ...
include/GDerivative.hpp
  View file @7bd9023
... ... @@ -31,7 +31,6 @@
31 31 #include <string>
32 32 #include <iostream>
33 33 #include "GBase.hpp"
34   -#include "GLog.hpp"
35 34 #include "GFunction.hpp"
36 35  
37 36  
... ... @@ -46,10 +45,6 @@
46 45 ***************************************************************************/
47 46 class GDerivative : public GBase {
48 47  
49   - // I/O friends
50   - friend std::ostream& operator<<(std::ostream& os, const GDerivative& dx);
51   - friend GLog& operator<<(GLog& log, const GDerivative& dx);
52   -
53 48 public:
54 49  
55 50 // Constructors and destructors
... ...
include/GEbounds.hpp
  View file @7bd9023
... ... @@ -31,7 +31,6 @@
31 31 #include <iostream>
32 32 #include <string>
33 33 #include "GBase.hpp"
34   -#include "GLog.hpp"
35 34 #include "GFits.hpp"
36 35 #include "GFitsTable.hpp"
37 36 #include "GEnergy.hpp"
... ... @@ -46,10 +45,6 @@
46 45 ***************************************************************************/
47 46 class GEbounds : public GBase {
48 47  
49   - // I/O friends
50   - friend std::ostream& operator<<(std::ostream& os, const GEbounds& ebds);
51   - friend GLog& operator<<(GLog& log, const GEbounds& ebds);
52   -
53 48 public:
54 49 // Constructors and destructors
55 50 GEbounds(void);
... ...
include/GEvent.hpp
  View file @7bd9023
... ... @@ -29,9 +29,7 @@
29 29  
30 30 /* __ Includes ___________________________________________________________ */
31 31 #include <string>
32   -#include <iostream>
33 32 #include "GBase.hpp"
34   -#include "GLog.hpp"
35 33 #include "GInstDir.hpp"
36 34 #include "GEnergy.hpp"
37 35 #include "GTime.hpp"
... ... @@ -72,10 +70,6 @@
72 70 ***************************************************************************/
73 71 class GEvent : public GBase {
74 72  
75   - // I/O friends
76   - friend std::ostream& operator<< (std::ostream& os, const GEvent& event);
77   - friend GLog& operator<< (GLog& log, const GEvent& event);
78   -
79 73 public:
80 74 // Constructors and destructors
81 75 GEvent(void);
... ...
include/GEvents.hpp
  View file @7bd9023
... ... @@ -29,9 +29,7 @@
29 29  
30 30 /* __ Includes ___________________________________________________________ */
31 31 #include <string>
32   -#include <iostream>
33 32 #include "GBase.hpp"
34   -#include "GLog.hpp"
35 33 #include "GEvent.hpp"
36 34 #include "GFits.hpp"
37 35 #include "GEbounds.hpp"
... ... @@ -64,10 +62,6 @@
64 62 ***************************************************************************/
65 63 class GEvents : public GBase {
66 64  
67   - // I/O friends
68   - friend std::ostream& operator<<(std::ostream& os, const GEvents& events);
69   - friend GLog& operator<<(GLog& log, const GEvents& events);
70   -
71 65 public:
72 66 // Constructors and destructors
73 67 GEvents(void);
... ...
include/GFitsHeader.hpp
  View file @7bd9023
... ... @@ -28,9 +28,7 @@
28 28 #define GFITSHEADER_HPP
29 29  
30 30 /* __ Includes ___________________________________________________________ */
31   -#include <iostream>
32 31 #include "GBase.hpp"
33   -#include "GLog.hpp"
34 32 #include "GFitsHeaderCard.hpp"
35 33  
36 34  
... ... @@ -47,10 +45,6 @@
47 45 ***************************************************************************/
48 46 class GFitsHeader : public GBase {
49 47  
50   - // I/O friends
51   - friend std::ostream& operator<< (std::ostream& os, const GFitsHeader& header);
52   - friend GLog& operator<< (GLog& log, const GFitsHeader& header);
53   -
54 48 public:
55 49 // Constructors and destructors
56 50 GFitsHeader(void);
... ...
include/GGti.hpp
  View file @7bd9023
1 1 /***************************************************************************
2 2 * GGti.hpp - Good time interval class *
3 3 * ----------------------------------------------------------------------- *
4   - * copyright (C) 2008-2011 by Juergen Knoedlseder *
  4 + * copyright (C) 2008-2012 by Juergen Knoedlseder *
5 5 * ----------------------------------------------------------------------- *
6 6 * *
7 7 * This program is free software: you can redistribute it and/or modify *
... ... @@ -21,7 +21,7 @@
21 21 /**
22 22 * @file GGti.hpp
23 23 * @brief Good time interval class interface definition
24   - * @author J. Knoedlseder
  24 + * @author Juergen Knoedlseder
25 25 */
26 26  
27 27 #ifndef GGTI_HPP
... ... @@ -29,9 +29,7 @@
29 29  
30 30 /* __ Includes ___________________________________________________________ */
31 31 #include <string>
32   -#include <iostream>
33 32 #include "GBase.hpp"
34   -#include "GLog.hpp"
35 33 #include "GFits.hpp"
36 34 #include "GFitsTable.hpp"
37 35 #include "GTime.hpp"
... ... @@ -47,10 +45,6 @@
47 45 ***************************************************************************/
48 46 class GGti : public GBase {
49 47  
50   - // I/O friends
51   - friend std::ostream& operator<< (std::ostream& os, const GGti& gti);
52   - friend GLog& operator<< (GLog& log, const GGti& gti);
53   -
54 48 public:
55 49 // Constructors and destructors
56 50 GGti(void);
... ...
include/GInstDir.hpp
  View file @7bd9023
... ... @@ -29,9 +29,7 @@
29 29  
30 30 /* __ Includes ___________________________________________________________ */
31 31 #include <string>
32   -#include <iostream>
33 32 #include "GBase.hpp"
34   -#include "GLog.hpp"
35 33  
36 34  
37 35 /***********************************************************************//**
... ... @@ -48,10 +46,6 @@
48 46 ***************************************************************************/
49 47 class GInstDir : public GBase {
50 48  
51   - // I/O friends
52   - friend std::ostream& operator<< (std::ostream& os, const GInstDir& dir);
53   - friend GLog& operator<< (GLog& log, const GInstDir& dir);
54   -
55 49 public:
56 50 // Constructors and destructors
57 51 GInstDir(void);
... ...
include/GIntegral.hpp
  View file @7bd9023
... ... @@ -29,9 +29,7 @@
29 29  
30 30 /* __ Includes ___________________________________________________________ */
31 31 #include <string>
32   -#include <iostream>
33 32 #include "GBase.hpp"
34   -#include "GLog.hpp"
35 33 #include "GIntegrand.hpp"
36 34  
37 35  
... ... @@ -45,10 +43,6 @@
45 43 ***************************************************************************/
46 44 class GIntegral : public GBase {
47 45  
48   - // I/O friends
49   - friend std::ostream& operator<<(std::ostream& os, const GIntegral& integral);
50   - friend GLog& operator<<(GLog& log, const GIntegral& integral);
51   -
52 46 public:
53 47  
54 48 // Constructors and destructors
... ...
include/GModel.hpp
  View file @7bd9023
... ... @@ -30,9 +30,7 @@
30 30 /* __ Includes ___________________________________________________________ */
31 31 #include <vector>
32 32 #include <string>
33   -#include <iostream>
34 33 #include "GBase.hpp"
35   -#include "GLog.hpp"
36 34 #include "GModelPar.hpp"
37 35 #include "GXmlElement.hpp"
38 36 #include "GEnergy.hpp"
... ... @@ -65,10 +63,6 @@ class GObservation;
65 63 ***************************************************************************/
66 64 class GModel : public GBase {
67 65  
68   - // I/O friends
69   - friend std::ostream& operator<< (std::ostream& os, const GModel& model);
70   - friend GLog& operator<< (GLog& log, const GModel& model);
71   -
72 66 public:
73 67 // Constructors and destructors
74 68 GModel(void);
... ...
include/GModelPar.hpp
  View file @7bd9023
... ... @@ -29,9 +29,7 @@
29 29  
30 30 /* __ Includes ___________________________________________________________ */
31 31 #include <string>
32   -#include <iostream>
33 32 #include "GBase.hpp"
34   -#include "GLog.hpp"
35 33 #include "GException.hpp"
36 34 #include "GXmlElement.hpp"
37 35  
... ... @@ -57,10 +55,6 @@
57 55 ***************************************************************************/
58 56 class GModelPar : public GBase {
59 57  
60   - // I/O friends
61   - friend std::ostream& operator<<(std::ostream& os, const GModelPar& par);
62   - friend GLog& operator<<(GLog& log, const GModelPar& par);
63   -
64 58 public:
65 59 // Constructors and destructors
66 60 GModelPar(void);
... ...
include/GModelSpatial.hpp
  View file @7bd9023
... ... @@ -30,9 +30,7 @@
30 30 /* __ Includes ___________________________________________________________ */
31 31 #include <string>
32 32 #include <vector>
33   -#include <iostream>
34 33 #include "GBase.hpp"
35   -#include "GLog.hpp"
36 34 #include "GModelPar.hpp"
37 35 #include "GSkyDir.hpp"
38 36 #include "GXmlElement.hpp"
... ... @@ -50,10 +48,6 @@
50 48 ***************************************************************************/
51 49 class GModelSpatial : public GBase {
52 50  
53   - // I/O friends
54   - friend std::ostream& operator<<(std::ostream& os, const GModelSpatial& model);
55   - friend GLog& operator<<(GLog& log, const GModelSpatial& model);
56   -
57 51 public:
58 52 // Constructors and destructors
59 53 GModelSpatial(void);
... ...
include/GModelSpectral.hpp
  View file @7bd9023
... ... @@ -30,9 +30,7 @@
30 30 /* __ Includes ___________________________________________________________ */
31 31 #include <string>
32 32 #include <vector>
33   -#include <iostream>
34 33 #include "GBase.hpp"
35   -#include "GLog.hpp"
36 34 #include "GModelPar.hpp"
37 35 #include "GEnergy.hpp"
38 36 #include "GRan.hpp"
... ... @@ -49,10 +47,6 @@
49 47 ***************************************************************************/
50 48 class GModelSpectral : public GBase {
51 49  
52   - // I/O friends
53   - friend std::ostream& operator<<(std::ostream& os, const GModelSpectral& model);
54   - friend GLog& operator<<(GLog& log, const GModelSpectral& model);
55   -
56 50 public:
57 51 // Constructors and destructors
58 52 GModelSpectral(void);
... ...
include/GModelTemporal.hpp
  View file @7bd9023
... ... @@ -30,9 +30,7 @@
30 30 /* __ Includes ___________________________________________________________ */
31 31 #include <vector>
32 32 #include <string>
33   -#include <iostream>
34 33 #include "GBase.hpp"
35   -#include "GLog.hpp"
36 34 #include "GModelPar.hpp"
37 35 #include "GTime.hpp"
38 36 #include "GRan.hpp"
... ... @@ -51,10 +49,6 @@
51 49 ***************************************************************************/
52 50 class GModelTemporal : public GBase {
53 51  
54   - // I/O friends
55   - friend std::ostream& operator<<(std::ostream& os, const GModelTemporal& model);
56   - friend GLog& operator<<(GLog& log, const GModelTemporal& model);
57   -
58 52 public:
59 53 // Constructors and destructors
60 54 GModelTemporal(void);
... ...
include/GNodeArray.hpp
  View file @7bd9023
... ... @@ -32,7 +32,6 @@
32 32 #include <string>
33 33 #include <iostream>
34 34 #include "GBase.hpp"
35   -#include "GLog.hpp"
36 35 #include "GVector.hpp"
37 36  
38 37  
... ... @@ -56,10 +55,6 @@
56 55 ***************************************************************************/
57 56 class GNodeArray : public GBase {
58 57  
59   - // I/O friends
60   - friend std::ostream& operator<<(std::ostream& os, const GNodeArray& array);
61   - friend GLog& operator<<(GLog& log, const GNodeArray& array);
62   -
63 58 public:
64 59 // Constructors and destructors
65 60 GNodeArray(void);
... ...
include/GObservation.hpp
  View file @7bd9023
... ... @@ -29,9 +29,7 @@
29 29  
30 30 /* __ Includes ___________________________________________________________ */
31 31 #include <string>
32   -#include <iostream>
33 32 #include "GBase.hpp"
34   -#include "GLog.hpp"
35 33 #include "GEvents.hpp"
36 34 #include "GResponse.hpp"
37 35 #include "GPointing.hpp"
... ... @@ -62,13 +60,6 @@
62 60 ***************************************************************************/
63 61 class GObservation : public GBase {
64 62  
65   - // Friend classes
66   - //friend class GObservations;
67   -
68   - // I/O friends
69   - friend std::ostream& operator<< (std::ostream& os, const GObservation& obs);
70   - friend GLog& operator<< (GLog& log, const GObservation& obs);
71   -
72 63 public:
73 64 // Constructors and destructors
74 65 GObservation(void);
... ...
src/fits/GFitsHeader.cpp
  View file @7bd9023
1 1 /***************************************************************************
2 2 * GFitsHeader.cpp - FITS header handling class *
3 3 * ----------------------------------------------------------------------- *
4   - * copyright (C) 2008-2011 by Juergen Knoedlseder *
  4 + * copyright (C) 2008-2012 by Juergen Knoedlseder *
5 5 * ----------------------------------------------------------------------- *
6 6 * *
7 7 * This program is free software: you can redistribute it and/or modify *
... ... @@ -21,14 +21,13 @@
21 21 /**
22 22 * @file GFitsHeader.cpp
23 23 * @brief FITS header class implementation
24   - * @author J. Knoedlseder
  24 + * @author Juergen Knoedlseder
25 25 */
26 26  
27 27 /* __ Includes ___________________________________________________________ */
28 28 #ifdef HAVE_CONFIG_H
29 29 #include <config.h>
30 30 #endif
31   -#include <iostream>
32 31 #include "GException.hpp"
33 32 #include "GFitsCfitsio.hpp"
34 33 #include "GFitsHeader.hpp"
... ... @@ -636,41 +635,3 @@ GFitsHeaderCard* GFitsHeader::card_ptr(const std::string&amp; keyname) const
636 635 // Return pointer
637 636 return ptr;
638 637 }
639   -
640   -
641   -/*==========================================================================
642   - = =
643   - = GFitsHeader friends =
644   - = =
645   - ==========================================================================*/
646   -
647   -/***********************************************************************//**
648   - * @brief Output operator
649   - *
650   - * @param[in] os Output stream.
651   - * @param[in] header FITS header.
652   - ***************************************************************************/
653   -std::ostream& operator<< (std::ostream& os, const GFitsHeader& header)
654   -{
655   - // Write header in output stream
656   - os << header.print();
657   -
658   - // Return output stream
659   - return os;
660   -}
661   -
662   -
663   -/***********************************************************************//**
664   - * @brief Log operator
665   - *
666   - * @param[in] log Logger.
667   - * @param[in] header FITS header.
668   - ***************************************************************************/
669   -GLog& operator<< (GLog& log, const GFitsHeader& header)
670   -{
671   - // Write header in logger
672   - log << header.print();
673   -
674   - // Return logger
675   - return log;
676   -}
... ...
src/model/GModel.cpp
  View file @7bd9023
... ... @@ -415,41 +415,3 @@ std::string GModel::print_name_instrument(void) const
415 415 // Return result
416 416 return result;
417 417 }
418   -
419   -
420   -/*==========================================================================
421   - = =
422   - = Friends =
423   - = =
424   - ==========================================================================*/
425   -
426   -/***********************************************************************//**
427   - * @brief Output operator
428   - *
429   - * @param[in] os Output stream.
430   - * @param[in] model Model.
431   - ***************************************************************************/
432   -std::ostream& operator<< (std::ostream& os, const GModel& model)
433   -{
434   - // Write spectrum in output stream
435   - os << model.print();
436   -
437   - // Return output stream
438   - return os;
439   -}
440   -
441   -
442   -/***********************************************************************//**
443   - * @brief Log operator
444   - *
445   - * @param[in] log Logger.
446   - * @param[in] model Model.
447   - ***************************************************************************/
448   -GLog& operator<< (GLog& log, const GModel& model)
449   -{
450   - // Write spectrum into logger
451   - log << model.print();
452   -
453   - // Return logger
454   - return log;
455   -}
... ...
src/model/GModelPar.cpp
  View file @7bd9023
1 1 /***************************************************************************
2 2 * GModelPar.cpp - Model parameter class *
3 3 * ----------------------------------------------------------------------- *
4   - * copyright (C) 2009-2011 by Jurgen Knodlseder *
  4 + * copyright (C) 2009-2012 by Juergen Knoedlseder *
5 5 * ----------------------------------------------------------------------- *
6 6 * *
7 7 * This program is free software: you can redistribute it and/or modify *
... ... @@ -21,7 +21,7 @@
21 21 /**
22 22 * @file GModelPar.cpp
23 23 * @brief GModelPar class implementation.
24   - * @author J. Knodlseder
  24 + * @author Juergen Knoedlseder
25 25 */
26 26  
27 27 /* __ Includes ___________________________________________________________ */
... ... @@ -532,41 +532,3 @@ void GModelPar::free_members(void)
532 532 // Return
533 533 return;
534 534 }
535   -
536   -
537   -/*==========================================================================
538   - = =
539   - = Friends =
540   - = =
541   - ==========================================================================*/
542   -
543   -/***********************************************************************//**
544   - * @brief Output operator
545   - *
546   - * @param[in] os Output stream.
547   - * @param[in] par Model parameter.
548   - ***************************************************************************/
549   -std::ostream& operator<< (std::ostream& os, const GModelPar& par)
550   -{
551   - // Write spectrum in output stream
552   - os << par.print();
553   -
554   - // Return output stream
555   - return os;
556   -}
557   -
558   -
559   -/***********************************************************************//**
560   - * @brief Log operator
561   - *
562   - * @param[in] log Logger.
563   - * @param[in] par Model parameter.
564   - ***************************************************************************/
565   -GLog& operator<< (GLog& log, const GModelPar& par)
566   -{
567   - // Write spectrum into logger
568   - log << par.print();
569   -
570   - // Return logger
571   - return log;
572   -}
... ...
src/model/GModelSpatial.cpp
  View file @7bd9023
1 1 /***************************************************************************
2 2 * GModelSpatial.cpp - Abstract spatial model base class *
3 3 * ----------------------------------------------------------------------- *
4   - * copyright (C) 2009-2010 by Jurgen Knodlseder *
  4 + * copyright (C) 2009-2012 by Juergen Knoedlseder *
5 5 * ----------------------------------------------------------------------- *
6 6 * *
7 7 * This program is free software: you can redistribute it and/or modify *
... ... @@ -21,7 +21,7 @@
21 21 /**
22 22 * @file GModelSpatial.cpp
23 23 * @brief Abstract spatial model base class implementation
24   - * @author J. Knodlseder
  24 + * @author Juergen Knoedlseder
25 25 */
26 26  
27 27 /* __ Includes ___________________________________________________________ */
... ... @@ -266,41 +266,3 @@ void GModelSpatial::free_members(void)
266 266 // Return
267 267 return;
268 268 }
269   -
270   -
271   -/*==========================================================================
272   - = =
273   - = Friends =
274   - = =
275   - ==========================================================================*/
276   -
277   -/***********************************************************************//**
278   - * @brief Output operator
279   - *
280   - * @param[in] os Output stream.
281   - * @param[in] model Spatial model.
282   - ***************************************************************************/
283   -std::ostream& operator<<(std::ostream& os, const GModelSpatial& model)
284   -{
285   - // Write model in output stream
286   - os << model.print();
287   -
288   - // Return output stream
289   - return os;
290   -}
291   -
292   -
293   -/***********************************************************************//**
294   - * @brief Log operator
295   - *
296   - * @param[in] log Logger.
297   - * @param[in] model Spatial model.
298   - ***************************************************************************/
299   -GLog& operator<<(GLog& log, const GModelSpatial& model)
300   -{
301   - // Write model into logger
302   - log << model.print();
303   -
304   - // Return logger
305   - return log;
306   -}
... ...
src/model/GModelSpectral.cpp
  View file @7bd9023
1 1 /***************************************************************************
2 2 * GModelSpectral.cpp - Abstract spectral model base class *
3 3 * ----------------------------------------------------------------------- *
4   - * copyright (C) 2009-2011 by Jurgen Knodlseder *
  4 + * copyright (C) 2009-2012 by Juergen Knoedlseder *
5 5 * ----------------------------------------------------------------------- *
6 6 * *
7 7 * This program is free software: you can redistribute it and/or modify *
... ... @@ -21,7 +21,7 @@
21 21 /**
22 22 * @file GModelSpectral.cpp
23 23 * @brief Abstract spectral model base class implementation
24   - * @author J. Knodlseder
  24 + * @author Juergen Knoedlseder
25 25 */
26 26  
27 27 /* __ Includes ___________________________________________________________ */
... ... @@ -266,41 +266,3 @@ void GModelSpectral::free_members(void)
266 266 // Return
267 267 return;
268 268 }
269   -
270   -
271   -/*==========================================================================
272   - = =
273   - = Friends =
274   - = =
275   - ==========================================================================*/
276   -
277   -/***********************************************************************//**
278   - * @brief Output operator
279   - *
280   - * @param[in] os Output stream.
281   - * @param[in] model Spectral model.
282   - ***************************************************************************/
283   -std::ostream& operator<< (std::ostream& os, const GModelSpectral& model)
284   -{
285   - // Write model in output stream
286   - os << model.print();
287   -
288   - // Return output stream
289   - return os;
290   -}
291   -
292   -
293   -/***********************************************************************//**
294   - * @brief Log operator
295   - *
296   - * @param[in] log Logger.
297   - * @param[in] model Spectral model.
298   - ***************************************************************************/
299   -GLog& operator<< (GLog& log, const GModelSpectral& model)
300   -{
301   - // Write model into logger
302   - log << model.print();
303   -
304   - // Return logger
305   - return log;
306   -}
... ...
src/model/GModelTemporal.cpp
  View file @7bd9023
1 1 /***************************************************************************
2 2 * GModelTemporal.cpp - Abstract temporal model base class *
3 3 * ----------------------------------------------------------------------- *
4   - * copyright (C) 2009-2010 by Jurgen Knodlseder *
  4 + * copyright (C) 2009-2012 by Juergen Knoedlseder *
5 5 * ----------------------------------------------------------------------- *
6 6 * *
7 7 * This program is free software: you can redistribute it and/or modify *
... ... @@ -21,7 +21,7 @@
21 21 /**
22 22 * @file GModelTemporal.cpp
23 23 * @brief Abstract temporal model base class implementation
24   - * @author J. Knodlseder
  24 + * @author Juergen Knoedlseder
25 25 */
26 26  
27 27 /* __ Includes ___________________________________________________________ */
... ... @@ -266,41 +266,3 @@ void GModelTemporal::free_members(void)
266 266 // Return
267 267 return;
268 268 }
269   -
270   -
271   -/*==========================================================================
272   - = =
273   - = Friends =
274   - = =
275   - ==========================================================================*/
276   -
277   -/***********************************************************************//**
278   - * @brief Output operator
279   - *
280   - * @param[in] os Output stream.
281   - * @param[in] model Temporal model.
282   - ***************************************************************************/
283   -std::ostream& operator<<(std::ostream& os, const GModelTemporal& model)
284   -{
285   - // Write model in output stream
286   - os << model.print();
287   -
288   - // Return output stream
289   - return os;
290   -}
291   -
292   -
293   -/***********************************************************************//**
294   - * @brief Log operator
295   - *
296   - * @param[in] log Logger.
297   - * @param[in] model Temporal model.
298   - ***************************************************************************/
299   -GLog& operator<<(GLog& log, const GModelTemporal& model)
300   -{
301   - // Write model into logger
302   - log << model.print();
303   -
304   - // Return logger
305   - return log;
306   -}
... ...
src/numerics/GDerivative.cpp
  View file @7bd9023
... ... @@ -21,7 +21,7 @@
21 21 /**
22 22 * @file GDerivative.cpp
23 23 * @brief GDerivative class implementation.
24   - * @author J. Knoedlseder
  24 + * @author Juergen Knoedlseder
25 25 */
26 26  
27 27 /* __ Includes ___________________________________________________________ */
... ... @@ -658,41 +658,3 @@ double GDerivative::tiny::operator()(double eps) const
658 658 // Return result
659 659 return result;
660 660 }
661   -
662   -
663   -/*==========================================================================
664   - = =
665   - = Friends =
666   - = =
667   - ==========================================================================*/
668   -
669   -/***********************************************************************//**
670   - * @brief Output operator
671   - *
672   - * @param[in] os Output stream.
673   - * @param[in] dx Derivative.
674   - ***************************************************************************/
675   -std::ostream& operator<< (std::ostream& os, const GDerivative& dx)
676   -{
677   - // Write derivative in output stream
678   - os << dx.print();
679   -
680   - // Return output stream
681   - return os;
682   -}
683   -
684   -
685   -/***********************************************************************//**
686   - * @brief Log operator
687   - *
688   - * @param[in] log Logger.
689   - * @param[in] dx Derivative.
690   - ***************************************************************************/
691   -GLog& operator<< (GLog& log, const GDerivative& dx)
692   -{
693   - // Write derivative into logger
694   - log << dx.print();
695   -
696   - // Return logger
697   - return log;
698   -}
... ...
src/numerics/GIntegral.cpp
  View file @7bd9023
... ... @@ -21,7 +21,7 @@
21 21 /**
22 22 * @file GIntegral.cpp
23 23 * @brief Integration class implementation
24   - * @author J. Knoedlseder
  24 + * @author Juergen Knoedlseder
25 25 */
26 26  
27 27 /* __ Includes ___________________________________________________________ */
... ... @@ -507,41 +507,3 @@ double GIntegral::polint(double* xa, double* ya, int n, double x, double *dy)
507 507 // Return
508 508 return y;
509 509 }
510   -
511   -
512   -/*==========================================================================
513   - = =
514   - = Friends =
515   - = =
516   - ==========================================================================*/
517   -
518   -/***********************************************************************//**
519   - * @brief Output operator
520   - *
521   - * @param[in] os Output stream.
522   - * @param[in] integral Integral.
523   - ***************************************************************************/
524   -std::ostream& operator<< (std::ostream& os, const GIntegral& integral)
525   -{
526   - // Write integral in output stream
527   - os << integral.print();
528   -
529   - // Return output stream
530   - return os;
531   -}
532   -
533   -
534   -/***********************************************************************//**
535   - * @brief Log operator
536   - *
537   - * @param[in] log Logger.
538   - * @param[in] integral Integral.
539   - ***************************************************************************/
540   -GLog& operator<< (GLog& log, const GIntegral& integral)
541   -{
542   - // Write integral into logger
543   - log << integral.print();
544   -
545   - // Return logger
546   - return log;
547   -}
... ...
src/obs/GCaldb.cpp
  View file @7bd9023
1 1 /***************************************************************************
2 2 * GCaldb.cpp - Calibration database class *
3 3 * ----------------------------------------------------------------------- *
4   - * copyright (C) 2011 by Juergen Knoedlseder *
  4 + * copyright (C) 2011-2012 by Juergen Knoedlseder *
5 5 * ----------------------------------------------------------------------- *
6 6 * *
7 7 * This program is free software: you can redistribute it and/or modify *
... ... @@ -21,7 +21,7 @@
21 21 /**
22 22 * @file GCaldb.cpp
23 23 * @brief Calibration database class implementation.
24   - * @author J. Knoedlseder
  24 + * @author Juergen Knoedlseder
25 25 */
26 26  
27 27 /* __ Includes ___________________________________________________________ */
... ... @@ -558,41 +558,3 @@ std::string GCaldb::cifname(const std::string&amp; mission, const std::string&amp; instr
558 558 // Return cif
559 559 return cif;
560 560 }
561   -
562   -
563   -/*==========================================================================
564   - = =
565   - = Friends =
566   - = =
567   - ==========================================================================*/
568   -
569   -/***********************************************************************//**
570   - * @brief Output operator
571   - *
572   - * @param[in] os Output stream.
573   - * @param[in] caldb Calibration database.
574   - ***************************************************************************/
575   -std::ostream& operator<< (std::ostream& os, const GCaldb& caldb)
576   -{
577   - // Write calibration database in output stream
578   - os << caldb.print();
579   -
580   - // Return output stream
581   - return os;
582   -}
583   -
584   -
585   -/***********************************************************************//**
586   - * @brief Log operator
587   - *
588   - * @param[in] log Logger.
589   - * @param[in] caldb Calibration database.
590   - ***************************************************************************/
591   -GLog& operator<< (GLog& log, const GCaldb& caldb)
592   -{
593   - // Write calibration database into logger
594   - log << caldb.print();
595   -
596   - // Return logger
597   - return log;
598   -}
... ...
src/obs/GEbounds.cpp
  View file @7bd9023
1 1 /***************************************************************************
2 2 * GEbounds.cpp - Energy boundary class *
3 3 * ----------------------------------------------------------------------- *
4   - * copyright (C) 2009-2011 by Jurgen Knodlseder *
  4 + * copyright (C) 2009-2012 by Juergen Knoedlseder *
5 5 * ----------------------------------------------------------------------- *
6 6 * *
7 7 * This program is free software: you can redistribute it and/or modify *
... ... @@ -21,7 +21,7 @@
21 21 /**
22 22 * @file GEbounds.cpp
23 23 * @brief Energy boundary class implementation.
24   - * @author J. Knodlseder
  24 + * @author Juergen Knoedlseder
25 25 */
26 26  
27 27 /* __ Includes ___________________________________________________________ */
... ... @@ -61,7 +61,7 @@
61 61 /***********************************************************************//**
62 62 * @brief Constructor
63 63 ***************************************************************************/
64   -GEbounds::GEbounds(void)
  64 +GEbounds::GEbounds(void) : GBase()
65 65 {
66 66 // Initialise class members for clean destruction
67 67 init_members();
... ... @@ -825,41 +825,3 @@ void GEbounds::merge_engs(void)
825 825 // Return
826 826 return;
827 827 }
828   -
829   -
830   -/*==========================================================================
831   - = =
832   - = Friends =
833   - = =
834   - ==========================================================================*/
835   -
836   -/***********************************************************************//**
837   - * @brief Output operator
838   - *
839   - * @param[in] os Output stream.
840   - * @param[in] ebds Energy boundaries.
841   - ***************************************************************************/
842   -std::ostream& operator<< (std::ostream& os, const GEbounds& ebds)
843   -{
844   - // Write energy boundaries in output stream
845   - os << ebds.print();
846   -
847   - // Return output stream
848   - return os;
849   -}
850   -
851   -
852   -/***********************************************************************//**
853   - * @brief Log operator
854   - *
855   - * @param[in] log Logger.
856   - * @param[in] ebds Energy boundaries.
857   - ***************************************************************************/
858   -GLog& operator<< (GLog& log, const GEbounds& ebds)
859   -{
860   - // Write energy boundaries into logger
861   - log << ebds.print();
862   -
863   - // Return logger
864   - return log;
865   -}
... ...
src/obs/GEvent.cpp
  View file @7bd9023
1 1 /***************************************************************************
2 2 * GEvent.cpp - Event abstract base class *
3 3 * ----------------------------------------------------------------------- *
4   - * copyright (C) 2009-2010 by Jurgen Knodlseder *
  4 + * copyright (C) 2009-2012 by Juergen Knoedlseder *
5 5 * ----------------------------------------------------------------------- *
6 6 * *
7 7 * This program is free software: you can redistribute it and/or modify *
... ... @@ -21,15 +21,13 @@
21 21 /**
22 22 * @file GEvent.cpp
23 23 * @brief GEvent abstract base class implementation.
24   - * @author J. Knodlseder
  24 + * @author Juergen Knoedlseder
25 25 */
26 26  
27 27 /* __ Includes ___________________________________________________________ */
28 28 #ifdef HAVE_CONFIG_H
29 29 #include <config.h>
30 30 #endif
31   -#include <iostream>
32   -#include <iomanip>
33 31 #include "GException.hpp"
34 32 #include "GEvent.hpp"
35 33  
... ... @@ -166,41 +164,3 @@ void GEvent::free_members(void)
166 164 // Return
167 165 return;
168 166 }
169   -
170   -
171   -/*==========================================================================
172   - = =
173   - = Friends =
174   - = =
175   - ==========================================================================*/
176   -
177   - /***********************************************************************//**
178   - * @brief Output operator
179   - *
180   - * @param[in] os Output stream.
181   - * @param[in] event Event.
182   - ***************************************************************************/
183   -std::ostream& operator<< (std::ostream& os, const GEvent& event)
184   -{
185   - // Write event in output stream
186   - os << event.print();
187   -
188   - // Return output stream
189   - return os;
190   -}
191   -
192   -
193   -/***********************************************************************//**
194   - * @brief Log operator
195   - *
196   - * @param[in] log Logger.
197   - * @param[in] event Event.
198   - ***************************************************************************/
199   -GLog& operator<< (GLog& log, const GEvent& event)
200   -{
201   - // Write event into logger
202   - log << event.print();
203   -
204   - // Return logger
205   - return log;
206   -}
... ...
src/obs/GEvents.cpp
  View file @7bd9023
1 1 /***************************************************************************
2 2 * GEvents.cpp - Abstract Event container class *
3 3 * ----------------------------------------------------------------------- *
4   - * copyright (C) 2008-2011 by Juergen Knoedlseder *
  4 + * copyright (C) 2008-2012 by Juergen Knoedlseder *
5 5 * ----------------------------------------------------------------------- *
6 6 * *
7 7 * This program is free software: you can redistribute it and/or modify *
... ... @@ -21,7 +21,7 @@
21 21 /**
22 22 * @file GEvents.cpp
23 23 * @brief Abstract event container class implementation
24   - * @author J. Knoedlseder
  24 + * @author Juergen Knoedlseder
25 25 */
26 26  
27 27 /* __ Includes ___________________________________________________________ */
... ... @@ -291,41 +291,3 @@ void GEvents::free_members(void)
291 291 // Return
292 292 return;
293 293 }
294   -
295   -
296   -/*==========================================================================
297   - = =
298   - = Friends =
299   - = =
300   - ==========================================================================*/
301   -
302   -/***********************************************************************//**
303   - * @brief Output operator
304   - *
305   - * @param[in] os Output stream.
306   - * @param[in] events Event container.
307   - ***************************************************************************/
308   -std::ostream& operator<< (std::ostream& os, const GEvents& events)
309   -{
310   - // Write events in output stream
311   - os << events.print();
312   -
313   - // Return output stream
314   - return os;
315   -}
316   -
317   -
318   -/***********************************************************************//**
319   - * @brief Log operator
320   - *
321   - * @param[in] log Logger.
322   - * @param[in] events Event container.
323   - ***************************************************************************/
324   -GLog& operator<< (GLog& log, const GEvents& events)
325   -{
326   - // Write events into logger
327   - log << events.print();
328   -
329   - // Return logger
330   - return log;
331   -}
... ...
src/obs/GGti.cpp
  View file @7bd9023
1 1 /***************************************************************************
2 2 * GGti.cpp - Good time interval class *
3 3 * ----------------------------------------------------------------------- *
4   - * copyright (C) 2008-2011 by Juergen Knoedlseder *
  4 + * copyright (C) 2008-2012 by Juergen Knoedlseder *
5 5 * ----------------------------------------------------------------------- *
6 6 * *
7 7 * This program is free software: you can redistribute it and/or modify *
... ... @@ -21,7 +21,7 @@
21 21 /**
22 22 * @file GGti.cpp
23 23 * @brief Good time interval class implementation.
24   - * @author J. Knoedlseder
  24 + * @author Juergen Knoedlseder
25 25 */
26 26  
27 27 /* __ Includes ___________________________________________________________ */
... ... @@ -779,42 +779,3 @@ void GGti::merge_gtis(void)
779 779 // Return
780 780 return;
781 781 }
782   -
783   -
784   -/*==========================================================================
785   - = =
786   - = Friends =
787   - = =
788   - ==========================================================================*/
789   -
790   -
791   -/***********************************************************************//**
792   - * @brief Output operator
793   - *
794   - * @param[in] os Output stream.
795   - * @param[in] gti Good Time Intervals.
796   - ***************************************************************************/
797   -std::ostream& operator<< (std::ostream& os, const GGti& gti)
798   -{
799   - // Write GTIs in output stream
800   - os << gti.print();
801   -
802   - // Return output stream
803   - return os;
804   -}
805   -
806   -
807   -/***********************************************************************//**
808   - * @brief Log operator
809   - *
810   - * @param[in] log Logger.
811   - * @param[in] gti Good Time Intervals.
812   - ***************************************************************************/
813   -GLog& operator<< (GLog& log, const GGti& gti)
814   -{
815   - // Write GTIs into logger
816   - log << gti.print();
817   -
818   - // Return logger
819   - return log;
820   -}
... ...
src/obs/GInstDir.cpp
  View file @7bd9023
1 1 /***************************************************************************
2 2 * GInstDir.cpp - Instrument direction class *
3 3 * ----------------------------------------------------------------------- *
4   - * copyright (C) 2010-2011 by Jurgen Knodlseder *
  4 + * copyright (C) 2010-2012 by Juergen Knoedlseder *
5 5 * ----------------------------------------------------------------------- *
6 6 * *
7 7 * This program is free software: you can redistribute it and/or modify *
... ... @@ -21,7 +21,7 @@
21 21 /**
22 22 * @file GInstDir.cpp
23 23 * @brief Abstract instrument direction class implementation
24   - * @author J. Knodlseder
  24 + * @author Juergen Knoedlseder
25 25 */
26 26  
27 27 /* __ Includes ___________________________________________________________ */
... ... @@ -164,41 +164,3 @@ void GInstDir::free_members(void)
164 164 // Return
165 165 return;
166 166 }
167   -
168   -
169   -/*==========================================================================
170   - = =
171   - = Friends =
172   - = =
173   - ==========================================================================*/
174   -
175   -/***********************************************************************//**
176   - * @brief Output operator
177   - *
178   - * @param[in] os Output stream.
179   - * @param[in] dir Instrument direction.
180   - ***************************************************************************/
181   -std::ostream& operator<< (std::ostream& os, const GInstDir& dir)
182   -{
183   - // Write instrument direction in output stream
184   - os << dir.print();
185   -
186   - // Return output stream
187   - return os;
188   -}
189   -
190   -
191   -/***********************************************************************//**
192   - * @brief Log operator
193   - *
194   - * @param[in] log Logger.
195   - * @param[in] dir Instrument direction.
196   - ***************************************************************************/
197   -GLog& operator<< (GLog& log, const GInstDir& dir)
198   -{
199   - // Write instrument direction into logger
200   - log << dir.print();
201   -
202   - // Return logger
203   - return log;
204   -}
... ...
src/obs/GObservation.cpp
  View file @7bd9023
... ... @@ -963,41 +963,3 @@ double GObservation::npred_spec_kern::eval(double x)
963 963 // Return value
964 964 return value;
965 965 }
966   -
967   -
968   -/*==========================================================================
969   - = =
970   - = Friends =
971   - = =
972   - ==========================================================================*/
973   -
974   -/***********************************************************************//**
975   - * @brief Output operator
976   - *
977   - * @param[in] os Output stream.
978   - * @param[in] obs Observation.
979   - ***************************************************************************/
980   -std::ostream& operator<< (std::ostream& os, const GObservation& obs)
981   -{
982   - // Write observation in output stream
983   - os << obs.print();
984   -
985   - // Return output stream
986   - return os;
987   -}
988   -
989   -
990   -/***********************************************************************//**
991   - * @brief Log operator
992   - *
993   - * @param[in] log Logger.
994   - * @param[in] obs Observation.
995   - ***************************************************************************/
996   -GLog& operator<< (GLog& log, const GObservation& obs)
997   -{
998   - // Write observation into logger
999   - log << obs.print();
1000   -
1001   - // Return logger
1002   - return log;
1003   -}
... ...
src/support/GNodeArray.cpp
  View file @7bd9023
... ... @@ -21,7 +21,7 @@
21 21 /**
22 22 * @file GNodeArray.cpp
23 23 * @brief Node array class implementation
24   - * @author J. Knoedlseder
  24 + * @author Juergen Knoedlseder
25 25 */
26 26  
27 27 /* __ Includes ___________________________________________________________ */
... ... @@ -598,42 +598,3 @@ void GNodeArray::setup(void)
598 598 // Return
599 599 return;
600 600 }
601   -
602   -
603   -/*==========================================================================
604   - = =
605   - = Friends =
606   - = =
607   - ==========================================================================*/
608   -
609   -
610   -/***********************************************************************//**
611   - * @brief Output operator
612   - *
613   - * @param[in] os Output stream.
614   - * @param[in] array Node array.
615   - ***************************************************************************/
616   -std::ostream& operator<<(std::ostream& os, const GNodeArray& array)
617   -{
618   - // Write array in output stream
619   - os << array.print();
620   -
621   - // Return output stream
622   - return os;
623   -}
624   -
625   -
626   -/***********************************************************************//**
627   - * @brief Log operator
628   - *
629   - * @param[in] log Logger.
630   - * @param[in] array Node array.
631   - ***************************************************************************/
632   -GLog& operator<<(GLog& log, const GNodeArray& array)
633   -{
634   - // Write array into logger
635   - log << array.print();
636   -
637   - // Return logger
638   - return log;
639   -}
... ...