Changeset 4689 for trunk/Ohana/src/opihi/dvo/photometry.c

Timestamp:

Jul 31, 2005, 1:04:22 PM (21 years ago)

Author:

eugene

Message:

cleanups so -Wall -Werror succeed, some .h reorgs

File:

• trunk/Ohana/src/opihi/dvo/photometry.c (modified) (20 diffs)

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

@@ -329 +329 @@
   double trange;
 
-  if (N = get_argument (*argc, argv, "-phothelp")) {
+  if ((N = get_argument (*argc, argv, "-phothelp"))) {
     fprintf (stderr, "optional photometry selection criteria:\n");
     fprintf (stderr, " -magrange min max\n");
@@ -346 +346 @@
   /* select based on measured mag (MEASURE ONLY) */
   MagSelect = FALSE;
-  if (N = get_argument (*argc, argv, "-magrange")) {
+  if ((N = get_argument (*argc, argv, "-magrange"))) {
     MagSelect = TRUE;
     remove_argument (N, argc, argv);
@@ -357 +357 @@
   /* select based on instrument mag (MEASURE ONLY) */
   iMagSelect = FALSE;
-  if (N = get_argument (*argc, argv, "-imaglim")) {
+  if ((N = get_argument (*argc, argv, "-imaglim"))) {
     iMagSelect = TRUE;
     remove_argument (N, argc, argv);
@@ -366 +366 @@
   /* select on value of flag (MEASURE ONLY) */
   FlagSelect = FALSE;
-  if (N = get_argument (*argc, argv, "-flag")) {
+  if ((N = get_argument (*argc, argv, "-flag"))) {
     FlagSelect = TRUE;
     remove_argument (N, argc, argv);
@@ -375 +375 @@
   /* select on value of Chisq (AVERAGE ONLY) */
   for (i = 0; i < 4; i++) ApplySelections[i] = TRUE;
-  if (N = get_argument (*argc, argv, "-apply")) {
+  if ((N = get_argument (*argc, argv, "-apply"))) {
     remove_argument (N, argc, argv);
     if (strlen(argv[N]) != Nparams) {
@@ -393 +393 @@
   /* select on value of photcode */
   PhotcodeSelect = FALSE;
-  if (N = get_argument (*argc, argv, "-photcode")) {
+  if ((N = get_argument (*argc, argv, "-photcode"))) {
     PhotcodeSelect = TRUE;
     remove_argument (N, argc, argv);
@@ -406 +406 @@
   /* selection on basis of time range (MEASURE only) */
   TimeSelect = FALSE;
-  if (N = get_argument (*argc, argv, "-time")) {
+  if ((N = get_argument (*argc, argv, "-time"))) {
     remove_argument (N, argc, argv);
     if (!str_to_time (argv[N], &tzero)) { 
@@ -430 +430 @@
   /* select by error (on measure or average) */
   ErrSelect = FALSE;
-  if (N = get_argument (*argc, argv, "-errorlim")) {
+  if ((N = get_argument (*argc, argv, "-errorlim"))) {
     remove_argument (N, argc, argv);
     ErrValue = 1000*atof (argv[N]);
@@ -439 +439 @@
   /* select on value of Chisq (AVERAGE ONLY) */
   ChiSelect = FALSE;
-  if (N = get_argument (*argc, argv, "-chisq")) {
+  if ((N = get_argument (*argc, argv, "-chisq"))) {
     ChiSelect = TRUE;
     remove_argument (N, argc, argv);
@@ -448 +448 @@
   /* select on measurement type: 1,2,3 (AVERAGE ONLY) */
   TypeSelect = FALSE;
-  if (N = get_argument (*argc, argv, "-type")) {
+  if ((N = get_argument (*argc, argv, "-type"))) {
     remove_argument (N, argc, argv);
     TypeValue = atoi (argv[N]);
@@ -457 +457 @@
   /* select on measurement type: 1,2,3 (AVERAGE ONLY) */
   TypefracType = 0;
-  if (N = get_argument (*argc, argv, "-usetype")) {
+  if ((N = get_argument (*argc, argv, "-usetype"))) {
     remove_argument (N, argc, argv);
     TypefracType = atoi (argv[N]);
@@ -465 +465 @@
   /* select on measurement type: 1,2,3 (AVERAGE ONLY) */
   TypefracSelect = FALSE;
-  if (N = get_argument (*argc, argv, "-typefrac")) {
+  if ((N = get_argument (*argc, argv, "-typefrac"))) {
     remove_argument (N, argc, argv);
     TypefracType  = atoi (argv[N]);
@@ -479 +479 @@
   /* select by number of measurements (AVERAGE ONLY) */
   NphotSelect = FALSE;
-  if (N = get_argument (*argc, argv, "-nphot")) {
+  if ((N = get_argument (*argc, argv, "-nphot"))) {
     remove_argument (N, argc, argv);
     NphotValue = abs (atoi (argv[N]));
@@ -491 +491 @@
   /* select by number of measurements (AVERAGE ONLY) */
   NcodeSelect = FALSE;
-  if (N = get_argument (*argc, argv, "-ncode")) {
+  if ((N = get_argument (*argc, argv, "-ncode"))) {
     remove_argument (N, argc, argv);
     NcodeValue = abs (atoi (argv[N]));
@@ -503 +503 @@
   /* -fwhm value frac (AVERAGE ONLY) */
   FWHMSelect = FALSE;
-  if (N = get_argument (*argc, argv, "-fwhm")) {
+  if ((N = get_argument (*argc, argv, "-fwhm"))) {
     remove_argument (N, argc, argv);
     FWHMvalue = abs (atof (argv[N]));
@@ -522 +522 @@
 double *ExtractMeasures (PhotCode *code, int mode, Average *average, SecFilt *secfilt, Measure *measure, int *nlist, int param) {
 
-  int i, k, m, Nlist, NLIST, np, found, Nm;
-  time_t t;
-  double ra, dec, x, y, value, M, fwhm;
-  double *list;
+  int i, Nlist, NLIST;
+  double M, *list;
   
   *nlist = 0; 
@@ -552 +550 @@
 double ExtractAverages (PhotCode *code, int mode, Average *average, SecFilt *secfilt, Measure *measure, int param) {
 
-  int i, k, Nm;
+  int i;
   double value;
 
@@ -937 +935 @@
 
   int i, j, Np0, Np1, Nlist, NLIST;
-  double *list, M1, M2, value, NoMag;
+  double *list, M1, M2, NoMag;
   
   *nlist = 0; 
@@ -1008 +1006 @@
 double *ExtractMeasuresByDMag (PhotCode **code, int *mode, int use_first, Average *average, SecFilt *secfilt, Measure *measure, int *nlist, int param) {
 
-  int i, j, k, n, Nlist, NLIST;
-  time_t t;
-  int np, found;
-  double *list, M1, M2, value;
+  int i, j, n, Nlist, NLIST;
+  double *list, M1, M2;
   
   *nlist = 0; 
@@ -1050 +1046 @@
 double GetMeasure (int param, Average *average, Measure *measure, double mag) {
 
-  int m;
   double ra, dec, x, y;
   double value;