Changeset 38153 for trunk/Ohana/src/addstar

Timestamp:

Apr 18, 2015, 6:33:51 AM (11 years ago)

Author:

eugene

Message:

merge changes from eam branch ipp-20150405: add R7 to lensing, fix R5,R6,R7 definitions and mean photometry; calculate E1,E2 in dvolens; fix precision for dvopsps FW objects; fix histograms at axis; new colormap options; require primary skycell in diff mean photometry

Location:

trunk

Files:

• . (modified) (1 prop)
• Ohana/src/addstar/src/FilterStars.c (modified) (1 diff)
• Ohana/src/addstar/src/ReadXradFITS.c (modified) (1 diff)
• Ohana/src/addstar/src/resort_catalog.c (modified) (1 diff)

trunk/Ohana/src/addstar/src/FilterStars.c

@@ -105 +105 @@
       stars[N].measure.dFluxAp /= image[0].exptime;
     }
+    if (stars[N].lensing) {
+      if (!isnan(stars[N].lensing-> F_ApR5)) stars[N].lensing-> F_ApR5 /= image[0].exptime;
+      if (!isnan(stars[N].lensing->dF_ApR5)) stars[N].lensing->dF_ApR5 /= image[0].exptime;
+      if (!isnan(stars[N].lensing->sF_ApR5)) stars[N].lensing->sF_ApR5 /= image[0].exptime;
+      if (!isnan(stars[N].lensing->fF_ApR5)) stars[N].lensing->fF_ApR5 /= image[0].exptime;
+
+      if (!isnan(stars[N].lensing-> F_ApR6)) stars[N].lensing-> F_ApR6 /= image[0].exptime;
+      if (!isnan(stars[N].lensing->dF_ApR6)) stars[N].lensing->dF_ApR6 /= image[0].exptime;
+      if (!isnan(stars[N].lensing->sF_ApR6)) stars[N].lensing->sF_ApR6 /= image[0].exptime;
+      if (!isnan(stars[N].lensing->fF_ApR6)) stars[N].lensing->fF_ApR6 /= image[0].exptime;
+
+      if (!isnan(stars[N].lensing-> F_ApR7)) stars[N].lensing-> F_ApR7 /= image[0].exptime;
+      if (!isnan(stars[N].lensing->dF_ApR7)) stars[N].lensing->dF_ApR7 /= image[0].exptime;
+      if (!isnan(stars[N].lensing->sF_ApR7)) stars[N].lensing->sF_ApR7 /= image[0].exptime;
+      if (!isnan(stars[N].lensing->fF_ApR7)) stars[N].lensing->fF_ApR7 /= image[0].exptime;
+    }
     
     // the external ID is supplied, but do we trust it?

trunk/Ohana/src/addstar/src/ReadXradFITS.c

@@ -72 +72 @@
     }
 
-    stars[i].lensing-> F_ApR5 = AperFlux   [Nap*Ncol + 3];
-    stars[i].lensing->dF_ApR5 = AperFluxErr[Nap*Ncol + 3];
-    stars[i].lensing->sF_ApR5 = AperFluxStd[Nap*Ncol + 3];
-    stars[i].lensing->fF_ApR5 = AperFill   [Nap*Ncol + 3];
+    // XXX this is all hard-wired and should make use of the headers. 
+    // psphot cmfs have 5 radial apertures:
+    // array 0, 1, 2, 3, 4
+    // SDSS  3, 4, 5, 6, 7
 
-    stars[i].lensing-> F_ApR6 = AperFlux   [Nap*Ncol + 4];
-    stars[i].lensing->dF_ApR6 = AperFluxErr[Nap*Ncol + 4];
-    stars[i].lensing->sF_ApR6 = AperFluxStd[Nap*Ncol + 4];
-    stars[i].lensing->fF_ApR6 = AperFill   [Nap*Ncol + 4];
+    stars[i].lensing-> F_ApR5 = AperFlux   [Nap*Ncol + 2];
+    stars[i].lensing->dF_ApR5 = AperFluxErr[Nap*Ncol + 2];
+    stars[i].lensing->sF_ApR5 = AperFluxStd[Nap*Ncol + 2];
+    stars[i].lensing->fF_ApR5 = AperFill   [Nap*Ncol + 2];
+
+    stars[i].lensing-> F_ApR6 = AperFlux   [Nap*Ncol + 3];
+    stars[i].lensing->dF_ApR6 = AperFluxErr[Nap*Ncol + 3];
+    stars[i].lensing->sF_ApR6 = AperFluxStd[Nap*Ncol + 3];
+    stars[i].lensing->fF_ApR6 = AperFill   [Nap*Ncol + 3];
+
+    stars[i].lensing-> F_ApR7 = AperFlux   [Nap*Ncol + 4];
+    stars[i].lensing->dF_ApR7 = AperFluxErr[Nap*Ncol + 4];
+    stars[i].lensing->sF_ApR7 = AperFluxStd[Nap*Ncol + 4];
+    stars[i].lensing->fF_ApR7 = AperFill   [Nap*Ncol + 4];
     Nap ++;
   }

trunk/Ohana/src/addstar/src/resort_catalog.c

@@ -40 +40 @@
   resort_catalog_lensing (catalog);
   resort_catalog_starpar (catalog);
+
+  // XXX somehow need to set the value of lensing->measure offset here 
+
+
 }