EllipSect 3.4.1__tar.gz → 3.4.3__tar.gz

{ellipsect-3.4.1 → ellipsect-3.4.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: EllipSect
-Version: 3.4.1
+Version: 3.4.3
 Summary: A surface brightness analysis tool for GALFIT output.
 Home-page: https://github.com/canorve/EllipSect
 Author: Christopher Añorve

{ellipsect-3.4.1 → ellipsect-3.4.3}/src/EllipSect.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: EllipSect
-Version: 3.4.1
+Version: 3.4.3
 Summary: A surface brightness analysis tool for GALFIT output.
 Home-page: https://github.com/canorve/EllipSect
 Author: Christopher Añorve

{ellipsect-3.4.1 → ellipsect-3.4.3}/src/ellipsect/inout/plots.py

@@ -26,15 +26,16 @@ from ellipsect.inout.prt import PrintFilesComps
 from ellipsect.inout.galfit  import conver2Sersic 
 from ellipsect.inout.galfit  import GetReff 
 
-def PlotSB(xradq,ysbq,ysberrq,xradm,ysbm,ysberrm,ellconf,scale):
+def PlotSB(xradq, ysbq, ysberrq, xradm, ysbm, ysberrm, ellconf, scale):
     """  Produces final best-fitting plot  """
 
     # subplot for arc sec axis
     plt.close('all')
 
 
+
     #ULISES begin
-    fig, (axsec,axred) = plt.subplots(2, sharex=True, sharey=False)
+    #fig, (axsec, axred) = plt.subplots(2, sharex=True, sharey=False)
     gs = gridspec.GridSpec(2, 1,height_ratios=[3,1])
     gs.update(hspace=0.07)
     #ULISES end 
@@ -62,11 +63,12 @@ def PlotSB(xradq,ysbq,ysberrq,xradm,ysbm,ysberrm,ellconf,scale):
     axsec.set_ylabel(r"Surface Brightness $(mag\; arcsec^{-2})$")
     # ULISES end
 
-    axsec.errorbar(xradq, ysbq,yerr=ysberrq,fmt='o-',capsize=2,color='red',markersize=0.7,label="galaxy",linewidth=2)
+    axsec.errorbar(xradq, ysbq, yerr=ysberrq,fmt='o-',capsize=2,color='red',markersize=0.7,label="galaxy",linewidth=2)
+    #axsec.plot(r, mgegal.sb[angal], 'C3-',linewidth=2)
 
 
     if ellconf.flagalax == False:
-        axsec.errorbar(xradm, ysbm,yerr=ysberrm,fmt='o-',capsize=2,color='blue',markersize=0.7,label="Model",linewidth=2)
+        axsec.errorbar(xradm, ysbm, yerr=ysberrm,fmt='o-',capsize=2,color='blue',markersize=0.7,label="Model",linewidth=2)
 
 
     if ellconf.flagrany == True:
@@ -94,7 +96,6 @@ def PlotSB(xradq,ysbq,ysberrq,xradm,ysbm,ysberrm,ellconf,scale):
     axsec.tick_params(which='major', length=7)
     axsec.tick_params(which='minor', length=4, color='r')
 
-
     #begin psf fwhm 
     if ellconf.flagfwhm: 
         xpos = ellconf.fwhm*scale
@@ -146,6 +147,7 @@ def PlotSB(xradq,ysbq,ysberrq,xradm,ysbm,ysberrm,ellconf,scale):
 
     err = ((ysbm/ysbq**2)**2) * ysberrq**2 + ((1/ysbq)**2) * ysberrm**2 
     err = np.sqrt(err)*100
+
     axred = plt.subplot(gs[1])
 
     if len(xradq) != len(residual):
@@ -159,7 +161,6 @@ def PlotSB(xradq,ysbq,ysberrq,xradm,ysbm,ysberrm,ellconf,scale):
     axred.set_ylim(-2,2)
     # ULISES end
 
-
     if ellconf.flaglogx == True:
 
         axred.set_xscale("log")
@@ -235,7 +236,8 @@ def PlotSB(xradq,ysbq,ysberrq,xradm,ysbm,ysberrm,ellconf,scale):
         axred.spines[axis].set_linewidth(1.5)
 
 
-    return xran,yran,axret
+
+    return xran, yran, axret
 
 #io/plot.py
 def PlotSub(xradq,ysbq,nsub,axsec,namec,colorval):
@@ -285,12 +287,13 @@ def Comp2Ellip(galhead, galcomps, N, lw=1):
     ellipses = [] 
 
     #color value
-    values = range(N)
+    values = np.arange(N)
     jet = cm = plt.get_cmap('jet') 
     cNorm  = colors.Normalize(vmin=0, vmax=values[-1])
     scalarMap = cmx.ScalarMappable(norm=cNorm, cmap=jet)
 
-    
+
+    idxcol=0
     for idx, item in enumerate(galcomps.N):
 
         if galcomps.Active[idx] == True:
@@ -304,8 +307,7 @@ def Comp2Ellip(galhead, galcomps, N, lw=1):
             w = galcomps.Rad[idx]
             h = galcomps.Rad[idx]*galcomps.AxRat[idx]
 
-
-            colorVal = scalarMap.to_rgba(values[idx])
+            colorVal = scalarMap.to_rgba(values[idxcol])
 
 
             ell=Ellipse((xc, yc), width = w, height = h, angle = pa,
@@ -314,7 +316,7 @@ def Comp2Ellip(galhead, galcomps, N, lw=1):
                          linewidth = lw)
 
             ellipses.append(ell)
-
+            idxcol+=1
 
     return ellipses
 

{ellipsect-3.4.1 → ellipsect-3.4.3}/src/ellipsect/inout/read.py

@@ -78,7 +78,7 @@ def InitParsing():
     parser.add_argument("-r95","--rad95", action="store_true", help="Draw a vertical line indicating the 95%% of total light")
 
 
-    parser.add_argument("-k","--keep", action="store_true", help="use existing file to compute subcomponents")
+    parser.add_argument("-rc","--remcomp", action="store_true", help="remove file of subcomponents")
     parser.add_argument("-gx","--galax", action="store_true", help="only the galaxy surface brightness is shown in the plot")
 
 

{ellipsect-3.4.1 → ellipsect-3.4.3}/src/ellipsect/lib/clas.py

@@ -55,7 +55,7 @@ class EllipSectConfig:
     flagmodel=False
 
     flagsky=False
-    flagkeep=False
+    flagkeep=True
     flagalax=False
 
     flagnedfile=False

{ellipsect-3.4.1 → ellipsect-3.4.3}/src/ellipsect/sectors/comp.py

@@ -28,7 +28,7 @@ def SubComp(ellconf, galhead, galcomps, sectcomps, axsec, n_sectors=19):
     N=len(galcomps.N)
 
     #color value
-    values = range(N)
+    values = np.arange(N)
     jet = cm = plt.get_cmap('jet') 
     cNorm  = colors.Normalize(vmin=0, vmax=values[-1])
     scalarMap = cmx.ScalarMappable(norm=cNorm, cmap=jet)
@@ -37,21 +37,21 @@ def SubComp(ellconf, galhead, galcomps, sectcomps, axsec, n_sectors=19):
     ab=ellconf.qarg
     n=0
 
+    idxcol=0
     maskcomp = galcomps.Active == True
     while(n<N):
 
-
         if galcomps.Active[n] == True:
             namec = galcomps.NameComp[n] #check if name coincide, it must be
 
-            scmp = sectcomps[n] 
+            scmp = sectcomps[idxcol] 
 
 
             ###################################################
 
             xradq, ysbq, ysberrq = ellip.sect2xy(scmp, ellconf, galhead, n_sectors)
 
-            colorVal = scalarMap.to_rgba(values[n])
+            colorVal = scalarMap.to_rgba(values[idxcol])
 
             PlotSub(xradq, ysbq, n, axsec, namec, colorVal)
 
@@ -62,7 +62,7 @@ def SubComp(ellconf, galhead, galcomps, sectcomps, axsec, n_sectors=19):
 
                 PrintEllFilesComps(ellconf, galhead, namec, ncomp, xradq, ysbq, ysberrq)
 
-
+            idxcol+=1
         n=n+1
 
 

{ellipsect-3.4.1 → ellipsect-3.4.3}/src/ellipsect/sectors/sect.py

@@ -632,8 +632,8 @@ def PassArgs(args):
     if args.snr:
         ellconf.flagsnr=True
  
-    if args.keep:
-        ellconf.flagkeep=True
+    if args.remcomp:
+        ellconf.flagkeep=False
 
     if args.galax:
         ellconf.flagalax=True