Changeset 27839 for branches/simmosaic_branches/Ohana/src/opihi/dvo/photometry.c

Timestamp:

May 3, 2010, 8:45:22 AM (16 years ago)

Author:

eugene

Message:

updates from trunk

Location:

branches/simmosaic_branches

Files:

• . (modified) (1 prop)
• Ohana (modified) (1 prop)
• Ohana/src/opihi/dvo/photometry.c (modified) (14 diffs)

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

@@ -228 +228 @@
   if (!strcasecmp (parname, "Xp"))    param = AVE_Xp;
   if (!strcasecmp (parname, "Xm"))    param = AVE_Xm;
-  if (!strcasecmp (parname, "flag"))  param = AVE_FLAG;
+  if (!strcasecmp (parname, "flag"))  param = AVE_OBJ_FLAGS;
   if (!strcasecmp (parname, "type"))  param = AVE_TYPE;
   if (!strcasecmp (parname, "typefrac")) {
@@ -325 +325 @@
     return (FALSE);
   }
-  if (!LoadPhotcodes (CatdirPhotcodeFile, MasterPhotcodeFile)) {
+
+  // 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);
@@ -334 +336 @@
 int ListPhotSelections () {
 
-  gprint (GP_ERR, "TimeSelect: %d, %d - %d\n",      TimeSelect, tzero, tend);
+  gprint (GP_ERR, "TimeSelect: %d, %s - %s\n",      TimeSelect, ctime(&tzero), ctime(&tend));
   gprint (GP_ERR, "MagSelect: %d, %f - %f\n",       MagSelect, MagMax, MagMin);
   gprint (GP_ERR, "TypeSelect: %d, %d\n",           TypeSelect, TypeValue);
@@ -553 +555 @@
 
 /* extract a list of measure parameters from the specified average entry based on the pre-set selections */
-double *ExtractMeasures (PhotCode *code, int mode, Average *average, SecFilt *secfilt, Measure *measure, int *nlist, int param) {
-
-  int i, Nlist, NLIST;
+double *ExtractMeasures (PhotCode *code, int mode, Average *average, SecFilt *secfilt, Measure *measure, off_t *nlist, int param) {
+
+  off_t i, Nlist, NLIST;
   double M, *list;
   
@@ -583 +585 @@
 double ExtractAverages (PhotCode *code, int mode, Average *average, SecFilt *secfilt, Measure *measure, int param) {
 
-  int i;
+  off_t i;
   double value;
 
@@ -639 +641 @@
       value = 0.01*average[0].Xp;
       break;
-    case AVE_FLAG:
+    case AVE_OBJ_FLAGS:
       value = average[0].flags;
       break;
@@ -712 +714 @@
 
   double frac;
-  int k, Nc, Nt;
+  int Nc, Nt;
+  off_t k;
   
   Nt = Nc = 0;
@@ -728 +731 @@
 int DetermineTypeCode (Average *average, Measure *measure, int code) {
 
-  int k, N, Nt[3];
+  off_t k;
+  int N, Nt[3];
   
   Nt[0] = Nt[1] = Nt[2] = 0;
@@ -786 +790 @@
 int TestAverage (PhotCode *code, Average *average, SecFilt *secfilt, Measure *measure) {
 
-  int i, Nm, Type, Select;
+  off_t i, Nm;
+  int Type, Select;
   double fwhm, typefrac, dM, Xm;
 
@@ -935 +940 @@
 
 
-double *ExtractMagnitudes (PhotCode *code, int mode, Average *average, SecFilt *secfilt, Measure *measure, int *n) {
+double *ExtractMagnitudes (PhotCode *code, int mode, Average *average, SecFilt *secfilt, Measure *measure, off_t *n) {
   
   double *M, mag;
-  int N;
+  off_t N;
 
   if ((mode == MAG_AVE) || (mode == MAG_REF)) {
@@ -958 +963 @@
 
 /* extract delta-mag pairs applying specified selections */
-double *ExtractDMag (PhotCode **code, int *mode, Average *average, SecFilt *secfilt, Measure *measure, int *nlist) {
-
-  int i, j, A1, A2, N1, N2, Np, Nlist, NLIST;
+double *ExtractDMag (PhotCode **code, int *mode, Average *average, SecFilt *secfilt, Measure *measure, off_t *nlist) {
+
+  int A1, A2;
+  off_t i, j, N1, N2, Np, Nlist, NLIST;
   double *M1, *M2, *list;
 
@@ -1007 +1013 @@
 /* extract a list of delta-measure-mags from the specified average entry based on the 
    pre-set selections - does not return self-matched measurements */
-double *ExtractMeasuresDMag (PhotCode **code, int *mode, Average *average, SecFilt *secfilt, Measure *measure, int *nlist) {
-
-  int i, j, Np0, Np1, Nlist, NLIST;
+double *ExtractMeasuresDMag (PhotCode **code, int *mode, Average *average, SecFilt *secfilt, Measure *measure, off_t *nlist) {
+
+  int Np0, Np1;
+  off_t i, j, Nlist, NLIST;
   double *list, M1, M2;
   
@@ -1054 +1061 @@
 
 /* extract a measurement list matching the number of dmag entries */
-double *ExtractByDMag (PhotCode **code, int *mode, Average *average, SecFilt *secfilt, Measure *measure, int *nlist, int param) {
-
-  int A1, A2, N1;
+double *ExtractByDMag (PhotCode **code, int *mode, Average *average, SecFilt *secfilt, Measure *measure, off_t *nlist, int param) {
+
+  off_t N1;
+  int A1, A2;
   double *list;
 
@@ -1078 +1086 @@
   
 /* extract a list of delta-measure-mags from the specified average entry based on the pre-set selections */
-double *ExtractMeasuresByDMag (PhotCode **code, int *mode, int use_first, Average *average, SecFilt *secfilt, Measure *measure, int *nlist, int param) {
-
-  int i, j, n, Nlist, NLIST;
+double *ExtractMeasuresByDMag (PhotCode **code, int *mode, int use_first, Average *average, SecFilt *secfilt, Measure *measure, off_t *nlist, int param) {
+
+  off_t i, j, n, Nlist, NLIST;
   double *list, M1, M2;