IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 12295


Ignore:
Timestamp:
Mar 7, 2007, 11:54:39 AM (19 years ago)
Author:
eugene
Message:

cleanup Nsec / Nsecfilt names, fixed usage with PRI photcodes dropped

Location:
branches/dvo-mods-2007-02/Ohana/src
Files:
24 edited

Legend:

Unmodified
Added
Removed

  • branches/dvo-mods-2007-02/Ohana/src/addstar/src/find_matches.c

    r12037 r12295  
    1212  Coords tcoords;
    1313
    14   /* photcode data - must by of type DEP; options.photcode is equiv PRI/SEC photcode */
    15   /* this function requires incoming stars to have the same (valid!) photcode.equiv value */
     14  /* photcode data - must by of type DEP; options.photcode is equiv photcode for all input
     15     images this function requires incoming stars to have the same photcode.equiv value.  if
     16     this value is not a valid photcode (ie, 0), then no modification is made to the average
     17     magnitudes (Nsec will be -1) */
     18
    1619  Nsecfilt = GetPhotcodeNsecfilt ();
    1720  Nsec     = GetPhotcodeNsec (options.photcode);
    … …  
    181184      catalog[0].measure[Nmeas].theta    = MIN ((0xffff/360.0)*stars[N].df, NO_MAG);
    182185       
    183       /* set the average magnitude if not already set and photcode.equiv is valid */
     186      /* set the average magnitude if not already set and if photcode.equiv is not 0 */
    184187      /* in UPDATE mode, this value is not saved; use relphot to recalculate */
    185188      if (Nsec > -1) {
    … …  
    293296    /* XXX replace df here with theta, right? */
    294297
    295     /* set the average magnitude if not already set and photcode.equiv is valid */
     298    /* set the average magnitude if not already set and the photcode.equiv is not 0 */
    296299    /* in UPDATE mode, this value is not saved; use relphot to recalculate */
    297300    if (Nsec > -1) {

  • branches/dvo-mods-2007-02/Ohana/src/addstar/src/find_matches_closest.c

    r12037 r12295  
    1212  int Nsecfilt, Nsec;
    1313
    14   /* photcode data - must by of type DEP; options.photcode is equiv PRI/SEC photcode */
    15   /* this function requires incoming stars to have the same photcode.equiv value */
     14  /* photcode data - must by of type DEP; options.photcode is equiv photcode for all input
     15     images this function requires incoming stars to have the same photcode.equiv value.  if
     16     this value is not a valid photcode (ie, 0), then no modification is made to the average
     17     magnitudes (Nsec will be -1) */
     18
    1619  Nsecfilt = GetPhotcodeNsecfilt ();
    1720  Nsec     = GetPhotcodeNsec (options.photcode);
    … …  
    199202    catalog[0].measure[Nmeas].theta    = MIN ((0xffff/360.0)*stars[N].df, NO_MAG);
    200203       
    201     /* set the average magnitude if not already set and photcode.equiv is valid */
     204    /* set the average magnitude if not already set and the photcode.equiv is not 0 */
    202205    /* in UPDATE mode, this value is not saved; use relphot to recalculate */
    203206    if (Nsec > -1) {
    … …  
    290293    catalog[0].measure[Nmeas].theta    = MIN ((0xffff/360.0)*stars[N].df, NO_ERR);
    291294
    292     /* set the average magnitude if not already set and photcode.equiv is valid */
     295    /* set the average magnitude if not already set and the photcode.equiv is not 0 */
    293296    /* in UPDATE mode, this value is not saved; use relphot to recalculate */
    294297    if (Nsec > -1) {

  • branches/dvo-mods-2007-02/Ohana/src/addstar/src/gstars.c

    r12270 r12295  
    77  int i, j, Nfile, Nheader, NHEADER, Nimage, NIMAGE;
    88  int Nskip, Nhead, Ndata, done, status, mode, NinStars;
    9   char **file;
     9  char **file, *name;
    1010  FILE *f;
    1111  glob_t globList;
    … …  
    6363
    6464      ReadImageHeader (header, &image[i], photcode);
     65     
     66      /* find image rootname */
     67      name = filebasename (file[i]);
     68      snprintf (image[i].name, 32, name);
     69      free (name);
    6570   
    6671      switch (mode) {
    … …  
    195200  if (VERBOSE) fprintf (stderr, "file %s has %d headers, including %d images\n", file[0], Nheader, Nimage);
    196201
     202  /* find image rootname */
     203  name = filebasename (file[0]);
     204
    197205  // now run through the images, interpret the headers and read the stars
    198206  for (i = 0; i < Nimage; i++) {
    … …  
    201209      if (VERBOSE) fprintf (stderr, "reading header for %s (%s)\n", exthead[i], extdata[i]);
    202210      ReadImageHeader (headers[Nhead], &image[i], 0);
     211
     212      // XXX use something to set the chip name? EXTNAME?
     213      if (!strcmp(exthead[i], "PHU") && (Nimage == 1)) {
     214        snprintf (image[i].name, 32, "%s", name);
     215      } else {
     216        snprintf (image[i].name, 32, "%s.%s", name, exthead[i]);
     217      }
    203218
    204219      // this is an error we should not encounter
    … …  
    217232      stars = MergeStars (stars, Nstars, inStars, image[i].nstar);
    218233  }
     234  free (name);
    219235  *Nimages = Nimage;
    220236  *images = image;

  • branches/dvo-mods-2007-02/Ohana/src/libdvo/src/LoadPhotcodesFITS.c

    r12273 r12295  
    7474  for (i = 0; i < Ncode; i++) {
    7575    if (photcode[i].type == PHOT_DEP) {
    76       Nsec = table[0].hashcode[photcode[i].equiv];
    77       if ((Nsec >= Ncode) || (Nsec < 0)) {
    78         fprintf (stderr, "reference for dependent photcode is not in photcodes\n");
    79         free (photcode);
    80         return FALSE;
     76      if (photcode[i].equiv) {
     77        Nsec = table[0].hashcode[photcode[i].equiv];
     78        if ((Nsec >= Ncode) || (Nsec < 0)) {
     79          fprintf (stderr, "reference for dependent photcode is not in photcodes\n");
     80          free (photcode);
     81          return FALSE;
     82        }
    8183      }
    8284      if (photcode[Nsec].type != PHOT_SEC) {

  • branches/dvo-mods-2007-02/Ohana/src/libdvo/src/LoadPhotcodesText.c

    r12031 r12295  
    5252    if (!strcmp (C1, "-")) { c1 = 0; }
    5353    if (!strcmp (C2, "-")) { c2 = 0; }
     54
     55    if (!code) {
     56        fprintf (stderr, "photcode values may not be 0: fix %s\n", name);
     57        return (FALSE);
     58    }
    5459
    5560    photcode[Ncode].type = 0;
    … …  
    151156  for (i = 0; i < Ncode; i++) {
    152157    if (photcode[i].type == PHOT_DEP) {
    153       Nsec = table[0].hashcode[photcode[i].equiv];
    154       if ((Nsec >= Ncode) || (Nsec < 0)) {
    155         fprintf (stderr, "reference for dependent photcode is not in photcodes\n");
    156         free (photcode);
    157         return (FALSE);
    158       }
    159       if (photcode[Nsec].type != PHOT_SEC) {
    160         fprintf (stderr, "reference for dependent photcode is not an average photcode\n");
    161         free (photcode);
    162         return (FALSE);
     158      // photcode.equiv of 0 means "undefined"
     159      if (photcode[i].equiv) {
     160        Nsec = table[0].hashcode[photcode[i].equiv];
     161        if ((Nsec >= Ncode) || (Nsec < 0)) {
     162          fprintf (stderr, "reference for dependent photcode is not a valid photcode\n");
     163          free (photcode);
     164          return (FALSE);
     165        }
     166        if (photcode[Nsec].type != PHOT_SEC) {
     167          fprintf (stderr, "reference for dependent photcode is not an average photcode\n");
     168          free (photcode);
     169          return (FALSE);
     170        }
    163171      }
    164172    }

  • branches/dvo-mods-2007-02/Ohana/src/libdvo/src/dvo_photcode_ops.c

    r12031 r12295  
    173173PhotCode *GetPhotcodebyNsec (int Nsec) {
    174174 
     175  int Ncode;
     176  int Nseq;
     177
    175178  if (Nsec > photcodes[0].Nsecfilt) return (NULL);
    176179  if (Nsec < 0) return (NULL);
    177180 
    178   return (&photcodes[0].code[photcodes[0].codeNsec[Nsec]]);
     181  Ncode = photcodes[0].codeNsec[Nsec];
     182  if (Ncode < 0) return (NULL);
     183
     184  Nseq = photcodes[0].hashcode[Ncode];
     185  return (&photcodes[0].code[Nseq]);
    179186}
    180187

  • branches/dvo-mods-2007-02/Ohana/src/opihi/dvo/avextract.c

    r10796 r12295  
    44 
    55  int i, j, m, N, NPTS, param;
    6   int Nsec, mode;
     6  int Nsecfilt, mode;
    77  char *RegionName, *RegionList, *p;
    88
    … …  
    2222  /* load photcode information */
    2323  if (!InitPhotcodes ()) goto escape;
    24   Nsec = GetPhotcodeNsecfilt ();
     24  Nsecfilt = GetPhotcodeNsecfilt ();
    2525
    2626  /* interpret command-line options */
    … …  
    6868    for (j = 0; j < catalog.Naverage; j++) {
    6969      m = catalog.average[j].offset;
    70       vec[0].elements[N] = ExtractAverages (code, mode, &catalog.average[j], &catalog.secfilt[j*Nsec], &catalog.measure[m], param);
     70      vec[0].elements[N] = ExtractAverages (code, mode, &catalog.average[j], &catalog.secfilt[j*Nsecfilt], &catalog.measure[m], param);
    7171      N++;
    7272      CHECK_REALLOCATE (vec[0].elements, float, NPTS, N, 2000);

  • branches/dvo-mods-2007-02/Ohana/src/opihi/dvo/calextract.c

    r12046 r12295  
    66 
    77  int i, j, m, N, Nr, mode[2];
    8   int Nsec, NSTAR;
     8  int Nsecfilt, NSTAR;
    99  char *RegionName, *RegionList;
    1010  double M1, M2, dM2, color;
    … …  
    2626  /* load photcode information */
    2727  if (!InitPhotcodes ()) return (FALSE);
    28   Nsec = GetPhotcodeNsecfilt ();
     28  Nsecfilt = GetPhotcodeNsecfilt ();
    2929
    3030  /* command line arguments */
    … …  
    7878      m = catalog.average[i].offset;
    7979
    80       if (code[0][0].c1 && code[0][0].c2 && !PhotColor (&catalog.average[i], &catalog.secfilt[i*Nsec], &catalog.measure[m], code[0][0].c1, code[0][0].c2, &color)) continue;
     80      if (code[0][0].c1 && code[0][0].c2 && !PhotColor (&catalog.average[i], &catalog.secfilt[i*Nsecfilt], &catalog.measure[m], code[0][0].c1, code[0][0].c2, &color)) continue;
    8181
    8282      /* find data for filter 2 (PHOT_REF) */
    … …  
    9191
    9292      /* find data for filter 1 */
    93       M1 = ExtractAverages (code[0], mode[0], &catalog.average[i], &catalog.secfilt[i*Nsec], &catalog.measure[m], AVE_MAG);
     93      M1 = ExtractAverages (code[0], mode[0], &catalog.average[i], &catalog.secfilt[i*Nsecfilt], &catalog.measure[m], AVE_MAG);
    9494      if (M1 == NO_MAG) continue;
    9595
    … …  
    9999      vec[NR ][0].elements[N] = catalog.average[i].R;
    100100      vec[ND ][0].elements[N] = catalog.average[i].D;
    101       vec[Nd1][0].elements[N] = ExtractAverages (code[0], mode[0], &catalog.average[i], &catalog.secfilt[i*Nsec], &catalog.measure[m], AVE_dMAG);
     101      vec[Nd1][0].elements[N] = ExtractAverages (code[0], mode[0], &catalog.average[i], &catalog.secfilt[i*Nsecfilt], &catalog.measure[m], AVE_dMAG);
    102102      vec[Nd2][0].elements[N] = dM2;
    103       vec[Nx ][0].elements[N] = ExtractAverages (code[0], mode[0], &catalog.average[i], &catalog.secfilt[i*Nsec], &catalog.measure[m], AVE_Xm);
    104       vec[Nc ][0].elements[N] = ExtractAverages (code[0], mode[0], &catalog.average[i], &catalog.secfilt[i*Nsec], &catalog.measure[m], AVE_NCODE);
    105       vec[Np ][0].elements[N] = ExtractAverages (code[0], mode[0], &catalog.average[i], &catalog.secfilt[i*Nsec], &catalog.measure[m], AVE_NPHOT);
    106       vec[Nt ][0].elements[N] = ExtractAverages (code[0], mode[0], &catalog.average[i], &catalog.secfilt[i*Nsec], &catalog.measure[m], AVE_NCRIT);
     103      vec[Nx ][0].elements[N] = ExtractAverages (code[0], mode[0], &catalog.average[i], &catalog.secfilt[i*Nsecfilt], &catalog.measure[m], AVE_Xm);
     104      vec[Nc ][0].elements[N] = ExtractAverages (code[0], mode[0], &catalog.average[i], &catalog.secfilt[i*Nsecfilt], &catalog.measure[m], AVE_NCODE);
     105      vec[Np ][0].elements[N] = ExtractAverages (code[0], mode[0], &catalog.average[i], &catalog.secfilt[i*Nsecfilt], &catalog.measure[m], AVE_NPHOT);
     106      vec[Nt ][0].elements[N] = ExtractAverages (code[0], mode[0], &catalog.average[i], &catalog.secfilt[i*Nsecfilt], &catalog.measure[m], AVE_NCRIT);
    107107      N ++;
    108108      if (N == NSTAR) {

  • branches/dvo-mods-2007-02/Ohana/src/opihi/dvo/calmextract.c

    r12046 r12295  
    77 
    88  int i, j, k, m, N, N1, Nr, mode[2];
    9   int NSTAR, Nstar, Nsec;
     9  int NSTAR, Nstar, Nsecfilt;
    1010  char *RegionName, *RegionList;
    1111  double *M1, M2, dM2, color;
    … …  
    2727  /* load photcode information */
    2828  if (!InitPhotcodes ()) goto escape;
    29   Nsec = GetPhotcodeNsecfilt ();
     29  Nsecfilt = GetPhotcodeNsecfilt ();
    3030
    3131  /* command line arguments */
    … …  
    9191
    9292      /* PRI/SEC must have data for color term */
    93       if (code[0][0].c1 && code[0][0].c2 && !PhotColor (&catalog.average[i], &catalog.secfilt[i*Nsec], &catalog.measure[m], code[0][0].c1, code[0][0].c2, &color)) continue;
     93      if (code[0][0].c1 && code[0][0].c2 && !PhotColor (&catalog.average[i], &catalog.secfilt[i*Nsecfilt], &catalog.measure[m], code[0][0].c1, code[0][0].c2, &color)) continue;
    9494
    9595      /* find data for filter 2 (REF) */
    … …  
    104104     
    105105      /* find data for filter 1 */
    106       M1 = ExtractMeasures (code[0], mode[0], &catalog.average[i], &catalog.secfilt[i*Nsec], &catalog.measure[m], &N1, MEAS_MAG);
     106      M1 = ExtractMeasures (code[0], mode[0], &catalog.average[i], &catalog.secfilt[i*Nsecfilt], &catalog.measure[m], &N1, MEAS_MAG);
    107107      if (N1 == 0) goto skip;
    108108
    … …  
    115115      }
    116116
    117       ConcatMeasures (vec[Nt ], code[0], mode[0], &catalog.average[i], &catalog.secfilt[i*Nsec], &catalog.measure[m], N1, MEAS_TIME);
    118       ConcatMeasures (vec[Nz ], code[0], mode[0], &catalog.average[i], &catalog.secfilt[i*Nsec], &catalog.measure[m], N1, MEAS_AIRMASS);
    119       ConcatMeasures (vec[NT ], code[0], mode[0], &catalog.average[i], &catalog.secfilt[i*Nsec], &catalog.measure[m], N1, MEAS_EXPTIME);
    120       ConcatMeasures (vec[NP ], code[0], mode[0], &catalog.average[i], &catalog.secfilt[i*Nsec], &catalog.measure[m], N1, MEAS_PHOTCODE);
    121       ConcatMeasures (vec[Nd1], code[0], mode[0], &catalog.average[i], &catalog.secfilt[i*Nsec], &catalog.measure[m], N1, MEAS_dMAG);
    122       ConcatMeasures (vec[Nxc], code[0], mode[0], &catalog.average[i], &catalog.secfilt[i*Nsec], &catalog.measure[m], N1, MEAS_XCCD);
    123       ConcatMeasures (vec[Nyc], code[0], mode[0], &catalog.average[i], &catalog.secfilt[i*Nsec], &catalog.measure[m], N1, MEAS_YCCD);
    124       ConcatMeasures (vec[Nxm], code[0], mode[0], &catalog.average[i], &catalog.secfilt[i*Nsec], &catalog.measure[m], N1, MEAS_XMOSAIC);
    125       ConcatMeasures (vec[Nym], code[0], mode[0], &catalog.average[i], &catalog.secfilt[i*Nsec], &catalog.measure[m], N1, MEAS_YMOSAIC);
     117      ConcatMeasures (vec[Nt ], code[0], mode[0], &catalog.average[i], &catalog.secfilt[i*Nsecfilt], &catalog.measure[m], N1, MEAS_TIME);
     118      ConcatMeasures (vec[Nz ], code[0], mode[0], &catalog.average[i], &catalog.secfilt[i*Nsecfilt], &catalog.measure[m], N1, MEAS_AIRMASS);
     119      ConcatMeasures (vec[NT ], code[0], mode[0], &catalog.average[i], &catalog.secfilt[i*Nsecfilt], &catalog.measure[m], N1, MEAS_EXPTIME);
     120      ConcatMeasures (vec[NP ], code[0], mode[0], &catalog.average[i], &catalog.secfilt[i*Nsecfilt], &catalog.measure[m], N1, MEAS_PHOTCODE);
     121      ConcatMeasures (vec[Nd1], code[0], mode[0], &catalog.average[i], &catalog.secfilt[i*Nsecfilt], &catalog.measure[m], N1, MEAS_dMAG);
     122      ConcatMeasures (vec[Nxc], code[0], mode[0], &catalog.average[i], &catalog.secfilt[i*Nsecfilt], &catalog.measure[m], N1, MEAS_XCCD);
     123      ConcatMeasures (vec[Nyc], code[0], mode[0], &catalog.average[i], &catalog.secfilt[i*Nsecfilt], &catalog.measure[m], N1, MEAS_YCCD);
     124      ConcatMeasures (vec[Nxm], code[0], mode[0], &catalog.average[i], &catalog.secfilt[i*Nsecfilt], &catalog.measure[m], N1, MEAS_XMOSAIC);
     125      ConcatMeasures (vec[Nym], code[0], mode[0], &catalog.average[i], &catalog.secfilt[i*Nsecfilt], &catalog.measure[m], N1, MEAS_YMOSAIC);
    126126
    127127      for (j = 0; j < N1; j++, N++) {

  • branches/dvo-mods-2007-02/Ohana/src/opihi/dvo/ccd.c

    r12046 r12295  
    77  int i, m, k, Npts, NPTS, N;
    88  int N1, N2, i1, i2, mode[4];
    9   int Nsec, KeepNulls;
     9  int Nsecfilt, KeepNulls;
    1010
    1111  Catalog catalog;
    … …  
    2424  /* load photcode information */
    2525  if (!InitPhotcodes ()) goto escape;
    26   Nsec = GetPhotcodeNsecfilt ();
     26  Nsecfilt = GetPhotcodeNsecfilt ();
    2727
    2828  /* interpret command-line options */
    … …  
    7676
    7777      SetSelectionParam (0);
    78       M1 = ExtractDMag (&code[0], &mode[0], &catalog.average[i], &catalog.secfilt[i*Nsec], &catalog.measure[m], &N1);
     78      M1 = ExtractDMag (&code[0], &mode[0], &catalog.average[i], &catalog.secfilt[i*Nsecfilt], &catalog.measure[m], &N1);
    7979      if (N1 == 0) goto skip;
    8080
    8181      SetSelectionParam (2);
    82       M2 = ExtractDMag (&code[2], &mode[2], &catalog.average[i], &catalog.secfilt[i*Nsec], &catalog.measure[m], &N2);
     82      M2 = ExtractDMag (&code[2], &mode[2], &catalog.average[i], &catalog.secfilt[i*Nsecfilt], &catalog.measure[m], &N2);
    8383      if (N2 == 0) {
    8484        if (KeepNulls) {

  • branches/dvo-mods-2007-02/Ohana/src/opihi/dvo/cmd.c

    r12046 r12295  
    77  int i, j, m, i1, i3, N1, N3, N;
    88  int Npts, NPTS, mode[3];
    9   int Nsec, KeepNulls;
     9  int Nsecfilt, KeepNulls;
    1010
    1111  PhotCode *code[3];
    … …  
    2424  /* load photcode information */
    2525  if (!InitPhotcodes ()) goto escape;
    26   Nsec = GetPhotcodeNsecfilt ();
     26  Nsecfilt = GetPhotcodeNsecfilt ();
    2727
    2828  /* interpret command-line options */
    … …  
    7474
    7575      SetSelectionParam (0);
    76       M1 = ExtractDMag (code, mode, &catalog.average[i], &catalog.secfilt[i*Nsec], &catalog.measure[m], &N1);
     76      M1 = ExtractDMag (code, mode, &catalog.average[i], &catalog.secfilt[i*Nsecfilt], &catalog.measure[m], &N1);
    7777      if (N1 == 0) goto skip;
    7878
    7979      SetSelectionParam (2);
    80       M3 = ExtractMagnitudes (code[2], mode[2], &catalog.average[i], &catalog.secfilt[i*Nsec], &catalog.measure[m], &N3);
     80      M3 = ExtractMagnitudes (code[2], mode[2], &catalog.average[i], &catalog.secfilt[i*Nsecfilt], &catalog.measure[m], &N3);
    8181      if (N3 == 0) {
    8282        if (KeepNulls) {

  • branches/dvo-mods-2007-02/Ohana/src/opihi/dvo/ddmags.c

    r8455 r12295  
    77  int i, m, k, N, Npts, NPTS;
    88  int N1, N2, i1, i2, mode[4];
    9   int Nsec, KeepNulls;
     9  int Nsecfilt, KeepNulls;
    1010
    1111  Catalog catalog;
    … …  
    2424  /* load photcode information */
    2525  if (!InitPhotcodes ()) goto escape;
    26   Nsec = GetPhotcodeNsecfilt ();
     26  Nsecfilt = GetPhotcodeNsecfilt ();
    2727
    2828  /* interpret command-line options */
    … …  
    7979
    8080      SetSelectionParam (0);
    81       M1 = ExtractDMag (&code[0], &mode[0], &catalog.average[i], &catalog.secfilt[i*Nsec], &catalog.measure[m], &N1);
     81      M1 = ExtractDMag (&code[0], &mode[0], &catalog.average[i], &catalog.secfilt[i*Nsecfilt], &catalog.measure[m], &N1);
    8282      if (N1 == 0) goto skip;
    8383
    8484      SetSelectionParam (2);
    85       M2 = ExtractDMag (&code[2], &mode[2], &catalog.average[i], &catalog.secfilt[i*Nsec], &catalog.measure[m], &N2);
     85      M2 = ExtractDMag (&code[2], &mode[2], &catalog.average[i], &catalog.secfilt[i*Nsecfilt], &catalog.measure[m], &N2);
    8686      if (N2 == 0) {
    8787        if (KeepNulls) {

  • branches/dvo-mods-2007-02/Ohana/src/opihi/dvo/dmagaves.c

    r12046 r12295  
    77  int i, j, k, m, N1;
    88  int Npts, NPTS, param, mode[3];
    9   int Nsec;
     9  int Nsecfilt;
    1010
    1111  PhotCode *code[3];
    … …  
    2525  /* load photcode information */
    2626  if (!InitPhotcodes ()) goto escape;
    27   Nsec = GetPhotcodeNsecfilt ();
     27  Nsecfilt = GetPhotcodeNsecfilt ();
    2828
    2929  /* interpret command-line options */
    … …  
    6868
    6969      SetSelectionParam (0);
    70       M1 = ExtractDMag (code, mode, &catalog.average[i], &catalog.secfilt[i*Nsec], &catalog.measure[m], &N1);
     70      M1 = ExtractDMag (code, mode, &catalog.average[i], &catalog.secfilt[i*Nsecfilt], &catalog.measure[m], &N1);
    7171      if (N1 == 0) goto skip;
    7272
    7373      SetSelectionParam (2);
    74       M2 = ExtractAverages (code[2], mode[2], &catalog.average[i], &catalog.secfilt[i*Nsec], &catalog.measure[m], param);
     74      M2 = ExtractAverages (code[2], mode[2], &catalog.average[i], &catalog.secfilt[i*Nsecfilt], &catalog.measure[m], param);
    7575
    7676      for (k = 0; k < N1; k++) {

  • branches/dvo-mods-2007-02/Ohana/src/opihi/dvo/dmagmeas.c

    r12046 r12295  
    77  int i, j, m, i1, i3, N1, N3, N;
    88  int Npts, NPTS, param, mode[3];
    9   int Nsec, KeepNulls;
     9  int Nsecfilt, KeepNulls;
    1010
    1111  Catalog catalog;
    … …  
    2525  /* load photcode information */
    2626  if (!InitPhotcodes ()) goto escape;
    27   Nsec = GetPhotcodeNsecfilt ();
     27  Nsecfilt = GetPhotcodeNsecfilt ();
    2828
    2929  /* interpret command-line options */
    … …  
    7676
    7777      SetSelectionParam (0);
    78       M1 = ExtractDMag (code, mode, &catalog.average[i], &catalog.secfilt[i*Nsec], &catalog.measure[m], &N1);
     78      M1 = ExtractDMag (code, mode, &catalog.average[i], &catalog.secfilt[i*Nsecfilt], &catalog.measure[m], &N1);
    7979      if (N1 == 0) goto skip;
    8080
    8181      SetSelectionParam (2);
    82       M3 = ExtractMeasures (code[2], mode[2], &catalog.average[i], &catalog.secfilt[i*Nsec], &catalog.measure[m], &N3, param);
     82      M3 = ExtractMeasures (code[2], mode[2], &catalog.average[i], &catalog.secfilt[i*Nsecfilt], &catalog.measure[m], &N3, param);
    8383      if (N3 == 0) {
    8484        if (KeepNulls) {

  • branches/dvo-mods-2007-02/Ohana/src/opihi/dvo/dmags.c

    r8455 r12295  
    77  int i, j, m, i1, i3, N1, N3, N;
    88  int Npts, NPTS, mode[3];
    9   int Nsec, KeepNulls;
     9  int Nsecfilt, KeepNulls;
    1010
    1111  PhotCode *code[3];
    … …  
    2424  /* load photcode information */
    2525  if (!InitPhotcodes ()) goto escape;
    26   Nsec = GetPhotcodeNsecfilt ();
     26  Nsecfilt = GetPhotcodeNsecfilt ();
    2727
    2828  /* interpret command-line options */
    … …  
    7474
    7575      SetSelectionParam (0);
    76       M1 = ExtractDMag (code, mode, &catalog.average[i], &catalog.secfilt[i*Nsec], &catalog.measure[m], &N1);
     76      M1 = ExtractDMag (code, mode, &catalog.average[i], &catalog.secfilt[i*Nsecfilt], &catalog.measure[m], &N1);
    7777      if (N1 == 0) goto skip;
    7878
    7979      SetSelectionParam (2);
    80       M3 = ExtractMagnitudes (code[2], mode[2], &catalog.average[i], &catalog.secfilt[i*Nsec], &catalog.measure[m], &N3);
     80      M3 = ExtractMagnitudes (code[2], mode[2], &catalog.average[i], &catalog.secfilt[i*Nsecfilt], &catalog.measure[m], &N3);
    8181      if (N3 == 0) {
    8282        if (KeepNulls) {

  • branches/dvo-mods-2007-02/Ohana/src/opihi/dvo/dmt.c

    r12046 r12295  
    55 
    66  int i, m, k, N, Ngraph, SaveVectors;
    7   int Ns, Nsec, NPTS;
     7  int Nsec, Nsecfilt, NPTS;
    88  double Radius;
    99  float dt1, dt2, dmt1, dmt2;
    … …  
    5050    return (FALSE);
    5151  }
    52   Nsec = GetPhotcodeNsecfilt();
    53   Ns = GetPhotcodeNsec (code[0].code);
     52  Nsecfilt = GetPhotcodeNsecfilt();
     53  Nsec = GetPhotcodeNsec (code[0].code);
    5454
    5555  Radius = MAX (fabs(graphsky.xmax), fabs(graphsky.ymax));
    … …  
    8484      if (catalog.average[i].Nm != 3) continue;
    8585      m = catalog.average[i].offset;
    86       M0 = (Ns == -1) ? NO_MAG : catalog.secfilt[i*Nsec+Ns].M;
     86      M0 = catalog.secfilt[i*Nsecfilt+Nsec].M;
    8787      M1 = PhotCat (&catalog.measure[m+0]);
    8888      M2 = PhotCat (&catalog.measure[m+1]);

  • branches/dvo-mods-2007-02/Ohana/src/opihi/dvo/fitcolors.c

    r12046 r12295  
    1212  int i, k, m, N, NP1, NP2, NP, Np, Npts, NPTS;
    1313  int N1, N2, i1, i2, mode[4];
    14   int Nsec, status;
     14  int Nsecfilt, status;
    1515  void *oldsignal;
    1616  char *RegionName, *RegionList;
    … …  
    4343  /* load photcode information */
    4444  if (!InitPhotcodes ()) goto escape;
    45   Nsec = GetPhotcodeNsecfilt ();
     45  Nsecfilt = GetPhotcodeNsecfilt ();
    4646
    4747  /* interpret command-line options */
    … …  
    218218
    219219          SetSelectionParam (0);
    220           M1 = ExtractDMag (&code[0], &mode[0], &catalog[k].average[i], &catalog[k].secfilt[i*Nsec], &catalog[k].measure[m], &N1);
     220          M1 = ExtractDMag (&code[0], &mode[0], &catalog[k].average[i], &catalog[k].secfilt[i*Nsecfilt], &catalog[k].measure[m], &N1);
    221221          if (N1 == 0) goto skip_star;
    222222
    223223          SetSelectionParam (2);
    224           M2 = ExtractDMag (&code[2], &mode[2], &catalog[k].average[i], &catalog[k].secfilt[i*Nsec], &catalog[k].measure[m], &N2);
     224          M2 = ExtractDMag (&code[2], &mode[2], &catalog[k].average[i], &catalog[k].secfilt[i*Nsecfilt], &catalog[k].measure[m], &N2);
    225225          if (N2 == 0) goto skip_star;
    226226

  • branches/dvo-mods-2007-02/Ohana/src/opihi/dvo/fitsed.c

    r12046 r12295  
    2525  int *hashcode;
    2626  int i, j, k, m, N, done, Nfit;
    27   int Nsec, status;
     27  int Nsecfilt, status;
    2828  void *oldsignal;
    2929  char *RegionName, *RegionList;
    … …  
    7878  /* load photcode information */
    7979  if (!InitPhotcodes ()) goto escape;
    80   Nsec = GetPhotcodeNsecfilt ();
     80  Nsecfilt = GetPhotcodeNsecfilt ();
    8181
    8282  /* interpret command-line options */

  • branches/dvo-mods-2007-02/Ohana/src/opihi/dvo/gstar.c

    r12012 r12295  
    11# include "dvoshell.h"
    22
    3 void initPhotcodeSequence (int Nsec);
     3void initPhotcodeSequence (int Nsecfilt);
    44void freePhotcodeSequence ();
    55void printPhotcodeSequence (Average *average, SecFilt *secfilt, int entry, int type);
    … …  
    1111  double Mcat, Mrel;
    1212  float *RA, *DEC;
    13   int i, j, k, m, N, *N1, Nsec, NPTS, QUIET;
     13  int i, j, k, m, N, *N1, Nsecfilt, NPTS, QUIET;
    1414  int Nstars, found, GetMeasures, Nlo, Nhi;
    1515  int SaveVectors;
    … …  
    2222
    2323  if (!InitPhotcodes ()) return (FALSE);
    24   Nsec = GetPhotcodeNsecfilt ();
     24  Nsecfilt = GetPhotcodeNsecfilt ();
    2525
    2626  QUIET = FALSE;
    … …  
    127127  }
    128128
    129   initPhotcodeSequence (Nsec);
     129  initPhotcodeSequence (Nsecfilt);
    130130
    131131  for (i = Nlo; (i < catalog.Naverage) && !found; i++) {
    … …  
    144144     
    145145        /* filter names */
    146         for (j = 0; j < Nsec + 1; j++) printPhotcodeSequence (&catalog.average[k], &catalog.secfilt[Nsec*k], j, 3);
     146        for (j = 0; j < Nsecfilt; j++) printPhotcodeSequence (&catalog.average[k], &catalog.secfilt[Nsecfilt*k], j, 3);
    147147        gprint (GP_LOG, "\n");
    148148
    149149        /* average mags */
    150         for (j = 0; j < Nsec + 1; j++) printPhotcodeSequence (&catalog.average[k], &catalog.secfilt[Nsec*k], j, 0);
     150        for (j = 0; j < Nsecfilt; j++) printPhotcodeSequence (&catalog.average[k], &catalog.secfilt[Nsecfilt*k], j, 0);
    151151        gprint (GP_LOG, "\n");
    152152
    153153        /* average mag errors */
    154         for (j = 0; j < Nsec + 1; j++) printPhotcodeSequence (&catalog.average[k], &catalog.secfilt[Nsec*k], j, 1);
     154        for (j = 0; j < Nsecfilt; j++) printPhotcodeSequence (&catalog.average[k], &catalog.secfilt[Nsecfilt*k], j, 1);
    155155        gprint (GP_LOG, "\n");
    156156
    157157        /* average mag chisq */
    158         for (j = 0; j < Nsec + 1; j++) printPhotcodeSequence (&catalog.average[k], &catalog.secfilt[Nsec*k], j, 2);
     158        for (j = 0; j < Nsecfilt; j++) printPhotcodeSequence (&catalog.average[k], &catalog.secfilt[Nsecfilt*k], j, 2);
    159159        gprint (GP_LOG, "\n");
    160160      }
    … …  
    165165
    166166          Mcat = PhotCat (&catalog.measure[m]);
    167           Mrel = PhotRel (&catalog.measure[m], &catalog.average[k], &catalog.secfilt[k*Nsec]);
     167          Mrel = PhotRel (&catalog.measure[m], &catalog.average[k], &catalog.secfilt[k*Nsecfilt]);
    168168
    169169          if (GetMeasures && !QUIET) {
    … …  
    223223static int *sequence = NULL;
    224224
    225 void initPhotcodeSequence (int Nsec) {
     225void initPhotcodeSequence (int Nsecfilt) {
    226226
    227227  int j;
    … …  
    230230
    231231  // sequence contains, in desired order, secfilt number (0 == pri)
    232   ALLOCATE (sequence, int, Nsec + 1);
    233   ALLOCATE (codeNumber, int, Nsec + 1);
     232  ALLOCATE (sequence, int, Nsecfilt);
     233  ALLOCATE (codeNumber, int, Nsecfilt);
    234234 
    235235  /* filter names -- primary code is 0 in this function */
    236   for (j = 0; j < Nsec + 1; j++) {
     236  for (j = 0; j < Nsecfilt; j++) {
    237237    code = GetPhotcodebyNsec (j);
    238238    codeNumber[j] = code[0].code;
    … …  
    240240  }
    241241
    242   isort_pair (codeNumber, sequence, Nsec + 1);
     242  isort_pair (codeNumber, sequence, Nsecfilt);
    243243  free (codeNumber);
    244244}
    … …  
    254254  PhotCode *code;
    255255
    256   seq = sequence[entry] - 1;
     256  seq = sequence[entry];
    257257
    258258  switch (type) {
    … …  
    282282
    283283    case 3: /* filter names */
    284       code = GetPhotcodebyNsec (seq + 1);
    285       gprint (GP_LOG, "%6s ", code[0].name);
    286       break;
    287   }
    288 }
     284      code = GetPhotcodebyNsec (seq);
     285      gprint (GP_LOG, "%-6s ", code[0].name);
     286      break;
     287  }
     288}

  • branches/dvo-mods-2007-02/Ohana/src/opihi/dvo/lightcurve.c

    r12031 r12295  
    66  float *RA, *DEC;
    77  int Nstars, found, PhotCodeSelect;
    8   int i, j, k, m, N, NPTS, Nsec, RELPHOT, *N1, TimeFormat;
     8  int i, j, k, m, N, NPTS, Nsecfilt, RELPHOT, *N1, TimeFormat;
    99  time_t TimeReference;
    1010
    … …  
    1616
    1717  if (!InitPhotcodes ()) return (FALSE);
    18   Nsec = GetPhotcodeNsecfilt ();
     18  Nsecfilt = GetPhotcodeNsecfilt ();
    1919
    2020  if ((tvec = SelectVector ("tc", ANYVECTOR, TRUE)) == NULL) return (FALSE);
    … …  
    122122          mvec[0].elements[N] = PhotCat (&catalog.measure[m]);
    123123        } else {
    124           mvec[0].elements[N] = PhotRel (&catalog.measure[m], &catalog.average[k], &catalog.secfilt[k*Nsec]);
     124          mvec[0].elements[N] = PhotRel (&catalog.measure[m], &catalog.average[k], &catalog.secfilt[k*Nsecfilt]);
    125125        }
    126126        N++;

  • branches/dvo-mods-2007-02/Ohana/src/opihi/dvo/mextract.c

    r12008 r12295  
    44 
    55  int i, j, k, m, N, N1, NPTS;
    6   int param, mode, Nsec;
     6  int param, mode, Nsecfilt;
    77  char *RegionName, *RegionList, *p;
    88  double *M1;
    … …  
    2323  /* load photcode information */
    2424  if (!InitPhotcodes ()) goto escape;
    25   Nsec = GetPhotcodeNsecfilt ();
     25  Nsecfilt = GetPhotcodeNsecfilt ();
    2626
    2727  /* interpret command-line options */
    … …  
    5757    catalog.filename = skylist[0].filename[i];
    5858    catalog.catflags = LOAD_AVES | LOAD_MEAS | LOAD_SECF;
    59     catalog.Nsecfilt = Nsec;
     59    catalog.Nsecfilt = Nsecfilt;
    6060
    6161    // an error exit status here is a significant error
    … …  
    7171      M1 = NULL;
    7272      m = catalog.average[j].offset;
    73       M1 = ExtractMeasures (code, mode, &catalog.average[j], &catalog.secfilt[j*Nsec], &catalog.measure[m], &N1, param);
     73      M1 = ExtractMeasures (code, mode, &catalog.average[j], &catalog.secfilt[j*Nsecfilt], &catalog.measure[m], &N1, param);
    7474      for (k = 0; k < N1; k++) {
    7575        vec[0].elements[N] = M1[k];

  • branches/dvo-mods-2007-02/Ohana/src/opihi/dvo/paverage.c

    r12046 r12295  
    3131  Rmax = graphmode.coords.crval1 + 182.0;
    3232
    33   Nsec = -1;
     33  // require a photcode?  default to 0?
     34  Nsec = 0;
    3435  if ((Narg = get_argument (argc, argv, "-p"))) {
    3536    remove_argument (Narg, &argc, argv);
    … …  
    4142    remove_argument (Narg, &argc, argv);
    4243    Nsec = GetPhotcodeNsec (photcode[0].code);
     44    if (Nsec == -1) {
     45        fprintf (stderr, "photcode %s is not an AVERAGE photcode\n", argv[Narg]);
     46        return (FALSE);
     47    }
    4348  }
    4449
    … …  
    116121      while (average[i].R > Rmax) average[i].R -= 360.0;
    117122
    118       mag = (Nsec == -1) ? NO_MAG : secfilt[i*Nsecfilt+Nsec].M;
     123      mag = secfilt[i*Nsecfilt+Nsec].M;
    119124      Zvec[Npts] = MIN (1.0, MAX (0.01, (mag - Mz) / Mr));
    120125      if (LimExclude && (Zvec[Npts] > 0.99)) continue;

  • branches/dvo-mods-2007-02/Ohana/src/relastro/src/bcatalog.c

    r12276 r12295  
    105105  subcatalog[0].Nsecfilt = catalog[0].Nsecfilt;
    106106
    107   // XXX really do this or not???
    108   if (catalog[0].Naverage > 0) free (catalog[0].average);
    109   if (catalog[0].Nmeasure > 0) free (catalog[0].measure);
    110   if (catalog[0].Naverage > 0) free (catalog[0].secfilt);
    111 
    112107  if (VERBOSE) {
    113108    fprintf (stderr, "%d: using %d stars (%d measures) for catalog\n", i,

  • branches/dvo-mods-2007-02/Ohana/src/relphot/src/bcatalog.c

    r12221 r12295  
    106106  subcatalog[0].Nsecfilt = catalog[0].Nsecfilt;
    107107
    108   // XXX really do this or not???
    109   if (catalog[0].Naverage > 0) free (catalog[0].average);
    110   if (catalog[0].Nmeasure > 0) free (catalog[0].measure);
    111   if (catalog[0].Naverage > 0) free (catalog[0].secfilt);
    112 
    113108  if (VERBOSE) {
    114109    fprintf (stderr, "%d: using %d stars (%d measures) for catalog\n", i,
Note: See TracChangeset for help on using the changeset viewer.