Changeset 18

Timestamp:

07/15/08 17:53:43 (16 years ago)

Author:

meynadie

Message:

mises au point

Location:

mire

Files:

• mire.sh (modified) (3 diffs)
• mire_all.sh (modified) (1 diff)
• process.py (modified) (4 diffs)

mire/mire.sh

@@ -3 +3 @@
 # Batch pour analyse des images de mires
 
-# usage : mire nom.fits reperes.txt timing.txt
+usage="mire [-s(kip sextractor)] nom.fits reperes.txt timing.txt"
+
+skip_sextractor=false;
+while getopts s flag ; do
+    case $flag in
+        s) skip_sextractor=true;;
+        \?) echo $usage; exit 1;;
+    esac
+done
+shift `expr "$OPTIND" - 1`
+
 
 echo "********** Image : $1 ****"
@@ -9 +19 @@
 PATH_TO_MIRE="/home/meynadie/svn/mire"
 
-echo "Détection d'objets..."
-cp -f $PATH_TO_MIRE/mire.param .
-sex -c $PATH_TO_MIRE/mire.sex $1
 CATALOG=$(basename $1 .fits).cat
-mv test.cat $CATALOG
+if test $skip_sextractor == false
+then
+    rm -f $CATALOG mire.param
+    echo "Détection d'objets..."
+    cp -f $PATH_TO_MIRE/mire.param .
+    sex -c $PATH_TO_MIRE/mire.sex $1
+    mv test.cat $CATALOG
+fi
 
 echo "Mesures géométriques..."
@@ -20 +34 @@
 
 
-rm -f $CATALOG mire.param
+
 
 

mire/mire_all.sh

@@ -1 +1 @@
 #!/bin/sh
 
-for file in *.fits; do
-    mire $file reperes.txt timing;
-    done;
+usage="mire_all [-s(kip sextractor)]"
+
+skip_sextractor=false;
+while getopts s flag ; do
+    case $flag in
+        s) skip_sextractor=true;;
+        \?) echo $usage; exit 1;;
+    esac
+done
+shift `expr "$OPTIND" - 1`
+
 
 rm -f collect
-for file in *.mes; do
-    tail -n1 $file >> collect;
+for file in *.fits; do
+    if test $skip_sextractor == true
+    then
+        mire -s $file reperes.txt timing;
+    else
+        mire $file reperes.txt timing;
+    fi
+    tail -n1 $(basename $file .fits).mes >> collect;
     done;
 
 
+

mire/process.py

@@ -158 +158 @@
 # Calcul de la distance moyenne entre noeuds voisins
 
-for i in range(1,80):
-    for j in range(1,80):
+fen = 2
+
+shift_list = []
+
+for i in range(-fen,fen+1):
+    for j in range(-fen,fen+1):
+        if (i!=0 or j!=0):
+            shift_list.append([i,j])
+
+for i in range(fen,81-fen):
+    for j in range(fen,81-fen):
         if (lookup_sources[i,j,0] > 0):
             knot_idx = int(lookup_sources[i,j,2])
@@ -165 +174 @@
             nb_voisin = 0
             distance = 0
+            weights = 0
             pos_source = array([catalog[knot_idx]['X_IMAGE'],
                                 catalog[knot_idx]['Y_IMAGE']])
-            for shifts in [[0,1],[1,0],[-1,0],[0,-1]]:
+            for shifts in shift_list :
                 i_voisin = i + shifts[0]
                 j_voisin = j + shifts[1]
@@ -176 +186 @@
                                         catalog[neigh_idx]['Y_IMAGE']])
                     distance += modulus(pos_source-pos_voisin)
-            if (nb_voisin !=0):
-                catalog[knot_idx]['MEAN_DIST_TO_NGBRS'] = float(distance) / nb_voisin
-                lookup_sources[i,j,3] = float(distance) / nb_voisin
+                    weights += modulus(shifts)
+            if (nb_voisin > 0):
+                catalog[knot_idx]['MEAN_DIST_TO_NGBRS'] = float(distance)/weights
+                lookup_sources[i,j,3] = float(distance)/weights
         
 cleaned_catalog = []
@@ -266 +277 @@
 for i in range(81):
     for j in range(81):
-        if (lookup_sources[i,j,0] > 0):
+        if (lookup_sources[i,j,0] == 1):
             tmp.append(lookup_sources[i,j,3])