Justine Devin / gammalib

Commit 3e8d7f23ef4f1c56fbc308b9d4364b005082fd27

Authored by knodlseder
1 parent bb659b36

update

Inline Side-by-side
Showing 10 changed files with 55 additions and 20 deletions
include/GEvent.hpp
  View file @3e8d7f2
... ... @@ -32,6 +32,8 @@ class GEvent {
32 32  
33 33 // Friend classes
34 34 friend class GEvents;
  35 +// friend class GEventList;
  36 +// friend class GEventCube;
35 37  
36 38 // I/O friends
37 39 friend std::ostream& operator<< (std::ostream& os, const GEvent& event);
... ...
include/GEventCube.hpp
  View file @3e8d7f2
... ... @@ -53,7 +53,7 @@ public:
53 53 virtual GEvent* pointer(int index) const = 0;
54 54  
55 55 // Implemented methods
56   - int number(void) const;
  56 + int number(void) const;
57 57 int dim(void) const;
58 58 int naxis(int axis) const;
59 59  
... ...
include/GLATEvent.hpp
  View file @3e8d7f2
... ... @@ -31,7 +31,8 @@
31 31 class GLATEvent : public GEvent {
32 32  
33 33 // Friend classes
34   - friend class GLATEvents;
  34 + friend class GLATEventList;
  35 + friend class GLATEventCube;
35 36  
36 37 public:
37 38 // Constructors and destructors
... ...
include/GLATObservation.hpp
  View file @3e8d7f2
... ... @@ -30,6 +30,9 @@
30 30 ***************************************************************************/
31 31 class GLATObservation : public GObservation {
32 32  
  33 + // I/O friends
  34 + friend std::ostream& operator<< (std::ostream& os, const GLATObservation& obs);
  35 +
33 36 public:
34 37 // Constructors and destructors
35 38 GLATObservation();
... ...
include/GammaLib.hpp
  View file @3e8d7f2
... ... @@ -26,13 +26,16 @@
26 26 #include "GData.hpp"
27 27 #include "GObservation.hpp"
28 28 #include "GEvents.hpp"
  29 +#include "GEventList.hpp"
  30 +#include "GEventCube.hpp"
29 31 #include "GEvent.hpp"
30 32 #include "GGti.hpp"
31 33 #include "GResponse.hpp"
32 34  
33 35 /* __ Fermi/LAT specific code ____________________________________________ */
34 36 #include "GLATObservation.hpp"
35   -#include "GLATEvents.hpp"
  37 +#include "GLATEventList.hpp"
  38 +#include "GLATEventCube.hpp"
36 39 #include "GLATEvent.hpp"
37 40 #include "GLATResponse.hpp"
38 41  
... ...
include/Makefile.am
  View file @3e8d7f2
... ... @@ -7,11 +7,14 @@ pkginclude_HEADERS = GammaLib.hpp \
7 7 GData.hpp \
8 8 GObservation.hpp \
9 9 GEvents.hpp \
  10 + GEventList.hpp \
  11 + GEventCube.hpp \
10 12 GEvent.hpp \
11 13 GGti.hpp \
12 14 GResponse.hpp \
13 15 GLATObservation.hpp \
14   - GLATEvents.hpp \
  16 + GLATEventList.hpp \
  17 + GLATEventCube.hpp \
15 18 GLATEvent.hpp \
16 19 GLATResponse.hpp \
17 20 GLATResponseTable.hpp \
... ...
include/Makefile.in
  View file @3e8d7f2
... ... @@ -211,11 +211,14 @@ pkginclude_HEADERS = GammaLib.hpp \
211 211 GData.hpp \
212 212 GObservation.hpp \
213 213 GEvents.hpp \
  214 + GEventList.hpp \
  215 + GEventCube.hpp \
214 216 GEvent.hpp \
215 217 GGti.hpp \
216 218 GResponse.hpp \
217 219 GLATObservation.hpp \
218   - GLATEvents.hpp \
  220 + GLATEventList.hpp \
  221 + GLATEventCube.hpp \
219 222 GLATEvent.hpp \
220 223 GLATResponse.hpp \
221 224 GLATResponseTable.hpp \
... ...
src/Makefile.am
  View file @3e8d7f2
... ... @@ -17,11 +17,14 @@ files = GException.cpp \
17 17 obs/GData.cpp \
18 18 obs/GObservation.cpp \
19 19 obs/GEvents.cpp \
  20 + obs/GEventList.cpp \
  21 + obs/GEventCube.cpp \
20 22 obs/GEvent.cpp \
21 23 obs/GGti.cpp \
22 24 obs/GResponse.cpp \
23 25 lat/GLATObservation.cpp \
24   - lat/GLATEvents.cpp \
  26 + lat/GLATEventList.cpp \
  27 + lat/GLATEventCube.cpp \
25 28 lat/GLATEvent.cpp \
26 29 lat/GLATResponse.cpp \
27 30 lat/GLATResponseTable.cpp \
... ...
src/Makefile.in
  View file @3e8d7f2
... ... @@ -77,16 +77,17 @@ LTLIBRARIES = $(lib_LTLIBRARIES)
77 77 libgamma_la_LIBADD =
78 78 am__objects_1 = GException.lo GTools.lo GSkyDir.lo GNodeArray.lo \
79 79 GImage.lo GHealpix.lo GData.lo GObservation.lo GEvents.lo \
80   - GEvent.lo GGti.lo GResponse.lo GLATObservation.lo \
81   - GLATEvents.lo GLATEvent.lo GLATResponse.lo \
82   - GLATResponseTable.lo GLATAeff.lo GLATPsf.lo GLATEdisp.lo \
83   - GFitsHeaderCard.lo GFitsHeader.lo GFitsData.lo GFitsImage.lo \
84   - GFitsDblImage.lo GFitsTable.lo GFitsAsciiTable.lo \
85   - GFitsBinTable.lo GFitsTableCol.lo GFitsTableLogCol.lo \
86   - GFitsTableStrCol.lo GFitsTableShtCol.lo GFitsTableLngCol.lo \
87   - GFitsTableFltCol.lo GFitsTableDblCol.lo GFitsHDU.lo GFits.lo \
88   - GFitPar.lo GVector.lo GMatrixBase.lo GMatrix.lo GSymMatrix.lo \
89   - GSparseMatrix.lo GSparseSymbolic.lo GSparseNumeric.lo
  80 + GEventList.lo GEventCube.lo GEvent.lo GGti.lo GResponse.lo \
  81 + GLATObservation.lo GLATEventList.lo GLATEventCube.lo \
  82 + GLATEvent.lo GLATResponse.lo GLATResponseTable.lo GLATAeff.lo \
  83 + GLATPsf.lo GLATEdisp.lo GFitsHeaderCard.lo GFitsHeader.lo \
  84 + GFitsData.lo GFitsImage.lo GFitsDblImage.lo GFitsTable.lo \
  85 + GFitsAsciiTable.lo GFitsBinTable.lo GFitsTableCol.lo \
  86 + GFitsTableLogCol.lo GFitsTableStrCol.lo GFitsTableShtCol.lo \
  87 + GFitsTableLngCol.lo GFitsTableFltCol.lo GFitsTableDblCol.lo \
  88 + GFitsHDU.lo GFits.lo GFitPar.lo GVector.lo GMatrixBase.lo \
  89 + GMatrix.lo GSymMatrix.lo GSparseMatrix.lo GSparseSymbolic.lo \
  90 + GSparseNumeric.lo
90 91 am_libgamma_la_OBJECTS = $(am__objects_1)
91 92 libgamma_la_OBJECTS = $(am_libgamma_la_OBJECTS)
92 93 libgamma_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
... ... @@ -245,11 +246,14 @@ files = GException.cpp \
245 246 obs/GData.cpp \
246 247 obs/GObservation.cpp \
247 248 obs/GEvents.cpp \
  249 + obs/GEventList.cpp \
  250 + obs/GEventCube.cpp \
248 251 obs/GEvent.cpp \
249 252 obs/GGti.cpp \
250 253 obs/GResponse.cpp \
251 254 lat/GLATObservation.cpp \
252   - lat/GLATEvents.cpp \
  255 + lat/GLATEventList.cpp \
  256 + lat/GLATEventCube.cpp \
253 257 lat/GLATEvent.cpp \
254 258 lat/GLATResponse.cpp \
255 259 lat/GLATResponseTable.cpp \
... ... @@ -379,6 +383,12 @@ GObservation.lo: obs/GObservation.cpp
379 383 GEvents.lo: obs/GEvents.cpp
380 384 $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o GEvents.lo `test -f 'obs/GEvents.cpp' || echo '$(srcdir)/'`obs/GEvents.cpp
381 385  
  386 +GEventList.lo: obs/GEventList.cpp
  387 + $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o GEventList.lo `test -f 'obs/GEventList.cpp' || echo '$(srcdir)/'`obs/GEventList.cpp
  388 +
  389 +GEventCube.lo: obs/GEventCube.cpp
  390 + $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o GEventCube.lo `test -f 'obs/GEventCube.cpp' || echo '$(srcdir)/'`obs/GEventCube.cpp
  391 +
382 392 GEvent.lo: obs/GEvent.cpp
383 393 $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o GEvent.lo `test -f 'obs/GEvent.cpp' || echo '$(srcdir)/'`obs/GEvent.cpp
384 394  
... ... @@ -391,8 +401,11 @@ GResponse.lo: obs/GResponse.cpp
391 401 GLATObservation.lo: lat/GLATObservation.cpp
392 402 $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o GLATObservation.lo `test -f 'lat/GLATObservation.cpp' || echo '$(srcdir)/'`lat/GLATObservation.cpp
393 403  
394   -GLATEvents.lo: lat/GLATEvents.cpp
395   - $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o GLATEvents.lo `test -f 'lat/GLATEvents.cpp' || echo '$(srcdir)/'`lat/GLATEvents.cpp
  404 +GLATEventList.lo: lat/GLATEventList.cpp
  405 + $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o GLATEventList.lo `test -f 'lat/GLATEventList.cpp' || echo '$(srcdir)/'`lat/GLATEventList.cpp
  406 +
  407 +GLATEventCube.lo: lat/GLATEventCube.cpp
  408 + $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o GLATEventCube.lo `test -f 'lat/GLATEventCube.cpp' || echo '$(srcdir)/'`lat/GLATEventCube.cpp
396 409  
397 410 GLATEvent.lo: lat/GLATEvent.cpp
398 411 $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o GLATEvent.lo `test -f 'lat/GLATEvent.cpp' || echo '$(srcdir)/'`lat/GLATEvent.cpp
... ...
src/obs/GObservation.cpp
  View file @3e8d7f2
... ... @@ -307,8 +307,12 @@ std::ostream&amp; operator&lt;&lt; (std::ostream&amp; os, const GObservation&amp; obs)
307 307 obs.m_tstart << " - " << obs.m_tstop << std::endl;
308 308 os << " Energy range ..............: " << fixed << setprecision(3) <<
309 309 obs.m_emin << " - " << obs.m_emax << std::endl;
  310 +
  311 + // Add event list to stream
310 312 if (obs.m_events != NULL)
311   - os << *(obs.m_events);
  313 + os << *(obs.m_events) << std::endl;
  314 +
  315 + // Add GTIs to stream
312 316 if (obs.m_gti != NULL)
313 317 os << *(obs.m_gti);
314 318  
... ...