IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 31103


Ignore:
Timestamp:
Mar 31, 2011, 9:16:03 AM (15 years ago)
Author:
eugene
Message:

create program setfwhm to set fwhm in Images.dat; add dvo imextract fields for fwhm_median and related

Location:
branches/eam_branches/ipp-20110213/Ohana/src
Files:
3 added
8 edited

Legend:

Unmodified
Added
Removed

  • branches/eam_branches/ipp-20110213/Ohana/src/opihi/dvo/dbExtractImages.c

    r30612 r31103  
    5959  time_t t;
    6060  dbValue value;
     61  off_t Nmosaic;
    6162
    6263  value.Flt = NAN;
    … …  
    236237      value.Flt = image[N].fwhm_y / 25.0;
    237238      break;
     239
     240    case IMAGE_FWHM_MEDIAN:
     241      if (!(Nmosaic = FindMosaicForImage (image, Nimage, N))) return value;
     242      Nmosaic --; // XXX kind of a hack: FindMosaicForImage returns 0 or the mosaic seq number + 1
     243      value.Flt = (image[Nmosaic].fwhm_x + image[Nmosaic].fwhm_y) / 50.0;
     244      break;
     245    case IMAGE_FWHM_MAJ_MEDIAN:
     246      if (!(Nmosaic = FindMosaicForImage (image, Nimage, N))) return value;
     247      Nmosaic --; // XXX kind of a hack: FindMosaicForImage returns 0 or the mosaic seq number + 1
     248      value.Flt = image[Nmosaic].fwhm_x / 25.0;
     249      break;
     250    case IMAGE_FWHM_MIN_MEDIAN:
     251      if (!(Nmosaic = FindMosaicForImage (image, Nimage, N))) return value;
     252      Nmosaic --; // XXX kind of a hack: FindMosaicForImage returns 0 or the mosaic seq number + 1
     253      value.Flt = image[Nmosaic].fwhm_y / 25.0;
     254      break;
     255
    238256    case IMAGE_TRATE:
    239257      value.Flt = image[N].trate / 10000.0;

  • branches/eam_branches/ipp-20110213/Ohana/src/opihi/dvo/dbFields.c

    r30612 r31103  
    395395  if (!strcasecmp (fieldName, "cerror"   )) ESCAPE (IMAGE_CERROR,    MAG_NONE, OPIHI_FLT);
    396396
    397   if (!strcasecmp (fieldName, "FWHM"     )) ESCAPE (IMAGE_FWHM,      MAG_NONE, OPIHI_FLT);
    398   if (!strcasecmp (fieldName, "FWHM_MAJ" )) ESCAPE (IMAGE_FWHM_MAJ,  MAG_NONE, OPIHI_FLT);
    399   if (!strcasecmp (fieldName, "FWHM_MIN" )) ESCAPE (IMAGE_FWHM_MIN,  MAG_NONE, OPIHI_FLT);
     397  if (!strcasecmp (fieldName, "FWHM"       )) ESCAPE (IMAGE_FWHM,      MAG_NONE, OPIHI_FLT);
     398  if (!strcasecmp (fieldName, "FWHM_MAJ"   )) ESCAPE (IMAGE_FWHM_MAJ,  MAG_NONE, OPIHI_FLT);
     399  if (!strcasecmp (fieldName, "FWHM_MIN"   )) ESCAPE (IMAGE_FWHM_MIN,  MAG_NONE, OPIHI_FLT);
     400  if (!strcasecmp (fieldName, "FWHM_MAJOR" )) ESCAPE (IMAGE_FWHM_MAJ,  MAG_NONE, OPIHI_FLT);
     401  if (!strcasecmp (fieldName, "FWHM_MINOR" )) ESCAPE (IMAGE_FWHM_MIN,  MAG_NONE, OPIHI_FLT);
     402
     403  if (!strcasecmp (fieldName, "FWHM_MEDIAN"    ))   ESCAPE (IMAGE_FWHM_MEDIAN,      MAG_NONE, OPIHI_FLT);
     404  if (!strcasecmp (fieldName, "FWHM_MAJ_MEDIAN"))   ESCAPE (IMAGE_FWHM_MAJ_MEDIAN,  MAG_NONE, OPIHI_FLT);
     405  if (!strcasecmp (fieldName, "FWHM_MIN_MEDIAN"))   ESCAPE (IMAGE_FWHM_MIN_MEDIAN,  MAG_NONE, OPIHI_FLT);
     406  if (!strcasecmp (fieldName, "FWHM_MAJOR_MEDIAN")) ESCAPE (IMAGE_FWHM_MAJ_MEDIAN,  MAG_NONE, OPIHI_FLT);
     407  if (!strcasecmp (fieldName, "FWHM_MINOR_MEDIAN")) ESCAPE (IMAGE_FWHM_MIN_MEDIAN,  MAG_NONE, OPIHI_FLT);
     408
    400409  if (!strcasecmp (fieldName, "trate"    )) ESCAPE (IMAGE_TRATE,     MAG_NONE, OPIHI_FLT);
    401410

  • branches/eam_branches/ipp-20110213/Ohana/src/opihi/dvo/imextract.c

    r30612 r31103  
    197197    gprint (GP_ERR, "  cerror : astrometric scatter\n");
    198198
    199     gprint (GP_ERR, "  FWHM : mean fwhm of exposure\n");
    200     gprint (GP_ERR, "  FWHM_MAJ : fwhm of major axis\n");
    201     gprint (GP_ERR, "  FWHM_MIN : fwhm of minor axis\n");
     199    gprint (GP_ERR, "  -- Note: the follow FWHM are from the PSF model --\n");
     200    gprint (GP_ERR, "  FWHM : mean fwhm of chip\n");
     201    gprint (GP_ERR, "  FWHM_MAJ : fwhm of chip (major axis)\n");
     202    gprint (GP_ERR, "  FWHM_MIN : fwhm of chip (minor axis)\n");
     203    gprint (GP_ERR, "  FWHM_MAJOR : fwhm of chip (major axis)\n");
     204    gprint (GP_ERR, "  FWHM_MININ : fwhm of chip (minor axis)\n");
     205
     206    gprint (GP_ERR, "  FWHM_MEDIAN : median fwhm of exposure\n");
     207    gprint (GP_ERR, "  FWHM_MAJ_MEDIAN : median fwhm of major axis\n");
     208    gprint (GP_ERR, "  FWHM_MIN_MEDIAN : median fwhm of minor axis\n");
     209    gprint (GP_ERR, "  FWHM_MAJOR_MEDIAN : median fwhm of major axis\n");
     210    gprint (GP_ERR, "  FWHM_MININ_MEDIAN : median fwhm of minor axis\n");
     211
    202212    gprint (GP_ERR, "  trate : tracking rate for TDI images\n");
    203213

  • branches/eam_branches/ipp-20110213/Ohana/src/opihi/include/dvoshell.h

    r30614 r31103  
    179179      IMAGE_TIME,
    180180      IMAGE_FWHM,
     181      IMAGE_FWHM_MEDIAN,
    181182      IMAGE_EXPTIME,
    182183      IMAGE_NSTAR,
    … …  
    200201      IMAGE_FWHM_MAJ,
    201202      IMAGE_FWHM_MIN,
     203      IMAGE_FWHM_MAJ_MEDIAN,
     204      IMAGE_FWHM_MIN_MEDIAN,
    202205      IMAGE_TRATE,
    203206      IMAGE_IMAGE_ID,

  • branches/eam_branches/ipp-20110213/Ohana/src/uniphot/Makefile

    r30976 r31103  
    1 default: uniphot setphot
     1default: uniphot setphot setfwhm
    22help:
    3 @echo "make options: uniphot setphot default help install default (uniphot setphot)"
     3@echo "make options: uniphot setphot setfwhm default help install default (uniphot setphot setfwhm)"
    44
    55include ../../Makefile.System
    … …  
    1919uniphot: $(BIN)/uniphot.$(ARCH)
    2020setphot: $(BIN)/setphot.$(ARCH)
    21 install: $(DESTBIN)/uniphot $(DESTBIN)/setphot
     21setfwhm: $(BIN)/setfwhm.$(ARCH)
     22install: $(DESTBIN)/uniphot $(DESTBIN)/setphot $(DESTBIN)/setfwhm
    2223
    2324UNIPHOT = \
    … …  
    5758$(SETPHOT): $(INC)/uniphot.h
    5859$(BIN)/setphot.$(ARCH): $(SETPHOT)
     60
     61SETFWHM =                           \
     62$(SRC)/setfwhm.$(ARCH).o            \
     63$(SRC)/initialize.$(ARCH).o         \
     64$(SRC)/ConfigInit.$(ARCH).o         \
     65$(SRC)/args.$(ARCH).o               \
     66$(SRC)/liststats.$(ARCH).o          \
     67$(SRC)/load_fwhm_table.$(ARCH).o    \
     68$(SRC)/load_images.$(ARCH).o        \
     69$(SRC)/match_fwhm_to_images.$(ARCH).o       \
     70$(SRC)/SetSignals.$(ARCH).o         \
     71$(SRC)/Shutdown.$(ARCH).o           
     72
     73$(SETFWHM): $(INC)/uniphot.h
     74$(BIN)/setfwhm.$(ARCH): $(SETFWHM)

  • branches/eam_branches/ipp-20110213/Ohana/src/uniphot/include/uniphot.h

    r30976 r31103  
    4747    int found;
    4848} ZptTable;
     49
     50typedef struct {
     51    float fwhm_major;
     52    float fwhm_minor;
     53    e_time time;
     54    int found;
     55    unsigned short photcode;
     56} FWHMTable;
    4957
    5058/* global variables set in parameter file */
    … …  
    147155time_t        GetTimeReference      PROTO((char *reference));
    148156int           GetTimeUnits          PROTO((char *name));
     157
     158void          initialize_setfwhm    PROTO((int argc, char **argv));
     159int           args_setfwhm          PROTO((int argc, char **argv));
     160FWHMTable    *load_fwhm_table       PROTO((char *filename, int *nfwhm));
     161int           match_fwhm_to_images  PROTO((Image *image, off_t Nimage, FWHMTable *fwhm, int Nfwhm));
     162

  • branches/eam_branches/ipp-20110213/Ohana/src/uniphot/src/args.c

    r27790 r31103  
    9696}
    9797
     98int args_setfwhm (int argc, char **argv) {
     99
     100  int N;
     101
     102  VERBOSE = FALSE;
     103  if ((N = get_argument (argc, argv, "-v"))) {
     104    VERBOSE = TRUE;
     105    remove_argument (N, &argc, argv);
     106  }
     107
     108  UPDATE = FALSE;
     109  if ((N = get_argument (argc, argv, "-update"))) {
     110    remove_argument (N, &argc, argv);
     111    UPDATE = TRUE;
     112  }
     113
     114  if (argc != 2) {
     115    fprintf (stderr, "ERROR: USAGE: setfwhm (fwhmfile) [options]\n");
     116    exit (2);
     117  }
     118
     119  return (TRUE);
     120}
     121

  • branches/eam_branches/ipp-20110213/Ohana/src/uniphot/src/initialize.c

    r29001 r31103  
    2828}
    2929
     30void initialize_setfwhm (int argc, char **argv) {
     31
     32  /* are these set correctly? */
     33  ConfigInit (&argc, argv);
     34  args_setfwhm (argc, argv);
     35}
     36
Note: See TracChangeset for help on using the changeset viewer.