Changeset 34207

Timestamp:

Jul 25, 2012, 5:11:36 AM (14 years ago)

Author:

eugene

Message:

add stack ID to dvo schema (secfilt); code to calculate distance to skycell center; average flux in AB mags

Location:

branches/eam_branches/ipp-20120627/Ohana/src

Files:

• libautocode/def/secfilt-ps1-v4.d (modified) (2 diffs)
• libautocode/def/secfilt.d (modified) (1 diff)
• libdvo/include/dvo.h (modified) (1 diff)
• libdvo/include/dvodb.h (modified) (2 diffs)
• libdvo/src/dbExtractAverages.c (modified) (1 diff)
• libdvo/src/dbExtractMeasures.c (modified) (1 diff)
• libdvo/src/dbFields.c (modified) (4 diffs)
• libdvo/src/dvo_convert_PS1_DEV_1.c (modified) (1 diff)
• libdvo/src/dvo_convert_PS1_DEV_2.c (modified) (1 diff)
• libdvo/src/dvo_convert_PS1_REF.c (modified) (1 diff)
• libdvo/src/dvo_convert_PS1_V1.c (modified) (1 diff)
• libdvo/src/dvo_convert_PS1_V2.c (modified) (1 diff)
• libdvo/src/dvo_convert_PS1_V3.c (modified) (1 diff)
• libdvo/src/dvo_convert_PS1_V4.c (modified) (2 diffs)
• libdvo/src/dvo_convert_elixir.c (modified) (1 diff)
• libdvo/src/dvo_convert_loneos.c (modified) (1 diff)
• libdvo/src/dvo_convert_panstarrs_DEV_0.c (modified) (1 diff)
• libdvo/src/dvo_convert_panstarrs_DEV_1.c (modified) (1 diff)
• libdvo/src/dvo_photcode_ops.c (modified) (1 diff)
• opihi/dvo/mextract.c (modified) (1 diff)
• relphot/include/relphot.h (modified) (1 diff)
• relphot/src/ImageOps.c (modified) (1 diff)
• relphot/src/StarOps.c (modified) (3 diffs)

branches/eam_branches/ipp-20120627/Ohana/src/libautocode/def/secfilt-ps1-v4.d

@@ -2 +2 @@
 EXTNAME      DVO_SECFILT_PS1_V4
 TYPE         BINTABLE
-SIZE         56
+SIZE         64
 DESCRIPTION  DVO SecFilt : Secondary Filter Data 
 
@@ -23 +23 @@
 FIELD  ubercalDist, UBERCAL_DIST,  short,      number of images from an ubercal-image
 FIELD  Mstdev,      MAG_STDEV,     short,      standard deviation of measurements,    millimags
+FIELD  stackID,     STACK_ID,      uint32_t,   image ID of stack used for fluxes (if any)
+FIELD  dummy,       DUMMY,         uint32_t,   padding

branches/eam_branches/ipp-20120627/Ohana/src/libautocode/def/secfilt.d

@@ -2 +2 @@
 EXTNAME      DVO_SECFILT
 TYPE         BINTABLE
-SIZE         56
+SIZE         64
 DESCRIPTION  DVO SecFilt : Secondary Filter Data 
 
 # elements of data structure / FITS table
-FIELD  M,           MAG,          float,      average mag in this band,              mags
-FIELD  Map,         MAG,          float,      average mag in this band,              mags
-FIELD  Mkron,       MAG_KRON,     float,      ave kron mag in this band,             mags
-FIELD  dMkron,      MAG_KRON_ERR, float,      formal error on average kron mag,      mags
-FIELD  dM,          MAG_ERR,      float,      formal error on average mag,           mags
-FIELD  Xm,          MAG_CHI,      float,      chisq on average mag,                  [100*log(value)]
+FIELD  M,           MAG,           float,      average mag in this band,              mags
+FIELD  Map,         MAG,           float,      average mag in this band,              mags
+FIELD  Mkron,       MAG_KRON,      float,      ave kron mag in this band,             mags
+FIELD  dMkron,      MAG_KRON_ERR,  float,      formal error on average kron mag,      mags
+FIELD  dM,          MAG_ERR,       float,      formal error on average mag,           mags
+FIELD  Xm,          MAG_CHI,       float,      chisq on average mag,                  [100*log(value)]
 FIELD  FluxPSF,     FLUX_PSF,      float,      mean flux psf fit (PS1: stack)
 FIELD  dFluxPSF,    FLUX_PSF_ERR,  float,      mean flux psf error
 FIELD  FluxKron,    FLUX_KRON,     float,      mean flux kron ap (PS1: stack)
 FIELD  dFluxKron,   FLUX_KRON_ERR, float,      mean flux kron err
-FIELD  flags,       FLAGS,        uint32_t,   photometry flags
-FIELD  Ncode,       NCODE,        short,      number of detections in band
-FIELD  Nused,       NUSED,        short,      number of detections used in average
-FIELD  M_20,        MAG_20,       short,      lower 20percent mag,                   millimags
-FIELD  M_80,        MAG_80,       short,      upper 20percent mag,                   millimags
-FIELD  ubercalDist, UBERCAL_DIST, short,      number of images from an ubercal-image
-FIELD  Mstdev,      MAG_STDEV,    short,      standard deviation of measurements,    millimags
+FIELD  flags,       FLAGS,         uint32_t,   photometry flags
+FIELD  Ncode,       NCODE,         short,      number of detections in band
+FIELD  Nused,       NUSED,         short,      number of detections used in average
+FIELD  M_20,        MAG_20,        short,      lower 20percent mag,                   millimags
+FIELD  M_80,        MAG_80,        short,      upper 20percent mag,                   millimags
+FIELD  ubercalDist, UBERCAL_DIST,  short,      number of images from an ubercal-image
+FIELD  Mstdev,      MAG_STDEV,     short,      standard deviation of measurements,    millimags
+FIELD  stackID,     STACK_ID,      uint32_t,   image ID of stack used for fluxes (if any)
+FIELD  dummy,       DUMMY,         uint32_t,   padding
 
 # *** 20090206 : new fields : M_20, M_80; dropped dummy
 # *** 20120302 : new fields : ubercalDist, Map, Mstdev
-# *** 20120710 : new fields : Mkron, dMkron, FluxPSF, dFluxPSF, FluxKron, dFluxKron
+# *** 20120710 : new fields : Mkron, dMkron, FluxPSF, dFluxPSF, FluxKron, dFluxKron, stackID

branches/eam_branches/ipp-20120627/Ohana/src/libdvo/include/dvo.h

@@ -472 +472 @@
 float PhotM80 (PhotCode *code, Average *average, SecFilt *secfilt);
 float PhotUCdist (PhotCode *code, Average *average, SecFilt *secfilt);
+unsigned int PhotStackID (PhotCode *code, Average *average, SecFilt *secfilt);
 
 float PhotColorForCode (Average *average, SecFilt *secfilt, Measure *measure, PhotCode *code);

branches/eam_branches/ipp-20120627/Ohana/src/libdvo/include/dvodb.h

@@ -45 +45 @@
       MAG_80, 
       MAG_UC_DIST, 
+      MAG_STACK_ID, 
       MAG_FLUX_PSF,
       MAG_FLUX_PSF_ERR,
@@ -140 +141 @@
       MEAS_MCAL_OFFSET,
       MEAS_FLAT,
+      MEAS_CENTER_OFFSET,
       MEAS_FLUX_PSF,
       MEAS_FLUX_PSF_ERR,

branches/eam_branches/ipp-20120627/Ohana/src/libdvo/src/dbExtractAverages.c

@@ -246 +246 @@
           value.Flt = PhotUCdist (field->photcode, average, secfilt);
           break;
+        case MAG_STACK_ID:
+          value.Int = PhotStackID (field->photcode, average, secfilt);
+          break;
 
         case MAG_FLUX_PSF:

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

@@ -522 +522 @@
       break;
 
+    case MEAS_CENTER_OFFSET: /* OK */
+      { 
+        Image *image;
+        image = MatchImageDVO (measure[0].t, measure[0].photcode, measure[0].imageID);
+        if (image == NULL) break;
+        
+        // we have measure[0].Xccd,Yccd and image[0].NX,NY.  Find the distance to the center
+
+        // XXX we may hypotetically have images with -NX to +NX here (eg, projection center), but 
+        // we do not get a detection from that type of image
+        float Xcenter = 0.5*image[0].NX;
+        float Ycenter = 0.5*image[0].NY;
+        float distance = hypot (measure[0].Xccd - Xcenter, measure[0].Yccd - Ycenter);
+        value.Flt = distance;
+      }
+      break;
+
     case MEAS_FLUX_PSF: /* OK */
       value.Flt = measure[0].FluxPSF;

branches/eam_branches/ipp-20120627/Ohana/src/libdvo/src/dbFields.c

@@ -56 +56 @@
   if (!strcasecmp (string, "80"))          return (MAG_80);
   if (!strcasecmp (string, "ucdist"))      return (MAG_UC_DIST);
+  if (!strcasecmp (string, "stackID"))     return (MAG_STACK_ID);
   if (!strcasecmp (string, "fluxpsf"))     return (MAG_FLUX_PSF);
   if (!strcasecmp (string, "fluxpsferr"))  return (MAG_FLUX_PSF_ERR);
@@ -239 +240 @@
   if (!strcasecmp (fieldName, "MCAL_OFFSET"))    ESCAPE (MEAS_MCAL_OFFSET,    MAG_NONE, OPIHI_FLT);
   if (!strcasecmp (fieldName, "FLAT"))           ESCAPE (MEAS_FLAT,           MAG_NONE, OPIHI_FLT);
+  if (!strcasecmp (fieldName, "CENTER_OFFSET"))  ESCAPE (MEAS_CENTER_OFFSET,  MAG_NONE, OPIHI_FLT);
   if (!strcasecmp (fieldName, "FLUX"))           ESCAPE (MEAS_FLUX_PSF,       MAG_NONE, OPIHI_FLT);
   if (!strcasecmp (fieldName, "FLUX_ERR"))       ESCAPE (MEAS_FLUX_PSF_ERR,   MAG_NONE, OPIHI_FLT);
@@ -258 +260 @@
   field->magMode = mode;
   switch (mode) {
+    case MAG_STACK_ID:
     case MAG_NCODE:
     case MAG_NPHOT:
@@ -352 +355 @@
   field->magMode = mode;
   switch (mode) {
+    case MAG_STACK_ID:
     case MAG_NCODE:
     case MAG_NPHOT:

branches/eam_branches/ipp-20120627/Ohana/src/libdvo/src/dvo_convert_PS1_DEV_1.c

@@ -231 +231 @@
     out[i].FluxKron    = NAN;
     out[i].dFluxKron   = NAN;
+    out[i].stackID     = 0;
  }
   return (out);

branches/eam_branches/ipp-20120627/Ohana/src/libdvo/src/dvo_convert_PS1_DEV_2.c

@@ -225 +225 @@
     out[i].FluxKron    = NAN;
     out[i].dFluxKron   = NAN;
+    out[i].stackID     = 0;
  }
   return (out);

branches/eam_branches/ipp-20120627/Ohana/src/libdvo/src/dvo_convert_PS1_REF.c

@@ -185 +185 @@
     out[i].FluxKron    = NAN;
     out[i].dFluxKron   = NAN;
+    out[i].stackID     = 0;
  }
   return (out);

branches/eam_branches/ipp-20120627/Ohana/src/libdvo/src/dvo_convert_PS1_V1.c

@@ -229 +229 @@
     out[i].FluxKron    = NAN;
     out[i].dFluxKron   = NAN;
+    out[i].stackID     = 0;
  }
   return (out);

branches/eam_branches/ipp-20120627/Ohana/src/libdvo/src/dvo_convert_PS1_V2.c

@@ -228 +228 @@
     out[i].Mkron       = NAN;
     out[i].dMkron      = NAN;
-    out[i].FluxPSF    = NAN;
-    out[i].dFluxPSF   = NAN;
-    out[i].FluxKron   = NAN;
-    out[i].dFluxKron  = NAN;
+    out[i].FluxPSF     = NAN;
+    out[i].dFluxPSF    = NAN;
+    out[i].FluxKron    = NAN;
+    out[i].dFluxKron   = NAN;
+    out[i].stackID     = 0;
  }
   return (out);

branches/eam_branches/ipp-20120627/Ohana/src/libdvo/src/dvo_convert_PS1_V3.c

@@ -226 +226 @@
     out[i].Mkron       = NAN;
     out[i].dMkron      = NAN;
-    out[i].FluxPSF    = NAN;
-    out[i].dFluxPSF   = NAN;
-    out[i].FluxKron   = NAN;
-    out[i].dFluxKron  = NAN;
+    out[i].FluxPSF     = NAN;
+    out[i].dFluxPSF    = NAN;
+    out[i].FluxKron    = NAN;
+    out[i].dFluxKron   = NAN;
+    out[i].stackID     = 0;
  }
   return (out);

branches/eam_branches/ipp-20120627/Ohana/src/libdvo/src/dvo_convert_PS1_V4.c

@@ -232 +232 @@
     out[i].Mstdev      = in[i].Mstdev;      
     out[i].ubercalDist = in[i].ubercalDist;      
+    out[i].stackID     = in[i].stackID;      
  }
   return (out);
@@ -261 +262 @@
     out[i].Mstdev      = in[i].Mstdev;      
     out[i].ubercalDist = in[i].ubercalDist;      
+    out[i].stackID     = in[i].stackID;      
   }
   return (out);

branches/eam_branches/ipp-20120627/Ohana/src/libdvo/src/dvo_convert_elixir.c

@@ -240 +240 @@
     out[i].FluxKron   = NAN;
     out[i].dFluxKron  = NAN;
+    out[i].stackID     = 0;
   }
   return (out);

branches/eam_branches/ipp-20120627/Ohana/src/libdvo/src/dvo_convert_loneos.c

@@ -233 +233 @@
     out[i].FluxKron   = NAN;
     out[i].dFluxKron  = NAN;
+    out[i].stackID     = 0;
   }
   return (out);

branches/eam_branches/ipp-20120627/Ohana/src/libdvo/src/dvo_convert_panstarrs_DEV_0.c

@@ -240 +240 @@
     out[i].FluxKron    = NAN;
     out[i].dFluxKron   = NAN;
+    out[i].stackID     = 0;
  }
   return (out);

branches/eam_branches/ipp-20120627/Ohana/src/libdvo/src/dvo_convert_panstarrs_DEV_1.c

@@ -240 +240 @@
     out[i].FluxKron    = NAN;
     out[i].dFluxKron   = NAN;
+    out[i].stackID     = 0;
  }
   return (out);

branches/eam_branches/ipp-20120627/Ohana/src/libdvo/src/dvo_photcode_ops.c

@@ -656 +656 @@
 }
 
+unsigned int PhotStackID (PhotCode *code, Average *average, SecFilt *secfilt) {
+
+  int Ns;
+  unsigned int ID;
+
+  if (code == NULL) return 0;
+
+  Ns = photcodes[0].hashNsec[code[0].code];
+  ID = (Ns == -1) ? 0 : secfilt[Ns].stackID;
+  return (ID);
+}
+
 // XXX return NAN or NAN_S_SHORT? (secfilt->Xm is short)
 float PhotXm (PhotCode *code, Average *average, SecFilt *secfilt) {

branches/eam_branches/ipp-20120627/Ohana/src/opihi/dvo/mextract.c

@@ -129 +129 @@
       if (fields[i].ID == MEAS_YCCD) loadImages = TRUE;
     }
-    if (fields[i].ID == MEAS_XMOSAIC)   loadImages = mosaicMode = TRUE;
-    if (fields[i].ID == MEAS_YMOSAIC)   loadImages = mosaicMode = TRUE;
-    if (fields[i].ID == MEAS_EXTERN_ID) loadImages = mosaicMode = TRUE;
-    if (fields[i].ID == MEAS_FLAT)      loadImages = mosaicMode = TRUE;
+    if (fields[i].ID == MEAS_XMOSAIC)       loadImages = mosaicMode = TRUE;
+    if (fields[i].ID == MEAS_YMOSAIC)       loadImages = mosaicMode = TRUE;
+    if (fields[i].ID == MEAS_EXTERN_ID)     loadImages = mosaicMode = TRUE;
+    if (fields[i].ID == MEAS_FLAT)          loadImages = mosaicMode = TRUE;
+    if (fields[i].ID == MEAS_CENTER_OFFSET) loadImages = mosaicMode = TRUE;
   }
   if (loadImages && !SetImageSelection (mosaicMode, selection)) goto escape;

branches/eam_branches/ipp-20120627/Ohana/src/relphot/include/relphot.h

@@ -242 +242 @@
 float         getMrel             PROTO((Catalog *catalog, off_t meas, int cat));
 short         getUbercalDist      PROTO((off_t meas, int cat));
+float         getCenterOffset     PROTO((off_t meas, int cat, Measure *measure, unsigned int *myID));
 Image        *getimage            PROTO((off_t N));
 Image        *getimages           PROTO((off_t *N, off_t **LineNumber));

branches/eam_branches/ipp-20120627/Ohana/src/relphot/src/ImageOps.c

@@ -364 +364 @@
   if (image[i].flags & IMAGE_BAD) return (1000);  
   distance = image[i].ubercalDist; // was dummy3 in structure
+  return (distance);
+}
+
+// returns image.Mcal - ff(x,y)
+float getCenterOffset (off_t meas, int cat, Measure *measure, unsigned int *myID) {
+
+  off_t i;
+  float distance;
+
+  if (!MeasureToImage) return -1;
+
+  i = MeasureToImage[cat][meas];
+  if (i == -1) return (1000);
+
+  float Xcenter = 0.5*image[i].NX;
+  float Ycenter = 0.5*image[i].NY;
+
+  *myID = image[i].imageID;
+
+  distance = hypot (measure[0].Xccd - Xcenter, measure[0].Yccd - Ycenter);
   return (distance);
 }

branches/eam_branches/ipp-20120627/Ohana/src/relphot/src/StarOps.c

@@ -365 +365 @@
       float stackFluxKron = NAN;
       float stackdFluxKron = NAN;
+      float stackCenterOffsetMin = 1e9;
+      unsigned int stackImageIDmin;
 
       int forceSynth = FALSE;
@@ -430 +432 @@
           // gpc1 stack data
           if ((catalog[Nc].measure[m].photcode >= 11000) && (catalog[Nc].measure[m].photcode <= 11400)) {
-            if (pass < 2) continue;
+            // if (pass < 2) continue;
             haveStack = TRUE;
-            float zp = Mcal + Mmos + Mgrid + PhotZeroPoint (&catalog[Nc].measure[m], &catalog[Nc].average[j], &catalog[Nc].secfilt[j*Nsecfilt]);
-            float zpFactor = pow(10.0, -0.4*zp);
-            // need to put in AB mag factor to get to Janskies (or uJy?)
-            stackFluxPSF   = zpFactor * catalog[Nc].measure[m].FluxPSF;
-            stackdFluxPSF  = zpFactor * catalog[Nc].measure[m].dFluxPSF;
-            stackFluxKron  = zpFactor * catalog[Nc].measure[m].FluxKron;
-            stackdFluxKron = zpFactor * catalog[Nc].measure[m].dFluxKron;
+
+            unsigned int stackImageID;
+            float stackCenterOffset = getCenterOffset (m, Nc, &catalog[Nc].measure[m], &stackImageID);
+            if (stackCenterOffset < stackCenterOffsetMin) {
+              stackImageIDmin = stackImageID;
+
+              float zp = Mcal + Mmos + Mgrid + PhotZeroPoint (&catalog[Nc].measure[m], &catalog[Nc].average[j], &catalog[Nc].secfilt[j*Nsecfilt]);
+
+              // flux_cgs : erg sec^1 cm^-2 Hz^-1
+              // mag_inst : -2.5 log (cts/sec)
+              // mag_inst : -2.5 log (flux_inst)
+              // flux_inst = ten(-0.4*mag_inst)
+
+              // mag_AB = -2.5 log (flux_cgs) - 48.6 (~by definition) [~Vega flux in V-band]
+              // flux_cgs = ten(-0.4*(mag_AB + 48.6))
+
+              // flux_AB : ten(-0.4*mag_AB)
+
+              // flux_cgs = ten(-0.4*48.6) * flux_AB
+              // flux_AB  = ten(+0.4*48.6) * flux_cgs
+            
+              // flux_Jy : flux_cgs * 10^23
+
+              // flux_AB = ten(+0.4*48.6) * ten(-23) * flux_Jy
+
+              // mag_AB = mag_inst + ZP
+
+              // flux_inst = ten(-0.4*(mag_AB - ZP)) = ten(0.4*ZP) * flux_AB
+
+              // flux_AB = flux_inst * ten(-0.4*ZP)
+
+              // flux_inst * ten(-0.4*ZP) = ten(+0.4*48.6 - 23) * flux_Jy
+
+              // flux_inst = flux_Jy * ten(0.4*ZP + 0.4*48.6 - 23)
+              // flux_inst = flux_Jy * ten(0.4*ZP - 3.56)
+              // flux_Jy = flux_inst * ten(-0.4*ZP + 3.56)
+
+              // zpFactor to go from instrumental flux to Janskies
+              float zpFactor = pow(10.0, -0.4*zp + 3.56);
+
+              // need to put in AB mag factor to get to Janskies (or uJy?)
+              stackFluxPSF   = zpFactor * catalog[Nc].measure[m].FluxPSF;
+              stackdFluxPSF  = zpFactor * catalog[Nc].measure[m].dFluxPSF;
+              stackFluxKron  = zpFactor * catalog[Nc].measure[m].FluxKron;
+              stackdFluxKron = zpFactor * catalog[Nc].measure[m].dFluxKron;
+            }
           }
 
@@ -582 +623 @@
           catalog[Nc].secfilt[Nsecfilt*j+Nsec].FluxKron = stackFluxKron;
           catalog[Nc].secfilt[Nsecfilt*j+Nsec].dFluxKron = stackdFluxKron;
+          catalog[Nc].secfilt[Nsecfilt*j+Nsec].stackID = stackImageIDmin;
         }