EllipSect 3.4.2__tar.gz → 3.4.4__tar.gz

{ellipsect-3.4.2 → ellipsect-3.4.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: EllipSect
-Version: 3.4.2
+Version: 3.4.4
 Summary: A surface brightness analysis tool for GALFIT output.
 Home-page: https://github.com/canorve/EllipSect
 Author: Christopher Añorve
@@ -20,6 +20,7 @@ Classifier: Natural Language :: English
 Classifier: Topic :: Scientific/Engineering :: Astronomy
 Description-Content-Type: text/x-rst; charset=UTF-8
 License-File: LICENSE.txt
+Requires-Dist: importlib-metadata; python_version < "3.8"
 Requires-Dist: importlib-metadata
 Requires-Dist: sphinx>=3.2.1
 Requires-Dist: numpy>=1.20.3
@@ -36,12 +37,25 @@ Requires-Dist: pytest-cov; extra == "testing"
    :depth: 3
 ..
 
---------------
+
+=============
+
+.. image:: https://img.shields.io/pypi/v/EllipSect.svg
+    :alt: PyPI-Server
+    :target: https://pypi.org/project/EllipSect/
+
+.. image:: https://img.shields.io/badge/-PyScaffold-005CA0?logo=pyscaffold
+    :alt: Project generated with PyScaffold
+    :target: https://pyscaffold.org/
+
+.. image:: https://zenodo.org/badge/282223217.svg
+    :target: https://zenodo.org/badge/latestdoi/282223217
+
 
 **EllipSect**
 =============
 
-|DOI|
+
 
 EllipSect creates surface brightness profiles and extracts other
 photometric data from the GALFIT output peng et al. (2002).
@@ -207,9 +221,9 @@ The code is under the license of **GNU**
 
 If you find this code useful, please cite as:
 
-Añorve, Christopher, Ríos-López, Emmanuel, Reyes-Amador, 
-Ulises, & López-Cruz, Omar. (2022). canorve/EllipSect: 
-EllipSect v2.7.5 (v2.7.5). Zenodo. https://doi.org/10.5281/zenodo.6975592
+Añorve, C., Reyes-Amador, U., Ríos-López, E., & López-Cruz, O. (2024). 
+canorve/EllipSect: v3.4.3 (v3.4.3). Zenodo. https://doi.org/10.5281/zenodo.13994369
+
 
 
 --------------
@@ -267,12 +281,10 @@ PYTHON, 409(4), 1379–1392. doi:10.1111/j.1365-2966.2010.17426.x \__\_
 **Other Stuff**
 ---------------
 
-Check my others GALFIT tools
+Check my other project GALFITtools
 `here <https://github.com/canorve/GALFITools>`__
 
 --------------
 
-.. |DOI| image:: https://zenodo.org/badge/282223217.svg
-   :target: https://zenodo.org/badge/latestdoi/282223217
 .. |A85a| image:: img/A85.cub.png
 .. |A85b| image:: img/A85.def.png

{ellipsect-3.4.2 → ellipsect-3.4.4}/README.rst

@@ -2,12 +2,25 @@
    :depth: 3
 ..
 
---------------
+
+=============
+
+.. image:: https://img.shields.io/pypi/v/EllipSect.svg
+    :alt: PyPI-Server
+    :target: https://pypi.org/project/EllipSect/
+
+.. image:: https://img.shields.io/badge/-PyScaffold-005CA0?logo=pyscaffold
+    :alt: Project generated with PyScaffold
+    :target: https://pyscaffold.org/
+
+.. image:: https://zenodo.org/badge/282223217.svg
+    :target: https://zenodo.org/badge/latestdoi/282223217
+
 
 **EllipSect**
 =============
 
-|DOI|
+
 
 EllipSect creates surface brightness profiles and extracts other
 photometric data from the GALFIT output peng et al. (2002).
@@ -173,9 +186,9 @@ The code is under the license of **GNU**
 
 If you find this code useful, please cite as:
 
-Añorve, Christopher, Ríos-López, Emmanuel, Reyes-Amador, 
-Ulises, & López-Cruz, Omar. (2022). canorve/EllipSect: 
-EllipSect v2.7.5 (v2.7.5). Zenodo. https://doi.org/10.5281/zenodo.6975592
+Añorve, C., Reyes-Amador, U., Ríos-López, E., & López-Cruz, O. (2024). 
+canorve/EllipSect: v3.4.3 (v3.4.3). Zenodo. https://doi.org/10.5281/zenodo.13994369
+
 
 
 --------------
@@ -233,12 +246,10 @@ PYTHON, 409(4), 1379–1392. doi:10.1111/j.1365-2966.2010.17426.x \__\_
 **Other Stuff**
 ---------------
 
-Check my others GALFIT tools
+Check my other project GALFITtools
 `here <https://github.com/canorve/GALFITools>`__
 
 --------------
 
-.. |DOI| image:: https://zenodo.org/badge/282223217.svg
-   :target: https://zenodo.org/badge/latestdoi/282223217
 .. |A85a| image:: img/A85.cub.png
 .. |A85b| image:: img/A85.def.png

{ellipsect-3.4.2 → ellipsect-3.4.4}/docs/conf.py

@@ -88,7 +88,7 @@ master_doc = "index"
 
 # General information about the project.
 project = "EllipSect"
-copyright = "2022, Christopher Añorve"
+copyright = "2024, Christopher Añorve"
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the

{ellipsect-3.4.2 → ellipsect-3.4.4}/setup.cfg

@@ -31,6 +31,7 @@ package_dir =
 	
 	python_requires = >=3.8
 install_requires = 
+	importlib-metadata; python_version<"3.8"
 	importlib-metadata  #; python_version<"3.8"
 	sphinx>=3.2.1
 	numpy>=1.20.3
@@ -79,7 +80,7 @@ exclude =
 	docs/conf.py
 
 [pyscaffold]
-version = 4.2.1
+version = 4.5
 package = ellipsect
 extensions = 
 	no_skeleton

{ellipsect-3.4.2 → ellipsect-3.4.4}/setup.py

@@ -2,7 +2,7 @@
     Setup file for EllipSect.
     Use setup.cfg to configure your project.
 
-    This file was generated with PyScaffold 4.2.1.
+    This file was generated with PyScaffold 4.5.
     PyScaffold helps you to put up the scaffold of your new Python project.
     Learn more under: https://pyscaffold.org/
 """

{ellipsect-3.4.2 → ellipsect-3.4.4}/src/EllipSect.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: EllipSect
-Version: 3.4.2
+Version: 3.4.4
 Summary: A surface brightness analysis tool for GALFIT output.
 Home-page: https://github.com/canorve/EllipSect
 Author: Christopher Añorve
@@ -20,6 +20,7 @@ Classifier: Natural Language :: English
 Classifier: Topic :: Scientific/Engineering :: Astronomy
 Description-Content-Type: text/x-rst; charset=UTF-8
 License-File: LICENSE.txt
+Requires-Dist: importlib-metadata; python_version < "3.8"
 Requires-Dist: importlib-metadata
 Requires-Dist: sphinx>=3.2.1
 Requires-Dist: numpy>=1.20.3
@@ -36,12 +37,25 @@ Requires-Dist: pytest-cov; extra == "testing"
    :depth: 3
 ..
 
---------------
+
+=============
+
+.. image:: https://img.shields.io/pypi/v/EllipSect.svg
+    :alt: PyPI-Server
+    :target: https://pypi.org/project/EllipSect/
+
+.. image:: https://img.shields.io/badge/-PyScaffold-005CA0?logo=pyscaffold
+    :alt: Project generated with PyScaffold
+    :target: https://pyscaffold.org/
+
+.. image:: https://zenodo.org/badge/282223217.svg
+    :target: https://zenodo.org/badge/latestdoi/282223217
+
 
 **EllipSect**
 =============
 
-|DOI|
+
 
 EllipSect creates surface brightness profiles and extracts other
 photometric data from the GALFIT output peng et al. (2002).
@@ -207,9 +221,9 @@ The code is under the license of **GNU**
 
 If you find this code useful, please cite as:
 
-Añorve, Christopher, Ríos-López, Emmanuel, Reyes-Amador, 
-Ulises, & López-Cruz, Omar. (2022). canorve/EllipSect: 
-EllipSect v2.7.5 (v2.7.5). Zenodo. https://doi.org/10.5281/zenodo.6975592
+Añorve, C., Reyes-Amador, U., Ríos-López, E., & López-Cruz, O. (2024). 
+canorve/EllipSect: v3.4.3 (v3.4.3). Zenodo. https://doi.org/10.5281/zenodo.13994369
+
 
 
 --------------
@@ -267,12 +281,10 @@ PYTHON, 409(4), 1379–1392. doi:10.1111/j.1365-2966.2010.17426.x \__\_
 **Other Stuff**
 ---------------
 
-Check my others GALFIT tools
+Check my other project GALFITtools
 `here <https://github.com/canorve/GALFITools>`__
 
 --------------
 
-.. |DOI| image:: https://zenodo.org/badge/282223217.svg
-   :target: https://zenodo.org/badge/latestdoi/282223217
 .. |A85a| image:: img/A85.cub.png
 .. |A85b| image:: img/A85.def.png

{ellipsect-3.4.2 → ellipsect-3.4.4}/src/EllipSect.egg-info/SOURCES.txt

@@ -24,7 +24,6 @@ example/gal.fits
 example/galfit.feedme
 example/psf.fits
 img/A2029.ring.png
-img/A85.comp.png
 img/A85.con-cub.png
 img/A85.cub.png
 img/A85.def.png

{ellipsect-3.4.2 → ellipsect-3.4.4}/src/EllipSect.egg-info/requires.txt

@@ -6,6 +6,9 @@ scipy>=1.5.2
 matplotlib>=3.5.2
 mgefit>=5.0.13
 
+[:python_version < "3.8"]
+importlib-metadata
+
 [testing]
 setuptools
 pytest

{ellipsect-3.4.2 → ellipsect-3.4.4}/src/ellipsect/__init__.py

@@ -1,8 +1,5 @@
 import sys
 
-from ellipsect.inout.read import ArgParsing
-from ellipsect.sectors.sect import SectorsGalfit 
-
 if sys.version_info[:2] >= (3, 8):
     # TODO: Import directly (no need for conditional) when `python_requires = >= 3.8`
     from importlib.metadata import PackageNotFoundError, version  # pragma: no cover

{ellipsect-3.4.2 → ellipsect-3.4.4}/src/ellipsect/inout/plots.py

@@ -287,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:
@@ -306,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,
@@ -316,7 +316,7 @@ def Comp2Ellip(galhead, galcomps, N, lw=1):
                          linewidth = lw)
 
             ellipses.append(ell)
-
+            idxcol+=1
 
     return ellipses
 

{ellipsect-3.4.2 → ellipsect-3.4.4}/src/ellipsect/inout/read.py

@@ -167,6 +167,20 @@ def ReadGALFITout(ellconf,galhead,galcomps):
 
 
     galcomps = SelectGal(galcomps,ellconf.distmax,ellconf.numcomp)
+    
+    #removes blank files created by galfit
+    if os.path.isfile("none"):
+        print("Blank file none detected")
+        print("Removing...")
+        os.remove("none")
+        print("Removed")
+
+
+    if os.path.isfile("None"):
+        print("Blank file None detected")
+        print("Removing...")
+        os.remove("None")
+        print("Removed")
  
 
     errmsg="file {} does not exist".format(galhead.inputimage)

{ellipsect-3.4.2 → ellipsect-3.4.4}/src/ellipsect/phot/ned.py

@@ -71,7 +71,7 @@ def NED(ellconf):
                 #https://ned.ipac.caltech.edu/cgi-bin/nph-objsearch?extend=no&of=xml_all&objname=ngc+6166&hconst=67.8&omegam=0.308&omegav=0.692
 
 
-                wgetcmd = 'wget -O {} "{}{}&hconst={:.1f}\&omegam={:.3f}\&omegav={:.3f}"'.format(
+                wgetcmd = 'wget -O {} "{}{}&hconst={:.1f}\\&omegam={:.3f}\\&omegav={:.3f}"'.format(
                             filened,nedweb,objname,ellconf.hconst,ellconf.omegam,ellconf.omegav)
 
                 print("Running: ",wgetcmd)
@@ -94,7 +94,7 @@ def NED(ellconf):
 
 
         print("reading ",filened)
-        votable=parse(filened,pedantic=False) 
+        votable=parse(filened,verify='ignore') 
 
         try: 
             table=votable.get_table_by_index(0) 

{ellipsect-3.4.2 → ellipsect-3.4.4}/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