Commit 99ced2450086daa2ba9fdb1b4a9cfe04fb88fc4e
1 parent
80769328
remove GTime argument from pointing() method
Showing
7 changed files
with
24 additions
and
24 deletions
src/ctbin/ctbin.cpp
| 1 | 1 | /*************************************************************************** |
| 2 | 2 | * ctbin - CTA data binning tool * |
| 3 | 3 | * ----------------------------------------------------------------------- * |
| 4 | - * copyright (C) 2010-2011 by Jurgen Knodlseder * | |
| 4 | + * copyright (C) 2010-2011 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 ctbin.cpp |
| 23 | 23 | * @brief CTA data binning tool implementation |
| 24 | - * @author J. Knodlseder | |
| 24 | + * @author J. Knoedlseder | |
| 25 | 25 | */ |
| 26 | 26 | |
| 27 | 27 | /* __ Includes ___________________________________________________________ */ |
| ... | ... | @@ -437,10 +437,10 @@ void ctbin::bin_events(GCTAObservation* obs) |
| 437 | 437 | else { |
| 438 | 438 | |
| 439 | 439 | // Get pointer on CTA pointing |
| 440 | - const GTime srcTime; // Dummy time | |
| 441 | - const GCTAPointing *pnt = obs->pointing(srcTime); | |
| 442 | - if (pnt == NULL) | |
| 440 | + const GCTAPointing *pnt = obs->pointing(); | |
| 441 | + if (pnt == NULL) { | |
| 443 | 442 | throw GCTAException::no_pointing(G_BIN_EVENTS); |
| 443 | + } | |
| 444 | 444 | |
| 445 | 445 | // Set reference point to pointing |
| 446 | 446 | if (toupper(m_coordsys) == "GAL") { | ... | ... |
src/ctbin/ctbin.hpp
| 1 | 1 | /*************************************************************************** |
| 2 | 2 | * ctbin - CTA data binning tool * |
| 3 | 3 | * ----------------------------------------------------------------------- * |
| 4 | - * copyright (C) 2010-2011 by Jurgen Knodlseder * | |
| 4 | + * copyright (C) 2010-2011 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 ctbin.hpp |
| 23 | 23 | * @brief CTA data binning tool definition |
| 24 | - * @author J. Knodlseder | |
| 24 | + * @author J. Knoedlseder | |
| 25 | 25 | */ |
| 26 | 26 | |
| 27 | 27 | #ifndef CTBIN_HPP |
| ... | ... | @@ -33,7 +33,7 @@ |
| 33 | 33 | |
| 34 | 34 | /* __Definitions _________________________________________________________ */ |
| 35 | 35 | #define CTBIN_NAME "ctbin" |
| 36 | -#define CTBIN_VERSION "00-02-02" | |
| 36 | +#define CTBIN_VERSION "00-03-00" | |
| 37 | 37 | |
| 38 | 38 | |
| 39 | 39 | /***********************************************************************//** | ... | ... |
src/ctobssim/ctobssim.cpp
| 1 | 1 | /*************************************************************************** |
| 2 | 2 | * ctobssim - CTA observation simulator tool * |
| 3 | 3 | * ----------------------------------------------------------------------- * |
| 4 | - * copyright (C) 2011 by Jurgen Knodlseder * | |
| 4 | + * copyright (C) 2011 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 ctobssim.cpp |
| 23 | 23 | * @brief CTA observation simulator tool implementation |
| 24 | - * @author J. Knodlseder | |
| 24 | + * @author J. Knoedlseder | |
| 25 | 25 | */ |
| 26 | 26 | |
| 27 | 27 | /* __ Includes ___________________________________________________________ */ |
| ... | ... | @@ -497,15 +497,17 @@ void ctobssim::simulate_source(GCTAObservation* obs, const GModels& models) |
| 497 | 497 | // pointings implement we just determine the pointing from the |
| 498 | 498 | // beginning of the observation. Throw an exception if the pointing |
| 499 | 499 | // is not defined. |
| 500 | - GCTAPointing* pnt = obs->pointing(obs->events()->tstart()); | |
| 501 | - if (pnt == NULL) | |
| 500 | + GCTAPointing* pnt = obs->pointing(); | |
| 501 | + if (pnt == NULL) { | |
| 502 | 502 | throw GCTAException::no_pointing(G_SIMULATE_SOURCE); |
| 503 | + } | |
| 503 | 504 | |
| 504 | 505 | // Get pointer on CTA response. Throw an exception if the response |
| 505 | 506 | // is not defined. |
| 506 | 507 | GCTAResponse* rsp = obs->response(); |
| 507 | - if (rsp == NULL) | |
| 508 | + if (rsp == NULL) { | |
| 508 | 509 | throw GCTAException::no_response(G_SIMULATE_SOURCE); |
| 510 | + } | |
| 509 | 511 | |
| 510 | 512 | // Make sure that the observation holds a CTA event list. If this |
| 511 | 513 | // is not the case then allocate and attach a CTA event list now. | ... | ... |
src/ctobssim/ctobssim.hpp
| 1 | 1 | /*************************************************************************** |
| 2 | 2 | * ctobssim - CTA observation simulator tool * |
| 3 | 3 | * ----------------------------------------------------------------------- * |
| 4 | - * copyright (C) 2011 by Jurgen Knodlseder * | |
| 4 | + * copyright (C) 2011 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 ctobssim.hpp |
| 23 | 23 | * @brief CTA observation simulator tool definition |
| 24 | - * @author J. Knodlseder | |
| 24 | + * @author J. Knoedlseder | |
| 25 | 25 | */ |
| 26 | 26 | |
| 27 | 27 | #ifndef CTOBSSIM_HPP |
| ... | ... | @@ -33,7 +33,7 @@ |
| 33 | 33 | |
| 34 | 34 | /* __Definitions _________________________________________________________ */ |
| 35 | 35 | #define CTOBSSIM_NAME "ctobssim" |
| 36 | -#define CTOBSSIM_VERSION "00-03-00" | |
| 36 | +#define CTOBSSIM_VERSION "00-03-01" | |
| 37 | 37 | |
| 38 | 38 | |
| 39 | 39 | /***********************************************************************//** | ... | ... |
src/ctselect/ctselect.cpp
| ... | ... | @@ -469,8 +469,7 @@ void ctselect::select_events(GCTAObservation* obs, const std::string& filename) |
| 469 | 469 | double ra = m_ra; |
| 470 | 470 | double dec = m_dec; |
| 471 | 471 | if (m_ra == 0.0 && m_dec == 0.0) { |
| 472 | - GTime time; | |
| 473 | - const GCTAPointing *pnt = obs->pointing(time); | |
| 472 | + const GCTAPointing *pnt = obs->pointing(); | |
| 474 | 473 | ra = pnt->dir().ra_deg(); |
| 475 | 474 | dec = pnt->dir().dec_deg(); |
| 476 | 475 | } | ... | ... |
src/ctskymap/ctskymap.cpp
| 1 | 1 | /*************************************************************************** |
| 2 | 2 | * ctskymap - CTA sky mapping tool * |
| 3 | 3 | * ----------------------------------------------------------------------- * |
| 4 | - * copyright (C) 2010-2011 by Jurgen Knodlseder * | |
| 4 | + * copyright (C) 2011 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 ctskymap.cpp |
| 23 | 23 | * @brief CTA sky mapping tool implementation |
| 24 | - * @author J. Knodlseder | |
| 24 | + * @author J. Knoedlseder | |
| 25 | 25 | */ |
| 26 | 26 | |
| 27 | 27 | /* __ Includes ___________________________________________________________ */ |
| ... | ... | @@ -419,8 +419,7 @@ void ctskymap::init_map(GCTAObservation* obs) |
| 419 | 419 | |
| 420 | 420 | |
| 421 | 421 | // Get pointer on CTA pointing |
| 422 | - const GTime srcTime; // Dummy time | |
| 423 | - const GCTAPointing *pnt = obs->pointing(srcTime); | |
| 422 | + const GCTAPointing *pnt = obs->pointing(); | |
| 424 | 423 | if (pnt == NULL) { |
| 425 | 424 | throw GCTAException::no_pointing(G_INIT_MAP); |
| 426 | 425 | } | ... | ... |
src/ctskymap/ctskymap.hpp
| 1 | 1 | /*************************************************************************** |
| 2 | 2 | * ctskymap - CTA sky mapping tool * |
| 3 | 3 | * ----------------------------------------------------------------------- * |
| 4 | - * copyright (C) 2010-2011 by Jurgen Knodlseder * | |
| 4 | + * copyright (C) 2010-2011 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 ctskymap.hpp |
| 23 | 23 | * @brief CTA sky mapping tool definition |
| 24 | - * @author J. Knodlseder | |
| 24 | + * @author J. Knoedlseder | |
| 25 | 25 | */ |
| 26 | 26 | |
| 27 | 27 | #ifndef CTSKYMAP_HPP | ... | ... |