Changeset 39262 for trunk/Ohana/src/libdvo

Timestamp:

Dec 12, 2015, 8:38:47 PM (11 years ago)

Author:

eugene

Message:

updates for Mflat

Location:

trunk/Ohana/src/libdvo

Files:

• include/dvo.h (modified) (2 diffs)
• src/dbExtractMeasures.c (modified) (2 diffs)
• src/dvo_catalog.c (modified) (1 diff)
• src/dvo_convert_PS1_SIM.c (modified) (2 diffs)
• src/dvo_convert_PS1_V5.c (modified) (3 diffs)
• src/dvo_tiny_values.c (modified) (1 diff)

trunk/Ohana/src/libdvo/include/dvo.h

@@ -476 +476 @@
   double         R;
   double         D;
-  float          RoffGAL;
-  float          DoffGAL;
   float          M;
   float          Mcal;
+  float          Mflat;
   float          dM;
   float          airmass;
@@ -620 +619 @@
   float            XoffDCR;              // X offset from correction (pixels)
   float            YoffDCR;              // Y offset from correction (pixels)
-  float            RoffGAL;              // RA offset from correction (arcsec)
-  float            DoffGAL;              // DEC offset from correction (arcsec)
+  float            Mflat;                // flat offset from correction (arcsec)
+  int              padding2;             // dummy
   float            Sky;                  // local estimate of sky flux (counts/sec)
   float            dSky;                 // local estimate of sky flux (counts/sec)

trunk/Ohana/src/libdvo/src/dbExtractMeasures.c

@@ -597 +597 @@
     case MEAS_XOFF_CAM: { value.Flt = measure[0].XoffCAM; break; }
     case MEAS_YOFF_CAM: { value.Flt = measure[0].YoffCAM; break; }
-    case MEAS_ROFF_GAL: { value.Flt = measure[0].RoffGAL; break; }
-    case MEAS_DOFF_GAL: { value.Flt = measure[0].DoffGAL; break; }
 
     case MEAS_XFIELD: /* offset relative to exposure center in ra,dec space */
@@ -723 +721 @@
 
     case MEAS_MCAL_OFFSET: { value.Flt = measure[0].Mcal; break; }
-
-    case MEAS_FLAT: /* OK */
-      // flat = measure.Mcal - image.Mcal
-      if (REMOTE_CLIENT) {
-        ImageMetadata *image = MatchImageMetadataDVO (measure[0].imageID);
-        if (image == NULL) break;
-        value.Flt = measure[0].Mcal - image[0].Mcal;
-      } else {
-        Image *image = MatchImageDVO (measure[0].t, measure[0].photcode, measure[0].imageID);
-        if (image == NULL) break;
-        value.Flt = measure[0].Mcal - image[0].Mcal;
-      }
-      break;
+    case MEAS_FLAT: { value.Flt = measure[0].Mflat; break; }
 
       // we have measure[0].Xccd,Yccd and image[0].NX,NY.  Find the distance to the center

trunk/Ohana/src/libdvo/src/dvo_catalog.c

@@ -332 +332 @@
  measure->XoffCAM   = NAN;
  measure->YoffCAM   = NAN;
- measure->RoffGAL   = NAN;
- measure->DoffGAL   = NAN;
+
+ measure->Mflat     = 0.0;
+ measure->dummy2    = 0;
 
  measure->Sky       = NAN;

trunk/Ohana/src/libdvo/src/dvo_convert_PS1_SIM.c

@@ -29 +29 @@
     out[i].XoffDCR    = in[i].XoffDCR;
     out[i].YoffDCR    = in[i].YoffDCR;
-    out[i].RoffGAL    = in[i].RoffGAL;
-    out[i].DoffGAL    = in[i].DoffGAL;
+    out[i].Mflat      = in[i].Mflat;
     out[i].t          = in[i].t;
     out[i].averef     = in[i].averef;
@@ -75 +74 @@
     out[i].XoffDCR    = in[i].XoffDCR;
     out[i].YoffDCR    = in[i].YoffDCR;
-    out[i].RoffGAL    = in[i].RoffGAL;
-    out[i].DoffGAL    = in[i].DoffGAL;
+    out[i].Mflat      = in[i].Mflat;
     out[i].t          = in[i].t;
     out[i].averef     = in[i].averef;

trunk/Ohana/src/libdvo/src/dvo_convert_PS1_V5.c

@@ -42 +42 @@
     out[i].XoffCAM    = in[i].XoffCAM;
     out[i].YoffCAM    = in[i].YoffCAM;
-    out[i].RoffGAL    = in[i].RoffGAL;
-    out[i].DoffGAL    = in[i].DoffGAL;
+    out[i].Mflat      = in[i].Mflat;
     out[i].Sky        = in[i].Sky;
     out[i].dSky       = in[i].dSky;
@@ -116 +115 @@
     out[i].XoffCAM    = in[i].XoffCAM;
     out[i].YoffCAM    = in[i].YoffCAM;
-    out[i].RoffGAL    = in[i].RoffGAL;
-    out[i].DoffGAL    = in[i].DoffGAL;
+    out[i].Mflat      = in[i].Mflat;
     out[i].Sky        = in[i].Sky;
     out[i].dSky       = in[i].dSky;
@@ -1678 +1676 @@
     out[i].XoffDCR    = in[i].XoffDCR;
     out[i].YoffDCR    = in[i].YoffDCR;
-    out[i].RoffGAL    = in[i].RoffGAL;
-    out[i].DoffGAL    = in[i].DoffGAL;
+    out[i].Mflat      = in[i].Mflat;
     out[i].Sky        = in[i].Sky;
     out[i].dSky       = in[i].dSky;

trunk/Ohana/src/libdvo/src/dvo_tiny_values.c

@@ -22 +22 @@
   measureT[0].dM         = measure[0].dM;
   measureT[0].airmass    = measure[0].airmass;
-  measureT[0].RoffGAL    = measure[0].RoffGAL;
-  measureT[0].DoffGAL    = measure[0].DoffGAL;
+  measureT[0].Mflat      = measure[0].Mflat;
   measureT[0].Xccd       = measure[0].Xccd;
   measureT[0].Yccd       = measure[0].Yccd;