From 1ac6715e04f418eb69c0d8062c8d1a3357964f81 Mon Sep 17 00:00:00 2001 From: Johannes King Date: Tue, 9 May 2017 14:37:01 +0200 Subject: [PATCH] changes to dev tools --- dev/regions_parse.py | 10 ++++-- dev/regions_pyregion_comparison.csv | 54 +++++++++++++++++++++++++++++ 2 files changed, 62 insertions(+), 2 deletions(-) diff --git a/dev/regions_parse.py b/dev/regions_parse.py index a3dd137f..6d463202 100644 --- a/dev/regions_parse.py +++ b/dev/regions_parse.py @@ -1,4 +1,5 @@ import click +import pyregion from regions import read_ds9 from pathlib import Path @@ -17,11 +18,16 @@ def list_files(): @cli.command('parse') @click.option('--interactive', is_flag=True, default=False) +@click.option('--parser', default='regions') @click.argument('filename') -def parse(filename, interactive): +def parse(filename, interactive, parser): readname = TEST_FILE_DIR / filename print('Reading {}'.format(readname)) - regions = read_ds9(str(readname)) + print('Using parser {}'.format(parser)) + if parser == 'regions': + regions = read_ds9(str(readname), errors='warn') + elif parser == 'pyregion': + regions = pyregion.open(str(readname)) print(regions) if interactive: import IPython diff --git a/dev/regions_pyregion_comparison.csv b/dev/regions_pyregion_comparison.csv index b0e91c9b..8ffee34c 100644 --- a/dev/regions_pyregion_comparison.csv +++ b/dev/regions_pyregion_comparison.csv @@ -1,4 +1,5 @@ filename,time_regions,time_pyregion,compl_pyregion,compl_regions +<<<<<<< HEAD ds9.linear.wcsi.reg,0.008,0.751,100.0%,34.3% ds9.mosaic.fk4.hms.reg,0.022,0.733,100.0%,34.3% ds9.color.reg,0.005,0.229,100.0%,100.0% @@ -50,3 +51,56 @@ galactic_reference.reg,0.002,0.221,100.0%,100.0% ds9.galactic.hms.strip.reg,0.010,0.347,100.0%,40.0% ds9.mosaic.physical.reg,0.004,0.720,100.0%,34.3% ds9.ecliptic.hms.strip.reg,0.009,0.344,100.0%,40.0% +======= +ds9.linear.wcsi.reg,0.035,5.132,91.4%,34.3% +ds9.mosaic.fk4.hms.reg,0.163,5.549,91.4%,34.3% +ds9.color.reg,0.019,1.935,100.0%,100.0% +ds9.fk5.strip.reg,0.082,-1.000,0.0%,40.0% +ds9.fk5.reg,0.034,2.360,91.7%,33.3% +ds9.physical.strip.reg,0.006,-1.000,0.0%,40.0% +ds9.physical.windows.reg,0.007,1.576,91.4%,34.3% +ds9.fk5.hms.reg,0.041,1.687,91.7%,33.3% +ds9.icrs.hms.reg,0.037,1.728,91.7%,33.3% +ds9.icrs.strip.reg,0.029,-1.000,0.0%,40.0% +ds9.color.spaces.reg,0.020,0.860,100.0%,100.0% +ds9.mosaic.ecliptic.hms.reg,0.073,2.668,91.4%,34.3% +ds9.linear.wcs.reg,0.014,3.252,91.4%,34.3% +ds9.mosaic.ecliptic.reg,0.076,2.663,91.4%,34.3% +ds9.linear.wcsc.reg,0.014,3.605,91.4%,34.3% +ds9.fk4.hms.strip.reg,0.156,-1.000,0.0%,40.0% +ds9.mosaic.galactic.reg,0.061,5.826,91.4%,34.3% +ds9.linear.wcsd.reg,0.062,2.777,91.4%,34.3% +physical_reference.reg,0.003,0.789,100.0%,100.0% +ds9.fk4.reg,0.035,1.686,91.7%,33.3% +ds9.image.strip.reg,0.006,-1.000,0.0%,40.0% +ds9.icrs.hms.strip.reg,0.035,-1.000,0.0%,40.0% +ds9.image.reg,0.007,1.544,91.7%,33.3% +ds9.mosaic.fk5.hms.reg,0.078,2.604,91.4%,34.3% +ds9.mosaic.image.reg,0.014,2.541,91.4%,34.3% +ds9.physical.reg,0.007,1.529,91.7%,33.3% +ds9.ecliptic.reg,0.029,2.727,91.7%,33.3% +ds9.ecliptic.strip.reg,0.028,-1.000,0.0%,40.0% +ds9.fits.reg,0.006,1.087,100.0%,88.9% +ds9.icrs.reg,0.030,2.249,91.7%,33.3% +ds9.mosaic.fk4.reg,0.070,2.739,91.4%,34.3% +ds9.mosaic.icrs.hms.reg,0.080,3.020,91.4%,34.3% +ds9.ecliptic.hms.reg,0.081,4.070,91.7%,33.3% +ds9.fk4.hms.reg,0.102,4.080,91.7%,33.3% +ds9.mosaic.galactic.hms.reg,0.183,2.608,91.4%,34.3% +ds9.mosaic.icrs.reg,0.059,2.928,91.4%,34.3% +ds9.comment.reg,0.009,-1.000,0.0%,nan% +fk5_reference.reg,0.009,0.780,100.0%,100.0% +ds9.mosaic.fk5.reg,0.065,2.601,91.4%,34.3% +ds9.fk4.strip.reg,0.033,-1.000,0.0%,40.0% +ds9.galactic.strip.reg,0.030,-1.000,0.0%,40.0% +ds9.galactic.reg,0.034,1.648,91.7%,33.3% +ds9.composite.reg,0.035,2.998,91.7%,0.0% +ds9.linear.wcsa.reg,0.036,5.855,91.4%,34.3% +ds9.linear.wcsp.reg,0.036,5.473,91.4%,34.3% +ds9.fk5.hms.strip.reg,0.093,-1.000,0.0%,40.0% +ds9.galactic.hms.reg,0.102,2.551,91.7%,33.3% +galactic_reference.reg,0.008,0.784,100.0%,100.0% +ds9.galactic.hms.strip.reg,0.036,-1.000,0.0%,40.0% +ds9.mosaic.physical.reg,0.014,2.570,91.4%,34.3% +ds9.ecliptic.hms.strip.reg,0.035,-1.000,0.0%,40.0% +>>>>>>> changes to dev tools