Samuel Flis / gammalib

Commit 9bc9320e0ad085f55b99fe2e0fbc9c98dd5e247e

Authored by Jürgen Knödlseder
1 parent 937904f4

Correctly set names of spatial GLON/GLAT model parameters (#2113)

Inline Side-by-side
Showing 5 changed files with 15 additions and 5 deletions
ChangeLog
  View file @9bc9320
1 -2017-04-28 1 +2017-05-14
2 2
3 * Version 1.3.0 released 3 * Version 1.3.0 released
4 ========================= 4 =========================
5 5
  6 + Correct set names of spatial GLON/GLAT model parameters (#2113)
6 Support "BKG" as name of CTA background template 7 Support "BKG" as name of CTA background template
7 Scale optimizer convergence criterion with step size (#2022) 8 Scale optimizer convergence criterion with step size (#2022)
8 Put response cube loading and saving in OpenMP critical zone (#2021) 9 Put response cube loading and saving in OpenMP critical zone (#2021)
1 New Features and Important Changes in GammaLib 1.3.0.dev1 1 New Features and Important Changes in GammaLib 1.3.0.dev1
2 2
3 -28 April 2017 3 +14 May 2017
4 4
5 5
6 1. Introduction 6 1. Introduction
@@ -138,6 +138,9 @@ have been implemented: @@ -138,6 +138,9 @@ have been implemented:
138 Please note that these models are not deeply tested so far and the code 138 Please note that these models are not deeply tested so far and the code
139 and interface is still subject to change (#1520). 139 and interface is still subject to change (#1520).
140 140
  141 +The names of spatial model parameters are now always set to RA/DEC even if
  142 +the input parameters were GLON/GLAT (#2113).
  143 +
141 144
142 9. Numerics module 145 9. Numerics module
143 ------------------ 146 ------------------
src/model/GModelSpatialElliptical.cpp
  View file @9bc9320
1 /*************************************************************************** 1 /***************************************************************************
2 * GModelSpatialElliptical.cpp - Abstract elliptical spatial model class * 2 * GModelSpatialElliptical.cpp - Abstract elliptical spatial model class *
3 * ----------------------------------------------------------------------- * 3 * ----------------------------------------------------------------------- *
4 - * copyright (C) 2013-2016 by Juergen Knoedlseder * 4 + * copyright (C) 2013-2017 by Juergen Knoedlseder *
5 * ----------------------------------------------------------------------- * 5 * ----------------------------------------------------------------------- *
6 * * 6 * *
7 * This program is free software: you can redistribute it and/or modify * 7 * This program is free software: you can redistribute it and/or modify *
@@ -272,6 +272,8 @@ void GModelSpatialElliptical::read(const GXmlElement& xml) @@ -272,6 +272,8 @@ void GModelSpatialElliptical::read(const GXmlElement& xml)
272 dir.lb_deg(ra(), dec()), 272 dir.lb_deg(ra(), dec()),
273 m_ra.value(dir.ra_deg()); 273 m_ra.value(dir.ra_deg());
274 m_dec.value(dir.dec_deg()); 274 m_dec.value(dir.dec_deg());
  275 + m_ra.name("RA");
  276 + m_dec.name("DEC");
275 } 277 }
276 else if (has_glon || has_glat) { 278 else if (has_glon || has_glat) {
277 throw GException::model_invalid_parnames(G_READ, xml, 279 throw GException::model_invalid_parnames(G_READ, xml,
src/model/GModelSpatialPointSource.cpp
  View file @9bc9320
1 /*************************************************************************** 1 /***************************************************************************
2 * GModelSpatialPointSource.cpp - Spatial point source model class * 2 * GModelSpatialPointSource.cpp - Spatial point source model class *
3 * ----------------------------------------------------------------------- * 3 * ----------------------------------------------------------------------- *
4 - * copyright (C) 2009-2016 by Juergen Knoedlseder * 4 + * copyright (C) 2009-2017 by Juergen Knoedlseder *
5 * ----------------------------------------------------------------------- * 5 * ----------------------------------------------------------------------- *
6 * * 6 * *
7 * This program is free software: you can redistribute it and/or modify * 7 * This program is free software: you can redistribute it and/or modify *
@@ -416,6 +416,8 @@ void GModelSpatialPointSource::read(const GXmlElement& xml) @@ -416,6 +416,8 @@ void GModelSpatialPointSource::read(const GXmlElement& xml)
416 dir.lb_deg(ra(), dec()), 416 dir.lb_deg(ra(), dec()),
417 m_ra.value(dir.ra_deg()); 417 m_ra.value(dir.ra_deg());
418 m_dec.value(dir.dec_deg()); 418 m_dec.value(dir.dec_deg());
  419 + m_ra.name("RA");
  420 + m_dec.name("DEC");
419 } 421 }
420 else if (has_glon || has_glat) { 422 else if (has_glon || has_glat) {
421 throw GException::model_invalid_parnames(G_READ, xml, 423 throw GException::model_invalid_parnames(G_READ, xml,
src/model/GModelSpatialRadial.cpp
  View file @9bc9320
1 /*************************************************************************** 1 /***************************************************************************
2 * GModelSpatialRadial.cpp - Abstract radial spatial model base class * 2 * GModelSpatialRadial.cpp - Abstract radial spatial model base class *
3 * ----------------------------------------------------------------------- * 3 * ----------------------------------------------------------------------- *
4 - * copyright (C) 2011-2016 by Juergen Knoedlseder * 4 + * copyright (C) 2011-2017 by Juergen Knoedlseder *
5 * ----------------------------------------------------------------------- * 5 * ----------------------------------------------------------------------- *
6 * * 6 * *
7 * This program is free software: you can redistribute it and/or modify * 7 * This program is free software: you can redistribute it and/or modify *
@@ -263,6 +263,8 @@ void GModelSpatialRadial::read(const GXmlElement& xml) @@ -263,6 +263,8 @@ void GModelSpatialRadial::read(const GXmlElement& xml)
263 dir.lb_deg(ra(), dec()), 263 dir.lb_deg(ra(), dec()),
264 m_ra.value(dir.ra_deg()); 264 m_ra.value(dir.ra_deg());
265 m_dec.value(dir.dec_deg()); 265 m_dec.value(dir.dec_deg());
  266 + m_ra.name("RA");
  267 + m_dec.name("DEC");
266 } 268 }
267 else if (has_glon || has_glat) { 269 else if (has_glon || has_glat) {
268 throw GException::model_invalid_parnames(G_READ, xml, 270 throw GException::model_invalid_parnames(G_READ, xml,