Changeset 4606

Timestamp:

Jul 24, 2005, 8:31:04 PM (21 years ago)

Author:

eugene

Message:

cleanup for photometry concepts

Location:

trunk/Ohana/src/opihi

Files:

• dvo/avextract.c (modified) (1 diff)
• dvo/calmextract.c (modified) (1 diff)
• dvo/ccd.c (modified) (1 diff)
• dvo/cmd.c (modified) (1 diff)
• dvo/ddmags.c (modified) (1 diff)
• dvo/dmagaves.c (modified) (1 diff)
• dvo/dmagmeas.c (modified) (1 diff)
• dvo/mextract.c (modified) (1 diff)
• dvo/photometry.c (modified) (4 diffs)
• include/dvo1.h (modified) (1 diff)

trunk/Ohana/src/opihi/dvo/avextract.c

@@ -47 +47 @@
     }
   } 
-  if (!TestPhotSelections (&code, param)) goto escape;
+  if (!TestPhotSelections (&code, &mode, param)) goto escape;
 
   /* load region corresponding to selection above */

trunk/Ohana/src/opihi/dvo/calmextract.c

@@ -40 +40 @@
   if (!GetPhotcodeInfo (argv[1], &code[0], &mode[0])) goto usage;
   if (!GetPhotcodeInfo (argv[3], &code[1], &mode[1])) goto usage;
-  if (!TestPhotSelections (&code[0], MEAS_ZERO)) goto escape;
+  if (!TestPhotSelections (&code[0], &mode[0], MEAS_ZERO)) goto escape;
 
   /* returned vectors are dmag, mag, color, time, airmass, ra, dec, x, y, exptime */

trunk/Ohana/src/opihi/dvo/ccd.c

@@ -43 +43 @@
   if (!GetPhotcodeInfo (argv[5], &code[2], &mode[2])) return (FALSE);
   if (!GetPhotcodeInfo (argv[7], &code[3], &mode[3])) return (FALSE);
-  if (!TestPhotSelections (&code[0], MEAS_ZERO)) goto escape;
+  if (!TestPhotSelections (&code[0], &mode[0], MEAS_ZERO)) goto escape;
 
   /* load region corresponding to selection above */

trunk/Ohana/src/opihi/dvo/cmd.c

@@ -41 +41 @@
   if (!GetPhotcodeInfo (argv[3], &code[1], &mode[1])) return (FALSE);
   if (!GetPhotcodeInfo (argv[5], &code[2], &mode[2])) return (FALSE);
-  if (!TestPhotSelections (&code[0], MEAS_ZERO)) goto escape;
+  if (!TestPhotSelections (&code[0], &mode[0], MEAS_ZERO)) goto escape;
 
   /* load region corresponding to selection above */

trunk/Ohana/src/opihi/dvo/ddmags.c

@@ -43 +43 @@
   if (!GetPhotcodeInfo (argv[5], &code[2], &mode[2])) return (FALSE);
   if (!GetPhotcodeInfo (argv[7], &code[3], &mode[3])) return (FALSE);
-  if (!TestPhotSelections (&code[0], MEAS_ZERO)) goto escape;
+  if (!TestPhotSelections (&code[0], &mode[0], MEAS_ZERO)) goto escape;
 
   /* load region corresponding to selection above */

trunk/Ohana/src/opihi/dvo/dmagaves.c

@@ -40 +40 @@
   if (!GetPhotcodeInfo (argv[3], &code[1], &mode[1])) goto usage;
   if ((param = GetAverageParam (argv[5])) == AVE_ZERO) goto usage;
-  if (!TestPhotSelections (&code[2], param)) goto escape;
+  if (!TestPhotSelections (&code[2], &mode[2], param)) goto escape;
 
   /* load region corresponding to selection above */

trunk/Ohana/src/opihi/dvo/dmagmeas.c

@@ -41 +41 @@
   if (!GetPhotcodeInfo (argv[3], &code[1], &mode[1])) goto usage;
   if ((param = GetMeasureParam (argv[5])) == MEAS_ZERO) goto usage;
-  if (!TestPhotSelections (&code[2], MEAS_ZERO)) goto escape;
+  if (!TestPhotSelections (&code[2], &mode[2], MEAS_ZERO)) goto escape;
 
   /* load region corresponding to selection above */

trunk/Ohana/src/opihi/dvo/mextract.c

@@ -48 +48 @@
     }
   }
-  if (!TestPhotSelections (&code, MEAS_ZERO)) goto escape;
+  if (!TestPhotSelections (&code, &mode, MEAS_ZERO)) goto escape;
 
   /* load region corresponding to selection above */

trunk/Ohana/src/opihi/dvo/photometry.c

@@ -63 +63 @@
 static int PhotcodeSelect;
 static PhotCode *PhotcodeValue;
+static int PhotcodeMode;
 
 /* selections based on Average quantities */
@@ -247 +248 @@
 
 /* I've set some selections - if these require a photcode, check if I set one */
-int TestPhotSelections (PhotCode **code, int param) {
+int TestPhotSelections (PhotCode **code, int *mode, int param) {
 
   int NeedPhotcode;
@@ -281 +282 @@
     if (!PhotcodeSelect) return (FALSE);
     code[0] = PhotcodeValue;
+    mode[0] = PhotcodeMode;
     if (code[0][0].type == PHOT_DEP) return (FALSE);
     if (code[0][0].type == PHOT_REF) return (FALSE);
@@ -386 +388 @@
     PhotcodeSelect = TRUE;
     remove_argument (N, argc, argv);
-    PhotcodeValue = GetPhotcodebyName (argv[N]);
+    GetPhotcodeInfo (argv[N], &PhotcodeValue, &PhotcodeMode);
     if (PhotcodeValue == NULL) {
       fprintf (stderr, "photcode not found in photcode table\n");

trunk/Ohana/src/opihi/include/dvo1.h

@@ -67 +67 @@
 int           SetSelectionParam     PROTO((int param));
 int           TestAverage           PROTO((PhotCode *code, Average *average, SecFilt *secfilt, Measure *measure));
-int           TestPhotSelections    PROTO((PhotCode **code, int param));
+int           TestPhotSelections    PROTO((PhotCode **code, int *mode, int param));
 void          print_value           PROTO((FILE *f, double value, short int ival));