resyncing to bring inline

Author: nexus314

galaxydetect.py

@@ -17,17 +17,17 @@
 
 #galaxy detection
 x = 0
-while x<5000:
+while x<10000:
 
     starloc = s.FindBrightest()
     if s.img[starloc]<3500:
     	print "hit background level in count"
     	break
     galradius=s.FindGalaxyRadius(starloc)
     galcount=s.MaskGalaxy(starloc, Gradius=galradius)
-    galflux=s.flux(starloc)
+    galflux=s.count_to_flux(galcount)
     stars.append({'coords':starloc, 'count':galcount, 'flux':galflux})	#adds star's paramters to catalogue
-    print x, "	",s.img[starloc], "   ", starloc, "   ", galflux,  "   ", galradius
+    print x, "	",starloc, "   ",s.img[starloc], "   ", galcount, "   ", galflux,  "   ", galradius
     x=x+1
 
 #print stars
@@ -50,4 +50,4 @@
 plt.semilogy()
 #ax = plt
 #ax.set_yscale('log') 
-plt.show()
+plt.show()

plotter.py

@@ -31,6 +31,40 @@
 top = bottom + n
 
 
+# we need a (numrects x numsides x 2) numpy array for the path helper
+# function to build a compound path
+XY = np.array([[left,left,right,right], [bottom,top,top,bottom]]).T
+
+# get the Path object
+barpath = path.Path.make_compound_path_from_polys(XY)
+
+# make a patch out of it
+patch = patches.PathPatch(barpath, facecolor='blue', edgecolor='blue', alpha=0.8)
+ax.add_patch(patch)
+
+# update the view limits
+ax.set_xlim(left[0], right[-1])
+ax.set_ylim(bottom.min(), top.max())
+ax.set_yscale('log')					#sets log scale for y-axis
+plt.show()
+
+#s.img=s.img-3400
+s.ConvertFlux()
+	
+
+fig, ax = plt.subplots()
+
+# histogram our data with numpy
+
+n, bins = np.histogram(s.img, 10000)	# indjusts the numbe of bins.
+
+# get the corners of the rectangles for the histogram
+left = np.array(bins[:-1])
+right = np.array(bins[1:])
+bottom = np.zeros(len(left))
+top = bottom + n
+
+
 # we need a (numrects x numsides x 2) numpy array for the path helper
 # function to build a compound path
 XY = np.array([[left,left,right,right], [bottom,top,top,bottom]]).T

stardetect.py

@@ -30,4 +30,5 @@
 
 plt.clf()
 plt.imshow(s.masked)
-plt.show()
+plt.show()
+

starprocessor.py

@@ -15,6 +15,8 @@ def __init__(self):
 
     def ConvertFlux(self):
 	#converts whole image to flux
+		print self.header['MAGZPT']
+		print self.header['MAGZRR']
 		self.img = -2.5*np.log10(self.img)
 		self.img += self.header['MAGZPT']
 		self.RecalculateMasked()
@@ -152,10 +154,12 @@ def MaskGalaxy(self, coords, Gradius = 12, Bradius=50):
         avecount = avecount-localbck
         localmask = np.logical_not(gal)
         #print "true <count>", avecount
+		if avecount<0:
+			avecount=0
         self.mask = np.logical_and(self.mask, localmask)					
         self.RecalculateMasked()
         return avecount
-    
+		
     def RecalculateMasked(self):
         self.masked = self.img*self.mask