Changeset 36910 for branches/eam_branches/ipp-20140610/Ohana/src/opihi/dvo/photometry.c

Timestamp:

Jun 19, 2014, 8:11:39 AM (12 years ago)

Author:

eugene

Message:

rework dvo db photcode-related selection logic: allow fields of the form mag:psf:inst or g:ave:psf:stk, with arbitrary combinations; PhotInst, etc, now take options for mag class, etc

File:

• branches/eam_branches/ipp-20140610/Ohana/src/opihi/dvo/photometry.c (modified) (5 diffs)

branches/eam_branches/ipp-20140610/Ohana/src/opihi/dvo/photometry.c

@@ -41 +41 @@
   }
 
+# if (0)
 /* selection criteria */
 /* selections based on Measure quantities */
@@ -78 +79 @@
 static time_t TimeReference;
 static int TimeFormat;
-
+# endif
+
+# if (0)
 int GetTimeSelection (time_t *tz, time_t *te) {
   *tz = tzero;
@@ -298 +301 @@
   return;
 }
-
-/* (re)load photcodes from photcode table */
-int InitPhotcodes () {
-
-  double ZERO_POINT;
-  char MasterPhotcodeFile[256];
-  char CatdirPhotcodeFile[256];
-  char *catdir;
-
-  if (VarConfig ("ZERO_PT", "%lf", &ZERO_POINT) == (char *) NULL) {
-    gprint (GP_ERR, "ZERO_PT undefined in config\n");
-    return (FALSE);
-  }
-  SetZeroPoint (ZERO_POINT);
-
-  catdir = GetCATDIR();
-  if (catdir == NULL) {
-    CatdirPhotcodeFile[0] = 0;
-  } else {
-    sprintf (CatdirPhotcodeFile, "%s/Photcodes.dat", catdir);
-  }
-
-  if (VarConfig ("PHOTCODE_FILE", "%s", MasterPhotcodeFile) == (char *) NULL) {
-    gprint (GP_ERR, "PHOTCODE_FILE undefined in config\n");
-    return (FALSE);
-  }
-
-  // XXX now that DVO does not allow write access, we can drop the MasterPhotcodeFile
-  if (!LoadPhotcodes (CatdirPhotcodeFile, MasterPhotcodeFile, FALSE)) {
-    gprint (GP_ERR, "error loading photcode table %s or master file %s\n", CatdirPhotcodeFile, MasterPhotcodeFile);
-    return (FALSE);
-  }
-  return (TRUE);
-}
-
+# endif
+
+# if (0)
 int ListPhotSelections () {
 
@@ -1121 +1092 @@
   return (list);
 }
-
+# endif
+
+# if (0)
 double GetMeasure (int param, Average *average, Measure *measure, double mag) {
 
@@ -1214 +1187 @@
   return (value);
 }
+# endif
 
 /** the mosaic entries do not use the registered mosaic found