Changeset 21153 for trunk/Ohana/src/relphot

Timestamp:

Jan 22, 2009, 10:43:26 AM (18 years ago)

Author:

eugene

Message:

lots of very minor API mods to satisfy some pickier compilers (supply void to prototypes for argument-less functions)

Location:

trunk/Ohana/src/relphot

Files:

• include/relphot.h (modified) (5 diffs)
• src/StarOps.c (modified) (1 diff)
• src/relphot.c (modified) (1 diff)
• src/relphot_objects.c (modified) (2 diffs)

trunk/Ohana/src/relphot/include/relphot.h

@@ -125 +125 @@
 int           args                PROTO((int argc, char **argv));
 int           bcatalog            PROTO((Catalog *subcatalog, Catalog *catalog));
-void          clean_images        PROTO(());
+void          clean_images        PROTO((void));
 void          clean_measures      PROTO((Catalog *catalog, int Ncatalog, int final));
-void          clean_mosaics       PROTO(());
+void          clean_mosaics       PROTO((void));
 void          clean_stars         PROTO((Catalog *catalog, int Ncatalog));
 int           corner_check        PROTO((double *x1, double *y1, double *x2, double *y2));
-void          dumpGrid            PROTO(());
-void          dump_grid           PROTO(()); 
+void          dumpGrid            PROTO((void));
+void          dump_grid           PROTO((void)); 
 int           edge_check          PROTO((double *x1, double *y1, double *x2, double *y2));
 void          findImages          PROTO((Catalog *catalog, int Ncatalog));
@@ -140 +140 @@
 void TrapSignal (int sig);
 void SetProtect (int mode);
-int SetSignals ();
+int SetSignals (void);
 
 void          freeGridBins        PROTO((int Ncatalog));
@@ -179 +179 @@
 void          plot_defaults       PROTO((Graphdata *graphdata));
 void          plot_grid           PROTO((Catalog *catalog));
-void          plot_images         PROTO(());
+void          plot_images         PROTO((void));
 void          plot_list           PROTO((Graphdata *graphdata, double *xlist, double *ylist, int N, char *label, char *format, ...));
 void          plot_mosaic_fields  PROTO((Catalog *catalog));
-void          plot_mosaics        PROTO(());
+void          plot_mosaics        PROTO((void));
 void          plot_scatter        PROTO((Catalog *catalog, int Ncatalog));
 void          plot_star_coords    PROTO((Catalog *catalog, int Ncatalog));
@@ -190 +190 @@
 int           setExclusions       PROTO((Catalog *catalog, int Ncatalog));
 void          setMcal             PROTO((Catalog *catalog, int Poor));
-void          setMcalFinal        PROTO(());
+void          setMcalFinal        PROTO((void));
 int           setMcalOutput       PROTO((Catalog *catalog, int Ncatalog));
 void          setMgrid            PROTO((Catalog *catalog));
@@ -217 +217 @@
 StatType      statsStarX          PROTO((Catalog *catalog, int Ncatalog));
 void          wcatalog            PROTO((Catalog *catalog));
-void          wimages             PROTO(());
+void          wimages             PROTO((void));
 void          write_coords        PROTO((Header *header, Coords *coords));
-int relphot_objects ();
+int relphot_objects (void);

trunk/Ohana/src/relphot/src/StarOps.c

@@ -207 +207 @@
           if (isnan(Msys)) continue;
 
+          // XXX this is a hack for the 2MASS search; better to save an average value?
+          if (catalog[i].measure[m].qPSF < 0.85) continue;
+
           list[N] = Msys - catalog[i].measure[m].Mcal;
           dlist[N] = MAX (catalog[i].measure[m].dM, MIN_ERROR);

trunk/Ohana/src/relphot/src/relphot.c

@@ -125 +125 @@
     if ((i == 1) || (i == 5) || (i ==  9) || (i == 13)) clean_measures (catalog, Ncatalog, FALSE); 
     if ((i == 2) || (i == 6) || (i == 10) || (i == 14)) clean_stars (catalog, Ncatalog);
-    if ((i == 4) || (i == 8) || (i == 12) || (i == 16)) clean_mosaics (catalog, Ncatalog);
+    if ((i == 4) || (i == 8) || (i == 12) || (i == 16)) clean_mosaics ();
     if ((i == 4) || (i == 8) || (i == 12) || (i == 16)) clean_images ();
     global_stats (catalog, Ncatalog);

trunk/Ohana/src/relphot/src/relphot_objects.c

@@ -4 +4 @@
 
   int i, j, k, m;
+  int Nsecfilt;
 
   SkyTable *sky = NULL;
@@ -39 +40 @@
     // XXX consider what gets reset (only PHOTOM flags)
     if (RESET) {
+      Nsecfilt = catalog.Nsecfilt;
       for (j = 0; j < catalog.Naverage; j++) {
         catalog.average[j].code = 0;
+        for (k = 0; k < Nsecfilt; k++) {
+          catalog.secfilt[j*Nsecfilt + k].M  = NAN;
+          catalog.secfilt[j*Nsecfilt + k].dM = NAN;
+          catalog.secfilt[j*Nsecfilt + k].Xm = NAN_S_SHORT;
+          catalog.secfilt[j*Nsecfilt + k].Ncode = 0;
+          catalog.secfilt[j*Nsecfilt + k].Nused = 0;
+          catalog.secfilt[j*Nsecfilt + k].dummy = 0;
+        }
         m = catalog.average[j].measureOffset;
         for (k = 0; k < catalog.average[j].Nmeasure; k++) {