--fixed bug with number of pixels being counted

fraserw · Jul 15, 2019 · 5c9995d · 5c9995d
1 parent 1fd6677
commit 5c9995d
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/setup.py b/setup.py
@@ -17,7 +17,7 @@
 setup(
   name = 'trippy',
   packages = ['trippy','trippy.scamp','trippy.MCMCfit'],
-  version = '1.0',
+  version = '1.1',
   description = 'Pill aperture photometry for trailed astronomical sources',
   author = 'Wesley Fraser',
   author_email = 'westhefras@gmail.com',

diff --git a/trippy/__init__.py b/trippy/__init__.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-__version__='1.0'
+__version__='1.1'
 __author__='Wesley Fraser (github: fraserw, westhefras@gmail.com)'
 __all__=['psf','pill','bgFinder','utils','psfStarChooser','MCMCfit','scamp','tzscale']
 

diff --git a/trippy/pill.py b/trippy/pill.py
@@ -322,14 +322,17 @@ def __call__(self,xi,yi,radius=4.,l=5.,a=0.01,width=20.,skyRadius=8.,zpt=27.0,ex
         if singleAperture:
             W = np.where(mask != 0.0)
             flux = np.sum(image) - len(W[0]) * bg / float(self.repFact ** 2)
+            self.nPix = np.sum(mask) / float(self.repFact ** 2)
         elif multipleApertures:
             flux = []
+            self.nPix = []
             for jj in range(len(radius)):
                 W = np.where(mask[jj] != 0.0)
                 flux.append(np.sum(image[jj]) - len(W[0]) * bg / float(self.repFact ** 2))
+                self.nPix.append(np.sum(mask[jj]) / float(self.repFact ** 2))
             flux = np.array(flux)
+            self.nPix = np.array(self.nPix)
 
-        self.nPix = np.sum(mask) / float(self.repFact ** 2)
         self.sourceFlux = flux
         self.bg = bg
         self.bgstd = bgstd