IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 38059


Ignore:
Timestamp:
Mar 29, 2015, 6:14:05 AM (11 years ago)
Author:
eugene
Message:

merge changes from trunk

Location:
branches/eam_branches/ipp-20150112/Ohana
Files:
6 deleted
31 edited
13 copied

Legend:

Unmodified
Added
Removed

  • branches/eam_branches/ipp-20150112/Ohana/Makefile.in

    r37807 r38059  
    3030addstar     \
    3131delstar     \
     32dvolens     \
    3233dvosplit    \
    3334dvomerge    \

  • branches/eam_branches/ipp-20150112/Ohana/configure.tcsh

    r37807 r38059  
    230230
    231231set syslibpath = "/lib /usr/lib /usr/X11R6/lib /usr/local/lib"
    232 set xtrlibpath = `checkpaths.pl lib`
     232set xtrlibpath = `./checkpaths.pl lib`
    233233set syslibpath = "$syslibpath $xtrlibpath"
    234234
    … …  
    249249
    250250set sysincpath = "/usr/include /usr/local/include /usr/X11R6/include"
    251 set xtrincpath = `checkpaths.pl include`
     251set xtrincpath = `./checkpaths.pl include`
    252252set sysincpath = "$sysincpath $xtrincpath"
    253253

  • branches/eam_branches/ipp-20150112/Ohana/src/addstar/src/MatchHeaders.c

    r37729 r38059  
    7070    if (!strcmp (exttype, "PS1_DV3")) goto keep;
    7171    if (!strcmp (exttype, "PS1_DV4")) goto keep;
     72    if (!strcmp (exttype, "PS1_DV5")) goto keep;
    7273    continue;
    7374

  • branches/eam_branches/ipp-20150112/Ohana/src/addstar/src/ReadStarsFITS.c

    r37729 r38059  
    44// (excluding SDSS data and reference database info, such as 2MASS)
    55// NOTE: these must also be listed in MatchHeaders.c (line ~ 62)
    6 Stars     *Convert_SMPDATA        PROTO((FTable *table, unsigned int *nstars));
    7 Stars     *Convert_PS1_DEV_0      PROTO((FTable *table, unsigned int *nstars));
    8 Stars     *Convert_PS1_DEV_1      PROTO((FTable *table, unsigned int *nstars));
    9 Stars     *Convert_PS1_V1         PROTO((FTable *table, unsigned int *nstars));
    10 Stars     *Convert_PS1_V1_Alt     PROTO((FTable *table, unsigned int *nstars));
    11 Stars     *Convert_PS1_V2         PROTO((FTable *table, unsigned int *nstars));
    12 Stars     *Convert_PS1_V3         PROTO((FTable *table, unsigned int *nstars));
    13 Stars     *Convert_PS1_V4         PROTO((FTable *table, unsigned int *nstars));
    14 Stars     *Convert_PS1_V5         PROTO((FTable *table, unsigned int *nstars));
    15 Stars     *Convert_PS1_V5_Lensing PROTO((FTable *table, unsigned int *nstars));
    16 Stars     *Convert_PS1_V5_Lensing_Alt PROTO((FTable *table, unsigned int *nstars));
    17 Stars     *Convert_PS1_SV1        PROTO((FTable *table, unsigned int *nstars));
    18 Stars     *Convert_PS1_SV1_Alt    PROTO((FTable *table, unsigned int *nstars));
    19 Stars     *Convert_PS1_SV2        PROTO((FTable *table, unsigned int *nstars));
    20 Stars     *Convert_PS1_SV3        PROTO((FTable *table, unsigned int *nstars));
    21 Stars     *Convert_PS1_SV4        PROTO((FTable *table, unsigned int *nstars));
    22 Stars     *Convert_PS1_DV3        PROTO((FTable *table, unsigned int *nstars));
    23 Stars     *Convert_PS1_DV4        PROTO((FTable *table, unsigned int *nstars));
     6Stars     *Convert_SMPDATA           PROTO((FTable *table, unsigned int *nstars));
     7Stars     *Convert_PS1_DEV_0         PROTO((FTable *table, unsigned int *nstars));
     8Stars     *Convert_PS1_DEV_1         PROTO((FTable *table, unsigned int *nstars));
     9Stars     *Convert_PS1_V1            PROTO((FTable *table, unsigned int *nstars));
     10Stars     *Convert_PS1_V1_Alt        PROTO((FTable *table, unsigned int *nstars));
     11Stars     *Convert_PS1_V2            PROTO((FTable *table, unsigned int *nstars));
     12Stars     *Convert_PS1_V3            PROTO((FTable *table, unsigned int *nstars));
     13Stars     *Convert_PS1_V4            PROTO((FTable *table, unsigned int *nstars));
     14Stars     *Convert_PS1_V5            PROTO((FTable *table, unsigned int *nstars));
     15Stars     *Convert_PS1_V5_R0_Lensing PROTO((FTable *table, unsigned int *nstars));
     16Stars     *Convert_PS1_V5_R1_Lensing PROTO((FTable *table, unsigned int *nstars));
     17Stars     *Convert_PS1_V5_R2_Lensing PROTO((FTable *table, unsigned int *nstars));
     18Stars     *Convert_PS1_SV1           PROTO((FTable *table, unsigned int *nstars));
     19Stars     *Convert_PS1_SV1_Alt       PROTO((FTable *table, unsigned int *nstars));
     20Stars     *Convert_PS1_SV2           PROTO((FTable *table, unsigned int *nstars));
     21Stars     *Convert_PS1_SV3           PROTO((FTable *table, unsigned int *nstars));
     22Stars     *Convert_PS1_SV4           PROTO((FTable *table, unsigned int *nstars));
     23Stars     *Convert_PS1_DV3           PROTO((FTable *table, unsigned int *nstars));
     24Stars     *Convert_PS1_DV4           PROTO((FTable *table, unsigned int *nstars));
     25Stars     *Convert_PS1_DV5           PROTO((FTable *table, unsigned int *nstars));
    2426
    2527// given a file with the pointer at the start of the table block and the
    … …  
    8587        break;
    8688      case 312:
    87         stars = Convert_PS1_V5_Lensing_Alt (&table, &Nstars);
     89        stars = Convert_PS1_V5_R0_Lensing (&table, &Nstars);
    8890        break;
    8991      case 320:
    90         stars = Convert_PS1_V5_Lensing (&table, &Nstars);
     92        stars = Convert_PS1_V5_R1_Lensing (&table, &Nstars);
     93        break;
     94      case 328:
     95        stars = Convert_PS1_V5_R2_Lensing (&table, &Nstars);
    9196        break;
    9297      default:
    … …  
    112117  if (!strcmp (type, "PS1_DV4")) {
    113118    stars = Convert_PS1_DV4 (&table, &Nstars);
     119  }
     120  if (!strcmp (type, "PS1_DV5")) {
     121    stars = Convert_PS1_DV5 (&table, &Nstars);
    114122  }
    115123  if (stars == NULL) {
    … …  
    860868}
    861869
    862 Stars *Convert_PS1_V5_Lensing (FTable *table, unsigned int *nstars) {
     870Stars *Convert_PS1_V5_R0_Lensing (FTable *table, unsigned int *nstars) {
    863871
    864872  off_t Nstars;
    … …  
    866874  double ZeroPt;
    867875  Stars *stars;
    868   CMF_PS1_V5_Lensing *ps1data;
    869 
    870   ps1data = gfits_table_get_CMF_PS1_V5_Lensing (table, &Nstars, NULL);
     876  CMF_PS1_V5_R0_Lensing *ps1data;
     877
     878  ps1data = gfits_table_get_CMF_PS1_V5_R0_Lensing (table, &Nstars, NULL);
    871879  if (!ps1data) {
    872880    fprintf (stderr, "skipping inconsistent entry\n");
    … …  
    985993}
    986994
    987 Stars *Convert_PS1_V5_Lensing_Alt (FTable *table, unsigned int *nstars) {
     995Stars *Convert_PS1_V5_R1_Lensing (FTable *table, unsigned int *nstars) {
    988996
    989997  off_t Nstars;
    … …  
    991999  double ZeroPt;
    9921000  Stars *stars;
    993   CMF_PS1_V5_Lensing_Alt *ps1data;
    994 
    995   ps1data = gfits_table_get_CMF_PS1_V5_Lensing_Alt (table, &Nstars, NULL);
     1001  CMF_PS1_V5_R1_Lensing *ps1data;
     1002
     1003  ps1data = gfits_table_get_CMF_PS1_V5_R1_Lensing (table, &Nstars, NULL);
    9961004  if (!ps1data) {
    9971005    fprintf (stderr, "skipping inconsistent entry\n");
    … …  
    11101118}
    11111119
    1112 Stars *Convert_PS1_SV1 (FTable *table, unsigned int *nstars) {
     1120Stars *Convert_PS1_V5_R2_Lensing (FTable *table, unsigned int *nstars) {
    11131121
    11141122  off_t Nstars;
    … …  
    11161124  double ZeroPt;
    11171125  Stars *stars;
    1118   CMF_PS1_SV1 *ps1data;
    1119 
    1120   if (table[0].header[0].Naxis[0] == 196) {
    1121     stars = Convert_PS1_SV1_Alt (table, nstars);
    1122     return (stars);
    1123   }
    1124 
    1125   ps1data = gfits_table_get_CMF_PS1_SV1 (table, &Nstars, NULL);
     1126  CMF_PS1_V5_R2_Lensing *ps1data;
     1127
     1128  ps1data = gfits_table_get_CMF_PS1_V5_R2_Lensing (table, &Nstars, NULL);
    11261129  if (!ps1data) {
    11271130    fprintf (stderr, "skipping inconsistent entry\n");
    … …  
    11491152    stars[i].measure.dMcal      = ps1data[i].dMcal;
    11501153    stars[i].measure.Map        = ps1data[i].Map + ZeroPt;
     1154    stars[i].measure.dMap       = (ps1data[i].apFlux > 0.0) ? fabs(ps1data[i].apFluxErr / ps1data[i].apFlux) : NAN;
     1155                       
     1156    stars[i].measure.Mkron      = (ps1data[i].kronFlux > 0.0) ? -2.5*log10(ps1data[i].kronFlux) + ZeroPt : NAN;
     1157    stars[i].measure.dMkron     = (ps1data[i].kronFlux > 0.0) ? ps1data[i].kronFluxErr / ps1data[i].kronFlux : NAN;
     1158                       
     1159    // these fluxes are converted from counts to counts/sec in FilterStars.c
     1160    stars[i].measure.FluxPSF    = GetFluxFromFluxOrMag (ps1data[i].Flux, ps1data[i].M);
     1161    stars[i].measure.dFluxPSF   = GetFluxErrFromFluxOrMag (ps1data[i].dFlux, stars[i].measure.FluxPSF, ps1data[i].dM);
     1162    stars[i].measure.FluxKron   = ps1data[i].kronFlux;
     1163    stars[i].measure.dFluxKron  = ps1data[i].kronFluxErr;
     1164    stars[i].measure.FluxAp     = GetFluxFromFluxOrMag (ps1data[i].apFlux, ps1data[i].Map);
     1165    stars[i].measure.dFluxAp    = GetFluxErrFromFluxOrMag (ps1data[i].apFluxErr, stars[i].measure.FluxAp, stars[i].measure.dMap);
     1166
     1167    stars[i].measure.Sky        = ps1data[i].sky;
     1168    stars[i].measure.dSky       = ps1data[i].dSky;
     1169                       
     1170    stars[i].measure.psfChisq   = ps1data[i].psfChisq;
     1171    stars[i].measure.psfQF      = ps1data[i].psfQF;
     1172    stars[i].measure.psfQFperf  = ps1data[i].psfQFperf;
     1173
     1174    stars[i].measure.psfNdof    = ps1data[i].psfNdof;
     1175    stars[i].measure.psfNpix    = ps1data[i].psfNpix;
     1176    stars[i].measure.extNsigma  = ps1data[i].extNsigma;
     1177
     1178    stars[i].measure.FWx        = ToShortPixels(ps1data[i].fx);
     1179    stars[i].measure.FWy        = ToShortPixels(ps1data[i].fy);
     1180    stars[i].measure.theta      = ToShortDegrees(ps1data[i].df);
     1181
     1182    stars[i].measure.Mxx        = ToShortPixels(ps1data[i].Mxx);
     1183    stars[i].measure.Mxy        = ToShortPixels(ps1data[i].Mxy);
     1184    stars[i].measure.Myy        = ToShortPixels(ps1data[i].Myy);
     1185                       
     1186    stars[i].measure.photFlags  = ps1data[i].flags;
     1187    stars[i].measure.photFlags2 = ps1data[i].flags2;
     1188
     1189    // this is may optionally be replaced by the internal sequence (see FilterStars.c)
     1190    stars[i].measure.detID      = ps1data[i].detID;
     1191
     1192    ALLOCATE (stars[i].lensing, Lensing, 1);
     1193    dvo_lensing_init (stars[i].lensing);
     1194
     1195    stars[i].lensing->X11_sm_obj  = ps1data[i].X11_sm_obj;
     1196    stars[i].lensing->X12_sm_obj  = ps1data[i].X12_sm_obj;
     1197    stars[i].lensing->X22_sm_obj  = ps1data[i].X22_sm_obj;
     1198    stars[i].lensing->E1_sm_obj   = ps1data[i].E1_sm_obj;
     1199    stars[i].lensing->E2_sm_obj   = ps1data[i].E2_sm_obj;
     1200
     1201    stars[i].lensing->X11_sh_obj  = ps1data[i].X11_sh_obj;
     1202    stars[i].lensing->X12_sh_obj  = ps1data[i].X12_sh_obj;
     1203    stars[i].lensing->X22_sh_obj  = ps1data[i].X22_sh_obj;
     1204    stars[i].lensing->E1_sh_obj   = ps1data[i].E1_sh_obj;
     1205    stars[i].lensing->E2_sh_obj   = ps1data[i].E2_sh_obj;
     1206
     1207    stars[i].lensing->X11_sm_psf  = ps1data[i].X11_sm_psf;
     1208    stars[i].lensing->X12_sm_psf  = ps1data[i].X12_sm_psf;
     1209    stars[i].lensing->X22_sm_psf  = ps1data[i].X22_sm_psf;
     1210    stars[i].lensing->E1_sm_psf   = ps1data[i].E1_sm_psf;
     1211    stars[i].lensing->E2_sm_psf   = ps1data[i].E2_sm_psf;
     1212
     1213    stars[i].lensing->X11_sh_psf  = ps1data[i].X11_sh_psf;
     1214    stars[i].lensing->X12_sh_psf  = ps1data[i].X12_sh_psf;
     1215    stars[i].lensing->X22_sh_psf  = ps1data[i].X22_sh_psf;
     1216    stars[i].lensing->E1_sh_psf   = ps1data[i].E1_sh_psf;
     1217    stars[i].lensing->E2_sh_psf   = ps1data[i].E2_sh_psf;
     1218
     1219    stars[i].lensing->E1_psf      = ps1data[i].E1_psf;
     1220    stars[i].lensing->E2_psf      = ps1data[i].E2_psf;
     1221
     1222    // stars[i].lensing->F_ApR5    = ps1data[i].F_ApR5;
     1223    // stars[i].lensing->dF_ApR5   = ps1data[i].dF_ApR5;
     1224    // stars[i].lensing->sF_ApR5   = ps1data[i].sF_ApR5;
     1225    // stars[i].lensing->fF_ApR5   = ps1data[i].fF_ApR5;
     1226    //
     1227    // stars[i].lensing->F_ApR6    = ps1data[i].F_ApR6;
     1228    // stars[i].lensing->dF_ApR6   = ps1data[i].dF_ApR6;
     1229    // stars[i].lensing->sF_ApR6   = ps1data[i].sF_ApR6;
     1230    // stars[i].lensing->fF_ApR6   = ps1data[i].fF_ApR6;
     1231
     1232    // this is may optionally be replaced by the internal sequence (see FilterStars.c)
     1233    stars[i].lensing->detID      = ps1data[i].detID;
     1234
     1235    // the Average fields and the following Measure fields are set in FilterStars after
     1236    // the image metadata is in hand:  dR, dD, Mcal, dt, airmass, az, t, imageID, extID.
     1237
     1238    // averef is set in find_matches
     1239
     1240    // dbFlags is zero on ingest.
     1241
     1242    // the following fields are currently not being set anywhere: t_msec
     1243  }   
     1244  *nstars = Nstars;
     1245  return (stars);
     1246}
     1247
     1248Stars *Convert_PS1_SV1 (FTable *table, unsigned int *nstars) {
     1249
     1250  off_t Nstars;
     1251  unsigned int i;
     1252  double ZeroPt;
     1253  Stars *stars;
     1254  CMF_PS1_SV1 *ps1data;
     1255
     1256  if (table[0].header[0].Naxis[0] == 196) {
     1257    stars = Convert_PS1_SV1_Alt (table, nstars);
     1258    return (stars);
     1259  }
     1260
     1261  ps1data = gfits_table_get_CMF_PS1_SV1 (table, &Nstars, NULL);
     1262  if (!ps1data) {
     1263    fprintf (stderr, "skipping inconsistent entry\n");
     1264    return (NULL);
     1265  }
     1266  ZeroPt = GetZeroPoint();
     1267
     1268  ALLOCATE (stars, Stars, Nstars);
     1269  for (i = 0; i < Nstars; i++) {
     1270    InitStar (&stars[i]);
     1271    stars[i].measure.Xccd       = ps1data[i].X;
     1272    stars[i].measure.Yccd       = ps1data[i].Y;
     1273    stars[i].measure.dXccd      = ToShortPixels(ps1data[i].dX);
     1274    stars[i].measure.dYccd      = ToShortPixels(ps1data[i].dY);
     1275
     1276    stars[i].measure.posangle   = ToShortDegrees(ps1data[i].posangle);
     1277    stars[i].measure.pltscale   = ps1data[i].pltscale;
     1278
     1279    if ((ps1data[i].M >= 0.0) || isnan(ps1data[i].M)) {
     1280      stars[i].measure.M      = NAN;
     1281    } else {
     1282      stars[i].measure.M      = ps1data[i].M + ZeroPt;
     1283    }
     1284    stars[i].measure.dM         = ps1data[i].dM;
     1285    stars[i].measure.dMcal      = ps1data[i].dMcal;
     1286    stars[i].measure.Map        = ps1data[i].Map + ZeroPt;
    11511287    stars[i].measure.dMap       = ps1data[i].dM; // a proxy measure
    11521288                       
    … …  
    16951831}
    16961832
    1697 
    1698 
     1833Stars *Convert_PS1_DV5 (FTable *table, unsigned int *nstars) {
     1834
     1835  off_t Nstars;
     1836  unsigned int i;
     1837  double ZeroPt;
     1838  Stars *stars;
     1839  CMF_PS1_DV5 *ps1data;
     1840
     1841  ps1data = gfits_table_get_CMF_PS1_DV5 (table, &Nstars, NULL);
     1842  if (!ps1data) {
     1843    fprintf (stderr, "skipping inconsistent entry\n");
     1844    return (NULL);
     1845  }
     1846  ZeroPt = GetZeroPoint();
     1847
     1848  ALLOCATE (stars, Stars, Nstars);
     1849  for (i = 0; i < Nstars; i++) {
     1850    InitStar (&stars[i]);
     1851    stars[i].measure.Xccd       = ps1data[i].X;
     1852    stars[i].measure.Yccd       = ps1data[i].Y;
     1853    stars[i].measure.dXccd      = ToShortPixels(ps1data[i].dX);
     1854    stars[i].measure.dYccd      = ToShortPixels(ps1data[i].dY);
     1855
     1856    stars[i].measure.posangle   = ToShortDegrees(ps1data[i].posangle);
     1857    stars[i].measure.pltscale   = ps1data[i].pltscale;
     1858
     1859    if ((ps1data[i].M >= 0.0) || isnan(ps1data[i].M)) {
     1860      stars[i].measure.M      = NAN;
     1861    } else {
     1862      stars[i].measure.M      = ps1data[i].M + ZeroPt;
     1863    }
     1864    stars[i].measure.dM         = ps1data[i].dM;
     1865    stars[i].measure.dMcal      = ps1data[i].dMcal;
     1866    stars[i].measure.Map        = ps1data[i].Map + ZeroPt;
     1867    stars[i].measure.dMap       = (ps1data[i].apFlux > 0.0) ? fabs(ps1data[i].apFluxErr / ps1data[i].apFlux) : NAN;
     1868                       
     1869    stars[i].measure.Mkron      = (ps1data[i].kronFlux > 0.0) ? -2.5*log10(ps1data[i].kronFlux) + ZeroPt : NAN;
     1870    stars[i].measure.dMkron     = (ps1data[i].kronFlux > 0.0) ? ps1data[i].kronFluxErr / ps1data[i].kronFlux : NAN;
     1871                       
     1872    // these fluxes are converted from counts to counts/sec in FilterStars.c
     1873    stars[i].measure.FluxPSF    = GetFluxFromFluxOrMag (ps1data[i].Flux, ps1data[i].M);
     1874    stars[i].measure.dFluxPSF   = GetFluxErrFromFluxOrMag (ps1data[i].dFlux, stars[i].measure.FluxPSF, ps1data[i].dM);
     1875    stars[i].measure.FluxKron   = ps1data[i].kronFlux;
     1876    stars[i].measure.dFluxKron  = ps1data[i].kronFluxErr;
     1877    stars[i].measure.FluxAp     = GetFluxFromFluxOrMag (ps1data[i].apFlux, ps1data[i].Map);
     1878    stars[i].measure.dFluxAp    = GetFluxErrFromFluxOrMag (ps1data[i].apFluxErr, stars[i].measure.FluxAp, stars[i].measure.dMap);
     1879
     1880    stars[i].measure.Sky        = ps1data[i].sky;
     1881    stars[i].measure.dSky       = ps1data[i].dSky;
     1882                       
     1883    stars[i].measure.psfChisq   = ps1data[i].psfChisq;
     1884    stars[i].measure.psfQF      = ps1data[i].psfQF;
     1885    stars[i].measure.psfQFperf  = ps1data[i].psfQFperf;
     1886    stars[i].measure.psfNdof    = ps1data[i].psfNdof;
     1887    stars[i].measure.psfNpix    = ps1data[i].psfNpix;
     1888    stars[i].measure.extNsigma  = ps1data[i].extNsigma;
     1889
     1890    stars[i].measure.FWx        = ToShortPixels(ps1data[i].fx);
     1891    stars[i].measure.FWy        = ToShortPixels(ps1data[i].fy);
     1892    stars[i].measure.theta      = ToShortDegrees(ps1data[i].df);
     1893
     1894    stars[i].measure.Mxx        = ToShortPixels(ps1data[i].Mxx);
     1895    stars[i].measure.Mxy        = ToShortPixels(ps1data[i].Mxy);
     1896    stars[i].measure.Myy        = ToShortPixels(ps1data[i].Myy);
     1897                       
     1898    stars[i].measure.photFlags  = ps1data[i].flags;
     1899    stars[i].measure.photFlags2 = ps1data[i].flags2;
     1900
     1901    // this is may optionally be replaced by the internal sequence (see FilterStars.c)
     1902    stars[i].measure.detID      = ps1data[i].detID;
     1903
     1904    // the Average fields and the following Measure fields are set in FilterStars after
     1905    // the image metadata is in hand:  dR, dD, Mcal, dt, airmass, az, t, imageID, extID.
     1906
     1907    // averef is set in find_matches
     1908
     1909    // dbFlags is zero on ingest.
     1910
     1911    // the following fields are currently not being set anywhere: t_msec
     1912  }   
     1913  *nstars = Nstars;
     1914  return (stars);
     1915}
     1916
     1917
     1918

  • branches/eam_branches/ipp-20150112/Ohana/src/addstar/src/mkcmf.c

    r37807 r38059  
    10031003
    10041004  int i;
    1005   CMF_PS1_V5_Lensing *stars;
     1005  CMF_PS1_V5_R2_Lensing *stars;
    10061006  float flux, fSN;
    10071007
    10081008  // XXX add gaussian-distributed noise based on counts
    10091009  // this needs to make different output 'stars' entries depending on the desired type
    1010   ALLOCATE (stars, CMF_PS1_V5_Lensing, Nstars);
     1010  ALLOCATE (stars, CMF_PS1_V5_R2_Lensing, Nstars);
    10111011  for (i = 0; i < Nstars; i++) {
    10121012
    … …  
    11291129  }
    11301130
    1131   gfits_table_set_CMF_PS1_V5_Lensing (ftable, stars, Nstars);
     1131  gfits_table_set_CMF_PS1_V5_R2_Lensing (ftable, stars, Nstars);
    11321132  gfits_modify (ftable->header, "EXTTYPE",   "%s", 1, "PS1_V5");
    11331133}

  • branches/eam_branches/ipp-20150112/Ohana/src/dvolens

    • Property svn:ignore set to
      bin

  • branches/eam_branches/ipp-20150112/Ohana/src/dvopsps/Makefile

    r37672 r38059  
    3232$(SRC)/insert_FWobjects_dvopsps.$(ARCH).o \
    3333$(SRC)/insert_FWobjects_dvopsps_catalog.$(ARCH).o \
     34$(SRC)/insert_diffobj_dvopsps.$(ARCH).o \
     35$(SRC)/insert_diffobj_dvopsps_catalog.$(ARCH).o \
    3436$(SRC)/insert_detections_dvopsps.$(ARCH).o \
    3537$(SRC)/insert_detections_dvopsps_catalog.$(ARCH).o
    … …  
    5052$(SRC)/insert_FWobjects_dvopsps.$(ARCH).o \
    5153$(SRC)/insert_FWobjects_dvopsps_catalog.$(ARCH).o \
     54$(SRC)/insert_diffobj_dvopsps.$(ARCH).o \
     55$(SRC)/insert_diffobj_dvopsps_catalog.$(ARCH).o \
    5256$(SRC)/insert_detections_dvopsps.$(ARCH).o \
    5357$(SRC)/insert_detections_dvopsps_catalog.$(ARCH).o

  • branches/eam_branches/ipp-20150112/Ohana/src/dvopsps/include/dvopsps.h

    r37672 r38059  
    121121int    insert_skytable_mysql_init         PROTO((IOBuffer *buffer));
    122122
     123int    insert_diffobj_dvopsps             PROTO(());
     124int    insert_diffobj_dvopsps_parallel    PROTO((SkyList *sky));
     125int    insert_diffobj_dvopsps_catalog     PROTO((Catalog *catalog, char *basename, MYSQL *mysql));
     126
     127int    insert_diffobj_mysql_create_tables PROTO((char *basename, MYSQL *mysql));
     128int    insert_diffobj_mysql_init          PROTO((IOBuffer *ave_buffer, IOBuffer *sec_buffer, char *basename));
     129int    insert_diffobj_mysql_value         PROTO((IOBuffer *ave_buffer, IOBuffer *sec_buffer, Average *average, SecFilt *secfilt, int Nsecfilt));
     130int    insert_diffobj_mysql_commit        PROTO((IOBuffer *ave_buffer, IOBuffer *sec_buffer, MYSQL *mysql));
     131
    123132Detections *DetectionsLoad                PROTO((char *filename, int *Ndetections));
    124133int         DetectionsSave                PROTO((char *filename, Detections *detections, int Ndetections));

  • branches/eam_branches/ipp-20150112/Ohana/src/dvopsps/src/dvopsps.c

    r37672 r38059  
    1414  if (!strcasecmp (argv[1], "objects")) {
    1515    status = insert_objects_dvopsps ();
     16  }
     17  if (!strcasecmp (argv[1], "diffobj")) {
     18    status = insert_diffobj_dvopsps ();
    1619  }
    1720  if (!strcasecmp (argv[1], "forced_warp_objects")) {

  • branches/eam_branches/ipp-20150112/Ohana/src/dvopsps/src/dvopsps_client.c

    r37672 r38059  
    2222    status = insert_objects_dvopsps ();
    2323  }
     24  if (!strcasecmp (argv[1], "diffobj")) {
     25    status = insert_diffobj_dvopsps ();
     26  }
    2427  if (!strcasecmp (argv[1], "forced_warp_objects")) {
    2528    status = insert_FWobjects_dvopsps ();

  • branches/eam_branches/ipp-20150112/Ohana/src/dvopsps/src/insert_FWobjects_dvopsps_catalog.c

    r37672 r38059  
    66  off_t i;
    77  int missingID = 0;
     8  int noLensobj = 0;
    89
    910  IOBuffer ave_buffer, sec_buffer, cpy_buffer;
    … …  
    4243    off_t m = average[i].lensobjOffset;
    4344    off_t Nlensobj = average[i].Nlensobj;
     45
     46    // skip objects with no lensing object
     47    if (!Nlensobj) {
     48      noLensobj ++;
     49      continue;
     50    }
    4451
    4552    // XXX check return status
    … …  
    7683    found ++;
    7784  }
    78   insert_FWobjects_mysql_commit (&ave_buffer, &sec_buffer, &cpy_buffer, mysql);
    79   if (VERBOSE) fprintf (stderr, "inserted "OFF_T_FMT" average, "OFF_T_FMT" secfilt\n",
    80                         catalog[0].Naverage, Nsecfilt*catalog[0].Naverage);
     85  if (Ninsert) {
     86    insert_FWobjects_mysql_commit (&ave_buffer, &sec_buffer, &cpy_buffer, mysql);
     87  }
     88  if (VERBOSE) fprintf (stderr, "inserted "OFF_T_FMT" average, "OFF_T_FMT" secfilt, "OFF_T_FMT" lensobj\n",
     89                        catalog[0].Naverage, Nsecfilt*catalog[0].Naverage, catalog[0].Nlensobj);
    8190  FreeIOBuffer (&ave_buffer);
    8291  FreeIOBuffer (&sec_buffer);
    … …  
    8493  free (cleanname);
    8594
    86   MARKTIME("-- inserted "OFF_T_FMT" objects in %f sec, skipped %d without IDs\n", found, dtime, missingID);
     95  MARKTIME("-- inserted "OFF_T_FMT" objects in %f sec, skipped %d without IDs, %d with no lensobj\n", found, dtime, missingID, noLensobj);
    8796  return (TRUE);
    8897}
    … …  
    158167    fprintf (stderr, "Nbuffer: %d\n", buffer.Nbuffer);
    159168  }
     169  buffer.Nbuffer = 0;
     170  bzero (buffer.buffer, buffer.Nalloc);
    160171
    161172  PrintIOBuffer (&buffer, "DROP TABLE %s_cpy\n", basename);
    … …  
    173184                 "PHOTCODE           SMALLINT, "
    174185
    175                  "FLUX_AP_R5,        FLOAT, "
    176                  "FLUX_ERR_AP_R5,    FLOAT, "
    177                  "FLUX_STD_AP_R5,    FLOAT, "
    178                  "FLUX_FIL_AP_R5,    FLOAT, "
    179                  "FLUX_AP_R6,        FLOAT, "
    180                  "FLUX_ERR_AP_R6,    FLOAT, "
    181                  "FLUX_STD_AP_R6,    FLOAT, "
    182                  "FLUX_FIL_AP_R6,    FLOAT, "
    183 
    184                  "X11_SM_OBJ,        FLOAT, "
    185                  "X12_SM_OBJ,        FLOAT, "
    186                  "X22_SM_OBJ,        FLOAT, "
    187                  "E1_SM_OBJ,         FLOAT, "
    188                  "E2_SM_OBJ,         FLOAT, "
    189                  "X11_SH_OBJ,        FLOAT, "
    190                  "X12_SH_OBJ,        FLOAT, "
    191                  "X22_SH_OBJ,        FLOAT, "
    192                  "E1_SH_OBJ,         FLOAT, "
    193                  "E2_SH_OBJ,         FLOAT, "
    194 
    195                  "X11_SM_PSF,        FLOAT, "
    196                  "X12_SM_PSF,        FLOAT, "
    197                  "X22_SM_PSF,        FLOAT, "
    198                  "E1_SM_PSF,         FLOAT, "
    199                  "E2_SM_PSF,         FLOAT, "
    200                  "X11_SH_PSF,        FLOAT, "
    201                  "X12_SH_PSF,        FLOAT, "
    202                  "X22_SH_PSF,        FLOAT, "
    203                  "E1_SH_PSF,         FLOAT, "
    204                  "E2_SH_PSF,         FLOAT, "
    205 
    206                  "GAMMA,             FLOAT, "
    207                  "E1,                FLOAT, "
    208                  "E2,                FLOAT, "
     186                 "FLUX_AP_R5         FLOAT, "
     187                 "FLUX_ERR_AP_R5     FLOAT, "
     188                 "FLUX_STD_AP_R5     FLOAT, "
     189                 "FLUX_FIL_AP_R5     FLOAT, "
     190                 "FLUX_AP_R6         FLOAT, "
     191                 "FLUX_ERR_AP_R6     FLOAT, "
     192                 "FLUX_STD_AP_R6     FLOAT, "
     193                 "FLUX_FIL_AP_R6     FLOAT, "
     194
     195                 "X11_SM_OBJ         FLOAT, "
     196                 "X12_SM_OBJ         FLOAT, "
     197                 "X22_SM_OBJ         FLOAT, "
     198                 "E1_SM_OBJ          FLOAT, "
     199                 "E2_SM_OBJ          FLOAT, "
     200                 "X11_SH_OBJ         FLOAT, "
     201                 "X12_SH_OBJ         FLOAT, "
     202                 "X22_SH_OBJ         FLOAT, "
     203                 "E1_SH_OBJ          FLOAT, "
     204                 "E2_SH_OBJ          FLOAT, "
     205
     206                 "X11_SM_PSF         FLOAT, "
     207                 "X12_SM_PSF         FLOAT, "
     208                 "X22_SM_PSF         FLOAT, "
     209                 "E1_SM_PSF          FLOAT, "
     210                 "E2_SM_PSF          FLOAT, "
     211                 "X11_SH_PSF         FLOAT, "
     212                 "X12_SH_PSF         FLOAT, "
     213                 "X22_SH_PSF         FLOAT, "
     214                 "E1_SH_PSF          FLOAT, "
     215                 "E2_SH_PSF          FLOAT, "
     216
     217                 "GAMMA              FLOAT, "
     218                 "E1                 FLOAT, "
     219                 "E2                 FLOAT, "
    209220
    210221                 "NMEAS              INT "
    … …  
    317328  PrintIOBuffer (ave_buffer, "%lu, ", average->extID);         
    318329  PrintIOBuffer (ave_buffer, "%u,  ", average->objID);         
    319   PrintIOBuffer (ave_buffer, "%u,  ", average->catID);         
     330  PrintIOBuffer (ave_buffer, "%u   ", average->catID);         
    320331  PrintIOBuffer (ave_buffer, "),\n");
    321332
    … …  
    379390    PrintIOBuffer (cpy_buffer, "%hd, ", lensobj->photcode);         
    380391
    381     PRINT_FLOAT(cpy_buffer, lensobj-> F_ApR5,     "%.8f");
    382     PRINT_FLOAT(cpy_buffer, lensobj->dF_ApR5,     "%.8f");
    383     PRINT_FLOAT(cpy_buffer, lensobj->sF_ApR5,     "%.8f");
    384     PRINT_FLOAT(cpy_buffer, lensobj->fF_ApR5,     "%.8f");
    385     PRINT_FLOAT(cpy_buffer, lensobj-> F_ApR6,     "%.8f");
    386     PRINT_FLOAT(cpy_buffer, lensobj->dF_ApR6,     "%.8f");
    387     PRINT_FLOAT(cpy_buffer, lensobj->sF_ApR6,     "%.8f");
    388     PRINT_FLOAT(cpy_buffer, lensobj->fF_ApR6,     "%.8f");
    389 
    390     PRINT_FLOAT(cpy_buffer, lensobj->X11_sm_obj,  "%.8f");
    391     PRINT_FLOAT(cpy_buffer, lensobj->X12_sm_obj,  "%.8f");
    392     PRINT_FLOAT(cpy_buffer, lensobj->X22_sm_obj,  "%.8f");
    393     PRINT_FLOAT(cpy_buffer, lensobj->E1_sm_obj,   "%.8f");
    394     PRINT_FLOAT(cpy_buffer, lensobj->E2_sm_obj,   "%.8f");
    395     PRINT_FLOAT(cpy_buffer, lensobj->X11_sh_obj,  "%.8f");
    396     PRINT_FLOAT(cpy_buffer, lensobj->X12_sh_obj,  "%.8f");
    397     PRINT_FLOAT(cpy_buffer, lensobj->X22_sh_obj,  "%.8f");
    398     PRINT_FLOAT(cpy_buffer, lensobj->E1_sh_obj,   "%.8f");
    399     PRINT_FLOAT(cpy_buffer, lensobj->E2_sh_obj,   "%.8f");
    400 
    401     PRINT_FLOAT(cpy_buffer, lensobj->X11_sm_psf,  "%.8f");
    402     PRINT_FLOAT(cpy_buffer, lensobj->X12_sm_psf,  "%.8f");
    403     PRINT_FLOAT(cpy_buffer, lensobj->X22_sm_psf,  "%.8f");
    404     PRINT_FLOAT(cpy_buffer, lensobj->E1_sm_psf,   "%.8f");
    405     PRINT_FLOAT(cpy_buffer, lensobj->E2_sm_psf,   "%.8f");
    406     PRINT_FLOAT(cpy_buffer, lensobj->X11_sh_psf,  "%.8f");
    407     PRINT_FLOAT(cpy_buffer, lensobj->X12_sh_psf,  "%.8f");
    408     PRINT_FLOAT(cpy_buffer, lensobj->X22_sh_psf,  "%.8f");
    409     PRINT_FLOAT(cpy_buffer, lensobj->E1_sh_psf,   "%.8f");
    410     PRINT_FLOAT(cpy_buffer, lensobj->E2_sh_psf,   "%.8f");
    411 
    412     PRINT_FLOAT(cpy_buffer, lensobj->gamma,       "%.8f");
    413     PRINT_FLOAT(cpy_buffer, lensobj->E1,          "%.8f");
    414     PRINT_FLOAT(cpy_buffer, lensobj->E2,          "%.8f");
     392    PRINT_FLOAT(cpy_buffer, lensobj-> F_ApR5,     "%.8f, ");
     393    PRINT_FLOAT(cpy_buffer, lensobj->dF_ApR5,     "%.8f, ");
     394    PRINT_FLOAT(cpy_buffer, lensobj->sF_ApR5,     "%.8f, ");
     395    PRINT_FLOAT(cpy_buffer, lensobj->fF_ApR5,     "%.8f, ");
     396    PRINT_FLOAT(cpy_buffer, lensobj-> F_ApR6,     "%.8f, ");
     397    PRINT_FLOAT(cpy_buffer, lensobj->dF_ApR6,     "%.8f, ");
     398    PRINT_FLOAT(cpy_buffer, lensobj->sF_ApR6,     "%.8f, ");
     399    PRINT_FLOAT(cpy_buffer, lensobj->fF_ApR6,     "%.8f, ");
     400
     401    PRINT_FLOAT(cpy_buffer, lensobj->X11_sm_obj,  "%.8f, ");
     402    PRINT_FLOAT(cpy_buffer, lensobj->X12_sm_obj,  "%.8f, ");
     403    PRINT_FLOAT(cpy_buffer, lensobj->X22_sm_obj,  "%.8f, ");
     404    PRINT_FLOAT(cpy_buffer, lensobj->E1_sm_obj,   "%.8f, ");
     405    PRINT_FLOAT(cpy_buffer, lensobj->E2_sm_obj,   "%.8f, ");
     406    PRINT_FLOAT(cpy_buffer, lensobj->X11_sh_obj,  "%.8f, ");
     407    PRINT_FLOAT(cpy_buffer, lensobj->X12_sh_obj,  "%.8f, ");
     408    PRINT_FLOAT(cpy_buffer, lensobj->X22_sh_obj,  "%.8f, ");
     409    PRINT_FLOAT(cpy_buffer, lensobj->E1_sh_obj,   "%.8f, ");
     410    PRINT_FLOAT(cpy_buffer, lensobj->E2_sh_obj,   "%.8f, ");
     411
     412    PRINT_FLOAT(cpy_buffer, lensobj->X11_sm_psf,  "%.8f, ");
     413    PRINT_FLOAT(cpy_buffer, lensobj->X12_sm_psf,  "%.8f, ");
     414    PRINT_FLOAT(cpy_buffer, lensobj->X22_sm_psf,  "%.8f, ");
     415    PRINT_FLOAT(cpy_buffer, lensobj->E1_sm_psf,   "%.8f, ");
     416    PRINT_FLOAT(cpy_buffer, lensobj->E2_sm_psf,   "%.8f, ");
     417    PRINT_FLOAT(cpy_buffer, lensobj->X11_sh_psf,  "%.8f, ");
     418    PRINT_FLOAT(cpy_buffer, lensobj->X12_sh_psf,  "%.8f, ");
     419    PRINT_FLOAT(cpy_buffer, lensobj->X22_sh_psf,  "%.8f, ");
     420    PRINT_FLOAT(cpy_buffer, lensobj->E1_sh_psf,   "%.8f, ");
     421    PRINT_FLOAT(cpy_buffer, lensobj->E2_sh_psf,   "%.8f, ");
     422
     423    PRINT_FLOAT(cpy_buffer, lensobj->gamma,       "%.8f, ");
     424    PRINT_FLOAT(cpy_buffer, lensobj->E1,          "%.8f, ");
     425    PRINT_FLOAT(cpy_buffer, lensobj->E2,          "%.8f, ");
    415426
    416427    PrintIOBuffer (cpy_buffer, "%u ", lensobj->Nmeas); // NOTE: PRINT_FLOAT always adds a trailing comma -- need to use a different method on the last entry

  • branches/eam_branches/ipp-20150112/Ohana/src/fakeastro/Makefile

    r37807 r38059  
    2020fakeastro_client: $(BIN)/fakeastro_client.$(ARCH)
    2121
    22 install: $(DESTBIN)/fakeastro $(DESTBIN)/fakeastro_client $(DESTBIN)/testparallax
     22install: $(DESTBIN)/fakeastro $(DESTBIN)/fakeastro_client
    2323
    2424FAKEASTRO = \

  • branches/eam_branches/ipp-20150112/Ohana/src/libautocode/Makefile.Targets

    r37807 r38059  
    4545$(ASRC)/measure-ps1-ref.$(ARCH).o \
    4646$(ASRC)/lensing.$(ARCH).o \
    47 $(ASRC)/lensing-ps1-v5.$(ARCH).o \
    48 $(ASRC)/lensing-ps1-v5-alt.$(ARCH).o \
     47$(ASRC)/lensing-ps1-v5-r0.$(ARCH).o \
     48$(ASRC)/lensing-ps1-v5-r1.$(ARCH).o \
     49$(ASRC)/lensing-ps1-v5-r2.$(ARCH).o \
    4950$(ASRC)/lensobj.$(ARCH).o \
    5051$(ASRC)/lensobj-ps1-v5.$(ARCH).o \
    … …  
    9192$(ASRC)/cmf-ps1-sv2.$(ARCH).o \
    9293$(ASRC)/cmf-ps1-dv4.$(ARCH).o \
     94$(ASRC)/cmf-ps1-dv5.$(ARCH).o \
    9395$(ASRC)/cmf-smpdata.$(ARCH).o \
    9496$(ASRC)/getstar-ps1-dev-0.$(ARCH).o \
    … …  
    151153$(AINC)/measure-ps1-ref.h \
    152154$(AINC)/lensing.h \
    153 $(AINC)/lensing-ps1-v5.h \
    154 $(AINC)/lensing-ps1-v5-alt.h \
     155$(AINC)/lensing-ps1-v5-r0.h \
     156$(AINC)/lensing-ps1-v5-r1.h \
     157$(AINC)/lensing-ps1-v5-r2.h \
    155158$(AINC)/lensobj.h \
    156159$(AINC)/lensobj-ps1-v5.h \
    … …  
    197200$(AINC)/cmf-ps1-sv2.h \
    198201$(AINC)/cmf-ps1-dv4.h \
     202$(AINC)/cmf-ps1-dv5.h \
    199203$(AINC)/cmf-smpdata.h \
    200204$(AINC)/getstar-ps1-dev-0.h \

  • branches/eam_branches/ipp-20150112/Ohana/src/libautocode/def/lensing.d

    r37807 r38059  
    22EXTNAME      DVO_LENSING
    33TYPE         BINTABLE
    4 SIZE         136
     4SIZE         144
    55DESCRIPTION  DVO Lensing Table
    66
    … …  
    2929FIELD  E2_sh_psf,      E2_SH_PSF,    float,          lensing shear psf stars E2
    3030
     31FIELD  E1_psf,         E1_PSF,       float,          polarization psf stars E1
     32FIELD  E2_psf,         E2_PSF,       float,          polarization psf stars E2
     33
    3134FIELD F_ApR5,        FLUX_AP_R5,     float,          Flux inside r = 5
    3235FIELD dF_ApR5,       FLUX_ERR_AP_R5, float,          error on Flux inside r = 5

  • branches/eam_branches/ipp-20150112/Ohana/src/libdvo/Makefile

    r37807 r38059  
    4343$(DESTINC)/cmf-ps1-sv3.h \
    4444$(DESTINC)/cmf-ps1-sv4.h \
    45 $(DESTINC)/cmf-ps1-v5-lensing.h \
    46 $(DESTINC)/cmf-ps1-v5-lensing-alt.h
     45$(DESTINC)/cmf-ps1-v5-r0-lensing.h \
     46$(DESTINC)/cmf-ps1-v5-r1-lensing.h \
     47$(DESTINC)/cmf-ps1-v5-r2-lensing.h
    4748
    4849INCS = $(DEFS) $(DESTINC)/dvo.h $(DESTINC)/autocode.h $(DESTINC)/dvo_util.h $(DESTINC)/dvodb.h $(DESTINC)/libdvo_astro.h $(DESTINC)/convert.h $(DESTINC)/get_graphdata.h
    … …  
    102103$(SRC)/cmf-ps1-sv4.$(ARCH).o \
    103104$(SRC)/cmf-ps1-v5.$(ARCH).o \
    104 $(SRC)/cmf-ps1-v5-lensing.$(ARCH).o \
    105 $(SRC)/cmf-ps1-v5-lensing-alt.$(ARCH).o \
     105$(SRC)/cmf-ps1-v5-r0-lensing.$(ARCH).o \
     106$(SRC)/cmf-ps1-v5-r1-lensing.$(ARCH).o \
     107$(SRC)/cmf-ps1-v5-r2-lensing.$(ARCH).o \
    106108$(SRC)/dvo_util.$(ARCH).o \
    107109$(SRC)/dbBooleanCond.$(ARCH).o          \

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

    r37912 r38059  
    334334# include "cmf-ps1-sv4.h"
    335335# include "cmf-ps1-v5.h"
    336 # include "cmf-ps1-v5-lensing.h"
    337 # include "cmf-ps1-v5-lensing-alt.h"
     336# include "cmf-ps1-v5-r0-lensing.h"
     337# include "cmf-ps1-v5-r1-lensing.h"
     338# include "cmf-ps1-v5-r2-lensing.h"
    338339
    339340typedef struct {

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

    r37954 r38059  
    167167      MEAS_DB_FLAGS,
    168168      MEAS_PHOT_FLAGS,
     169      MEAS_PHOT_FLAGS2,
    169170      MEAS_XCCD,
    170171      MEAS_YCCD,

  • branches/eam_branches/ipp-20150112/Ohana/src/libdvo/include/ps1_v5_defs.h

    r37807 r38059  
    88SecFilt_PS1_V5          *SecFiltInternalTo_PS1_V5 (SecFilt *in, off_t Nvalues);
    99
     10typedef Lensing_PS1_V5_R2 Lensing_PS1_V5;
     11
    1012Lensing                 *Lensing_PS1_V5_ToInternal (Lensing_PS1_V5 *in, off_t Nvalues);
    11 Lensing                 *Lensing_PS1_V5_ALT_ToInternal (Lensing_PS1_V5_ALT *in, off_t Nvalues);
    12 Lensing_PS1_V5          *LensingInternalTo_PS1_V5 (Lensing *in, off_t Nvalues);
     13Lensing_PS1_V5_R2       *LensingInternalTo_PS1_V5_R2 (Lensing *in, off_t Nvalues);
    1314Lensobj                 *Lensobj_PS1_V5_ToInternal (Lensobj_PS1_V5 *in, off_t Nvalues);
    1415Lensobj_PS1_V5          *LensobjInternalTo_PS1_V5 (Lensobj *in, off_t Nvalues);
     16
     17Lensing                 *Lensing_PS1_V5_R0_ToInternal (Lensing_PS1_V5_R0 *in, off_t Nvalues);
     18Lensing                 *Lensing_PS1_V5_R1_ToInternal (Lensing_PS1_V5_R1 *in, off_t Nvalues);
     19Lensing                 *Lensing_PS1_V5_R2_ToInternal (Lensing_PS1_V5_R2 *in, off_t Nvalues);
    1520
    1621StarPar                 *StarPar_PS1_V5_ToInternal (StarPar_PS1_V5 *in, off_t Nvalues);

  • branches/eam_branches/ipp-20150112/Ohana/src/libdvo/src/dbExtractMeasures.c

    r37954 r38059  
    528528      value.Int = measure[0].photFlags;
    529529      break;
     530    case MEAS_PHOT_FLAGS2: /* ? */
     531      value.Int = measure[0].photFlags2;
     532      break;
    530533    case MEAS_XCCD: /* OK */
    531534# if MEASURE_HAS_XCCD

  • branches/eam_branches/ipp-20150112/Ohana/src/libdvo/src/dbFields.c

    r37954 r38059  
    446446  if (!strcasecmp (fieldName, "DB_FLAGS"))       ESCAPE (MEAS_DB_FLAGS,       OPIHI_INT);
    447447  if (!strcasecmp (fieldName, "PHOT_FLAGS"))     ESCAPE (MEAS_PHOT_FLAGS,     OPIHI_INT);
     448  if (!strcasecmp (fieldName, "PHOT_FLAGS2"))    ESCAPE (MEAS_PHOT_FLAGS2,     OPIHI_INT);
    448449  if (!strcasecmp (fieldName, "DBFLAGS"))        ESCAPE (MEAS_DB_FLAGS,       OPIHI_INT);
    449450  if (!strcasecmp (fieldName, "PHOTFLAGS"))      ESCAPE (MEAS_PHOT_FLAGS,     OPIHI_INT);
     451  if (!strcasecmp (fieldName, "PHOTFLAGS2"))     ESCAPE (MEAS_PHOT_FLAGS2,    OPIHI_INT);
    450452  if (!strcasecmp (fieldName, "AIRMASS"))        ESCAPE (MEAS_AIRMASS,        OPIHI_FLT);
    451453  if (!strcasecmp (fieldName, "MEAN_AIRMASS"))   ESCAPE (MEAS_MEAN_AIRMASS,   OPIHI_FLT);

  • branches/eam_branches/ipp-20150112/Ohana/src/libdvo/src/dvo_catalog.c

    r37912 r38059  
    379379  lensing->E1_sh_psf  = NAN;
    380380  lensing->E2_sh_psf  = NAN;
     381
     382  lensing->E1_psf     = NAN;
     383  lensing->E2_psf     = NAN;
    381384
    382385  lensing->F_ApR5     = NAN;

  • branches/eam_branches/ipp-20150112/Ohana/src/libdvo/src/dvo_convert.c

    r37912 r38059  
    432432
    433433  if (!strcmp (extname, "DVO_LENSING_PS1_V5") && (ftable[0].header[0].Naxis[0] == 128)) {
    434     Lensing_PS1_V5_ALT *tmpLensing;                                             
    435     tmpLensing = gfits_table_get_Lensing_PS1_V5_ALT (ftable, Nlensing, NULL);
     434    Lensing_PS1_V5_R0 *tmpLensing;                                             
     435    tmpLensing = gfits_table_get_Lensing_PS1_V5_R0 (ftable, Nlensing, NULL);
    436436    if (!tmpLensing) {                                                 
    437437      fprintf (stderr, "ERROR: failed to read lensings\n");             
    438438      exit (2);                                                         
    439439    }                                                                   
    440     lensing = Lensing_PS1_V5_ALT_ToInternal (tmpLensing, *Nlensing);
     440    lensing = Lensing_PS1_V5_R0_ToInternal (tmpLensing, *Nlensing);
     441    free (tmpLensing);                                                 
     442    *format = DVO_FORMAT_PS1_V5;                                       
     443    return (lensing); }
     444
     445  if (!strcmp (extname, "DVO_LENSING_PS1_V5") && (ftable[0].header[0].Naxis[0] == 136)) {
     446    Lensing_PS1_V5_R1 *tmpLensing;                                             
     447    tmpLensing = gfits_table_get_Lensing_PS1_V5_R1 (ftable, Nlensing, NULL);
     448    if (!tmpLensing) {                                                 
     449      fprintf (stderr, "ERROR: failed to read lensings\n");             
     450      exit (2);                                                         
     451    }                                                                   
     452    lensing = Lensing_PS1_V5_R1_ToInternal (tmpLensing, *Nlensing);
    441453    free (tmpLensing);                                                 
    442454    *format = DVO_FORMAT_PS1_V5;                                       
    … …  
    484496  SKIPPING_FORMAT ("DVO_LENSING_PS1_V3",          PS1_V3,          PS1_V3);
    485497  SKIPPING_FORMAT ("DVO_LENSING_PS1_V4",          PS1_V4,          PS1_V4);
    486   CONVERT_FORMAT  ("DVO_LENSING_PS1_V5",          PS1_V5,          PS1_V5);
     498  CONVERT_FORMAT  ("DVO_LENSING_PS1_V5",          PS1_V5,          PS1_V5_R2);
    487499# undef CONVERT_FORMAT
    488500
    … …  
    521533//    FORMAT_CASE (PS1_V3,          PS1_V3);
    522534//    FORMAT_CASE (PS1_V4,          PS1_V4);
    523       FORMAT_CASE (PS1_V5,          PS1_V5);
     535      FORMAT_CASE (PS1_V5,          PS1_V5_R2);
    524536# undef FORMAT_CASE
    525537

  • branches/eam_branches/ipp-20150112/Ohana/src/libdvo/src/dvo_convert_PS1_V5.c

    r37954 r38059  
    448448}
    449449
    450 Lensing *Lensing_PS1_V5_ToInternal (Lensing_PS1_V5 *in, off_t Nvalues) {
     450Lensing *Lensing_PS1_V5_R2_ToInternal (Lensing_PS1_V5_R2 *in, off_t Nvalues) {
    451451
    452452  off_t i;
    … …  
    481481    out[i].E1_sh_psf   = in[i].E1_sh_psf;
    482482    out[i].E2_sh_psf   = in[i].E2_sh_psf;
     483
     484    out[i].E1_psf      = in[i].E1_psf;
     485    out[i].E2_psf      = in[i].E2_psf;
    483486
    484487    out[i].F_ApR5      = in[i].F_ApR5;
    … …  
    495498    out[i].objID       = in[i].objID;
    496499    out[i].catID       = in[i].catID;
    497 
    498500    out[i].averef      = in[i].averef;
    499501
    … …  
    503505}
    504506
    505 Lensing_PS1_V5 *LensingInternalTo_PS1_V5 (Lensing *in, off_t Nvalues) {
    506 
    507   off_t i;
    508   Lensing_PS1_V5 *out;
     507Lensing_PS1_V5_R2 *LensingInternalTo_PS1_V5_R2 (Lensing *in, off_t Nvalues) {
     508
     509  off_t i;
     510  Lensing_PS1_V5_R2 *out;
    509511
    510512  ALLOCATE_ZERO (out, Lensing_PS1_V5, Nvalues);
    … …  
    535537    out[i].E1_sh_psf   = in[i].E1_sh_psf;
    536538    out[i].E2_sh_psf   = in[i].E2_sh_psf;
     539
     540    out[i].E1_psf      = in[i].E1_psf;
     541    out[i].E2_psf      = in[i].E2_psf;
    537542
    538543    out[i].F_ApR5      = in[i].F_ApR5;
    … …  
    549554    out[i].objID       = in[i].objID;
    550555    out[i].catID       = in[i].catID;
    551 
    552556    out[i].averef      = in[i].averef;
     557
    553558    out[i].imageID     = in[i].imageID;
    554559  }
    … …  
    12681273}
    12691274
    1270 
    1271 Lensing *Lensing_PS1_V5_ALT_ToInternal (Lensing_PS1_V5_ALT *in, off_t Nvalues) {
     1275Lensing *Lensing_PS1_V5_R0_ToInternal (Lensing_PS1_V5_R0 *in, off_t Nvalues) {
    12721276
    12731277  off_t i;
    … …  
    13161320    out[i].objID       = in[i].objID;
    13171321    out[i].catID       = in[i].catID;
    1318 
    13191322    out[i].averef      = in[i].averef;
     1323  }
     1324  return (out);
     1325}
     1326
     1327Lensing *Lensing_PS1_V5_R1_ToInternal (Lensing_PS1_V5_R1 *in, off_t Nvalues) {
     1328
     1329  off_t i;
     1330  Lensing *out;
     1331
     1332  ALLOCATE_ZERO (out, Lensing, Nvalues);
     1333
     1334  for (i = 0; i < Nvalues; i++) {
     1335    dvo_lensing_init (&out[i]);
     1336
     1337    out[i].X11_sm_obj  = in[i].X11_sm_obj;     
     1338    out[i].X12_sm_obj  = in[i].X12_sm_obj;     
     1339    out[i].X22_sm_obj  = in[i].X22_sm_obj;     
     1340    out[i].E1_sm_obj   = in[i].E1_sm_obj;     
     1341    out[i].E2_sm_obj   = in[i].E2_sm_obj;     
     1342                                         
     1343    out[i].X11_sh_obj  = in[i].X11_sh_obj;     
     1344    out[i].X12_sh_obj  = in[i].X12_sh_obj;     
     1345    out[i].X22_sh_obj  = in[i].X22_sh_obj;     
     1346    out[i].E1_sh_obj   = in[i].E1_sh_obj;     
     1347    out[i].E2_sh_obj   = in[i].E2_sh_obj;     
     1348                                         
     1349    out[i].X11_sm_psf  = in[i].X11_sm_psf;
     1350    out[i].X12_sm_psf  = in[i].X12_sm_psf;
     1351    out[i].X22_sm_psf  = in[i].X22_sm_psf;
     1352    out[i].E1_sm_psf   = in[i].E1_sm_psf;
     1353    out[i].E2_sm_psf   = in[i].E2_sm_psf;     
     1354                                         
     1355    out[i].X11_sh_psf  = in[i].X11_sh_psf;
     1356    out[i].X12_sh_psf  = in[i].X12_sh_psf;
     1357    out[i].X22_sh_psf  = in[i].X22_sh_psf;
     1358    out[i].E1_sh_psf   = in[i].E1_sh_psf;
     1359    out[i].E2_sh_psf   = in[i].E2_sh_psf;
     1360
     1361    out[i].F_ApR5      = in[i].F_ApR5;
     1362    out[i].dF_ApR5     = in[i].dF_ApR5;
     1363    out[i].sF_ApR5     = in[i].sF_ApR5;
     1364    out[i].fF_ApR5     = in[i].fF_ApR5;
     1365                                   
     1366    out[i].F_ApR6      = in[i].F_ApR6;
     1367    out[i].dF_ApR6     = in[i].dF_ApR6;
     1368    out[i].sF_ApR6     = in[i].sF_ApR6;
     1369    out[i].fF_ApR6     = in[i].fF_ApR6;
     1370                                   
     1371    out[i].detID       = in[i].detID;
     1372    out[i].objID       = in[i].objID;
     1373    out[i].catID       = in[i].catID;
     1374    out[i].averef      = in[i].averef;
     1375
     1376    out[i].imageID     = in[i].imageID;
    13201377  }
    13211378  return (out);

  • branches/eam_branches/ipp-20150112/Ohana/src/opihi/lib.shell/expand_vectors.c

    r27491 r38059  
    11# include "opihi.h"
     2
     3// converts a[], a[4], a[2][3] to their numeric values
     4// add a?[] and a?[][] as equivalent to $?a
     5// a[][?]
    26
    37char *expand_vectors (char *line) {
    … …  
    59  char *newline, *tmpline, strValue[128], *val;
    610  char *L, *N, *p, *q, *p2, *w;
    7   int n, I, J, size, showLength, NLINE, Noff, isBuffer, inRange;
     11  int n, I, J, size, showLength, showXsize, showYsize, checkType, NLINE, Noff, isBuffer, inRange;
    812  float *ptr;
    913  double f1;
    … …  
    4145    val = NULL;
    4246    showLength = FALSE;
     47    showXsize  = FALSE;
     48    showYsize  = FALSE;
     49
    4350    if (n == 0) {
    4451      showLength = TRUE;
     52      showXsize  = TRUE;
    4553    } else {
    4654      tmpline = strncreate (p+1, n);
    … …  
    6068      p2 = strchr (q + 1, ']');
    6169      if (p2 != NULL) {
    62         if (showLength) {
    63           gprint (GP_ERR, "unsupported : name[][..]\n");
    64           goto asVector;
    65         }
     70        // if (showLength) {
     71        //   gprint (GP_ERR, "unsupported : name[][..]\n");
     72        //   goto asVector;
     73        // }
    6674
    6775        isBuffer = TRUE;
    … …  
    7179        val = NULL;
    7280        if (n == 0) {
    73           gprint (GP_ERR, "unsupported : name[..][]\n");
    74           isBuffer = FALSE;
    75           goto asVector;
    76         }
    77         tmpline = strncreate (q+2, n);
    78         val = dvomath (1, &tmpline, &size, 0);
    79         free (tmpline);
    80         if (val == NULL) {
    81           isBuffer = FALSE;
    82           goto asVector; /* not a valid vector subscript */
     81          showYsize = TRUE;
     82          // gprint (GP_ERR, "unsupported : name[..][]\n");
     83          // isBuffer = FALSE;
     84          // goto asVector;
     85        }  else {
     86          tmpline = strncreate (q+2, n);
     87          val = dvomath (1, &tmpline, &size, 0);
     88          free (tmpline);
     89          if (val == NULL) {
     90            isBuffer = FALSE;
     91            goto asVector; /* not a valid vector subscript */
     92          }
    8393        }
    8494        J = 0;
    … …  
    93103  asVector:
    94104    /* find vector/buffer name */
     105    checkType = FALSE;
     106    if (*(p-1) == '?') {
     107      checkType = TRUE;
     108      p--;
     109    }
    95110    for (w = p - 1; (w >= line) && !OHANA_WHITESPACE(*w) && (isalnum(*w) || (*w == ':') || (*w == '_')); w--);
    96111    w ++;
    … …  
    99114
    100115    if (isBuffer) {
    101       if ((buf = SelectBuffer (tmpline, OLDBUFFER, TRUE)) == NULL) goto dumpline;
    102 
     116      buf = SelectBuffer (tmpline, OLDBUFFER, !checkType);
     117      if (checkType) {
     118        f1 = (buf != NULL);
     119        goto skipBuffer;
     120      }
     121      if (showXsize && showYsize) {
     122        gprint (GP_ERR, "ambiguous size option buf[][]\n");
     123        goto dumpline;
     124      }
     125      if (buf == NULL) goto dumpline;
     126      if (showXsize) {
     127        f1 = buf[0].header.Naxis[0];
     128        goto skipBuffer;
     129      }
     130      if (showYsize) {
     131        f1 = buf[0].header.Naxis[1];
     132        goto skipBuffer;
     133      }
    103134      /* find buffer element */
    104135      inRange = TRUE;
    … …  
    116147      f1 = ptr[I + J*buf[0].header.Naxis[0]];
    117148    } else {
    118       if ((vec = SelectVector (tmpline, OLDVECTOR, TRUE)) == NULL) goto dumpline;
    119 
    120       /* find vector element */
    121       if (showLength) {
    122         f1 = vec[0].Nelements;
     149      vec = SelectVector (tmpline, OLDVECTOR, !checkType);
     150      if (checkType) {
     151        f1 = (vec != NULL);
    123152      } else {
    124         if ((I >= vec[0].Nelements) || (I < -1*vec[0].Nelements)) {
    125           gprint (GP_ERR, "vector subscript out of range\n");
    126           goto escape;
     153        if (vec == NULL) goto dumpline;
     154
     155        /* find vector element */
     156        if (showLength) {
     157          f1 = vec[0].Nelements;
     158        } else {
     159          if ((I >= vec[0].Nelements) || (I < -1*vec[0].Nelements)) {
     160            gprint (GP_ERR, "vector subscript out of range\n");
     161            goto escape;
     162          }
     163          if (I < 0) I += vec[0].Nelements;
     164          f1 = (vec[0].type == OPIHI_FLT) ? vec[0].elements.Flt[I] : vec[0].elements.Int[I];
    127165        }
    128         if (I < 0) I += vec[0].Nelements;
    129         f1 = (vec[0].type == OPIHI_FLT) ? vec[0].elements.Flt[I] : vec[0].elements.Int[I];
    130       }
    131     }
    132 
     166      }
     167    }
     168
     169  skipBuffer:
    133170    free (tmpline);
    134171    if ((int)f1 == f1)

  • branches/eam_branches/ipp-20150112/Ohana/src/opihi/pantasks/LocalJob.c

    r36623 r38059  
    11# include "pantasks.h"
     2# include <sys/resource.h>
    23
    34/* local jobs are forked in the background

  • branches/eam_branches/ipp-20150112/Ohana/src/opihi/pclient/job.c

    r36623 r38059  
    11# include "pclient.h"
     2# include <sys/resource.h>
    23
    34int job (int argc, char **argv) {

  • branches/eam_branches/ipp-20150112/Ohana/src/relphot/include/relphot.h

    r37957 r38059  
    214214
    215215int SET_MREL_VERSION;
     216int IS_DIFF_DB;
    216217
    217218double MAG_LIM;

  • branches/eam_branches/ipp-20150112/Ohana/src/relphot/src/args.c

    r37957 r38059  
    6464  }
    6565
     66  IS_DIFF_DB = FALSE;
     67  if ((N = get_argument (argc, argv, "-is-diff-db"))) {
     68    remove_argument (N, &argc, argv);
     69    IS_DIFF_DB = TRUE;
     70  }
     71
    6672  USE_FULL_OVERLAP = TRUE;
    6773  if ((N = get_argument (argc, argv, "-sloppy-image-overlap"))) {
    … …  
    517523  }
    518524
     525  IS_DIFF_DB = FALSE;
     526  if ((N = get_argument (argc, argv, "-is-diff-db"))) {
     527    remove_argument (N, &argc, argv);
     528    IS_DIFF_DB = TRUE;
     529  }
     530
    519531  SET_MREL_VERSION = 1;
    520532  if ((N = get_argument (argc, argv, "-set-mrel-version"))) {

  • branches/eam_branches/ipp-20150112/Ohana/src/relphot/src/extra.c

    r37876 r38059  
    4343int isGPC1warp (int photcode) {
    4444
     45  // diff warps get stack-like photcodes (kind of lame)
     46  if (IS_DIFF_DB) {
     47    if (photcode == 11000) return TRUE; // g-band
     48    if (photcode == 11100) return TRUE; // r-band
     49    if (photcode == 11200) return TRUE; // i-band
     50    if (photcode == 11300) return TRUE; // z-band
     51    if (photcode == 11400) return TRUE; // y-band
     52    if (photcode == 11500) return TRUE; // w-band
     53    return FALSE;
     54  }
     55
    4556  if (photcode == 12000) return TRUE; // g-band
    4657  if (photcode == 12100) return TRUE; // r-band

  • branches/eam_branches/ipp-20150112/Ohana/src/relphot/src/reload_catalogs.c

    r37807 r38059  
    226226    if (RESET_ZEROPTS)    { snprintf (tmpline, 1024, "%s -reset-zpts",          command);                                         strcpy (command, tmpline); }
    227227    if (UPDATE)           { snprintf (tmpline, 1024, "%s -update",              command);                                         strcpy (command, tmpline); }
     228    if (IS_DIFF_DB)       { snprintf (tmpline, 1024, "%s -is-diff-db",          command);                                         strcpy (command, tmpline); }
    228229    if (!KEEP_UBERCAL)    { snprintf (tmpline, 1024, "%s -reset-ubercal",       command);                                         strcpy (command, tmpline); }
    229230    if (UPDATE_CATFORMAT) { snprintf (tmpline, 1024, "%s -update-catformat %s", command, UPDATE_CATFORMAT);                       strcpy (command, tmpline); }

  • branches/eam_branches/ipp-20150112/Ohana/src/relphot/src/setMrelCatalog.c

    r37807 r38059  
    6262
    6363    // only apply Stack operation on setMrelFinal in first pass
    64     if (isSetMrelFinal && (pass == 0)) {
     64    if (isSetMrelFinal && (pass == 0) && !IS_DIFF_DB) {
    6565      setMrelAverageStack (m, Nc, flatcorr, results, average, secfilt, &catalog[Nc].measure[m], catalog[Nc].Nmeasure);
    6666      setGlobalObjStats (&catalog[Nc].average[j], &catalog[Nc].measure[m]);
    … …  
    703703  }
    704704
     705  // for a diff db, we just want primary, if available or not
     706  int priTessID, priProjID, priSkycellID;
     707  if (IS_DIFF_DB) {
     708    get_tess_ids(&priTessID, &priProjID, &priSkycellID, average[0].R, average[0].D);
     709  }
     710
    705711  int Ns;
    706712  for (Ns = 0; Ns < Nphotcodes; Ns++) {
    … …  
    718724    int stkTessID, stkProjID, stkSkycellID;
    719725
    720     myAssert (secfilt[Nsec].stackBestOff <= Nmeasure, "stackBestOff out of range");
    721     if (!FindImageSkycellID (secfilt[Nsec].stackBestOff, cat, &stkTessID, &stkProjID, &stkSkycellID)) continue;
     726    if (!IS_DIFF_DB) {
     727      myAssert (secfilt[Nsec].stackBestOff <= Nmeasure, "stackBestOff out of range");
     728      if (!FindImageSkycellID (secfilt[Nsec].stackBestOff, cat, &stkTessID, &stkProjID, &stkSkycellID)) continue;
     729    }
     730
     731    float psfQfMax = 0.0;
     732    float psfQfPerfMax = 0.0;
    722733
    723734    off_t meas = measureOffset;
    … …  
    744755      measure[k].dbFlags &= ~ID_MEAS_WARP_USED;
    745756
    746       if (!MatchImageSkycellID (meas, cat, stkTessID, stkProjID, stkSkycellID)) continue;
    747 
     757      if (IS_DIFF_DB) {
     758        if (!MatchImageSkycellID (meas, cat, priTessID, priProjID, priSkycellID)) continue;
     759      } else {
     760        if (!MatchImageSkycellID (meas, cat, stkTessID, stkProjID, stkSkycellID)) continue;
     761      }
     762 
    748763      if (measure[k].dbFlags & MEAS_BAD) SKIP_THIS_MEAS(Nbad);
    749764
    … …  
    761776      float Fcal = MagToFlux(-Mcal);
    762777
     778      // these are only used below if IS_DIFF_DB
     779      if (IS_DIFF_DB) {
     780        if (measure[k].psfQF     > psfQfMax)     psfQfMax     = measure[k].psfQF;
     781        if (measure[k].psfQFperf > psfQfPerfMax) psfQfPerfMax = measure[k].psfQFperf;
     782      }
     783
    763784      // in the calculations below,
    764785      // ...list gives the error per measurement, wlist gives the weight
    … …  
    811832      }
    812833    }
    813     if (Npsf < 1) continue;
     834    if (Npsf < 1) {
     835      secfilt[Nsec].Nwarp        = Nwarp;
     836      secfilt[Nsec].NwarpGood    = NwarpGood;
     837      secfilt[Nsec].NusedWrp     = Npsf;
     838      secfilt[Nsec].NusedApWrp   = Nap;
     839      secfilt[Nsec].NusedKronWrp = Nkron;
     840      continue;
     841    }
    814842
    815843    found[Nsec] = TRUE;
    816844
    817845    liststats (Fpsflist, dpsflist, wpsflist, Npsf, psfstats);
     846
     847    if (IS_DIFF_DB) {
     848      // for non DIFF_DB, these are set in setMrelAverageExposure
     849      secfilt[Nsec].psfQfMax     = psfQfMax;
     850      secfilt[Nsec].psfQfPerfMax = psfQfPerfMax;
     851    }
    818852
    819853    secfilt[Nsec].FpsfWrp  = psfstats->mean;
Note: See TracChangeset for help on using the changeset viewer.