Changeset 34642 for trunk

Timestamp:

Nov 1, 2012, 10:22:47 AM (14 years ago)

Author:

eugene

Message:

add a -reset-zpts option if we really want to reset the zero points

Location:

trunk/Ohana/src/relphot

Files:

• include/relphot.h (modified) (1 diff)
• src/args.c (modified) (2 diffs)
• src/load_catalogs.c (modified) (2 diffs)
• src/reload_catalogs.c (modified) (2 diffs)
• src/relphot_objects.c (modified) (1 diff)
• src/select_images.c (modified) (1 diff)
• src/setMrelFinal.c (modified) (1 diff)

trunk/Ohana/src/relphot/include/relphot.h

@@ -137 +137 @@
 int    NGRID;
 int    RESET;
+int    RESET_ZEROPTS;
 int    UPDATE;
 int    SAVE_IMAGE_UPDATES;

trunk/Ohana/src/relphot/src/args.c

@@ -163 +163 @@
   }
 
+  RESET_ZEROPTS = FALSE;
+  if ((N = get_argument (argc, argv, "-reset-zpts"))) {
+    remove_argument (N, &argc, argv);
+    RESET_ZEROPTS = TRUE;
+  }
+
   UPDATE = FALSE;
   if ((N = get_argument (argc, argv, "-update"))) {
@@ -418 +424 @@
     remove_argument (N, &argc, argv);
     RESET = TRUE;
+  }
+
+  RESET_ZEROPTS = FALSE;
+  if ((N = get_argument (argc, argv, "-reset-zpts"))) {
+    remove_argument (N, &argc, argv);
+    RESET_ZEROPTS = TRUE;
   }
 

trunk/Ohana/src/relphot/src/load_catalogs.c

@@ -134 +134 @@
     // KEEP_UBERCAL
     // RESET (-reset)
+    // RESET_ZEROPTS (-reset-zpts)
     // TimeSelect -time
     // DophotSelect
@@ -150 +151 @@
     if (VERBOSE2)      { snprintf (tmpline, 1024, "%s -vv",             command);                    strcpy (command, tmpline); }
     if (RESET)         { snprintf (tmpline, 1024, "%s -reset",          command);                    strcpy (command, tmpline); }
+    if (RESET_ZEROPTS) { snprintf (tmpline, 1024, "%s -reset-zpts",     command);                    strcpy (command, tmpline); }
     if (!KEEP_UBERCAL) { snprintf (tmpline, 1024, "%s -reset-ubercal",  command);                    strcpy (command, tmpline); }
     if (DophotSelect)  { snprintf (tmpline, 1024, "%s -dophot %d",      command, DophotValue);       strcpy (command, tmpline); }

trunk/Ohana/src/relphot/src/reload_catalogs.c

@@ -172 +172 @@
     // VERBOSE, VERBOSE2
     // RESET
+    // RESET_ZEROPTS
     // TimeSelect
     // AreaSelect
@@ -182 +183 @@
     if (VERBOSE2)         { snprintf (tmpline, 1024, "%s -vv",                  command);                                         strcpy (command, tmpline); }
     if (RESET)            { snprintf (tmpline, 1024, "%s -reset",               command);                                         strcpy (command, tmpline); }
+    if (RESET_ZEROPTS)    { snprintf (tmpline, 1024, "%s -reset-zpts",          command);                                         strcpy (command, tmpline); }
     if (UPDATE)           { snprintf (tmpline, 1024, "%s -update",              command);                                         strcpy (command, tmpline); }
     if (!KEEP_UBERCAL)    { snprintf (tmpline, 1024, "%s -reset-ubercal",       command);                                         strcpy (command, tmpline); }

trunk/Ohana/src/relphot/src/relphot_objects.c

@@ -162 +162 @@
     if (VERBOSE2)      { snprintf (tmpline, 1024, "%s -vv",             command);                    strcpy (command, tmpline); }
     if (RESET)         { snprintf (tmpline, 1024, "%s -reset",          command);                    strcpy (command, tmpline); }
+    if (RESET_ZEROPTS) { snprintf (tmpline, 1024, "%s -reset-zpts",     command);                    strcpy (command, tmpline); }
     if (UPDATE)        { snprintf (tmpline, 1024, "%s -update",         command);                    strcpy (command, tmpline); }
     if (!KEEP_UBERCAL) { snprintf (tmpline, 1024, "%s -reset-ubercal",  command);                    strcpy (command, tmpline); }

trunk/Ohana/src/relphot/src/select_images.c

@@ -256 +256 @@
     }
     if (RESET) {
-      if (!KEEP_UBERCAL || !(image[nimage].flags & ID_IMAGE_PHOTOM_UBERCAL)) {
-        image[nimage].Mcal = 0.0;
-        image[nimage].dMcal = NAN;
-        image[nimage].flags &= ~ID_IMAGE_PHOTOM_UBERCAL;
+      if (RESET_ZEROPTS) {
+        if (!KEEP_UBERCAL || !(image[nimage].flags & ID_IMAGE_PHOTOM_UBERCAL)) {
+          image[nimage].Mcal = 0.0;
+          image[nimage].dMcal = NAN;
+          image[nimage].flags &= ~ID_IMAGE_PHOTOM_UBERCAL;
+        }
       }
       image[nimage].flags &= ~ID_IMAGE_PHOTOM_POOR;

trunk/Ohana/src/relphot/src/setMrelFinal.c

@@ -75 +75 @@
             } 
           } else {
-            if (getImageEntry (m, 0) >= 0) {
+            if (RESET_ZEROPTS && (getImageEntry (m, 0) >= 0)) {
               catalog[0].measure[m].Mcal = 0.0;
             }