Commit 571c0b56 authored by skamann's avatar skamann
Browse files

Started debugged for ARGUS data.

parent a3ad450b
......@@ -27,7 +27,7 @@ analysis of data observed with FLAMES/ARGUS at the VLT.
Latest SVN revision
-------------------
339, 2016/07/29
345, 2016/08/01
"""
import re
import logging
......@@ -37,7 +37,7 @@ from .instrument import Instrument
__author__ = "Sebastian Kamann (skamann@astro.physik.uni-goettingen.de)"
__revision__ = 339
__revision__ = 345
class Argus(Instrument):
......@@ -174,6 +174,13 @@ class Argus(Instrument):
return argus
@property
def nlayer(self):
"""
Returns the number of layers of the current data set.
"""
return self.datahdu.shape[0] if self.datahdu is not None else None
@property
def edgepath(self):
"""
......
......@@ -27,7 +27,7 @@ of data from the PMAS spectrograph in the analysis.
Latest SVN revision
-------------------
342, 2016/07/31
345, 2016/08/01
"""
import logging
import numpy as np
......@@ -35,7 +35,7 @@ from .instrument import Instrument
__author__ = "Sebastian Kamann (skamann@astro.physik.uni-goettingen.de)"
__revision__ = 342
__revision__ = 345
class Pmas(Instrument):
......@@ -70,7 +70,6 @@ class Pmas(Instrument):
kwargs['scale'] = 0.5 # By default, the finer sampling of PMAS (0.5" insetad of 1.0") is assumed
super(Pmas, self).__init__(transform=transform, **kwargs)
self.wcs.printwcs()
self.wcs.wcs.crpix[:2] = [self.shape[1]/2., self.shape[0]/2.]
@property
......
......@@ -55,7 +55,7 @@ catalogue and is called by the function 'initfit'.
Latest SVN Revision
-------------------
342, 2016/07/31
345, 2016/08/01
"""
import datetime
import itertools
......@@ -79,7 +79,7 @@ from ..utils.statistics import der_snr
__author__ = "Sebastian Kamann (skamann@astro.physik.uni-goettingen.de)"
__revision__ = 342
__revision__ = 345
logger = logging.getLogger(__name__)
......@@ -499,8 +499,10 @@ def initfit(pampelmuse):
sources.x += dx
sources.y += dy
# PSF.set_transform(pampelmuse.ifs_data.transform)
if isinstance(pampelmuse.ifs_data, MusePixtable): # pixtable has no constant transformation
psf_class.set_size(cc_data_image.shape)
else:
psf_class.set_transform(pampelmuse.ifs_data.transform)
for i in xrange(sources.nsrc):
if sources.ID[i] < 0:
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment