From 4e61d90f99342be9beda259a8eb3b3c193f718b6 Mon Sep 17 00:00:00 2001 From: Jürgen Knödlseder Date: Fri, 29 Nov 2013 21:33:37 +0100 Subject: [PATCH] Longitude in skymaps and counts maps now increases towards the left. Only relevant projections are proposed in parameter file. --- ChangeLog | 4 +++- NEWS | 11 ++++++++--- README | 4 ++-- src/ctbin/ctbin.cpp | 2 +- src/ctbin/ctbin.par | 2 +- src/ctmodel/ctmodel.cpp | 2 +- src/ctmodel/ctmodel.par | 2 +- src/ctskymap/ctskymap.cpp | 2 +- src/ctskymap/ctskymap.par | 2 +- 9 files changed, 19 insertions(+), 12 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5d72abb..d9e5774 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,4 @@ -2013-11-20 Juergen Knoedlseder +2013-11-29 Juergen Knoedlseder * Version 0.7.0 released ======================== @@ -7,6 +7,8 @@ ctobssim now only simulates events within ROI and supports all kinds of data space models ctbin now implements LIN and FILE binning algorithms + ctbin, ctskymap and ctmodel now generate maps with + increasing longitude to the left 2012-12-21 Juergen Knoedlseder diff --git a/NEWS b/NEWS index 599027b..9b853b6 100644 --- a/NEWS +++ b/NEWS @@ -2,7 +2,7 @@ New Features and Important Changes in ctools 00-07-00 Author(s) : Juergen Knoedlseder -20 November 2013 +29 November 2013 1. Introduction @@ -52,6 +52,9 @@ ENERGYBINS is expected. The ebinalg and ebinfile parameters are now automatic. +Counts maps generated by ctbin now have the longitude increasing +towards the left. + 7. ctlike - CTA maximum likelihood fitting ------------------------------------------ @@ -60,12 +63,14 @@ None 8. ctskymap - CTA sky mapping ----------------------------- -None +Skymaps generated by ctskymap now have the longitude increasing +towards the left. 9. ctmodel - CTA counts map modelling ------------------------------------- -None +Model maps generated by ctmodel now have the longitude increasing +towards the left. 10. Examples diff --git a/README b/README index 104e68c..30e85c9 100644 --- a/README +++ b/README @@ -1,8 +1,8 @@ ctools information ================== -Version: 00-06-00 (December 21th, 2012) +Version: 00-07-00 (November 29th, 2013) Author: Juergen Knodlseder (jurgen.knodlseder@irap.omp.eu) -GammaLib dependency: 00-07-00 +GammaLib dependency: 00-08-00 License information diff --git a/src/ctbin/ctbin.cpp b/src/ctbin/ctbin.cpp index b66891f..9937e35 100644 --- a/src/ctbin/ctbin.cpp +++ b/src/ctbin/ctbin.cpp @@ -590,7 +590,7 @@ void ctbin::bin_events(GCTAObservation* obs) // Create skymap GSkymap map = GSkymap(m_proj, m_coordsys, - xref, yref, m_binsz, m_binsz, + xref, yref, -m_binsz, m_binsz, m_nxpix, m_nypix, m_enumbins); // Initialise binning statistics diff --git a/src/ctbin/ctbin.par b/src/ctbin/ctbin.par index af2e156..a0eb9dd 100644 --- a/src/ctbin/ctbin.par +++ b/src/ctbin/ctbin.par @@ -39,7 +39,7 @@ coordsys, s, a, "CEL", CEL|GAL,,"Coordinate system (CEL - celestial, GAL - galac xref, r, a, 83.63,,, "First coordinate of image center in degrees (RA or galactic l)" yref, r, a, 22.01,,, "Second coordinate of image center in degrees (DEC or galactic b)" axisrot, r, h, 0.0,,, "Rotation angle of image axis, in degrees" -proj, s, a, "CAR",,, "Projection method e.g. AIT|ARC|CAR|GLS|MER|NCP|SIN|STG|TAN" +proj, s, a, "CAR", AZP|CAR|MER|STG|TAN,, "Projection method e.g. AZP|CAR|MER|STG|TAN" # # Standard parameters diff --git a/src/ctmodel/ctmodel.cpp b/src/ctmodel/ctmodel.cpp index 87e578d..51e6f04 100644 --- a/src/ctmodel/ctmodel.cpp +++ b/src/ctmodel/ctmodel.cpp @@ -495,7 +495,7 @@ void ctmodel::setup_obs(void) // Setup skymap GSkymap map = GSkymap(m_proj, m_coordsys, - m_xref, m_yref, m_binsz, m_binsz, + m_xref, m_yref, -m_binsz, m_binsz, m_nxpix, m_nypix, m_enumbins); // Create model cube from sky map diff --git a/src/ctmodel/ctmodel.par b/src/ctmodel/ctmodel.par index fb304c5..969ef16 100644 --- a/src/ctmodel/ctmodel.par +++ b/src/ctmodel/ctmodel.par @@ -52,7 +52,7 @@ coordsys, s, a, "CEL", CEL|GAL,,"Coordinate system (CEL - celestial, GAL - galac xref, r, a, 83.63,,, "First coordinate of image center in degrees (RA or galactic l)" yref, r, a, 22.01,,, "Second coordinate of image center in degrees (DEC or galactic b)" axisrot, r, h, 0.0,,, "Rotation angle of image axis, in degrees" -proj, s, a, "CAR",,, "Projection method e.g. AIT|ARC|CAR|GLS|MER|NCP|SIN|STG|TAN" +proj, s, a, "CAR", AZP|CAR|MER|STG|TAN,, "Projection method e.g. AZP|CAR|MER|STG|TAN" # # Standard parameters #==================== diff --git a/src/ctskymap/ctskymap.cpp b/src/ctskymap/ctskymap.cpp index 440050c..dd30ada 100644 --- a/src/ctskymap/ctskymap.cpp +++ b/src/ctskymap/ctskymap.cpp @@ -437,7 +437,7 @@ void ctskymap::init_map(GCTAObservation* obs) } // endelse: map centre set to pointing // Create skymap - m_skymap = GSkymap(m_proj, m_coordsys, xref, yref, m_binsz, m_binsz, + m_skymap = GSkymap(m_proj, m_coordsys, xref, yref, -m_binsz, m_binsz, m_nxpix, m_nypix, 1); // Return diff --git a/src/ctskymap/ctskymap.par b/src/ctskymap/ctskymap.par index 9a45d2f..b369740 100644 --- a/src/ctskymap/ctskymap.par +++ b/src/ctskymap/ctskymap.par @@ -34,7 +34,7 @@ coordsys, s, a, "CEL", CEL|GAL,,"Coordinate system (CEL - celestial, GAL - galac xref, r, a, 83.63,,, "First coordinate of image center in degrees (RA or galactic l)" yref, r, a, 22.01,,, "Second coordinate of image center in degrees (DEC or galactic b)" axisrot, r, h, 0.0,,, "Rotation angle of image axis, in degrees" -proj, s, a, "CAR",,, "Projection method e.g. AIT|ARC|CAR|GLS|MER|NCP|SIN|STG|TAN" +proj, s, a, "CAR", AZP|CAR|MER|STG|TAN,, "Projection method e.g. AZP|CAR|MER|STG|TAN" # # Standard parameters -- libgit2 0.21.4