From 13a723c37e4516fef93efb1dcd7f8904941b1f8b Mon Sep 17 00:00:00 2001 From: Jürgen Knödlseder Date: Mon, 11 Jun 2018 17:13:28 +0200 Subject: [PATCH] Add boolean FITS header card constructor --- NEWS | 3 ++- include/GFitsHeaderCard.hpp | 4 +++- pyext/GFitsHeaderCard.i | 4 +++- src/fits/GFitsHeaderCard.cpp | 30 ++++++++++++++++++++++++++++-- 4 files changed, 36 insertions(+), 5 deletions(-) diff --git a/NEWS b/NEWS index 6166884..f4d3d77 100644 --- a/NEWS +++ b/NEWS @@ -1,6 +1,6 @@ New Features and Important Changes in GammaLib 1.6.0 -8 June 2018 +11 June 2018 1. Introduction @@ -38,6 +38,7 @@ The following methods have been added: - GPha::obs_emin() - GPha::obs_emax(GEnergy&) - GPha::obs_emax() +- GFitsHeaderCard boolean constructor - GCTAInstDir::theta() - GCTAInstDir::phi() - GCTAEventAtom(GCTAInstDir&, GEnergy&, GTime&) diff --git a/include/GFitsHeaderCard.hpp b/include/GFitsHeaderCard.hpp index 2de1fe6..10beeea 100644 --- a/include/GFitsHeaderCard.hpp +++ b/include/GFitsHeaderCard.hpp @@ -1,7 +1,7 @@ /*************************************************************************** * GFitsHeaderCard.hpp - FITS header card class * * ----------------------------------------------------------------------- * - * copyright (C) 2008-2016 by Juergen Knoedlseder * + * copyright (C) 2008-2018 by Juergen Knoedlseder * * ----------------------------------------------------------------------- * * * * This program is free software: you can redistribute it and/or modify * @@ -55,6 +55,8 @@ public: const std::string& comment); GFitsHeaderCard(const std::string& keyname, const int& value, const std::string& comment); + GFitsHeaderCard(const std::string& keyname, const bool& value, + const std::string& comment); GFitsHeaderCard(const GFitsHeaderCard& card); virtual ~GFitsHeaderCard(void); diff --git a/pyext/GFitsHeaderCard.i b/pyext/GFitsHeaderCard.i index 59904e1..76699f0 100644 --- a/pyext/GFitsHeaderCard.i +++ b/pyext/GFitsHeaderCard.i @@ -1,7 +1,7 @@ /*************************************************************************** * GFitsHeaderCard.i - FITS header card class * * ----------------------------------------------------------------------- * - * copyright (C) 2008-2016 by Juergen Knoedlseder * + * copyright (C) 2008-2018 by Juergen Knoedlseder * * ----------------------------------------------------------------------- * * * * This program is free software: you can redistribute it and/or modify * @@ -51,6 +51,8 @@ public: const std::string& comment); GFitsHeaderCard(const std::string& keyname, const int& value, const std::string& comment); + GFitsHeaderCard(const std::string& keyname, const bool& value, + const std::string& comment); GFitsHeaderCard(const GFitsHeaderCard& card); virtual ~GFitsHeaderCard(void); diff --git a/src/fits/GFitsHeaderCard.cpp b/src/fits/GFitsHeaderCard.cpp index e1fe0fa..cb62936 100644 --- a/src/fits/GFitsHeaderCard.cpp +++ b/src/fits/GFitsHeaderCard.cpp @@ -1,7 +1,7 @@ /*************************************************************************** * GFitsHeaderCard.cpp - FITS header card class * * ----------------------------------------------------------------------- * - * copyright (C) 2008-2013 by Juergen Knoedlseder * + * copyright (C) 2008-2018 by Juergen Knoedlseder * * ----------------------------------------------------------------------- * * * * This program is free software: you can redistribute it and/or modify * @@ -127,7 +127,7 @@ GFitsHeaderCard::GFitsHeaderCard(const std::string& keyname, /***********************************************************************//** - * @brief Constructor for integer cards + * @brief Constructor for boolean cards * * @param[in] keyname Card name. * @param[in] value Card integer value. @@ -153,6 +153,32 @@ GFitsHeaderCard::GFitsHeaderCard(const std::string& keyname, /***********************************************************************//** + * @brief Constructor for integer cards + * + * @param[in] keyname Card name. + * @param[in] value Card boolean value. + * @param[in] comment Card comment. + * + * This constructor builds a header card from the keyname, value and comment. + ***************************************************************************/ +GFitsHeaderCard::GFitsHeaderCard(const std::string& keyname, + const bool& value, + const std::string& comment) +{ + // Initialise class members + init_members(); + + // Set members + this->keyname(keyname); + this->value(value); + this->comment(comment); + + // Return + return; +} + + +/***********************************************************************//** * @brief Copy constructor * * @param[in] card Header card. -- libgit2 0.21.4