Changeset 41886

Timestamp:

Nov 4, 2021, 5:52:02 PM (5 years ago)

Author:

eugene

Message:

merge changes from trunk (loadgaia_edr3)

Location:

branches/eam_branches/ipp-dev-20210817/Ohana

Files:

• . (modified) (1 prop)
• src/addstar/src/grefstars.c (modified) (1 diff)
• src/addstar/src/loadgaia_edr3_readstars.c (modified) (4 diffs)

branches/eam_branches/ipp-dev-20210817/Ohana/src/addstar/src/grefstars.c

@@ -12 +12 @@
   if (f == NULL) Shutdown ("can't read data from %s", file);
 
-  NSTARS = 1000;
+  NSTARS = 10000000;
 
   Catalog *catalog = NULL;

branches/eam_branches/ipp-dev-20210817/Ohana/src/addstar/src/loadgaia_edr3_readstars.c

@@ -329 +329 @@
     }
 
+    stars[Nstars].average.Nmeasure = 3;
     stars[Nstars].average.R = Rg[i];
     stars[Nstars].average.D = Dg[i];
@@ -368 +369 @@
       stars[Nstars].measure[j].D = Dg[i];
 
-      //stars[Nstars].measure[j].psfNpix = nObs[i];
-      //stars[Nstars].measure[j].psfNdof = nGood[i];
-      stars[Nstars].measure[j].psfNpix = ngg[i] + nbg[i] + nrg[i];
+      stars[Nstars].measure[j].psfNpix = nPeriods[i]; // number of observation for period calculation
       stars[Nstars].measure[j].extNsigma = goFit[i];
       stars[Nstars].measure[j].psfChisq = chiSq[i];
       stars[Nstars].measure[j].psfQF = exNoise[i];
       stars[Nstars].measure[j].psfQFperf = exNoiseSig[i];
-      stars[Nstars].measure[j].FWx = nPeriods[i]; // this one is not great
+      stars[Nstars].measure[j].Xccd = nObs[i]; // number of observation for astrometry
+      stars[Nstars].measure[j].Xfix = nGood[i]; // number of observations for astrometry fitting
+      stars[Nstars].measure[j].XoffKH  = ngg[i]; // number of observations for g band
+      stars[Nstars].measure[j].XoffDCR = nbg[i]; // number of observation for bp band
+      stars[Nstars].measure[j].XoffCAM = nrg[i]; // number of observations for rp band
       stars[Nstars].measure[j].photFlags = photFlags;
       stars[Nstars].measure[j].t = GAIA_EDR3_EPOCH;
@@ -382 +385 @@
     // the flux reported by Gaia is in electrons / second; we just want to use the mags:
     // dgg, dbg, drg store (flux / error), i.e., S/N.  mag error is 2.5/ln(10) ~ 1.0857 / (S/N)
+    // ngg, nbg, nrg: number of measurement for the photcode
     stars[Nstars].measure[0].M  = gg[i];
     stars[Nstars].measure[0].dM = 1.08573620476 / dgg[i];
@@ -398 +402 @@
     stars[Nstars].measure[2].photcode = codeR;
 
-    // printf ("%10.5f %10.5f %10.5f\n", gg[i], bg[i], rg[i]);
-    // stars[Nstars].measure.dM = dmgFlux[i] / flux;
-    // stars[Nstars].measure.FluxPSF = flux;
-    // stars[Nstars].measure.dFluxPSF = dgFlux[i];
-    // stars[Nstars].measure.t = options->timeref;
-
-    stars[Nstars].average.Nmeasure = 3;
     // Not sure how to make these work
-    stars[Nstars].average.Npos     = nGood[i];
-    stars[Nstars].average.Nmissing = nObs[i] - nGood[i];
-    //stars[Nstars].average.Nmissing = 1;
-
-    printf ("%5d %5d %5d %5d %5d %5d\n", nObs[i], nGood[i], ngg[i], nbg[i], nrg[i], nPeriods[i]);
+    // stars[Nstars].average.Npos     = nGood[i];
+    // stars[Nstars].average.Nmissing = nObs[i] - nGood[i];
+
+    //printf ("%5d %5d %5d %5d %5d %5d\n", nObs[i], nGood[i], ngg[i], nbg[i], nrg[i], nPeriods[i]);
     Nstars ++;