Changeset 11

Timestamp:

06/02/08 15:59:58 (16 years ago)

Author:

meynadie

Message:

Mise au point pre.py

Location:

datared

Files:

• gen_degrade.py (modified) (1 diff)
• pre.py (modified) (4 diffs)

datared/gen_degrade.py

@@ -12 +12 @@
 (options, args) = parser.parse_args ()
 
-if (len(args) !=2) :
+if (len(args) !=1) :
     print "Usage : gen_degrade.py output.fits"
 
 # Génération de la matrice
-a = numpy.zeros((2160,2053))
+a = numpy.zeros((2053,2160))
 for i in range(2160):
-    a[i,:]=i+1
+    a[:,i]=i+1
 
 # Creation de l'objet fits
-hdu = pyfits.PrimaryHDU(b)
+hdu = pyfits.PrimaryHDU(a)
 hdulist = pyfits.HDUList([hdu])
 
 prihdr = hdulist[0].header
 prihdr.add_history('Generation de la mire')
-hdulist.writeto(args[1],clobber=True)
+hdulist.writeto(args[0],clobber=True)
 
 

datared/pre.py

@@ -2 +2 @@
 # coding: utf-8
 
-VERSION='1.1'
+VERSION='1.2'
+
+# Version 1.2 : partie droite débute à 1086 et non 1087
 
 import pyfits
@@ -8 +10 @@
 
 import numpy
-
+from scipy import *
 
 parser = OptionParser()
+parser.add_option("-n","--nobias",action="store_true",
+                  dest="nobias", default=False,
+                  help="no suppression of the bias (based on overscans)")
 
 (options, args) = parser.parse_args ()
 
 if (len(args) !=2) :
-    print "Usage : pre.py input.fits output.fits"
+    print "Usage : pre.py [-n --nobias] input.fits output.fits"
+    exit(1)
 
 # Ouverture de l'image fits en argument
@@ -24 +30 @@
 
 gauche = scidata[:2048,50:1074]
-droite = scidata[:2048,1087:2111]
+droite = scidata[:2048,1086:2110]
 
-# Suppression du fond (version brutale)
-print "Warning ! bias removed (1600 / 2090) "
+# Suppression du fond selon moyenne des overscans
 
-gauche -= 1600 
-droite -= 2090
+if options.nobias :
+    print "No bias substraction"
+else:
+    bias_gauche = mean(scidata[:2048,:50])-10
+    bias_droite = mean(scidata[:2048,2110:])-10
+    print "Warning ! bias removed (%f / %f) " % (bias_gauche, bias_droite)
+    gauche -= bias_gauche
+    droite -= bias_droite
 
 scidata = numpy.hstack((gauche,droite))
@@ -39 +50 @@
 
 prihdr = hdulist[0].header
+prihdr.add_history('pre.py V'+VERSION)
 prihdr.add_history('Suppression os/ps')