Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Purge pyfits #110

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Purge pyfits #110

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1f46c90
Replace depricated pyfits with astropy fits io
Athanaseus May 27, 2021
2acf160
Bump version
Athanaseus May 27, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Cattery/Scripter/scripter.10calibration.funcs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -407,7 +407,7 @@ end
src='${SSCCM}'
# helper function to take center quadrant
qq=lambda x:x[0,0,x.shape[2]/4:-x.shape[2]/4,x.shape[3]/4:-x.shape[3]/4]
import pyfits
import astropy.io.fits as pyfits
cc = qq(pyfits.open('$model.fits')[0].data);
di = qq(pyfits.open('%s-dirty.fits'%src)[0].data);
ri = qq(pyfits.open('$residual.fits')[0].data);
Expand Down Expand Up @@ -486,4 +486,4 @@ end
$TIGGER_CONVERT $LSM $LSM -f --remove-source "$srcname*" --add-brick $srcname:${SSCCM}-cc.fits:$pad${_dE}brick
fi
done
}
}
2 changes: 1 addition & 1 deletion Cattery/Siamese/OMS/emss_beams/EMSSVoltageBeam.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -364,7 +364,7 @@ def grid (self,lgrid,mgrid,freqgrid):
c = vb.interpolate(l,l.T,freq=freq,freqaxis=2);

# create FITS file
import pyfits;
import astropy.io.fits as pyfits;
x = abs(c.transpose());
hdu = pyfits.PrimaryHDU(x);
hdr = hdu.header;
Expand Down
2 changes: 1 addition & 1 deletion Cattery/Siamese/OMS/emss_beams/InterpolatedBeams.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
import os.path
import math
import numpy
import pyfits
import astropy.io.fits as pyfits
from scipy.ndimage import interpolation
from scipy import interpolate

Expand Down
2 changes: 1 addition & 1 deletion Cattery/Siamese/OMS/emss_beams/emss2fits.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@
# if template FITS file is provided, get l/m/frequency grid from there
l0 = m0 = freq = None;

import pyfits
import astropy.io.fits as pyfits
if options.template:
ff = pyfits.open(options.template);
hdr = ff[0].header;
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ RUN docker-apt-install \
casacore-tools \
casarest \
python-pip \
python-pyfits \
python-astropy \
python-numpy \
python-scipy \
python-astlib \
Expand Down Expand Up @@ -75,4 +75,4 @@ WORKDIR /usr/local/lib/python2.7/dist-packages/Pyxis/recipies/meqtrees-batch-tes
RUN python2.7 -m "nose"

ENTRYPOINT ["meqtree-pipeliner.py"]
CMD ["--help"]
CMD ["--help"]
2 changes: 1 addition & 1 deletion requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
astropy
numpy
Purr
pyfits
pyrap
scipy
Timba
2 changes: 1 addition & 1 deletion setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ def fullsplit(path, result=None):


setup(name='meqtrees_cattery',
version='1.7.2',
version='1.7.3',
python_requires='>=3.0.0',
description='MeqTrees-based frameworks for simulation and calibration of radio interferometers ',
author='Oleg Smirnov',
Expand Down