Index: /trunk/Ohana/src/checkastro/include/checkastro.h =================================================================== --- /trunk/Ohana/src/checkastro/include/checkastro.h (revision 37042) +++ /trunk/Ohana/src/checkastro/include/checkastro.h (revision 37043) @@ -5,13 +5,4 @@ # include # include - -# define MARKTIME(MSG,...) { \ - gettimeofday (&stopTimer, (void *) NULL); \ - float dtime = DTIME (stopTimer, startTimer); \ - fprintf (stderr, MSG, __VA_ARGS__); } - -# define INITTIME \ - struct timeval startTimer, stopTimer; \ - gettimeofday (&startTimer, (void *) NULL); // choose off_t or int depending on full-scale relphot analysis resources Index: /trunk/Ohana/src/checkastro/src/BrightCatalog.c =================================================================== --- /trunk/Ohana/src/checkastro/src/BrightCatalog.c (revision 37042) +++ /trunk/Ohana/src/checkastro/src/BrightCatalog.c (revision 37043) @@ -258,5 +258,5 @@ GET_COLUMN(M, "MAG", float); GET_COLUMN(dM, "MAG_ERR", float); - GET_COLUMN(Xm, "MAG_CHI", float); + GET_COLUMN(Mchisq,"MAG_CHI", float); GET_COLUMN(flags, "FLAGS", int); GET_COLUMN(Ncode, "NCODE", short); @@ -272,5 +272,5 @@ secfilt[i].M = M[i]; secfilt[i].dM = dM[i]; - secfilt[i].Xm = Xm[i]; + secfilt[i].Mchisq= Mchisq[i]; secfilt[i].flags = flags[i]; secfilt[i].Ncode = Ncode[i]; @@ -281,12 +281,12 @@ fprintf (stderr, "loaded data for %lld averages\n", (long long) Nrow); - free (M ); - free (dM ); - free (Xm ); - free (flags); - free (Ncode); - free (Nused); - free (M_20 ); - free (M_80 ); + free (M ); + free (dM ); + free (Mchisq); + free (flags ); + free (Ncode ); + free (Nused ); + free (M_20 ); + free (M_80 ); catalog->secfilt = secfilt; // assert Nsecfilt * Naverage = Nrow? @@ -351,11 +351,11 @@ gfits_define_bintable_column (&theader, "E", "Y_FIX", "ccd y fiex coord", "pix", 1.0, 0.0); gfits_define_bintable_column (&theader, "E", "EXPTIME", "-2.5 * log (exposure time)", "sec", 1.0, 0.0); - gfits_define_bintable_column (&theader, "J", "TIME", "time of exp", "sec", 1.0, 1.0*0x8000); - gfits_define_bintable_column (&theader, "J", "AVE_REF", "pointer to average table", NULL, 1.0, 1.0*0x8000); - gfits_define_bintable_column (&theader, "J", "IMAGE_ID", "image", NULL, 1.0, 1.0*0x8000); - gfits_define_bintable_column (&theader, "J", "DB_FLAGS", "flags", NULL, 1.0, 1.0*0x8000); - gfits_define_bintable_column (&theader, "J", "PHOT_FLAGS", "photflags", NULL, 1.0, 1.0*0x8000); - gfits_define_bintable_column (&theader, "J", "CAT_ID", "catalog", NULL, 1.0, 1.0*0x8000); - gfits_define_bintable_column (&theader, "I", "PHOTCODE", "photcode", NULL, 1.0, 1.0*0x80); + gfits_define_bintable_column (&theader, "J", "TIME", "time of exp", "sec", 1.0, 0.0); + gfits_define_bintable_column (&theader, "J", "AVE_REF", "pointer to average table", NULL, 1.0, 0.0); + gfits_define_bintable_column (&theader, "J", "IMAGE_ID", "image", NULL, 1.0, 0.0); + gfits_define_bintable_column (&theader, "J", "DB_FLAGS", "flags", NULL, 1.0, 0.0); + gfits_define_bintable_column (&theader, "J", "PHOT_FLAGS", "photflags", NULL, 1.0, 0.0); + gfits_define_bintable_column (&theader, "J", "CAT_ID", "catalog", NULL, 1.0, 0.0); + gfits_define_bintable_column (&theader, "I", "PHOTCODE", "photcode", NULL, 1.0, 0.0); // generate the output array that carries the data @@ -467,20 +467,20 @@ gfits_define_bintable_column (&theader, "E", "CHISQ_PM", "astrometry analysis chisq", "", 1.0, 0.0); gfits_define_bintable_column (&theader, "E", "CHISQ_PAP", "astrometry analysis chisq", "", 1.0, 0.0); - gfits_define_bintable_column (&theader, "J", "MEAN_EPOCH", "mean epoch (PM-PAR ref)", "", 1.0, 1.0*0x8000); - gfits_define_bintable_column (&theader, "J", "TIME_RANGE", "mean epoch (PM-PAR ref)", "", 1.0, 1.0*0x8000); + gfits_define_bintable_column (&theader, "J", "MEAN_EPOCH", "mean epoch (PM-PAR ref)", "", 1.0, 0.0); + gfits_define_bintable_column (&theader, "J", "TIME_RANGE", "mean epoch (PM-PAR ref)", "", 1.0, 0.0); gfits_define_bintable_column (&theader, "E", "STARGAL_SEP", "star/galaxy separator", "", 1.0, 0.0); - gfits_define_bintable_column (&theader, "I", "NUMBER_POS", "number of detections used for astrometry", "", 1.0, 1.0*0x80); - gfits_define_bintable_column (&theader, "I", "NMEASURE", "number of psf measurements", "", 1.0, 1.0*0x80); - gfits_define_bintable_column (&theader, "I", "NMISSING", "number of missings", "", 1.0, 1.0*0x80); - gfits_define_bintable_column (&theader, "I", "NEXTEND", "number of extended measurements", "", 1.0, 1.0*0x80); - gfits_define_bintable_column (&theader, "J", "OFF_MEASURE", "offset to first psf measurement", "", 1.0, 1.0*0x8000); - gfits_define_bintable_column (&theader, "J", "OFF_MISSING", "offset to first missing obs", "", 1.0, 1.0*0x8000); - gfits_define_bintable_column (&theader, "J", "OFF_EXTEND", "offset to first extended measurement", "", 1.0, 1.0*0x8000); - gfits_define_bintable_column (&theader, "J", "FLAGS", "average object flags (star; ghost; etc)", "", 1.0, 1.0*0x8000); - gfits_define_bintable_column (&theader, "J", "PHOTFLAGS_U", "upper bit of 2 bit summary of per-measure photflags", "", 1.0, 1.0*0x8000); - gfits_define_bintable_column (&theader, "J", "PHOTFLAGS_L", "lower bit of 2 bit summary of per-measure photflags", "", 1.0, 1.0*0x8000); - gfits_define_bintable_column (&theader, "J", "OBJ_ID", "unique ID for object in table", "", 1.0, 1.0*0x8000); - gfits_define_bintable_column (&theader, "J", "CAT_ID", "unique ID for table in which object was first realized", "", 1.0, 1.0*0x8000); - gfits_define_bintable_column (&theader, "K", "EXT_ID", "external ID for object (eg PSPS objID)", "", 1.0, 1.0*0x80000000); + gfits_define_bintable_column (&theader, "I", "NUMBER_POS", "number of detections used for astrometry", "", 1.0, 0.0); + gfits_define_bintable_column (&theader, "I", "NMEASURE", "number of psf measurements", "", 1.0, 0.0); + gfits_define_bintable_column (&theader, "I", "NMISSING", "number of missings", "", 1.0, 0.0); + gfits_define_bintable_column (&theader, "I", "NEXTEND", "number of extended measurements", "", 1.0, 0.0); + gfits_define_bintable_column (&theader, "J", "OFF_MEASURE", "offset to first psf measurement", "", 1.0, 0.0); + gfits_define_bintable_column (&theader, "J", "OFF_MISSING", "offset to first missing obs", "", 1.0, 0.0); + gfits_define_bintable_column (&theader, "J", "OFF_EXTEND", "offset to first extended measurement", "", 1.0, 0.0); + gfits_define_bintable_column (&theader, "J", "FLAGS", "average object flags (star; ghost; etc)", "", 1.0, 0.0); + gfits_define_bintable_column (&theader, "J", "PHOTFLAGS_U", "upper bit of 2 bit summary of per-measure photflags", "", 1.0, 0.0); + gfits_define_bintable_column (&theader, "J", "PHOTFLAGS_L", "lower bit of 2 bit summary of per-measure photflags", "", 1.0, 0.0); + gfits_define_bintable_column (&theader, "J", "OBJ_ID", "unique ID for object in table", "", 1.0, 0.0); + gfits_define_bintable_column (&theader, "J", "CAT_ID", "unique ID for table in which object was first realized", "", 1.0, 0.0); + gfits_define_bintable_column (&theader, "K", "EXT_ID", "external ID for object (eg PSPS objID)", "", 1.0, 0.0); // generate the output array that carries the data @@ -642,5 +642,5 @@ float *M ; ALLOCATE (M , float, Nsec); float *dM ; ALLOCATE (dM , float, Nsec); - float *Xm ; ALLOCATE (Xm , float, Nsec); + float *Mchisq ; ALLOCATE (Mchisq , float, Nsec); int *flags ; ALLOCATE (flags , int, Nsec); short *Ncode ; ALLOCATE (Ncode , short, Nsec); @@ -652,27 +652,27 @@ SecFilt *secfilt = catalog->secfilt; for (i = 0; i < Nsec; i++) { - M [i] = secfilt[i]. M ; - dM [i] = secfilt[i]. dM ; - Xm [i] = secfilt[i]. Xm ; - flags [i] = secfilt[i]. flags ; - Ncode [i] = secfilt[i]. Ncode ; - Nused [i] = secfilt[i]. Nused ; - M_20 [i] = secfilt[i]. M_20 ; - M_80 [i] = secfilt[i]. M_80 ; + M [i] = secfilt[i].M ; + dM [i] = secfilt[i].dM ; + Mchisq[i] = secfilt[i].Mchisq ; + flags [i] = secfilt[i].flags ; + Ncode [i] = secfilt[i].Ncode ; + Nused [i] = secfilt[i].Nused ; + M_20 [i] = secfilt[i].M_20 ; + M_80 [i] = secfilt[i].M_80 ; } // add the columns to the output array - gfits_set_bintable_column (&theader, &ftable, "MAG", M , Nsec); - gfits_set_bintable_column (&theader, &ftable, "MAG_ERR", dM , Nsec); - gfits_set_bintable_column (&theader, &ftable, "MAG_CHI", Xm , Nsec); - gfits_set_bintable_column (&theader, &ftable, "FLAGS", flags, Nsec); - gfits_set_bintable_column (&theader, &ftable, "NCODE", Ncode, Nsec); - gfits_set_bintable_column (&theader, &ftable, "NUSED", Nused, Nsec); - gfits_set_bintable_column (&theader, &ftable, "MAG_20", M_20 , Nsec); - gfits_set_bintable_column (&theader, &ftable, "MAG_80", M_80 , Nsec); + gfits_set_bintable_column (&theader, &ftable, "MAG", M , Nsec); + gfits_set_bintable_column (&theader, &ftable, "MAG_ERR", dM , Nsec); + gfits_set_bintable_column (&theader, &ftable, "MAG_CHI", Mchisq, Nsec); + gfits_set_bintable_column (&theader, &ftable, "FLAGS", flags , Nsec); + gfits_set_bintable_column (&theader, &ftable, "NCODE", Ncode , Nsec); + gfits_set_bintable_column (&theader, &ftable, "NUSED", Nused , Nsec); + gfits_set_bintable_column (&theader, &ftable, "MAG_20", M_20 , Nsec); + gfits_set_bintable_column (&theader, &ftable, "MAG_80", M_80 , Nsec); free (M ); free (dM ); - free (Xm ); + free (Mchisq ); free (flags ); free (Ncode ); Index: /trunk/Ohana/src/dvosplit/src/dvosplit.c =================================================================== --- /trunk/Ohana/src/dvosplit/src/dvosplit.c (revision 37042) +++ /trunk/Ohana/src/dvosplit/src/dvosplit.c (revision 37043) @@ -16,4 +16,12 @@ ConfigInit (&argc, argv); args (argc, argv); + + /* + fprintf (stderr, + "this program has the ability to split dvo catalogs one file (cpt, cpm, etc) at a time. + however, new updates to the cpm format requires the average RA,DEC coords to load the + measures. update the code to handle that first"); + exit (2); + */ CATDIR = strcreate (argv[1]); Index: /trunk/Ohana/src/dvosplit/src/split_averages.c =================================================================== --- /trunk/Ohana/src/dvosplit/src/split_averages.c (revision 37042) +++ /trunk/Ohana/src/dvosplit/src/split_averages.c (revision 37043) @@ -1,4 +1,4 @@ # include "dvosplit.h" -# define NROWS 100000 /* ~10MB per block for measures */ +# define NROWS 1000000 /* ~10MB per block for measures */ # define DNOUT 1000 Index: /trunk/Ohana/src/dvosplit/src/split_measures.c =================================================================== --- /trunk/Ohana/src/dvosplit/src/split_measures.c (revision 37042) +++ /trunk/Ohana/src/dvosplit/src/split_measures.c (revision 37043) @@ -1,4 +1,4 @@ # include "dvosplit.h" -# define NROWS 100000 /* ~10MB per row for measures */ +# define NROWS 1000000 /* ~10MB per row for measures */ # define DNOUT 1000 @@ -19,5 +19,6 @@ // split out the measure entries: - incatalog[0].catflags = LOAD_MEAS; + incatalog[0].catflags = LOAD_MEAS | LOAD_AVES | LOAD_SECF; + // if ((incatalog[0].catformat == DVO_FORMAT_ELIXIR) || (incatalog[0].catformat == DVO_FORMAT_LONEOS)) { // // for these two formats, we need the average and secfilt values around until we do the measures... Index: /trunk/Ohana/src/uniphot/src/ImageSubset.c =================================================================== --- /trunk/Ohana/src/uniphot/src/ImageSubset.c (revision 37042) +++ /trunk/Ohana/src/uniphot/src/ImageSubset.c (revision 37043) @@ -99,11 +99,9 @@ gfits_create_table_header (&theader, "BINTABLE", "IMAGE_SUBSET"); - gfits_define_bintable_column (&theader, "E", "MCAL", "zero point offset", "magnitudes", 1.0, 0.0); - gfits_define_bintable_column (&theader, "E", "MCAL_ERR", "zero point error", "magnitudes", 1.0, 0.0); - - // an unsigned int needs to have bzero of 0x8000 - gfits_define_bintable_column (&theader, "J", "IMAGE_ID", "image ID", NULL, 1.0, 1.0*0x8000); - gfits_define_bintable_column (&theader, "J", "PHOTOM_MAP", "map", NULL, 1.0, 1.0*0x8000); - gfits_define_bintable_column (&theader, "J", "FLAGS", "flags", NULL, 1.0, 1.0*0x8000); + gfits_define_bintable_column (&theader, "E", "MCAL", "zero point offset", "magnitudes", 1.0, 0.0); + gfits_define_bintable_column (&theader, "E", "MCAL_ERR", "zero point error", "magnitudes", 1.0, 0.0); + gfits_define_bintable_column (&theader, "J", "IMAGE_ID", "image ID", NULL, 1.0, FT_BZERO_INT32); + gfits_define_bintable_column (&theader, "J", "PHOTOM_MAP", "map", NULL, 1.0, FT_BZERO_INT32); + gfits_define_bintable_column (&theader, "J", "FLAGS", "flags", NULL, 1.0, FT_BZERO_INT32); // generate the output array that carries the data @@ -114,6 +112,6 @@ // create intermediate storage arrays - ALLOCATE (Mcal, float, Nimage); - ALLOCATE (dMcal, float, Nimage); + ALLOCATE (Mcal, float, Nimage); + ALLOCATE (dMcal, float, Nimage); ALLOCATE (imageID, unsigned int, Nimage); ALLOCATE (map, unsigned int, Nimage); Index: /trunk/Ohana/src/uniphot/src/ImageSubsetFixImageIDs.c =================================================================== --- /trunk/Ohana/src/uniphot/src/ImageSubsetFixImageIDs.c (revision 37042) +++ /trunk/Ohana/src/uniphot/src/ImageSubsetFixImageIDs.c (revision 37043) @@ -1,5 +1,3 @@ # include "fiximids.h" -# define FT_BZERO_INT16 1.0*0x8000 -# define FT_BZERO_INT32 1.0*0x80000000 # define GET_COLUMN(OUT,NAME,TYPE) \ Index: /trunk/Ohana/src/uniphot/src/ImageSubsetFixStackIDs.c =================================================================== --- /trunk/Ohana/src/uniphot/src/ImageSubsetFixStackIDs.c (revision 37042) +++ /trunk/Ohana/src/uniphot/src/ImageSubsetFixStackIDs.c (revision 37043) @@ -1,5 +1,3 @@ # include "fixstkids.h" -# define FT_BZERO_INT16 1.0*0x8000 -# define FT_BZERO_INT32 1.0*0x80000000 # define GET_COLUMN(OUT,NAME,TYPE) \ Index: /trunk/Ohana/src/uniphot/src/ImageSubsetSetPosangle.c =================================================================== --- /trunk/Ohana/src/uniphot/src/ImageSubsetSetPosangle.c (revision 37042) +++ /trunk/Ohana/src/uniphot/src/ImageSubsetSetPosangle.c (revision 37043) @@ -149,6 +149,5 @@ gfits_create_table_header (&theader, "BINTABLE", "IMAGE_SUBSET"); - // an unsigned int needs to have bzero of 0x8000 - gfits_define_bintable_column (&theader, "J", "IMAGE_ID", "image ID", NULL, 1.0, 1.0*0x8000); + gfits_define_bintable_column (&theader, "J", "IMAGE_ID", "image ID", NULL, 1.0, FT_BZERO_INT32); gfits_define_bintable_column (&theader, "E", "TZERO", "tmp", "mp", 1.0, 0.0); gfits_define_bintable_column (&theader, "E", "TRATE", "tmp", "mp", 1.0, 0.0); Index: /trunk/Ohana/src/uniphot/src/load_images_fiximids.c =================================================================== --- /trunk/Ohana/src/uniphot/src/load_images_fiximids.c (revision 37042) +++ /trunk/Ohana/src/uniphot/src/load_images_fiximids.c (revision 37043) @@ -1,4 +1,3 @@ # include "fiximids.h" -# define FT_BZERO_INT32 1.0*0x80000000 off_t Nimage = 0; Index: /trunk/Ohana/src/uniphot/src/load_images_fixstkids.c =================================================================== --- /trunk/Ohana/src/uniphot/src/load_images_fixstkids.c (revision 37042) +++ /trunk/Ohana/src/uniphot/src/load_images_fixstkids.c (revision 37043) @@ -1,4 +1,3 @@ # include "fixstkids.h" -# define FT_BZERO_INT32 1.0*0x80000000 off_t Nimage = 0; Index: /trunk/Ohana/src/uniphot/src/update_catalog_setastrom.c =================================================================== --- /trunk/Ohana/src/uniphot/src/update_catalog_setastrom.c (revision 37042) +++ /trunk/Ohana/src/uniphot/src/update_catalog_setastrom.c (revision 37043) @@ -76,5 +76,5 @@ // correction may be Minst or Minst + 5.0*log(fwhm float fwhm_maj = FromShortPixels(measure[0].FWx); - float Minst = PhotInst (measure); + float Minst = PhotInst (measure, MAG_CLASS_PSF); float MinstSB = Minst + 5.0*log10(fwhm_maj);