Josh Cardenzana / gammalib

Commit 49434873385179b318b6c20e2894b1deed0d15a3

Authored by Jürgen Knödlseder
2 parents 498eef23 865b9ffb

Merge branch '2961-change-import' into integration

Inline Side-by-side
Showing 4 changed files with 17 additions and 11 deletions
pyext/GSkyRegionCircle.i
  View file @4943487
1 1 /***************************************************************************
2 2 * GSkyRegionCircle.i - Sky region class *
3 3 * ----------------------------------------------------------------------- *
4   - * copyright (C) 2013-2018 by Michael Mayer *
  4 + * copyright (C) 2013-2019 by Michael Mayer *
5 5 * ----------------------------------------------------------------------- *
6 6 * *
7 7 * This program is free software: you can redistribute it and/or modify *
... ... @@ -72,9 +72,10 @@ public:
72 72 }
73 73 %pythoncode {
74 74 def __getstate__(self):
75   - state = (self.centre(), self.radius())
  75 + state = (self.centre(), self.radius(), self.name())
76 76 return state
77 77 def __setstate__(self, state):
78 78 self.__init__(state[0], state[1])
  79 + self.name(state[2])
79 80 }
80 81 };
... ...
pyext/GSkyRegionMap.i
  View file @4943487
1 1 /***************************************************************************
2 2 * GSkyRegionMap.i - Sky region map class *
3 3 * ----------------------------------------------------------------------- *
4   - * copyright (C) 2017-2018 by Pierrick Martin *
  4 + * copyright (C) 2017-2019 by Pierrick Martin *
5 5 * ----------------------------------------------------------------------- *
6 6 * *
7 7 * This program is free software: you can redistribute it and/or modify *
... ... @@ -71,9 +71,10 @@ public:
71 71 }
72 72 %pythoncode {
73 73 def __getstate__(self):
74   - state = (self.map(),)
  74 + state = (self.map(), self.name())
75 75 return state
76 76 def __setstate__(self, state):
77 77 self.__init__(state[0])
  78 + self.name(state[1])
78 79 }
79 80 };
... ...
pyext/gammalib/__init__.py.in
  View file @4943487
1 1 # ==========================================================================
2 2 # GammaLib Python module
3 3 #
4   -# Copyright (C) 2016-2018 Juergen Knoedlseder
  4 +# Copyright (C) 2016-2019 Juergen Knoedlseder
5 5 #
6 6 # This program is free software: you can redistribute it and/or modify
7 7 # it under the terms of the GNU General Public License as published by
... ... @@ -22,14 +22,14 @@ from gammalib.app import *
22 22 from gammalib.base import *
23 23 from gammalib.fits import *
24 24 from gammalib.linalg import *
25   -from gammalib.model import *
  25 +from gammalib.sky import *
26 26 from gammalib.numerics import *
27   -from gammalib.obs import *
28 27 from gammalib.opt import *
29   -from gammalib.sky import *
30 28 from gammalib.support import *
31   -from gammalib.test import *
32 29 from gammalib.xml import *
  30 +from gammalib.model import *
  31 +from gammalib.obs import *
  32 +from gammalib.test import *
33 33 from gammalib.xspec import *
34 34 from gammalib.vo import *
35 35 from gammalib.mwl import *
... ...
test/test_GSky.py
  View file @4943487
... ... @@ -592,8 +592,12 @@ class Test(gammalib.GPythonTestSuite):
592 592 dir.lb_deg(1.0, 2.0)
593 593 map = gammalib.GFilename(os.environ['TEST_DATA']+'/test_cube.fits')
594 594 regions = gammalib.GSkyRegions()
595   - regions.append(gammalib.GSkyRegionCircle(dir,2.0))
596   - regions.append(gammalib.GSkyRegionMap(map))
  595 + rcircle = gammalib.GSkyRegionCircle(dir,2.0)
  596 + rmap = gammalib.GSkyRegionMap(map)
  597 + rcircle.name('My Circle')
  598 + rmap.name('My Map')
  599 + regions.append(rcircle)
  600 + regions.append(rmap)
597 601 horizdir = gammalib.GHorizDir()
598 602 horizdir.altaz_deg(2.0, 3.0)
599 603  
... ...