IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 40237


Ignore:
Timestamp:
Dec 4, 2017, 9:10:26 AM (9 years ago)
Author:
eugene
Message:

add options to adjust kron scaling and aperture scaling

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/eam_branches/ohana.20170822/src/addstar/src/mkcmf.c

    r40228 r40237  
    3333float BAD_PSFQF_FRAC = 0.0;
    3434
     35static Coords coords;
    3536static float exptime = 1.0;
    36 static Coords coords;
     37static float aper_offset = 0.0;
     38static float aper_scale = 1.0; // this is set to 10^-0.4*aper_offset below is aper_offset is non-zero
     39static float kron_scale = 1.0; // extra offset between psf and kron mags
    3740
    3841static char reserved[] =  "Reserved space.  This line can be used to add a new FITS card.";
     
    175178    remove_argument (N, &argc, argv);
    176179    exptime = atof (argv[N]);
     180    remove_argument (N, &argc, argv);
     181  } 
     182
     183  // aperture-like and psf-like mags may have different effective zero points. 
     184  // by setting this, we can check that we can apply different zero points
     185  if ((N = get_argument (argc, argv, "-aper-offset"))) {
     186    remove_argument (N, &argc, argv);
     187    aper_offset = atof (argv[N]);
     188    aper_scale = pow(10.0, -0.4*aper_offset);
     189    remove_argument (N, &argc, argv);
     190  } 
     191  if ((N = get_argument (argc, argv, "-kron-scale"))) {
     192    remove_argument (N, &argc, argv);
     193    kron_scale = atof (argv[N]);
    177194    remove_argument (N, &argc, argv);
    178195  } 
     
    795812    stars[i].Y = Y[i];
    796813    stars[i].M = M[i];
    797     stars[i].Map = M[i] - 0.05;
     814    stars[i].Map = M[i] + aper_offset - 0.05;
    798815
    799816    // randomly give poor PSFQF values
     
    822839    stars[i].flags     = Flag[i];
    823840
    824     stars[i].kronFlux  = flux * 1.25;
    825     stars[i].kronFluxErr = fSN * flux * 1.25;
     841    stars[i].kronFlux  = flux * kron_scale * aper_scale;
     842    stars[i].kronFluxErr = fSN * flux * kron_scale * aper_scale;
    826843  }
    827844
     
    856873    stars[i].Y = Y[i];
    857874    stars[i].M = M[i];
    858     stars[i].Map = M[i] - 0.05;
    859     stars[i].MapRaw = M[i] - 0.10;
     875    stars[i].Map = M[i] + aper_offset - 0.05;
     876    stars[i].MapRaw = M[i] + aper_offset - 0.10;
    860877
    861878    stars[i].Flux = flux;
     
    892909    stars[i].flags     = Flag[i];
    893910
    894     stars[i].kronFlux  = flux * 1.25;
    895     stars[i].kronFluxErr = fSN * flux * 1.25;
     911    stars[i].kronFlux  = flux * kron_scale * aper_scale;
     912    stars[i].kronFluxErr = fSN * flux * kron_scale * aper_scale;
    896913  }
    897914
     
    937954    stars[i].dFlux = flux * fSN;
    938955
    939     stars[i].Map = M[i] - 0.05;
    940     stars[i].MapRaw = M[i] - 0.10;
     956    stars[i].Map = M[i] + aper_offset - 0.05;
     957    stars[i].MapRaw = M[i] + aper_offset - 0.10;
    941958
    942959    stars[i].apRadius = 8.0;
     
    9871004    stars[i].Mrh       = FX;
    9881005
    989     stars[i].kronFlux  = flux * 1.25;
    990     stars[i].kronFluxErr = fSN * flux * 1.25;
    991 
    992     stars[i].kronInner = fSN * flux * 0.9;
    993     stars[i].kronOuter = fSN * flux * 1.5;
     1006    stars[i].kronFlux  = flux * kron_scale * aper_scale;
     1007    stars[i].kronFluxErr = fSN * flux * kron_scale * aper_scale;
     1008
     1009    stars[i].kronInner = fSN * flux * 0.9 * aper_scale;
     1010    stars[i].kronOuter = fSN * flux * 1.5 * aper_scale;
    9941011
    9951012    stars[i].skyLimitRad = 1;
     
    10441061    stars[i].dFlux = flux * fSN;
    10451062
    1046     stars[i].Map = M[i] - 0.05;
    1047     stars[i].MapRaw = M[i] - 0.10;
     1063    stars[i].Map = M[i] + aper_offset - 0.05;
     1064    stars[i].MapRaw = M[i] + aper_offset - 0.10;
    10481065
    10491066    stars[i].apRadius = 8.0;
     
    10941111    stars[i].Mrh       = FX;
    10951112
    1096     stars[i].kronFlux  = flux * 1.25;
    1097     stars[i].kronFluxErr = fSN * flux * 1.25;
    1098 
    1099     stars[i].kronInner = fSN * flux * 0.9;
    1100     stars[i].kronOuter = fSN * flux * 1.5;
     1113    stars[i].kronFlux  = flux * kron_scale * aper_scale;
     1114    stars[i].kronFluxErr = fSN * flux * kron_scale * aper_scale;
     1115
     1116    stars[i].kronInner = fSN * flux * 0.9 * aper_scale;
     1117    stars[i].kronOuter = fSN * flux * 1.5 * aper_scale;
    11011118
    11021119    // stars[i].skyLimitRad = 1;
     
    11481165    stars[i].dFlux = flux * fSN;
    11491166
    1150     stars[i].Map = M[i] - 0.05;
    1151     stars[i].MapRaw = M[i] - 0.10;
     1167    stars[i].Map = M[i] + aper_offset - 0.05;
     1168    stars[i].MapRaw = M[i] + aper_offset - 0.10;
    11521169
    11531170    stars[i].apRadius = 8.0;
     
    11891206    stars[i].Mrh = FX;
    11901207
    1191     stars[i].kronFlux = flux * 1.25;
    1192     stars[i].kronFluxErr = fSN * flux * 1.25;
    1193 
    1194     stars[i].kronInner = fSN * flux * 0.9;
    1195     stars[i].kronOuter = fSN * flux * 1.5;
     1208    stars[i].kronFlux = flux * kron_scale * aper_scale;
     1209    stars[i].kronFluxErr = fSN * flux * kron_scale * aper_scale;
     1210
     1211    stars[i].kronInner = fSN * flux * 0.9 * aper_scale;
     1212    stars[i].kronOuter = fSN * flux * 1.5 * aper_scale;
    11961213
    11971214    stars[i].chipNum = 1;
     
    12741291    stars[i].dFlux = flux * fSN;
    12751292
    1276     stars[i].Map = M[i] - 0.05;
    1277     stars[i].MapRaw = M[i] - 0.10;
     1293    stars[i].Map = M[i] + aper_offset - 0.05;
     1294    stars[i].MapRaw = M[i] + aper_offset - 0.10;
    12781295
    12791296    stars[i].apRadius = 8.0;
     
    13511368    stars[i].srcChipY   = Y[i] + 10.0;
    13521369
    1353     stars[i].kronFlux  = flux * 1.25;
    1354     stars[i].kronFluxErr = fSN * flux * 1.25;
    1355 
    1356     stars[i].kronInner = fSN * flux * 0.9;
    1357     stars[i].kronOuter = fSN * flux * 1.5;
     1370    stars[i].kronFlux  = flux * kron_scale * aper_scale;
     1371    stars[i].kronFluxErr = fSN * flux * kron_scale * aper_scale;
     1372
     1373    stars[i].kronInner = fSN * flux * 0.9 * aper_scale;
     1374    stars[i].kronOuter = fSN * flux * 1.5 * aper_scale;
    13581375
    13591376    stars[i].skyLimitRad = 1;
Note: See TracChangeset for help on using the changeset viewer.