IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 38318


Ignore:
Timestamp:
May 25, 2015, 12:43:23 PM (11 years ago)
Author:
eugene
Message:

add mode option to dvo_secfilt_init (so chip, warp, stack can be reset independently); add HAS_TYCHO, FIX_SYNTH to secfilt flags

Location:
branches/eam_branches/ipp-20150419/Ohana/src
Files:
23 edited

Legend:

Unmodified
Added
Removed

  • branches/eam_branches/ipp-20150419/Ohana/src/addstar/src/SEDfit.c

    r37036 r38318  
    152152
    153153    for (j = 0; j < Nsec; j++) {
    154       dvo_secfilt_init (&outcat[0].secfilt[Nave*Nsec+j]);
     154      dvo_secfilt_init (&outcat[0].secfilt[Nave*Nsec+j], SECFILT_RESET_ALL);
    155155    }
    156156

  • branches/eam_branches/ipp-20150419/Ohana/src/addstar/src/find_matches.c

    r38268 r38318  
    264264
    265265    for (j = 0; j < Nsecfilt; j++) {
    266       dvo_secfilt_init (&catalog[0].secfilt[Nave*Nsecfilt+j]);
     266      dvo_secfilt_init (&catalog[0].secfilt[Nave*Nsecfilt+j], SECFILT_RESET_ALL);
    267267    }
    268268

  • branches/eam_branches/ipp-20150419/Ohana/src/addstar/src/find_matches_closest.c

    r38268 r38318  
    297297
    298298    for (j = 0; j < Nsecfilt; j++) {
    299       dvo_secfilt_init (&catalog[0].secfilt[Nave*Nsecfilt+j]);
     299      dvo_secfilt_init (&catalog[0].secfilt[Nave*Nsecfilt+j], SECFILT_RESET_ALL);
    300300    }
    301301

  • branches/eam_branches/ipp-20150419/Ohana/src/addstar/src/find_matches_closest_refstars.c

    r38268 r38318  
    300300
    301301    for (j = 0; j < Nsecfilt; j++) {
    302       dvo_secfilt_init (&catalog[0].secfilt[Nave*Nsecfilt+j]);
     302      dvo_secfilt_init (&catalog[0].secfilt[Nave*Nsecfilt+j], SECFILT_RESET_ALL);
    303303    }
    304304

  • branches/eam_branches/ipp-20150419/Ohana/src/addstar/src/find_matches_refstars.c

    r38268 r38318  
    250250
    251251    for (j = 0; j < Nsecfilt; j++) {
    252       dvo_secfilt_init (&catalog[0].secfilt[Nave*Nsecfilt+j]);
     252      dvo_secfilt_init (&catalog[0].secfilt[Nave*Nsecfilt+j], SECFILT_RESET_ALL);
    253253    }
    254254

  • branches/eam_branches/ipp-20150419/Ohana/src/addstar/src/find_matches_starpar.c

    r37807 r38318  
    182182
    183183    for (j = 0; j < Nsecfilt; j++) {
    184       dvo_secfilt_init (&catalog[0].secfilt[Nave*Nsecfilt+j]);
     184      dvo_secfilt_init (&catalog[0].secfilt[Nave*Nsecfilt+j], SECFILT_RESET_ALL);
    185185    }
    186186

  • branches/eam_branches/ipp-20150419/Ohana/src/addstar/src/load2mass_catalog.c

    r37036 r38318  
    2929
    3030    for (j = 0; j < Nsec; j++) {
    31       dvo_secfilt_init (&catalog[0].secfilt[Nave*Nsec+j]);
     31      dvo_secfilt_init (&catalog[0].secfilt[Nave*Nsec+j], SECFILT_RESET_ALL);
    3232    }
    3333

  • branches/eam_branches/ipp-20150419/Ohana/src/addstar/test/relphot.flatcorr.dvo

    r38315 r38318  
    2121if (not($?PLOT)) set PLOT = 0
    2222
    23 $USE_CELL_OFFSETS = 0; # turn on non-zero cell offsets
     23$USE_CELL_OFFSETS = 1; # turn on non-zero cell offsets
    2424$SET_UC_RESID = 1; # write a non-zero resid value to the ubercal table (should not have an impact)
    25 $DO_2MASS = 0
    26 $DO_SYNTH = 0
    27 $DO_TYCHO = 0
     25$DO_2MASS = 1
     26$DO_SYNTH = 1
     27$DO_TYCHO = 1
    2828$NC_CLOUDS = 0.08
    2929$UC_CLOUDS = 0.02
    … …  
    196196  tapEXEC relphot -images g,r -v -region 9.5 10.5 19.5 20.5 -D CATDIR $catdir -D STAR_TOOFEW 1 -D SIGMA_LIM 0.07 -statmode WT_MEAN -cloud-limit 0.5 -D IMAGE_OFFSET 0.5 -update -synthphot_zpts $fileroot.synthzpts.fits
    197197  for i 0 mjd_uc[]
    198     ckexposure $catdir mjd_uc[$i] zpt_uc[$i] exptime_uc[$i] airmass_uc[$i] $filt_uc:$i relphot
     198    ckexposure $catdir mjd_uc[$i] zpt_uc[$i] exptime_uc[$i] airmass_uc[$i] $filt_uc:$i relphot_uc
    199199  end
    200200  for i 0 mjd_nc[]
    201     ckexposure $catdir mjd_nc[$i] zpt_nc[$i] exptime_nc[$i] airmass_nc[$i] $filt_nc:$i relphot
     201    ckexposure $catdir mjd_nc[$i] zpt_nc[$i] exptime_nc[$i] airmass_nc[$i] $filt_nc:$i relphot_nc
    202202  end
    203203  ck2mass relphot
     204  cksynth relphot
     205  cktycho relphot
    204206
    205207  tapDONE
    … …  
    207209
    208210macro try.relphot
     211  if ($0 != 3)
     212    echo "go (fileroot) (catdir)"
     213    break
     214  end
     215
     216  local i fileroot rootdir catdir
     217
     218  $fileroot = $1
     219  $catdir = $2
     220
    209221  # run relphot on the db and check that the images now match the expected values
    210   # tapEXEC relphot -images g,r -v -region 9.5 10.5 19.5 20.5 -D CATDIR $1 -D STAR_TOOFEW 1 -D SIGMA_LIM 0.07 -statmode WT_MEAN -cloud-limit 0.5 -D IMAGE_OFFSET 0.5 -update -synthphot_zpts $fileroot.synthzpts.fits
    211   tapEXEC relphot -images g,r -v -region 9.5 10.5 19.5 20.5 -D CATDIR $1 -D STAR_TOOFEW 1 -D SIGMA_LIM 0.07 -statmode WT_MEAN -cloud-limit 0.5 -D IMAGE_OFFSET 0.5 -update
     222  tapEXEC relphot -images g,r -v -region 9.5 10.5 19.5 20.5 -D CATDIR $catdir -D STAR_TOOFEW 1 -D SIGMA_LIM 0.07 -statmode WT_MEAN -cloud-limit 0.5 -D IMAGE_OFFSET 0.5 -update -synthphot_zpts $fileroot.synthzpts.fits -nloop 24
     223
    212224  for i 0 mjd_uc[]
    213     ckexposure $1 mjd_uc[$i] zpt_uc[$i] exptime_uc[$i] airmass_uc[$i] $filt_uc:$i relphot
     225    # ckexposure $catdir mjd_uc[$i] zpt_uc[$i] exptime_uc[$i] airmass_uc[$i] $filt_uc:$i relphot_uc
     226      ckexposure $catdir mjd_uc[$i] zpt_uc[$i] exptime_uc[$i] airmass_uc[$i] $filt_uc:$i relphot_uc
    214227  end
    215228  for i 0 mjd_nc[]
    216     ckexposure $1 mjd_nc[$i] zpt_nc[$i] exptime_nc[$i] airmass_nc[$i] $filt_nc:$i relphot
     229    # ckexposure $catdir mjd_nc[$i] zpt_nc[$i] exptime_nc[$i] airmass_nc[$i] $filt_nc:$i relphot_nc
     230      ckexposure $catdir mjd_nc[$i] zpt_nc[$i] exptime_nc[$i] airmass_nc[$i] $filt_nc:$i relphot_nc
    217231  end
    218232end
    … …  
    256270  $AIRMASS     = $5
    257271  $FILTER      = $6
    258   $MODE        = $7
     272  $FUNC_MODE   = $7
    259273
    260274  # XXX need a function to extract the nominal zpt for a given filter / photcode from the db
    … …  
    325339  $ZPT_REAL_NORM = $ZPT_REAL - 2.5*log($EXPTIME) - $KLAM_NOMINAL*($AIRMASS - 1.0)
    326340
    327   if ("$MODE" == "raw")
     341  if ("$FUNC_MODE" == "raw")
    328342    for ix 0 $NCELL_X
    329343      for iy 0 $NCELL_Y
    … …  
    342356  end
    343357
    344   if ("$MODE" == "setphot_uc")
     358  if ("$FUNC_MODE" == "setphot_uc")
    345359    vstat -q dm_good
    346360    sprintf line "setphot_uc  ZP %8.2f $FILTER %6.3f %6.3f %6.3f: %7.4f %7.4f : %3d" $MJD_IMAGE $ZPT_REAL $ZPT_REAL_NORM $ZPT_NOMINAL $MEAN $SIGMA dm_good[]
    … …  
    357371  end
    358372
    359   if ("$MODE" == "setphot_nc")
     373  if ("$FUNC_MODE" == "setphot_nc")
    360374    vstat -q dm_good
    361375    sprintf line "setphot_nc  ZP %8.2f $FILTER %6.3f %6.3f %6.3f: %7.4f %7.4f : %3d" $MJD_IMAGE $ZPT_REAL $ZPT_REAL_NORM $ZPT_NOMINAL $MEAN $SIGMA dm_good[]
    … …  
    372386  end
    373387
    374   if ("$MODE" == "relphot")
     388  if (("$FUNC_MODE" == "relphot_uc") || ("$FUNC_MODE" == "relphot_nc"))
    375389    vstat -q dm_good
    376390    sprintf line "relphot     ZP %8.2f $FILTER %6.3f %6.3f %6.3f: %7.4f %7.4f : %3d" $MJD_IMAGE $ZPT_REAL $ZPT_REAL_NORM $ZPT_NOMINAL $MEAN $SIGMA dm_good[]
    377     tapOK {abs($MEAN) < 0.001} "$line"
    378     tapOK {abs($SIGMA) < 0.001} "$line"
     391
     392    if ("$FUNC_MODE" == "relphot_uc")
     393      tapOK {abs($MEAN) < 0.001} "$line"
     394      tapOK {abs($SIGMA) < 0.001} "$line"
     395    end
     396    if ("$FUNC_MODE" == "relphot_nc")
     397      # XXX NOTE relaxed condition : bad photometry points are partly clipped but still cause a bias
     398      tapOK {abs($MEAN) < 0.020} "$line"
     399      tapOK {abs($SIGMA) < 0.020} "$line"
     400    end
    379401
    380402    mextract ra dec dbflags
    … …  
    390412    return
    391413  end
     414
     415  echo "ERROR: unknown mode for ckexposure : $FUNC_MODE"
    392416
    393417end
    … …  
    704728  tapEXEC addstar -ref $ROOT.tycho.dat -D CATDIR $CATDIR -D CAMERA gpc1 -quick-airmass -photcode TYCHO_B
    705729
    706   # $KAPA = kapa -noX
     730  $KAPA = kapa -noX
    707731  dev -n tmpdev
    708732  # resize 100 100
    … …  
    714738  cdensify tmpmap tmp tmp
    715739  set map = zero(tmpmap) + 0.2
    716   # close
     740  close
    717741  $KAPA = kapa
    718742
    … …  
    746770
    747771  if ("$1" == "relphot")
    748     subset rs = r_tycho if (m_tycho < 12)
    749     subset ds = d_tycho if (m_tycho < 12)
    750     avmatch rs ds 0.1 g:flags
    751     subset tmp = rs if (g:flags & 0x04); # tycho used for photometry
    752     tapOK {tmp[] == rs[]} "tycho objects used for photometry properly marked"
     772    subset rst = r_tycho if (m_tycho < 12)
     773    subset dst = d_tycho if (m_tycho < 12)
     774    # XXX : should not restrict to 'g'
     775    avmatch rst dst 0.1 g:flags
     776    subset tmp = rst if (g:flags & 0x40); # tycho used for photometry
     777    tapOK {tmp[] == rst[]} "tycho objects used for photometry properly marked"
     778
     779    # non-tycho stars with synth phot should be repaired
     780    subset rsn = r_synth if (m_synth > 12) && (m_synth < 13.5)
     781    subset dsn = d_synth if (m_synth > 12) && (m_synth < 13.5)
     782    # XXX : should not restrict to 'g'
     783    avmatch rsn dsn 0.1 g:flags
     784    subset tmp = rsn if (g:flags & 0x80); # synth photometry repaired
     785    tapOK {tmp[] == rsn[]} "tycho objects used for photometry properly marked"
    753786  end
    754787end

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

    r38293 r38318  
    4848} DVO_INT_NAN;
    4949
     50// init all data, or just catalog data
     51typedef enum {
     52  SECFILT_RESET_CHIP  = 0x01,
     53  SECFILT_RESET_WARP  = 0x02,
     54  SECFILT_RESET_STACK = 0x04,
     55  SECFILT_RESET_ALL   = 0x07,
     56} SecFiltInitMode;
     57 
    5058// max path length
    5159# define DVO_MAX_PATH 1024
    … …  
    182190  ID_SECF_HAS_PS1       = 0x00000010, // PS1 photometry used in average measurement
    183191  ID_SECF_HAS_STACK     = 0x00000020, // PS1 stack photometry exists
    184   ID_PHOTOM_PASS_0      = 0x00000100, // average magnitude calculated in 0th pass
    185   ID_PHOTOM_PASS_1      = 0x00000200, // average magnitude calculated in 1th pass
    186   ID_PHOTOM_PASS_2      = 0x00000400, // average magnitude calculated in 2th pass
    187   ID_PHOTOM_PASS_3      = 0x00000800, // average magnitude calculated in 3th pass
    188   ID_PHOTOM_PASS_4      = 0x00001000, // average magnitude calculated in 4th pass
    189   ID_PSPS_OBJ_EXT       = 0x00002000, // In PSPS ID_SECF_OBJ_EXT is moved here so it fits within 16 bits
     192  ID_SECF_HAS_TYCHO     = 0x00000040, // Tycho photometry used for synth mags
     193  ID_SECF_FIX_SYNTH     = 0x00000080, // synth mags repaired with zpt map
     194  ID_SECF_RANK_0        = 0x00000100, // average magnitude uses rank 0 values
     195  ID_SECF_RANK_1        = 0x00000200, // average magnitude uses rank 1 values
     196  ID_SECF_RANK_2        = 0x00000400, // average magnitude uses rank 2 values
     197  ID_SECF_RANK_3        = 0x00000800, // average magnitude uses rank 3 values
     198  ID_SECF_RANK_4        = 0x00001000, // average magnitude uses rank 4 values
     199  ID_SECF_OBJ_EXT_PSPS  = 0x00002000, // In PSPS ID_SECF_OBJ_EXT is moved here so it fits within 16 bits
    190200  ID_SECF_STACK_PRIMARY = 0x00004000, // PS1 stack photometry comes from primary skycell
    191201  ID_SECF_OBJ_EXT       = 0x01000000, // extended in this band
     202
     203  ID_SECF_CHIP_FLAGS    = 0x01003f1f, // all chip-related bits (used to reset the correct bits only)
     204  ID_SECF_STACK_FLAGS   = 0x00004020, // all stack-related bits (
    192205} DVOSecfiltFlags;
    193206
    … …  
    11041117void dvo_average_init (Average *average);
    11051118void dvo_averageT_init (AverageTiny *average);
    1106 void dvo_secfilt_init (SecFilt *secfilt);
     1119void dvo_secfilt_init (SecFilt *secfilt, SecFiltInitMode mode);
    11071120void dvo_measure_init (Measure *measure);
    11081121void dvo_measureT_init (MeasureTiny *measure);

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

    r38062 r38318  
    170170}
    171171
    172 // init all data, or just catalog data
    173 void dvo_secfilt_init (SecFilt *secfilt) {
    174   secfilt->M           = NAN;
    175   secfilt->dM          = NAN;
    176   secfilt->Map         = NAN;
    177   secfilt->dMap        = NAN;
    178   secfilt->sMap        = NAN;
    179   secfilt->Mkron       = NAN;
    180   secfilt->dMkron      = NAN;
    181   secfilt->sMkron      = NAN;
    182 
    183   secfilt->psfQfMax     = NAN;
    184   secfilt->psfQfPerfMax = NAN;
    185 
    186   secfilt->Mstdev      = NAN;
    187   secfilt->Mmin        = NAN;
    188   secfilt->Mmax        = NAN;
    189   secfilt->Mchisq      = NAN;
    190 
    191   secfilt->Ncode       = 0;
    192   secfilt->Nused       = 0;
    193   secfilt->NusedKron   = 0;
    194   secfilt->NusedAp     = 0;
    195 
    196   secfilt->flags       = 0;
    197 
    198   secfilt->MpsfStk     = NAN;
    199   secfilt->FpsfStk     = NAN;
    200   secfilt->dFpsfStk    = NAN;
    201 
    202   secfilt->MkronStk    = NAN;
    203   secfilt->FkronStk    = NAN;
    204   secfilt->dFkronStk   = NAN;
    205 
    206   secfilt->MapStk      = NAN;
    207   secfilt->FapStk      = NAN;
    208   secfilt->dFapStk     = NAN;
    209 
    210   secfilt->Nstack      = 0;
    211   secfilt->NstackDet   = 0;
    212 
    213   secfilt->stackPrmryOff = -1;
    214   secfilt->stackBestOff  = -1;
    215 
    216   secfilt->MpsfWrp     = NAN;
    217   secfilt->FpsfWrp     = NAN;
    218   secfilt->dFpsfWrp    = NAN;
    219   secfilt->sFpsfWrp    = NAN;
    220 
    221   secfilt->MkronWrp    = NAN;
    222   secfilt->FkronWrp    = NAN;
    223   secfilt->dFkronWrp   = NAN;
    224   secfilt->sFkronWrp   = NAN;
    225 
    226   secfilt->MapWrp      = NAN;
    227   secfilt->FapWrp      = NAN;
    228   secfilt->dFapWrp     = NAN;
    229   secfilt->sFapWrp     = NAN;
    230 
    231   secfilt->NusedWrp     = 0;
    232   secfilt->NusedKronWrp = 0;
    233   secfilt->NusedApWrp   = 0;
    234 
    235   secfilt->Nwarp        = 0;
    236   secfilt->NwarpGood    = 0;
    237 
    238   secfilt->ubercalDist = 1000;
     172void dvo_secfilt_init (SecFilt *secfilt, SecFiltInitMode mode) {
     173
     174  myAssert (mode & SECFILT_RESET_ALL, "at least one of the CHIP,WARP,STACK bits must be set");
     175
     176  if ((mode & SECFILT_RESET_ALL) == SECFILT_RESET_ALL) {
     177    secfilt->flags       = 0;
     178  }
     179
     180  if (mode & SECFILT_RESET_CHIP) {
     181    secfilt->M           = NAN;
     182    secfilt->dM          = NAN;
     183    secfilt->Map         = NAN;
     184    secfilt->dMap        = NAN;
     185    secfilt->sMap        = NAN;
     186    secfilt->Mkron       = NAN;
     187    secfilt->dMkron      = NAN;
     188    secfilt->sMkron      = NAN;
     189
     190    secfilt->psfQfMax     = NAN;
     191    secfilt->psfQfPerfMax = NAN;
     192
     193    secfilt->Mstdev      = NAN;
     194    secfilt->Mmin        = NAN;
     195    secfilt->Mmax        = NAN;
     196    secfilt->Mchisq      = NAN;
     197
     198    secfilt->Ncode       = 0;
     199    secfilt->Nused       = 0;
     200    secfilt->NusedKron   = 0;
     201    secfilt->NusedAp     = 0;
     202    secfilt->ubercalDist = 1000;
     203    secfilt->flags      &= ~ID_SECF_CHIP_FLAGS;
     204  }
     205
     206  if (mode & SECFILT_RESET_STACK) {
     207    secfilt->MpsfStk     = NAN;
     208    secfilt->FpsfStk     = NAN;
     209    secfilt->dFpsfStk    = NAN;
     210
     211    secfilt->MkronStk    = NAN;
     212    secfilt->FkronStk    = NAN;
     213    secfilt->dFkronStk   = NAN;
     214
     215    secfilt->MapStk      = NAN;
     216    secfilt->FapStk      = NAN;
     217    secfilt->dFapStk     = NAN;
     218
     219    secfilt->Nstack      = 0;
     220    secfilt->NstackDet   = 0;
     221
     222    secfilt->stackPrmryOff = -1;
     223    secfilt->stackBestOff  = -1;
     224    secfilt->flags      &= ~ID_SECF_STACK_FLAGS;
     225  }
     226
     227  if (mode & SECFILT_RESET_WARP) {
     228    secfilt->MpsfWrp     = NAN;
     229    secfilt->FpsfWrp     = NAN;
     230    secfilt->dFpsfWrp    = NAN;
     231    secfilt->sFpsfWrp    = NAN;
     232
     233    secfilt->MkronWrp    = NAN;
     234    secfilt->FkronWrp    = NAN;
     235    secfilt->dFkronWrp   = NAN;
     236    secfilt->sFkronWrp   = NAN;
     237
     238    secfilt->MapWrp      = NAN;
     239    secfilt->FapWrp      = NAN;
     240    secfilt->dFapWrp     = NAN;
     241    secfilt->sFapWrp     = NAN;
     242
     243    secfilt->NusedWrp     = 0;
     244    secfilt->NusedKronWrp = 0;
     245    secfilt->NusedApWrp   = 0;
     246
     247    secfilt->Nwarp        = 0;
     248    secfilt->NwarpGood    = 0;
     249  }
    239250}
    240251

  • branches/eam_branches/ipp-20150419/Ohana/src/libdvo/src/dvo_convert_PS1_DEV_1.c

    r37807 r38318  
    178178
    179179  for (i = 0; i < Nvalues; i++) {
    180     dvo_secfilt_init (&out[i]);
     180    dvo_secfilt_init (&out[i], SECFILT_RESET_ALL);
    181181
    182182    out[i].M     = in[i].M;     

  • branches/eam_branches/ipp-20150419/Ohana/src/libdvo/src/dvo_convert_PS1_DEV_2.c

    r37807 r38318  
    173173
    174174  for (i = 0; i < Nvalues; i++) {
    175     dvo_secfilt_init (&out[i]);
     175    dvo_secfilt_init (&out[i], SECFILT_RESET_ALL);
    176176
    177177    out[i].M     = in[i].M;     

  • branches/eam_branches/ipp-20150419/Ohana/src/libdvo/src/dvo_convert_PS1_REF.c

    r37807 r38318  
    110110
    111111  for (i = 0; i < Nvalues; i++) {
    112     dvo_secfilt_init (&out[i]);
     112    dvo_secfilt_init (&out[i], SECFILT_RESET_ALL);
    113113
    114114    out[i].M     = in[i].M;     

  • branches/eam_branches/ipp-20150419/Ohana/src/libdvo/src/dvo_convert_PS1_SIM.c

    r37807 r38318  
    195195
    196196  for (i = 0; i < Nvalues; i++) {
    197     dvo_secfilt_init (&out[i]);
     197    dvo_secfilt_init (&out[i], SECFILT_RESET_ALL);
    198198
    199199    out[i].M             = in[i].M;     

  • branches/eam_branches/ipp-20150419/Ohana/src/libdvo/src/dvo_convert_PS1_V1.c

    r37807 r38318  
    193193
    194194  for (i = 0; i < Nvalues; i++) {
    195     dvo_secfilt_init (&out[i]);
     195    dvo_secfilt_init (&out[i], SECFILT_RESET_ALL);
    196196
    197197    out[i].M     = in[i].M;     

  • branches/eam_branches/ipp-20150419/Ohana/src/libdvo/src/dvo_convert_PS1_V2.c

    r37807 r38318  
    202202
    203203  for (i = 0; i < Nvalues; i++) {
    204     dvo_secfilt_init (&out[i]);
     204    dvo_secfilt_init (&out[i], SECFILT_RESET_ALL);
    205205
    206206    out[i].M     = in[i].M;     

  • branches/eam_branches/ipp-20150419/Ohana/src/libdvo/src/dvo_convert_PS1_V3.c

    r37807 r38318  
    206206
    207207  for (i = 0; i < Nvalues; i++) {
    208     dvo_secfilt_init (&out[i]);
     208    dvo_secfilt_init (&out[i], SECFILT_RESET_ALL);
    209209
    210210    out[i].M           = in[i].M;     

  • branches/eam_branches/ipp-20150419/Ohana/src/libdvo/src/dvo_convert_PS1_V4.c

    r37807 r38318  
    230230
    231231  for (i = 0; i < Nvalues; i++) {
    232     dvo_secfilt_init (&out[i]);
     232    dvo_secfilt_init (&out[i], SECFILT_RESET_ALL);
    233233
    234234    out[i].M             = in[i].M;     

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

    r38153 r38318  
    299299
    300300  for (i = 0; i < Nvalues; i++) {
    301     dvo_secfilt_init (&out[i]);
     301    dvo_secfilt_init (&out[i], SECFILT_RESET_ALL);
    302302
    303303    out[i].M             = in[i].M;     
    … …  
    13591359
    13601360  for (i = 0; i < Nvalues; i++) {
    1361     dvo_secfilt_init (&out[i]);
     1361    dvo_secfilt_init (&out[i], SECFILT_RESET_ALL);
    13621362
    13631363    out[i].M             = in[i].M;     

  • branches/eam_branches/ipp-20150419/Ohana/src/libdvo/src/dvo_convert_elixir.c

    r37807 r38318  
    103103  for (i = 0; i < Nvalues; i++) {
    104104    dvo_average_init (&out[i]);
    105     dvo_secfilt_init (&primary[0][i]);
     105    dvo_secfilt_init (&primary[0][i], SECFILT_RESET_ALL);
    106106
    107107    out[i].R             = in[i].R;     
    … …  
    167167
    168168  for (i = 0; i < Nvalues; i++) {
    169     dvo_secfilt_init (&out[i]);
     169    dvo_secfilt_init (&out[i], SECFILT_RESET_ALL);
    170170
    171171    out[i].Mchisq = pow (10.0, 0.01*in[i].Xm);     

  • branches/eam_branches/ipp-20150419/Ohana/src/libdvo/src/dvo_convert_loneos.c

    r37807 r38318  
    8383  for (i = 0; i < Nvalues; i++) {
    8484    dvo_average_init (&out[i]);
    85     dvo_secfilt_init (&primary[0][i]);
     85    dvo_secfilt_init (&primary[0][i], SECFILT_RESET_ALL);
    8686
    8787    out[i].R             = in[i].R;     
    … …  
    147147
    148148  for (i = 0; i < Nvalues; i++) {
    149     dvo_secfilt_init (&out[i]);
     149    dvo_secfilt_init (&out[i], SECFILT_RESET_ALL);
    150150
    151151    out[i].Mchisq= pow (10.0, 0.01*in[i].Xm);     

  • branches/eam_branches/ipp-20150419/Ohana/src/libdvo/src/dvo_convert_panstarrs_DEV_0.c

    r37807 r38318  
    184184
    185185  for (i = 0; i < Nvalues; i++) {
    186     dvo_secfilt_init (&out[i]);
     186    dvo_secfilt_init (&out[i], SECFILT_RESET_ALL);
    187187
    188188    out[i].M     = in[i].M;     

  • branches/eam_branches/ipp-20150419/Ohana/src/libdvo/src/dvo_convert_panstarrs_DEV_1.c

    r37807 r38318  
    184184
    185185  for (i = 0; i < Nvalues; i++) {
    186     dvo_secfilt_init (&out[i]);
     186    dvo_secfilt_init (&out[i], SECFILT_RESET_ALL);
    187187
    188188    out[i].M     = in[i].M;     
Note: See TracChangeset for help on using the changeset viewer.