Changeset 35547

Timestamp:

May 9, 2013, 11:28:24 AM (13 years ago)

Author:

eugene

Message:

merge changes from trunk

Location:

branches/eam_branches/ipp-20130419/Ohana

Files:

• . (modified) (1 prop)
• src/dvomerge/src/dvomergeFromList.c (modified) (3 diffs)
• src/dvomerge/src/dvoverify_utils.c (modified) (2 diffs)
• src/dvopsps/src/insert_objects_dvopsps_catalog.c (modified) (4 diffs)
• src/libdvo/src/dbExtractMeasures.c (modified) (1 diff)
• src/libohana/src (modified) (1 prop)
• src/opihi (modified) (1 prop)
• src/opihi/cmd.astro (modified) (1 prop)
• src/opihi/cmd.data (modified) (1 prop)
• src/relastro/src (modified) (1 prop)
• src/relastro/src/UpdateObjectOffsets.c (modified) (1 diff)
• src/relastro/src/high_speed_objects.c (modified) (1 diff)
• src/relastro/src/hpm_objects.c (modified) (2 diffs)
• src/relphot/src/relphot_images.c (modified) (1 diff)
• src/uniphot/src/update_catalog_setphot.c (modified) (1 diff)

branches/eam_branches/ipp-20130419/Ohana/src/dvomerge/src/dvomergeFromList.c

@@ -103 +103 @@
     sprintf (outputfile, "%s/%s", output, list[i]);
 
+    OutputStatus *outstat = OutputStatusInit (1);
+    outstat[0].history = dmhObjectRead (outputfile);
+
+    dmhObjectStats *inStats = dmhObjectStatsRead (inputfile);
+
     LoadCatalog (&incatalog, NULL, inputfile, "r", NsecfiltInput);
 
@@ -138 +143 @@
     outcatalog.catflags = LOAD_AVES | LOAD_MEAS | LOAD_MISS | LOAD_SECF;
 
+    dmhObjectAdd (outstat[0].history, &outcatalog.header, inStats);
+
     // if we receive a signal which would cause us to exit, wait until the full catalog is written
     SetProtect (TRUE);
@@ -148 +155 @@
     fprintf (stderr, "merged %s into %s\n", inputfile, outputfile);
 
+    dmhObjectStatsFree (inStats);
+    OutputStatusFree (outstat, 1);
+
     dvo_catalog_unlock (&outcatalog);
     dvo_catalog_free (&outcatalog);

branches/eam_branches/ipp-20130419/Ohana/src/dvomerge/src/dvoverify_utils.c

@@ -26 +26 @@
   if (!VerifyTableFile (filename)) {
     fprintf (stderr, "bad average table %s\n", filename);
+    isGood = FALSE;
+  }
+
+  if (!CheckCatalogIndexes(filename, NULL)){
+    fprintf (stderr, "bad indexes in %s\n", filename);
     isGood = FALSE;
   }
@@ -45 +50 @@
     isGood = FALSE;
   }
+
   return (isGood);
 }

branches/eam_branches/ipp-20130419/Ohana/src/dvopsps/src/insert_objects_dvopsps_catalog.c

@@ -158 +158 @@
                  "MAG_ERR FLOAT,  "         
                  "MAG_CHI FLOAT,  "         
-                 "FLUX_PSF FLOAT,  "        
-                 "FLUX_PSF_ERR FLOAT,  "    
-                 "FLUX_KRON FLOAT,  "       
-                 "FLUX_KRON_ERR FLOAT,  "   
+                 "STACK_PSF_MAG FLOAT,  "        
+                 "STACK_PSF_MAG_ERR FLOAT,  "    
+                 "STACK_KRON_MAG FLOAT,  "       
+                 "STACK_KRON_MAG_ERR FLOAT,  "   
                  "FLAGS INT,  "           
                  "NCODE SMALLINT,  "           
@@ -171 +171 @@
                  "STACK_DETECT_ID BIGINT" 
                  ")\n", basename);
+
+ //              "FLUX_PSF FLOAT,  "        
+ //              "FLUX_PSF_ERR FLOAT,  "    
+ //              "FLUX_KRON FLOAT,  "       
+ //              "FLUX_KRON_ERR FLOAT,  "   
 
   if (DEBUG) fprintf (stderr, "%s\n", buffer.buffer);
@@ -237 +242 @@
                  "MAG_ERR, "         
                  "MAG_CHI, "         
-                 "FLUX_PSF, "        
-                 "FLUX_PSF_ERR, "    
-                 "FLUX_KRON, "       
-                 "FLUX_KRON_ERR, "   
+                 "STACK_PSF_MAG, "        
+                 "STACK_PSF_MAG_ERR, "    
+                 "STACK_KRON_MAG, "       
+                 "STACK_KRON_MAG_ERR, "   
                  "FLAGS, "           
                  "NCODE, "           
@@ -296 +301 @@
   PrintIOBuffer (ave_buffer, "),\n");
 
-// XXX this bit could/should be autocoded...
   for (i = 0; i < Nsecfilt; i++) {
+    float meanPSFMag    = -999.0;
+    float meanPSFMagErr = -999.0;
+    if (isfinite(secfilt->dM) && isfinite(secfilt->M)) {
+      meanPSFMag = secfilt->M;
+      meanPSFMagErr = secfilt->dM;
+    }
+
+    float meanKronMag    = -999.0;
+    float meanKronMagErr = -999.0;
+    if (isfinite(secfilt->dMkron) && isfinite(secfilt->Mkron) && (secfilt->dMkron < 0.333)) {
+      meanKronMag = secfilt->Mkron;
+      meanKronMagErr = secfilt->dMkron;
+    }
+
+    float meanApMag    = -999.0;
+    if (isfinite(secfilt->Map)) {
+      meanApMag = secfilt->Map;
+    }
+
+    float stackPSFMag    = -999.0;
+    float stackPSFMagErr = -999.0;
+    if (isfinite(secfilt->dFluxPSF) && isfinite(secfilt->FluxPSF) && (secfilt->dFluxPSF > 0.0)) {
+      float SN = secfilt->FluxPSF / secfilt->dFluxPSF;
+      if (SN > 3.0) {
+        stackPSFMag = -2.5 * log10(secfilt->FluxPSF) + 8.9;
+        stackPSFMagErr = secfilt->dFluxPSF / secfilt->FluxPSF;
+      }
+    }
+
+    float stackKronMag    = -999.0;
+    float stackKronMagErr = -999.0;
+    if (isfinite(secfilt->dFluxKron) && isfinite(secfilt->FluxKron) && (secfilt->dFluxKron > 0.0)) {
+      float SN = secfilt->FluxKron / secfilt->dFluxKron;
+      if (SN > 3.0) {
+        stackKronMag = -2.5 * log10(secfilt->FluxKron) + 8.9;
+        stackKronMagErr = secfilt->dFluxKron / secfilt->FluxKron;
+      }
+    }
+
     PrintIOBuffer (sec_buffer, " (");
-    PRINT_FLOAT(sec_buffer, secfilt->M,         "%.6f, "); // umag precision
-    PRINT_FLOAT(sec_buffer, secfilt->Map,       "%.6f, "); // umag precision
-    PRINT_FLOAT(sec_buffer, secfilt->Mkron,     "%.6f, "); // umag precision
-    PRINT_FLOAT(sec_buffer, secfilt->dMkron,    "%.6f, "); // umag precision
-    PRINT_FLOAT(sec_buffer, secfilt->dM,        "%.6f, "); // umag precision
-    PRINT_FLOAT(sec_buffer, secfilt->Xm,        "%.6f, ");
-    PRINT_FLOAT(sec_buffer, secfilt->FluxPSF,   "%.6e, "); // 0.36 umag precision
-    PRINT_FLOAT(sec_buffer, secfilt->dFluxPSF,  "%.6e, "); // 0.36 umag precision
-    PRINT_FLOAT(sec_buffer, secfilt->FluxKron,  "%.6e, "); // 0.36 umag precision
-    PRINT_FLOAT(sec_buffer, secfilt->dFluxKron, "%.6e, "); // 0.36 umag precision
+    PRINT_FLOAT(sec_buffer, meanPSFMag,      "%.6f, "); // umag precision
+    PRINT_FLOAT(sec_buffer, meanApMag,       "%.6f, "); // umag precision
+    PRINT_FLOAT(sec_buffer, meanKronMag,     "%.6f, "); // umag precision
+    PRINT_FLOAT(sec_buffer, meanKronMagErr,  "%.6f, "); // umag precision
+    PRINT_FLOAT(sec_buffer, meanPSFMagErr,   "%.6f, "); // umag precision
+    PRINT_FLOAT(sec_buffer, secfilt->Xm,     "%.6f, ");
+    PRINT_FLOAT(sec_buffer, stackPSFMag,     "%.6f, "); // umag precision
+    PRINT_FLOAT(sec_buffer, stackPSFMagErr,  "%.6f, "); // umag precision
+    PRINT_FLOAT(sec_buffer, stackKronMag,    "%.6f, "); // umag precision
+    PRINT_FLOAT(sec_buffer, stackKronMagErr, "%.6f, "); // 0.36 umag precision
     PrintIOBuffer (sec_buffer, "%u,  ", secfilt->flags);       
     PrintIOBuffer (sec_buffer, "%hd, ", secfilt->Ncode);        

branches/eam_branches/ipp-20130419/Ohana/src/libdvo/src/dbExtractMeasures.c

@@ -93 +93 @@
   Coords *mosaic, *fieldc;
 
-  PhotCode *equiv;
+  PhotCode *equiv = NULL;
 
   value.Flt = NAN;

branches/eam_branches/ipp-20130419/Ohana/src/relastro/src/UpdateObjectOffsets.c

@@ -60 +60 @@
     // uses MeasureTiny values, but will also update Measure values when populated
     UpdateObjects (&catalog, 1);
+
+    free_tiny_values(&catalog);
 
     freeImageBins (1);

branches/eam_branches/ipp-20130419/Ohana/src/relastro/src/high_speed_objects.c

@@ -272 +272 @@
   populate_tiny_values (&catalogOut, DVO_TV_MEASURE);
   UpdateObjects (&catalogOut, 1);
+  free_tiny_values(&catalogOut);
 
   fprintf (stderr, "found %d matches\n", Nmatch);

branches/eam_branches/ipp-20130419/Ohana/src/relastro/src/hpm_objects.c

@@ -258 +258 @@
     UpdateObjects (&testcat, 1);
 
+    free_tiny_values(&testcat);
+
     // logic for keeping the fit (anything else?)
     int good = FALSE;
@@ -285 +287 @@
   populate_tiny_values (&catalogOut, DVO_TV_MEASURE);
   UpdateObjects (&catalogOut, 1);
+  free_tiny_values(&catalogOut);
 
   fprintf (stderr, "found "OFF_T_FMT" matches with "OFF_T_FMT" detections\n", catalogOut.Naverage, catalogOut.Nmeasure);

branches/eam_branches/ipp-20130419/Ohana/src/relphot/src/relphot_images.c

@@ -224 +224 @@
     /* at this point, we have correct cal coeffs in the image/mosaic structures */
     for (i = 0; i < Ncatalog; i++) {
+      // these tiny values are set by BrightCatalogSplit from load_catalogs
       free_tiny_values (&catalog[i]);
       dvo_catalog_free (&catalog[i]);

branches/eam_branches/ipp-20130419/Ohana/src/uniphot/src/update_catalog_setphot.c

@@ -17 +17 @@
 
       off_t id = index[idx];
+      if (id < 0) continue;
+
       float Mcal = image[id].Mcal;
       float dMcal = image[id].dMcal;