Changeset 27

Timestamp:

09/05/08 11:43:58 (16 years ago)

Author:

meynadie

Message:

passage en timing_cycle

Location:

mire

Files:

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

mire/mire.sh

@@ -20 +20 @@
 
 CATALOG=$(basename $1 .fits).cat
+OUTPUT_FITS=$(basename $1 .fits)_sf.fits
+
 if test $skip_sextractor == false
 then
@@ -31 +33 @@
 echo "Mesures géométriques..."
 OUTPUT_FILENAME=$(basename $1 .fits).mes
-python $PATH_TO_MIRE/process.py -c $CATALOG -r $2 -o test.fits -m $OUTPUT_FILENAME -t $3
+python $PATH_TO_MIRE/process.py -c $CATALOG -r $2 -o $OUTPUT_FITS -m $OUTPUT_FILENAME -t $3
 
 

mire/mire_all.sh

@@ -14 +14 @@
 
 rm -f collect
-for file in *.fits; do
+for file in *_0.fits; do
     if test $skip_sextractor == true
     then
-        mire -s $file reperes.txt timing;
+        mire -s $file reperes.txt timing_cycle;
     else
-        mire $file reperes.txt timing;
+        mire $file reperes.txt timing_cycle;
     fi
     tail -n1 $(basename $file .fits).mes >> collect;

mire/process.py

@@ -34 +34 @@
 # ls -l $1| awk '{print$8 "\t" $7 "\t" $6}' | sort -k2 | sed -e 's/*//'
 # où $1 est le répertoire contenant les .dat non modifiés.)
-
-is_ref=1
-refdt=datetime(1970,1,1,0,0)
-dt = refdt
-delta_t = dt - refdt
+# format attendu : nom_fichier phase_cycle date_isoformat
+
 for line in file(options.timing):
     line_s = string.split(line)
     if (len(line_s) > 2):
         nom = line_s[0] [:-4]
-        if (is_ref==1):
-            [heure,minute] = string.split(line_s[1],":")
-            [annee,mois,jour] = string.split(line_s[2],"-")
-            refdt =  datetime(int(annee),
-                              int(mois),
-                              int(jour),
-                              int(heure),
-                              int(minute))
-            is_ref=0
         if (nom == options.catalogfile[:-6]):
-            [heure,minute] = string.split(line_s[1],":")
-            [annee,mois,jour] = string.split(line_s[2],"-")            
-            dt = datetime(int(annee),
-                          int(mois),
-                          int(jour),
-                          int(heure),
-                          int(minute))
-            delta_dt = dt-refdt
+            dt = datetime.strptime(line_s[2],
+                                   "%Y-%m-%dT%H:%M:%S")
+            phase = float(line_s[1])
 
 # Donner les coordonnées approximatives des 4 repÚres
@@ -91 +74 @@
         for i in range(len(fields)):
             tmp[fields[i]] = float(spl[i])
+        tmp['MEAN_DIST_TO_NGBRS']=0
         catalog.append(tmp)
 
@@ -287 +271 @@
                                          modulus(vec_i),
                                          modulus(vec_j),
-                                         delta_dt.seconds/60.,
+                                         phase,
                                          dt.isoformat())
 meas.write(outs)