Changeset 31669

Timestamp:

Jun 22, 2011, 12:45:03 AM (15 years ago)

Author:

eugene

Message:

merge from eam/ipp-20110505: allow read-only dvo dbs, allow fake zero point

Location:

trunk/Ohana

Files:

• configure.tcsh (modified) (2 diffs)
• src/addstar/include/addstar.h (modified) (1 diff)
• src/addstar/src/LoadData.c (modified) (1 diff)
• src/addstar/src/args.c (modified) (5 diffs)
• src/getstar/src/getstar.c (modified) (4 diffs)
• src/getstar/src/select_by_region.c (modified) (8 diffs)

trunk/Ohana/configure.tcsh

@@ -203 +203 @@
   set CPPFLAGS = ""
 endif  
-if ($pedantic) set CPPFLAGS = "$CPPFLAGS-Wall -Werror "
-if ($memcheck) set CPPFLAGS = "$CPPFLAGS-DOHANA_MEMORY "
+if ($pedantic) set CPPFLAGS = "$CPPFLAGS -Wall -Werror"
+if ($memcheck) set CPPFLAGS = "$CPPFLAGS -DOHANA_MEMORY"
 
 if (! $?LDFLAGS) then
@@ -540 +540 @@
   endif
   set haveflag = `echo $f | tr '[:lower:]' '[:upper:]' | tr '.' '_'`
-  set CPPFLAGS = "$CPPFLAGS-DHAVE_$haveflag "
+  set CPPFLAGS = "$CPPFLAGS -DHAVE_$haveflag"
 end
 

trunk/Ohana/src/addstar/include/addstar.h

@@ -124 +124 @@
 float   ZPT_OBS_PHU;
 float   ZPT_ERR_PHU;
+
+float   OFFSET_ZPT;
 
 int     OLD_RESORT;

trunk/Ohana/src/addstar/src/LoadData.c

@@ -89 +89 @@
     CHECK_REALLOCATE (images[0], Image, NVALID, Nvalid, 10);
   }
+
+  if (isfinite(OFFSET_ZPT)) {
+    for (i = 0; i < *Nstars; i++) {
+      stars[0][i].measure.M   += OFFSET_ZPT;
+      stars[0][i].measure.Map += OFFSET_ZPT;
+    }
+
+  }
+
   free (name);
   *nvalid = Nvalid;

trunk/Ohana/src/addstar/src/args.c

@@ -34 +34 @@
     remove_argument (N, &argc, argv);
   }
-  OLD_RESORT = FALSE;
-  if ((N = get_argument (argc, argv, "-old-resort"))) {
-    remove_argument (N, &argc, argv);
-    OLD_RESORT = TRUE;
-  }
+
   if ((N = get_argument (argc, argv, "-fakeimage"))) {
     options.mode = M_FAKEIMAGE;
@@ -47 +43 @@
     remove_argument (N, &argc, argv);
     FAKE_THETA = atof (argv[N]);
+    remove_argument (N, &argc, argv);
+  }
+
+  OFFSET_ZPT = NAN;
+  if ((N = get_argument (argc, argv, "-fakezpt"))) {
+    remove_argument (N, &argc, argv);
+    OFFSET_ZPT = atof (argv[N]);
     remove_argument (N, &argc, argv);
   }
@@ -392 +395 @@
   fprintf (stderr, "  -accept-motion              : accept proper-motion data from reference\n");
   fprintf (stderr, "  -accept-time                : use TZERO supplied in header\n");
+  fprintf (stderr, "  -use-name                   : use the given name instead of the filename as the filename\n");
   fprintf (stderr, "  -no-stars                   : skip the stars\n");
   fprintf (stderr, "  -force                      : force read of database with inconsistent info\n");
+  fprintf (stderr, "  -threads (N)                : use N threads for resort option\n");
+  fprintf (stderr, "  -fakezpt (offset)           : apply an artificial offset to the magnitudes (for testing)\n");
   fprintf (stderr, "  -textmode                   : force textmode for file (ignore header clues)\n");
   fprintf (stderr, "  -v                          : verbose mode\n");
@@ -399 +405 @@
   fprintf (stderr, "  -help                       : this list\n");
   fprintf (stderr, "  -h                          : this list\n\n");
+
   exit (2);
 }
@@ -417 +424 @@
 
 **/
-

trunk/Ohana/src/getstar/src/getstar.c

@@ -9 +9 @@
   Catalog output;
   FITS_DB db;
+  int code, Nsec, needMeas;
 
   args (argc, argv);
@@ -17 +18 @@
     
   SkyTableSetFilenames (sky, CATDIR, "cpt");
+
+  code = photcode[0].code;
+  Nsec = GetPhotcodeNsec (code);
+  needMeas = (Nsec == -1);
 
   // create an output catalog with the desired name and format options
@@ -58 +63 @@
         catalog.filename = skylist[0].filename[i];
         catalog.Nsecfilt  = GetPhotcodeNsecfilt ();
-        catalog.catflags = LOAD_AVES | LOAD_MEAS | LOAD_SECF;
+        catalog.catflags = LOAD_AVES | LOAD_SECF;
+        catalog.catflags |= needMeas ? LOAD_MEAS : SKIP_MEAS;
 
         // an error exit status here is a significant error
@@ -89 +95 @@
         catalog.filename = skylist[0].filename[i];
         catalog.Nsecfilt  = GetPhotcodeNsecfilt ();
-        catalog.catflags = LOAD_AVES | LOAD_MEAS | LOAD_SECF;
+        catalog.catflags = LOAD_AVES | LOAD_SECF;
+        catalog.catflags |= needMeas ? LOAD_MEAS : SKIP_MEAS;
 
         // an error exit status here is a significant error

trunk/Ohana/src/getstar/src/select_by_region.c

@@ -4 +4 @@
 int select_by_region (Catalog *output, Catalog *catalog, SkyRegion *region, int start, int end) {
 
-  int i, j, n, Nm, offset, m, Nsecfilt, code, Nsec;
-  int Nave, NAVE, Nmeas, NMEAS;
+  int i, j, Nm, offset, m, Nsecfilt, code, Nsec;
+  int Nave, NAVE, Nmeas, NMEAS, needMeas;
   double R, D, AREA;
   float mag;
@@ -27 +27 @@
   code = photcode[0].code;
   Nsec = GetPhotcodeNsec (code);
+  needMeas = (Nsec == -1);
 
   /* select the average objects in this region */
@@ -67 +68 @@
 
     for (i = 0; i < catalog[0].Naverage; i++) {
-      n = catalog[0].measure[i].averef;
+      // n = catalog[0].measure[i].averef;
       mag = NAN;
-      if (Nsec != -1) {
-        mag = catalog[0].secfilt[i*Nsecfilt + Nsec].M;
-      } else {
+      if (needMeas) {
         offset = catalog[0].average[i].measureOffset;
         for (m = 0; m < catalog[0].average[i].Nmeasure; m++) {
@@ -79 +78 @@
           }
         }
+      } else {
+        mag = catalog[0].secfilt[i*Nsecfilt + Nsec].M;
       }
       if (isnan(mag)) continue;
@@ -102 +103 @@
 
   for (i = 0; i < catalog[0].Naverage; i++) {
-    n = catalog[0].measure[i].averef;
+    // n = catalog[0].measure[i].averef;
 
     R = catalog[0].average[i].R;
@@ -119 +120 @@
     if (MagLimitUse) {
       mag = NAN;
-      if (Nsec != -1) {
-        mag = catalog[0].secfilt[i*Nsecfilt + Nsec].M;
-      } else {
+      if (needMeas) {
         offset = catalog[0].average[i].measureOffset;
         for (m = 0; m < catalog[0].average[i].Nmeasure; m++) {
@@ -129 +128 @@
           }
         }
+      } else {
+        mag = catalog[0].secfilt[i*Nsecfilt + Nsec].M;
       }
       if (isnan(mag) || (mag > MagLimitValue)) continue;
@@ -142 +143 @@
     offset = catalog[0].average[i].measureOffset;
 
-    for (j = 0; j < catalog[0].average[i].Nmeasure; j++) {
-      output[0].measure[Nmeas] = catalog[0].measure[offset + j];
-      output[0].measure[Nmeas].averef = Nave;
-      Nmeas ++;
-
-      CHECK_REALLOCATE (output[0].measure, Measure, NMEAS, Nmeas, 1000);
+    if (needMeas) {
+      for (j = 0; j < catalog[0].average[i].Nmeasure; j++) {
+        output[0].measure[Nmeas] = catalog[0].measure[offset + j];
+        output[0].measure[Nmeas].averef = Nave;
+        Nmeas ++;
+        CHECK_REALLOCATE (output[0].measure, Measure, NMEAS, Nmeas, 1000);
+      }
     }