Changeset 37924

Timestamp:

Feb 20, 2015, 3:57:48 PM (11 years ago)

Author:

eugene

Message:

calculate psfQfMax (and perfect) in diff mode; add to dvopsps diffobj

Location:

trunk/Ohana/src

Files:

• dvopsps/src/insert_diffobj_dvopsps_catalog.c (modified) (3 diffs)
• relphot/src/setMrelCatalog.c (modified) (3 diffs)

trunk/Ohana/src/dvopsps/src/insert_diffobj_dvopsps_catalog.c

@@ -124 +124 @@
                  "NUSED_KRON_WRP      SMALLINT,  "    
                  "NUSED_AP_WRP        SMALLINT,  "    
+                 "PSF_QF_PERF_MAX     FLOAT, "           
 
                  "FLUX_PSF_WRP        FLOAT,  "             
@@ -178 +179 @@
                  "NUSED_KRON_WRP, "    
                  "NUSED_AP_WRP, "    
+                 "PSF_QF_PERF_MAX, "           
 
                  "FLUX_PSF_WRP, "             
@@ -253 +255 @@
     PrintIOBuffer (sec_buffer, "%hd,  ", secfilt->NusedKronWrp);        
     PrintIOBuffer (sec_buffer, "%hd,  ", secfilt->NusedApWrp);        
+    PRINT_FLOAT(sec_buffer, secfilt->psfQfPerfMax, "%.6f,");       
 
     // use %e?

trunk/Ohana/src/relphot/src/setMrelCatalog.c

@@ -729 +729 @@
     }
 
+    float psfQfMax = 0.0;
+    float psfQfPerfMax = 0.0;
+
     off_t meas = measureOffset;
 
@@ -773 +776 @@
       float Fcal = MagToFlux(-Mcal);
 
+      // these are only used below if IS_DIFF_DB
+      if (IS_DIFF_DB) {
+        if (measure[k].psfQF     > psfQfMax)     psfQfMax     = measure[k].psfQF;
+        if (measure[k].psfQFperf > psfQfPerfMax) psfQfPerfMax = measure[k].psfQFperf;
+      }
+
       // in the calculations below, 
       // ...list gives the error per measurement, wlist gives the weight
@@ -836 +845 @@
     liststats (Fpsflist, dpsflist, wpsflist, Npsf, psfstats);
 
+    if (IS_DIFF_DB) {
+      // for non DIFF_DB, these are set in setMrelAverageExposure
+      secfilt[Nsec].psfQfMax     = psfQfMax;
+      secfilt[Nsec].psfQfPerfMax = psfQfPerfMax;
+    }
+
     secfilt[Nsec].FpsfWrp  = psfstats->mean;
     secfilt[Nsec].dFpsfWrp = psfstats->error;