From 99ced2450086daa2ba9fdb1b4a9cfe04fb88fc4e Mon Sep 17 00:00:00 2001 From: knodlseder <> Date: Fri, 25 Nov 2011 07:32:43 +0000 Subject: [PATCH] remove GTime argument from pointing() method --- src/ctbin/ctbin.cpp | 10 +++++----- src/ctbin/ctbin.hpp | 6 +++--- src/ctobssim/ctobssim.cpp | 12 +++++++----- src/ctobssim/ctobssim.hpp | 6 +++--- src/ctselect/ctselect.cpp | 3 +-- src/ctskymap/ctskymap.cpp | 7 +++---- src/ctskymap/ctskymap.hpp | 4 ++-- 7 files changed, 24 insertions(+), 24 deletions(-) diff --git a/src/ctbin/ctbin.cpp b/src/ctbin/ctbin.cpp index 2065c24..a9eb15c 100644 --- a/src/ctbin/ctbin.cpp +++ b/src/ctbin/ctbin.cpp @@ -1,7 +1,7 @@ /*************************************************************************** * ctbin - CTA data binning tool * * ----------------------------------------------------------------------- * - * copyright (C) 2010-2011 by Jurgen Knodlseder * + * copyright (C) 2010-2011 by Juergen Knoedlseder * * ----------------------------------------------------------------------- * * * * This program is free software: you can redistribute it and/or modify * @@ -21,7 +21,7 @@ /** * @file ctbin.cpp * @brief CTA data binning tool implementation - * @author J. Knodlseder + * @author J. Knoedlseder */ /* __ Includes ___________________________________________________________ */ @@ -437,10 +437,10 @@ void ctbin::bin_events(GCTAObservation* obs) else { // Get pointer on CTA pointing - const GTime srcTime; // Dummy time - const GCTAPointing *pnt = obs->pointing(srcTime); - if (pnt == NULL) + const GCTAPointing *pnt = obs->pointing(); + if (pnt == NULL) { throw GCTAException::no_pointing(G_BIN_EVENTS); + } // Set reference point to pointing if (toupper(m_coordsys) == "GAL") { diff --git a/src/ctbin/ctbin.hpp b/src/ctbin/ctbin.hpp index c780fe4..7bf36bf 100644 --- a/src/ctbin/ctbin.hpp +++ b/src/ctbin/ctbin.hpp @@ -1,7 +1,7 @@ /*************************************************************************** * ctbin - CTA data binning tool * * ----------------------------------------------------------------------- * - * copyright (C) 2010-2011 by Jurgen Knodlseder * + * copyright (C) 2010-2011 by Juergen Knoedlseder * * ----------------------------------------------------------------------- * * * * This program is free software: you can redistribute it and/or modify * @@ -21,7 +21,7 @@ /** * @file ctbin.hpp * @brief CTA data binning tool definition - * @author J. Knodlseder + * @author J. Knoedlseder */ #ifndef CTBIN_HPP @@ -33,7 +33,7 @@ /* __Definitions _________________________________________________________ */ #define CTBIN_NAME "ctbin" -#define CTBIN_VERSION "00-02-02" +#define CTBIN_VERSION "00-03-00" /***********************************************************************//** diff --git a/src/ctobssim/ctobssim.cpp b/src/ctobssim/ctobssim.cpp index 473dd7f..8fcab31 100644 --- a/src/ctobssim/ctobssim.cpp +++ b/src/ctobssim/ctobssim.cpp @@ -1,7 +1,7 @@ /*************************************************************************** * ctobssim - CTA observation simulator tool * * ----------------------------------------------------------------------- * - * copyright (C) 2011 by Jurgen Knodlseder * + * copyright (C) 2011 by Juergen Knoedlseder * * ----------------------------------------------------------------------- * * * * This program is free software: you can redistribute it and/or modify * @@ -21,7 +21,7 @@ /** * @file ctobssim.cpp * @brief CTA observation simulator tool implementation - * @author J. Knodlseder + * @author J. Knoedlseder */ /* __ Includes ___________________________________________________________ */ @@ -497,15 +497,17 @@ void ctobssim::simulate_source(GCTAObservation* obs, const GModels& models) // pointings implement we just determine the pointing from the // beginning of the observation. Throw an exception if the pointing // is not defined. - GCTAPointing* pnt = obs->pointing(obs->events()->tstart()); - if (pnt == NULL) + GCTAPointing* pnt = obs->pointing(); + if (pnt == NULL) { throw GCTAException::no_pointing(G_SIMULATE_SOURCE); + } // Get pointer on CTA response. Throw an exception if the response // is not defined. GCTAResponse* rsp = obs->response(); - if (rsp == NULL) + if (rsp == NULL) { throw GCTAException::no_response(G_SIMULATE_SOURCE); + } // Make sure that the observation holds a CTA event list. If this // is not the case then allocate and attach a CTA event list now. diff --git a/src/ctobssim/ctobssim.hpp b/src/ctobssim/ctobssim.hpp index 59e028e..2a314df 100644 --- a/src/ctobssim/ctobssim.hpp +++ b/src/ctobssim/ctobssim.hpp @@ -1,7 +1,7 @@ /*************************************************************************** * ctobssim - CTA observation simulator tool * * ----------------------------------------------------------------------- * - * copyright (C) 2011 by Jurgen Knodlseder * + * copyright (C) 2011 by Juergen Knoedlseder * * ----------------------------------------------------------------------- * * * * This program is free software: you can redistribute it and/or modify * @@ -21,7 +21,7 @@ /** * @file ctobssim.hpp * @brief CTA observation simulator tool definition - * @author J. Knodlseder + * @author J. Knoedlseder */ #ifndef CTOBSSIM_HPP @@ -33,7 +33,7 @@ /* __Definitions _________________________________________________________ */ #define CTOBSSIM_NAME "ctobssim" -#define CTOBSSIM_VERSION "00-03-00" +#define CTOBSSIM_VERSION "00-03-01" /***********************************************************************//** diff --git a/src/ctselect/ctselect.cpp b/src/ctselect/ctselect.cpp index 74d2d86..6e33d4c 100644 --- a/src/ctselect/ctselect.cpp +++ b/src/ctselect/ctselect.cpp @@ -469,8 +469,7 @@ void ctselect::select_events(GCTAObservation* obs, const std::string& filename) double ra = m_ra; double dec = m_dec; if (m_ra == 0.0 && m_dec == 0.0) { - GTime time; - const GCTAPointing *pnt = obs->pointing(time); + const GCTAPointing *pnt = obs->pointing(); ra = pnt->dir().ra_deg(); dec = pnt->dir().dec_deg(); } diff --git a/src/ctskymap/ctskymap.cpp b/src/ctskymap/ctskymap.cpp index de75337..5ba0161 100644 --- a/src/ctskymap/ctskymap.cpp +++ b/src/ctskymap/ctskymap.cpp @@ -1,7 +1,7 @@ /*************************************************************************** * ctskymap - CTA sky mapping tool * * ----------------------------------------------------------------------- * - * copyright (C) 2010-2011 by Jurgen Knodlseder * + * copyright (C) 2011 by Juergen Knoedlseder * * ----------------------------------------------------------------------- * * * * This program is free software: you can redistribute it and/or modify * @@ -21,7 +21,7 @@ /** * @file ctskymap.cpp * @brief CTA sky mapping tool implementation - * @author J. Knodlseder + * @author J. Knoedlseder */ /* __ Includes ___________________________________________________________ */ @@ -419,8 +419,7 @@ void ctskymap::init_map(GCTAObservation* obs) // Get pointer on CTA pointing - const GTime srcTime; // Dummy time - const GCTAPointing *pnt = obs->pointing(srcTime); + const GCTAPointing *pnt = obs->pointing(); if (pnt == NULL) { throw GCTAException::no_pointing(G_INIT_MAP); } diff --git a/src/ctskymap/ctskymap.hpp b/src/ctskymap/ctskymap.hpp index a5d7ce8..0011c89 100644 --- a/src/ctskymap/ctskymap.hpp +++ b/src/ctskymap/ctskymap.hpp @@ -1,7 +1,7 @@ /*************************************************************************** * ctskymap - CTA sky mapping tool * * ----------------------------------------------------------------------- * - * copyright (C) 2010-2011 by Jurgen Knodlseder * + * copyright (C) 2010-2011 by Juergen Knoedlseder * * ----------------------------------------------------------------------- * * * * This program is free software: you can redistribute it and/or modify * @@ -21,7 +21,7 @@ /** * @file ctskymap.hpp * @brief CTA sky mapping tool definition - * @author J. Knodlseder + * @author J. Knoedlseder */ #ifndef CTSKYMAP_HPP -- libgit2 0.21.4