Changeset 21419 for branches/eam_branch_20090208/Ohana/src/opihi/dvo/photometry.c

Timestamp:

Feb 8, 2009, 12:38:05 PM (17 years ago)

Author:

eugene

Message:

upgrades to PS1 Initial Deployed version; some field renames (average.code -> average.flags; image.code -> image.flags)

File:

• branches/eam_branch_20090208/Ohana/src/opihi/dvo/photometry.c (modified) (14 diffs)

branches/eam_branch_20090208/Ohana/src/opihi/dvo/photometry.c

@@ -2 +2 @@
 
 /* match code to measure  */
-# define TESTCODE(C,M) \
-  if (C != NULL) { \
-    switch (C[0].type) { \
-    case PHOT_DEP: \
-    case PHOT_REF: \
-      if (C[0].code != M.photcode) continue; \
-      break; \
-    case PHOT_SEC: \
-      if (C[0].code != GetPhotcodeEquivCodebyCode (M.photcode)) continue; \
-      break; \
-    default: \
-      break; \
-  } }
+# define TESTCODE(C,M)                                                  \
+  if (C != NULL) {                                                      \
+    switch (C[0].type) {                                                \
+      case PHOT_DEP:                                                    \
+      case PHOT_REF:                                                    \
+        if (C[0].code != M.photcode) continue;                          \
+        break;                                                          \
+      case PHOT_SEC:                                                    \
+        if (C[0].code != GetPhotcodeEquivCodebyCode (M.photcode)) continue; \
+        break;                                                          \
+      default:                                                          \
+        break;                                                          \
+    } }
 
 /* exclusions based on measure.params  */
-# define TESTMEASURE(M) \
-  if (ApplySelections[SelectionParam]) { \
-    if (TimeSelect && (M.t < tzero)) continue; \
-    if (TimeSelect && (M.t > tend)) continue; \
-    if (ErrSelect  && (M.dM > ErrValue)) continue; \
+# define TESTMEASURE(M)                                                 \
+  if (ApplySelections[SelectionParam]) {                                \
+    if (TimeSelect && (M.t < tzero)) continue;                          \
+    if (TimeSelect && (M.t > tend)) continue;                           \
+    if (ErrSelect  && (M.dM > ErrValue)) continue;                      \
+    if (iMagSelect && (PhotInst (&M) < iMagMin)) continue;              \
+    if (FlagSelect && (M.dbFlags != FlagValue)) continue;               \
     if (TypeSelect && (TypeValue != GetMeasureTypeCode (&M))) continue; \
-    if (iMagSelect && (PhotInst (&M) < iMagMin)) continue; \
-    if (FlagSelect && (M.dbFlags != FlagValue)) continue; \
-  }
-
-# define SETMAG(MOUT,MEAS,MODE) \
-  MOUT = NAN; \
-  if (MODE == MAG_INST) MOUT = PhotInst (&MEAS);  \
-  if (MODE == MAG_CAT)  MOUT = PhotCat  (&MEAS); \
-  if (MODE == MAG_SYS)  MOUT = PhotSys  (&MEAS, average, secfilt); \
-  if (MODE == MAG_REL)  MOUT = PhotRel  (&MEAS, average, secfilt); \
+  }
+
+# define SETMAG(MOUT,MEAS,MODE)                                         \
+  MOUT = NAN;                                                           \
+  if (MODE == MAG_INST) MOUT = PhotInst (&MEAS);                        \
+  if (MODE == MAG_CAT)  MOUT = PhotCat  (&MEAS);                        \
+  if (MODE == MAG_SYS)  MOUT = PhotSys  (&MEAS, average, secfilt);      \
+  if (MODE == MAG_REL)  MOUT = PhotRel  (&MEAS, average, secfilt);      \
   if (MODE == MAG_CAL)  MOUT = PhotCal  (&MEAS, average, secfilt, measure, GetPhotcodeEquivbyCode (MEAS.photcode)); \
   if (MODE == MAG_AVE)  MOUT = PhotAve  (GetPhotcodeEquivbyCode (MEAS.photcode), average, secfilt); \
   if (MODE == MAG_REF)  MOUT = PhotRef  (GetPhotcodeEquivbyCode (MEAS.photcode), average, secfilt, measure); \
-  if (ApplySelections[SelectionParam]) { \
-    if (MagSelect && (MOUT > MagMax)) continue; \
-    if (MagSelect && (MOUT < MagMin)) continue; \
+  if (ApplySelections[SelectionParam]) {                                \
+    if (MagSelect && (MOUT > MagMax)) continue;                         \
+    if (MagSelect && (MOUT < MagMin)) continue;                         \
   }
 
@@ -182 +182 @@
   if (!strcasecmp (parname, "dec"))      param = MEAS_DEC;
   if (!strcasecmp (parname, "mag"))      param = MEAS_MAG;
-  // if (!strcasecmp (parname, "dmag"))          param = MEAS_dMAG;
   if (!strcasecmp (parname, "airmass"))  param = MEAS_AIRMASS;
   if (!strcasecmp (parname, "exptime"))  param = MEAS_EXPTIME;
@@ -190 +189 @@
   if (!strcasecmp (parname, "dD"))       param = MEAS_DEC_OFFSET;
   if (!strcasecmp (parname, "fwhm"))     param = MEAS_FWHM;
-  // if (!strcasecmp (parname, "dophot"))        param = MEAS_DOPHOT;
   if (!strcasecmp (parname, "FLAGS"))    param = MEAS_DB_FLAGS;
   if (!strcasecmp (parname, "XCCD"))     param = MEAS_XCCD;
@@ -198 +196 @@
   if (!strcasecmp (parname, "help")) {
     gprint (GP_ERR, "value may be one of the following:\n");
-    gprint (GP_ERR, " ra dR dec dD mag dmag Mrel Mcal photcode time fwhm dophot xccd yccd xmosaic ymosaic flags\n");
+    gprint (GP_ERR, " ra dR dec dD mag dmag Mrel Mcal photcode time fwhm xccd yccd xmosaic ymosaic flags\n");
     gprint (GP_ERR, "value may also be a valid photcode\n");
     gprint (GP_ERR, "photcodes or 'mag' may have optional magnitude type: mag,[Minst, Mcat, Msys, Mrel, Mcal]\n");
@@ -311 +309 @@
 
   if (VarConfig ("ZERO_PT", "%lf", &ZERO_POINT) == (char *) NULL) {
-      gprint (GP_ERR, "ZERO_PT undefined in config\n");
-      return (FALSE);
+    gprint (GP_ERR, "ZERO_PT undefined in config\n");
+    return (FALSE);
   }
   SetZeroPoint (ZERO_POINT);
@@ -324 +322 @@
 
   if (VarConfig ("PHOTCODE_FILE", "%s", MasterPhotcodeFile) == (char *) NULL) {
-      gprint (GP_ERR, "PHOTCODE_FILE undefined in config\n");
-      return (FALSE);
+    gprint (GP_ERR, "PHOTCODE_FILE undefined in config\n");
+    return (FALSE);
   }
   if (!LoadPhotcodes (CatdirPhotcodeFile, MasterPhotcodeFile)) {
@@ -642 +640 @@
       break;
     case AVE_FLAG:
-      value = average[0].code;
+      value = average[0].flags;
       break;
     case AVE_MAG:
@@ -659 +657 @@
           value = NAN;
           for (i = 0; i < average[0].Nmeasure; i++) {
-              if (code[0].code != measure[i].photcode) continue;
-              value = measure[i].M;
+            if (code[0].code != measure[i].photcode) continue;
+            value = measure[i].M;
           }
           break;
@@ -675 +673 @@
       break;
     case AVE_TYPEFRAC:
-      value = DetermineTypefrac (average, measure, code);
+      // value = DetermineTypefrac (average, measure, code);
+      value = NAN;
       break;
     case AVE_NCODE:
@@ -719 +718 @@
     if ((code != NULL) && (code[0].code != GetPhotcodeEquivCodebyCode (measure[k].photcode))) continue;
     Nc ++;
-    if (measure[k].dophot != TypefracType) continue;
+    if ((measure[k].photFlags >> 16) != TypefracType) continue;
     Nt ++;
   }
@@ -744 +743 @@
 
 int GetMeasureTypeCode (Measure *measure) {
-  switch (measure[0].dophot) {
+  switch ((measure[0].photFlags >> 16)) {
     case 0:
     case 1:
@@ -770 +769 @@
   if (IsDophot) {
     
-    if (measure[0].dophot == 4) return (FALSE);
+    if ((measure[0].photFlags >> 16) == 4) return (FALSE);
     return (TRUE);
   
@@ -866 +865 @@
   if (ErrSelect) {
     dM = PhotdM (code, average, secfilt);
-    if (dM > ErrValue) return (NAN);
+    if (dM > ErrValue) return (FALSE);
   }
   
@@ -1137 +1136 @@
       value = average[0].D - measure[0].dD / 3600.0;
       break;
-# if (0)
-    case MEAS_dMAG: /* OK */
-      value = measure[0].dM;
-      break;
     case MEAS_DOPHOT: /* OK */
-      value = measure[0].dophot;
-      break;
-# endif
+      value = (measure[0].photFlags >> 16);
+      break;
     case MEAS_AIRMASS: /* OK */
       value = measure[0].airmass;