Changeset 30267

Timestamp:

Jan 12, 2011, 9:32:50 PM (15 years ago)

Author:

eugene

Message:

add PSF_QF_PERFECT accessor to dvo; add sunriseset program

Location:

branches/eam_branches/ipp-20101205/Ohana/src

Files:

• opihi/dvo/dbExtractMeasures.c (modified) (1 diff)
• opihi/dvo/dbFields.c (modified) (1 diff)
• opihi/include/dvoshell.h (modified) (1 diff)
• skycalc/Makefile (modified) (5 diffs)

branches/eam_branches/ipp-20101205/Ohana/src/opihi/dvo/dbExtractMeasures.c

@@ -425 +425 @@
       value.Flt = measure[0].psfQual;
       break;
+    case MEAS_PSF_QF_PERFECT: /* OK */
+      value.Flt = NAN;
+      break;
     case MEAS_PSF_CHISQ: /* OK */
       value.Flt = measure[0].psfChisq;

branches/eam_branches/ipp-20101205/Ohana/src/opihi/dvo/dbFields.c

@@ -205 +205 @@
   if (!strcasecmp (fieldName, "IMAGEID"))        ESCAPE (MEAS_IMAGE_ID,       MAG_NONE, OPIHI_INT);
   if (!strcasecmp (fieldName, "PSF_QF"))         ESCAPE (MEAS_PSF_QF,         MAG_NONE, OPIHI_FLT);
+  if (!strcasecmp (fieldName, "PSF_QF_PERFECT")) ESCAPE (MEAS_PSF_QF_PERFECT, MAG_NONE, OPIHI_FLT);
   if (!strcasecmp (fieldName, "PSF_CHISQ"))      ESCAPE (MEAS_PSF_CHISQ,      MAG_NONE, OPIHI_FLT);
   if (!strcasecmp (fieldName, "PSF_NDOF"))       ESCAPE (MEAS_PSF_NDOF,       MAG_NONE, OPIHI_INT);

branches/eam_branches/ipp-20101205/Ohana/src/opihi/include/dvoshell.h

@@ -116 +116 @@
       MEAS_IMAGE_ID, 
       MEAS_PSF_QF, 
+      MEAS_PSF_QF_PERFECT, 
       MEAS_PSF_CHISQ, 
       MEAS_PSF_NDOF,

branches/eam_branches/ipp-20101205/Ohana/src/skycalc/Makefile

@@ -20 +20 @@
 libskycalc: $(DESTLIB)/libskycalc.a $(DESTLIB)/libskycalc.$(DLLTYPE)
 
-all: libskycalc dusktime moondata sundata
+all: libskycalc dusktime moondata sundata sunriseset
 programs: all
 
@@ -43 +43 @@
 
 dusktime : $(BIN)/dusktime.$(ARCH)
+sunriseset : $(BIN)/sunriseset.$(ARCH)
 moondata : $(BIN)/moondata.$(ARCH)
 sundata  : $(BIN)/sundata.$(ARCH)
@@ -48 +49 @@
 
 DUSKTIME = $(SRC)/dusktime.$(ARCH).o
+SUNRISESET = $(SRC)/sunriseset.$(ARCH).o
 MOONDATA = $(SRC)/moondata.$(ARCH).o
 SUNDATA  = $(SRC)/sundata.$(ARCH).o
@@ -53 +55 @@
 
 $(DUSKTIME) : $(MYINCS)
+$(SUNRISESET) : $(MYINCS)
 $(MOONDATA) : $(MYINCS)
 $(SUNDATA)  : $(MYINCS)
@@ -58 +61 @@
 
 $(BIN)/dusktime.$(ARCH) : $(DUSKTIME)
+$(BIN)/sunriseset.$(ARCH) : $(SUNRISESET)
 $(BIN)/moondata.$(ARCH) : $(MOONDATA)
 $(BIN)/sundata.$(ARCH)  : $(SUNDATA)
 $(BIN)/sunmoon.$(ARCH)  : $(SUNMOON)
 
-INSTALL = dusktime moondata sundata sunmoon
+INSTALL = dusktime sunriseset moondata sundata sunmoon
 
 # dependancy rules for binary code #########################