Justine Devin / gammalib

Commit 845fa82d92d7bd2981b347e0f98fcf7dea0865f3

Authored by knodlseder
1 parent 92cf3bf6

update

Inline Side-by-side
Showing 5 changed files with 60 additions and 35 deletions
include/GammaLib.hpp
  View file @845fa82
... ... @@ -26,11 +26,14 @@
26 26 #include "GData.hpp"
27 27 #include "GObservation.hpp"
28 28 #include "GEvents.hpp"
  29 +#include "GEvent.hpp"
29 30 #include "GGti.hpp"
30 31 #include "GResponse.hpp"
31 32  
32 33 /* __ Fermi/LAT specific code ____________________________________________ */
33 34 #include "GLATObservation.hpp"
  35 +#include "GLATEvents.hpp"
  36 +#include "GLATEvent.hpp"
34 37 #include "GLATResponse.hpp"
35 38  
36 39 /* __ Image module _______________________________________________________ */
... ...
include/Makefile.am
  View file @845fa82
... ... @@ -7,11 +7,14 @@ pkginclude_HEADERS = GammaLib.hpp \
7 7 GData.hpp \
8 8 GObservation.hpp \
9 9 GEvents.hpp \
  10 + GEvent.hpp \
10 11 GGti.hpp \
11 12 GResponse.hpp \
  13 + GLATObservation.hpp \
  14 + GLATEvents.hpp \
  15 + GLATEvent.hpp \
12 16 GLATResponse.hpp \
13 17 GLATResponseTable.hpp \
14   - GLATObservation.hpp \
15 18 GFitsHeaderCard.hpp \
16 19 GFitsHeader.hpp \
17 20 GFitsData.hpp \
... ...
include/Makefile.in
  View file @845fa82
... ... @@ -211,11 +211,14 @@ pkginclude_HEADERS = GammaLib.hpp \
211 211 GData.hpp \
212 212 GObservation.hpp \
213 213 GEvents.hpp \
  214 + GEvent.hpp \
214 215 GGti.hpp \
215 216 GResponse.hpp \
  217 + GLATObservation.hpp \
  218 + GLATEvents.hpp \
  219 + GLATEvent.hpp \
216 220 GLATResponse.hpp \
217 221 GLATResponseTable.hpp \
218   - GLATObservation.hpp \
219 222 GFitsHeaderCard.hpp \
220 223 GFitsHeader.hpp \
221 224 GFitsData.hpp \
... ...
src/Makefile.am
  View file @845fa82
... ... @@ -14,17 +14,20 @@ files = GException.cpp \
14 14 GNodeArray.cpp \
15 15 GImage.cpp \
16 16 GHealpix.cpp \
17   - lat/GLATResponse.cpp \
18   - lat/GLATResponseTable.cpp \
19   - lat/GLATAeff.cpp \
20   - lat/GLATPsf.cpp \
21   - lat/GLATEdisp.cpp \
22   - lat/GLATObservation.cpp \
23 17 obs/GData.cpp \
24 18 obs/GObservation.cpp \
25 19 obs/GEvents.cpp \
  20 + obs/GEvent.cpp \
26 21 obs/GGti.cpp \
27 22 obs/GResponse.cpp \
  23 + lat/GLATObservation.cpp \
  24 + lat/GLATEvents.cpp \
  25 + lat/GLATEvent.cpp \
  26 + lat/GLATResponse.cpp \
  27 + lat/GLATResponseTable.cpp \
  28 + lat/GLATAeff.cpp \
  29 + lat/GLATPsf.cpp \
  30 + lat/GLATEdisp.cpp \
28 31 fits/GFitsHeaderCard.cpp \
29 32 fits/GFitsHeader.cpp \
30 33 fits/GFitsData.cpp \
... ...
src/Makefile.in
  View file @845fa82
... ... @@ -76,9 +76,10 @@ am__installdirs = "$(DESTDIR)$(libdir)"
76 76 LTLIBRARIES = $(lib_LTLIBRARIES)
77 77 libgamma_la_LIBADD =
78 78 am__objects_1 = GException.lo GTools.lo GSkyDir.lo GNodeArray.lo \
79   - GImage.lo GHealpix.lo GLATResponse.lo GLATResponseTable.lo \
80   - GLATAeff.lo GLATPsf.lo GLATEdisp.lo GLATObservation.lo \
81   - GData.lo GObservation.lo GEvents.lo GGti.lo GResponse.lo \
  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 \
82 83 GFitsHeaderCard.lo GFitsHeader.lo GFitsData.lo GFitsImage.lo \
83 84 GFitsDblImage.lo GFitsTable.lo GFitsAsciiTable.lo \
84 85 GFitsBinTable.lo GFitsTableCol.lo GFitsTableLogCol.lo \
... ... @@ -241,17 +242,20 @@ files = GException.cpp \
241 242 GNodeArray.cpp \
242 243 GImage.cpp \
243 244 GHealpix.cpp \
244   - lat/GLATResponse.cpp \
245   - lat/GLATResponseTable.cpp \
246   - lat/GLATAeff.cpp \
247   - lat/GLATPsf.cpp \
248   - lat/GLATEdisp.cpp \
249   - lat/GLATObservation.cpp \
250 245 obs/GData.cpp \
251 246 obs/GObservation.cpp \
252 247 obs/GEvents.cpp \
  248 + obs/GEvent.cpp \
253 249 obs/GGti.cpp \
254 250 obs/GResponse.cpp \
  251 + lat/GLATObservation.cpp \
  252 + lat/GLATEvents.cpp \
  253 + lat/GLATEvent.cpp \
  254 + lat/GLATResponse.cpp \
  255 + lat/GLATResponseTable.cpp \
  256 + lat/GLATAeff.cpp \
  257 + lat/GLATPsf.cpp \
  258 + lat/GLATEdisp.cpp \
255 259 fits/GFitsHeaderCard.cpp \
256 260 fits/GFitsHeader.cpp \
257 261 fits/GFitsData.cpp \
... ... @@ -366,24 +370,6 @@ distclean-compile:
366 370 .cpp.lo:
367 371 $(LTCXXCOMPILE) -c -o $@ $<
368 372  
369   -GLATResponse.lo: lat/GLATResponse.cpp
370   - $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o GLATResponse.lo `test -f 'lat/GLATResponse.cpp' || echo '$(srcdir)/'`lat/GLATResponse.cpp
371   -
372   -GLATResponseTable.lo: lat/GLATResponseTable.cpp
373   - $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o GLATResponseTable.lo `test -f 'lat/GLATResponseTable.cpp' || echo '$(srcdir)/'`lat/GLATResponseTable.cpp
374   -
375   -GLATAeff.lo: lat/GLATAeff.cpp
376   - $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o GLATAeff.lo `test -f 'lat/GLATAeff.cpp' || echo '$(srcdir)/'`lat/GLATAeff.cpp
377   -
378   -GLATPsf.lo: lat/GLATPsf.cpp
379   - $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o GLATPsf.lo `test -f 'lat/GLATPsf.cpp' || echo '$(srcdir)/'`lat/GLATPsf.cpp
380   -
381   -GLATEdisp.lo: lat/GLATEdisp.cpp
382   - $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o GLATEdisp.lo `test -f 'lat/GLATEdisp.cpp' || echo '$(srcdir)/'`lat/GLATEdisp.cpp
383   -
384   -GLATObservation.lo: lat/GLATObservation.cpp
385   - $(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
386   -
387 373 GData.lo: obs/GData.cpp
388 374 $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o GData.lo `test -f 'obs/GData.cpp' || echo '$(srcdir)/'`obs/GData.cpp
389 375  
... ... @@ -393,12 +379,39 @@ GObservation.lo: obs/GObservation.cpp
393 379 GEvents.lo: obs/GEvents.cpp
394 380 $(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
395 381  
  382 +GEvent.lo: obs/GEvent.cpp
  383 + $(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 +
396 385 GGti.lo: obs/GGti.cpp
397 386 $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o GGti.lo `test -f 'obs/GGti.cpp' || echo '$(srcdir)/'`obs/GGti.cpp
398 387  
399 388 GResponse.lo: obs/GResponse.cpp
400 389 $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o GResponse.lo `test -f 'obs/GResponse.cpp' || echo '$(srcdir)/'`obs/GResponse.cpp
401 390  
  391 +GLATObservation.lo: lat/GLATObservation.cpp
  392 + $(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 +
  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
  396 +
  397 +GLATEvent.lo: lat/GLATEvent.cpp
  398 + $(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
  399 +
  400 +GLATResponse.lo: lat/GLATResponse.cpp
  401 + $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o GLATResponse.lo `test -f 'lat/GLATResponse.cpp' || echo '$(srcdir)/'`lat/GLATResponse.cpp
  402 +
  403 +GLATResponseTable.lo: lat/GLATResponseTable.cpp
  404 + $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o GLATResponseTable.lo `test -f 'lat/GLATResponseTable.cpp' || echo '$(srcdir)/'`lat/GLATResponseTable.cpp
  405 +
  406 +GLATAeff.lo: lat/GLATAeff.cpp
  407 + $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o GLATAeff.lo `test -f 'lat/GLATAeff.cpp' || echo '$(srcdir)/'`lat/GLATAeff.cpp
  408 +
  409 +GLATPsf.lo: lat/GLATPsf.cpp
  410 + $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o GLATPsf.lo `test -f 'lat/GLATPsf.cpp' || echo '$(srcdir)/'`lat/GLATPsf.cpp
  411 +
  412 +GLATEdisp.lo: lat/GLATEdisp.cpp
  413 + $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o GLATEdisp.lo `test -f 'lat/GLATEdisp.cpp' || echo '$(srcdir)/'`lat/GLATEdisp.cpp
  414 +
402 415 GFitsHeaderCard.lo: fits/GFitsHeaderCard.cpp
403 416 $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o GFitsHeaderCard.lo `test -f 'fits/GFitsHeaderCard.cpp' || echo '$(srcdir)/'`fits/GFitsHeaderCard.cpp
404 417  
... ...