Changeset 15487 for trunk/Ohana/src/addstar

Timestamp:

Nov 6, 2007, 5:09:52 PM (19 years ago)

Author:

eugene

Message:

merging changes from eam_branch_20071015 (read compressed images, clean addstar I/O, other minor issues)

Location:

trunk/Ohana/src/addstar/src

Files:

• FilterStars.c (modified) (1 diff)
• LoadStars.c (modified) (3 diffs)
• ReadStarsFITS.c (modified) (4 diffs)

trunk/Ohana/src/addstar/src/FilterStars.c

@@ -45 +45 @@
     stars[N].dt      = MTIME;
 
-    stars[N].M       = MIN (stars[N].M + MTIME, NO_MAG);
+    if ((stars[N].M > 25.0) && (stars[N].M < 32.0)) {
+      fprintf (stderr, "*");
+    }
+
+    if (stars[N].M >= 0.001*NO_MAG) {
+      stars[N].M       = 0.001*NO_MAG;
+    } else {
+      stars[N].M       = stars[N].M + MTIME;
+    }
+
+    if (stars[N].M > 32.77) {
+      fprintf (stderr, "*");
+    }
+
     stars[N].dM      = MIN (stars[N].dM, NO_ERR);
 
-    stars[N].Mgal    = MIN (stars[N].Mgal + MTIME, NO_MAG);
+    stars[N].Mgal    = MIN (stars[N].Mgal + MTIME, 0.001*NO_MAG);
     
     if (SUBPIX) {

trunk/Ohana/src/addstar/src/LoadStars.c

@@ -102 +102 @@
 
     // advance to the next header
-    Nskip = gfits_matrix_size (headers[i]);
+    Nskip = gfits_data_size (headers[i]);
     fseek (f, Nskip, SEEK_CUR); 
     if (i == NHEADERS - 1) {
@@ -139 +139 @@
       extsize[0][i] = headers[i][0].size;
     } else {
-      extsize[0][i] = headers[i][0].size + gfits_matrix_size (headers[i]);
+      extsize[0][i] = headers[i][0].size + gfits_data_size (headers[i]);
     }
     gfits_scan (headers[i], "EXTTYPE", "%s", 1, exttype);
@@ -181 +181 @@
   // extension matched to the header in the PHU
   if (Nimage == 0) {
-    extsize[0][0] = headers[0][0].size + gfits_matrix_size (headers[0]);
-    extsize[0][1] = headers[1][0].size + gfits_matrix_size (headers[1]);
+    extsize[0][0] = headers[0][0].size + gfits_data_size (headers[0]);
+    extsize[0][1] = headers[1][0].size + gfits_data_size (headers[1]);
     gfits_scan (headers[1], ExtnameKeyword, "%s", 1, extname);
     if (!strcmp (extname, "SMPFILE")) {

trunk/Ohana/src/addstar/src/ReadStarsFITS.c

@@ -96 +96 @@
     stars[i].dX      = ps1data[i].dX;
     stars[i].dY      = ps1data[i].dY;
-    stars[i].M       = ps1data[i].M + ZeroPt;
+    if ((ps1data[i].M >= 0.0) || isnan(ps1data[i].M)) {
+        stars[i].M   = 0.001*NO_MAG;
+    } else {
+        stars[i].M   = ps1data[i].M + ZeroPt;
+    }
     stars[i].dM      = ps1data[i].dM;
     stars[i].Mpeak   = ps1data[i].Mpeak;
@@ -134 +138 @@
 
     /* these are not used */
-    stars[i].Map     = NO_MAG;
-    stars[i].Mgal    = NO_MAG;
+    stars[i].Map     = 0.001*NO_MAG;
+    stars[i].Mgal    = 0.001*NO_MAG;
     stars[i].dophot  = 0;
   }    
@@ -160 +164 @@
     stars[i].dX      = ps1data[i].dX;
     stars[i].dY      = ps1data[i].dY;
-    stars[i].M       = ps1data[i].M + ZeroPt;
+    if ((ps1data[i].M >= 0.0) || isnan(ps1data[i].M)) {
+        stars[i].M   = 0.001*NO_MAG;
+    } else {
+        stars[i].M   = ps1data[i].M + ZeroPt;
+    }
     stars[i].dM      = ps1data[i].dM;
     stars[i].Mpeak   = ps1data[i].Mpeak;
@@ -205 +213 @@
 
     /* these are not used */
-    stars[i].Map     = NO_MAG;
-    stars[i].Mgal    = NO_MAG;
+    stars[i].Map     = 0.001*NO_MAG;
+    stars[i].Mgal    = 0.001*NO_MAG;
     stars[i].dophot  = 0;
   }