Index: /branches/eam_branches/ipp-20140904/Ohana/src/relastro/include/relastro.h =================================================================== --- /branches/eam_branches/ipp-20140904/Ohana/src/relastro/include/relastro.h (revision 37719) +++ /branches/eam_branches/ipp-20140904/Ohana/src/relastro/include/relastro.h (revision 37720) @@ -55,4 +55,6 @@ int nFitAstrom; int flags; + float refColorBlue; + float refColorRed; } ImagePos; @@ -283,4 +285,5 @@ int CLIP_THRESH; int USE_BASIC_CHECK; +int APPLY_OFFSETS; // in parallel-regions mode, do not launch UpdateObjectOffsets unless -apply-offsets is called int ExcludeBogus; Index: /branches/eam_branches/ipp-20140904/Ohana/src/relastro/src/ImagePosIO.c =================================================================== --- /branches/eam_branches/ipp-20140904/Ohana/src/relastro/src/ImagePosIO.c (revision 37719) +++ /branches/eam_branches/ipp-20140904/Ohana/src/relastro/src/ImagePosIO.c (revision 37720) @@ -73,4 +73,6 @@ GET_COLUMN (dXpixSys, "XPIX_SYS_ERR", float); GET_COLUMN (dYpixSys, "YPIX_SYS_ERR", float); + GET_COLUMN (refColorBlue, "REF_COLOR_BLUE", float); + GET_COLUMN (refColorRed, "REF_COLOR_RED", float); GET_COLUMN (imageID, "ID", int); GET_COLUMN (nFitAstrom, "NFIT", int); @@ -86,20 +88,22 @@ for (i = 0; i < Nrow; i++) { InitCoords(&image_pos[i].coords, NULL); - image_pos[i].coords.crval1 = crval1 [i]; - image_pos[i].coords.crval2 = crval2 [i]; - image_pos[i].coords.crpix1 = crpix1 [i]; - image_pos[i].coords.crpix2 = crpix2 [i]; - image_pos[i].coords.cdelt1 = cdelt1 [i]; - image_pos[i].coords.cdelt2 = cdelt2 [i]; - image_pos[i].coords.pc1_1 = pc1_1 [i]; - image_pos[i].coords.pc1_2 = pc1_2 [i]; - image_pos[i].coords.pc2_1 = pc2_1 [i]; - image_pos[i].coords.pc2_2 = pc2_2 [i]; - image_pos[i].coords.Npolyterms = Npolyterms[i]; - image_pos[i].dXpixSys = dXpixSys [i]; - image_pos[i].dYpixSys = dYpixSys [i]; - image_pos[i].imageID = imageID [i]; - image_pos[i].nFitAstrom = nFitAstrom[i]; - image_pos[i].flags = flags [i]; + image_pos[i].coords.crval1 = crval1 [i]; + image_pos[i].coords.crval2 = crval2 [i]; + image_pos[i].coords.crpix1 = crpix1 [i]; + image_pos[i].coords.crpix2 = crpix2 [i]; + image_pos[i].coords.cdelt1 = cdelt1 [i]; + image_pos[i].coords.cdelt2 = cdelt2 [i]; + image_pos[i].coords.pc1_1 = pc1_1 [i]; + image_pos[i].coords.pc1_2 = pc1_2 [i]; + image_pos[i].coords.pc2_1 = pc2_1 [i]; + image_pos[i].coords.pc2_2 = pc2_2 [i]; + image_pos[i].coords.Npolyterms = Npolyterms [i]; + image_pos[i].dXpixSys = dXpixSys [i]; + image_pos[i].dYpixSys = dYpixSys [i]; + image_pos[i].refColorBlue = refColorBlue[i]; + image_pos[i].refColorRed = refColorRed [i]; + image_pos[i].imageID = imageID [i]; + image_pos[i].nFitAstrom = nFitAstrom [i]; + image_pos[i].flags = flags [i]; // polyterms and ctype are a bit different @@ -109,22 +113,24 @@ fprintf (stderr, "loaded data for %lld images\n", (long long) Nrow); - free (crval1 ); - free (crval2 ); - free (crpix1 ); - free (crpix2 ); - free (cdelt1 ); - free (cdelt2 ); - free (pc1_1 ); - free (pc1_2 ); - free (pc2_1 ); - free (pc2_2 ); - free (polyterms ); - free (ctype ); - free (Npolyterms); - free (dXpixSys ); - free (dYpixSys ); - free (imageID ); - free (nFitAstrom); - free (flags ); + free (crval1 ); + free (crval2 ); + free (crpix1 ); + free (crpix2 ); + free (cdelt1 ); + free (cdelt2 ); + free (pc1_1 ); + free (pc1_2 ); + free (pc2_1 ); + free (pc2_2 ); + free (polyterms ); + free (ctype ); + free (Npolyterms ); + free (dXpixSys ); + free (dYpixSys ); + free (refColorBlue); + free (refColorRed ); + free (imageID ); + free (nFitAstrom ); + free (flags ); *nimage_pos = Nrow; @@ -154,44 +160,48 @@ gfits_create_table_header (&theader, "BINTABLE", "IMAGE_POS"); - gfits_define_bintable_column (&theader, "D", "CRVAL1", "word", "unit", 1.0, 0.0); - gfits_define_bintable_column (&theader, "D", "CRVAL2", "word", "unit", 1.0, 0.0); - gfits_define_bintable_column (&theader, "E", "CRPIX1", "word", "unit", 1.0, 0.0); - gfits_define_bintable_column (&theader, "E", "CRPIX2", "word", "unit", 1.0, 0.0); - gfits_define_bintable_column (&theader, "E", "CDELT1", "word", "unit", 1.0, 0.0); - gfits_define_bintable_column (&theader, "E", "CDELT2", "word", "unit", 1.0, 0.0); - gfits_define_bintable_column (&theader, "E", "PC1_1", "word", "unit", 1.0, 0.0); - gfits_define_bintable_column (&theader, "E", "PC1_2", "word", "unit", 1.0, 0.0); - gfits_define_bintable_column (&theader, "E", "PC2_1", "word", "unit", 1.0, 0.0); - gfits_define_bintable_column (&theader, "E", "PC2_2", "word", "unit", 1.0, 0.0); - gfits_define_bintable_column (&theader, "14E", "POLYTERMS", "word", "unit", 1.0, 0.0); - gfits_define_bintable_column (&theader, "15A", "CTYPE", "word", "unit", 1.0, 0.0); - gfits_define_bintable_column (&theader, "L", "NPOLYTERMS", "word", "unit", 1.0, 0.0); - gfits_define_bintable_column (&theader, "E", "XPIX_SYS_ERR", "word", "unit", 1.0, 0.0); - gfits_define_bintable_column (&theader, "E", "YPIX_SYS_ERR", "word", "unit", 1.0, 0.0); - gfits_define_bintable_column (&theader, "J", "ID", "image ID", "unitless", 1.0, 0.0); - gfits_define_bintable_column (&theader, "J", "NFIT", "number of fitted stars", "unitless", 1.0, 0.0); - gfits_define_bintable_column (&theader, "J", "FLAGS", "analysis flags", "unitless", 1.0, 0.0); + gfits_define_bintable_column (&theader, "D", "CRVAL1", "word", "unit", 1.0, 0.0); + gfits_define_bintable_column (&theader, "D", "CRVAL2", "word", "unit", 1.0, 0.0); + gfits_define_bintable_column (&theader, "E", "CRPIX1", "word", "unit", 1.0, 0.0); + gfits_define_bintable_column (&theader, "E", "CRPIX2", "word", "unit", 1.0, 0.0); + gfits_define_bintable_column (&theader, "E", "CDELT1", "word", "unit", 1.0, 0.0); + gfits_define_bintable_column (&theader, "E", "CDELT2", "word", "unit", 1.0, 0.0); + gfits_define_bintable_column (&theader, "E", "PC1_1", "word", "unit", 1.0, 0.0); + gfits_define_bintable_column (&theader, "E", "PC1_2", "word", "unit", 1.0, 0.0); + gfits_define_bintable_column (&theader, "E", "PC2_1", "word", "unit", 1.0, 0.0); + gfits_define_bintable_column (&theader, "E", "PC2_2", "word", "unit", 1.0, 0.0); + gfits_define_bintable_column (&theader, "14E", "POLYTERMS", "word", "unit", 1.0, 0.0); + gfits_define_bintable_column (&theader, "15A", "CTYPE", "word", "unit", 1.0, 0.0); + gfits_define_bintable_column (&theader, "L", "NPOLYTERMS", "word", "unit", 1.0, 0.0); + gfits_define_bintable_column (&theader, "E", "XPIX_SYS_ERR", "word", "unit", 1.0, 0.0); + gfits_define_bintable_column (&theader, "E", "YPIX_SYS_ERR", "word", "unit", 1.0, 0.0); + gfits_define_bintable_column (&theader, "E", "REF_COLOR_BLUE", "word", "unit", 1.0, 0.0); + gfits_define_bintable_column (&theader, "E", "REF_COLOR_RED", "word", "unit", 1.0, 0.0); + gfits_define_bintable_column (&theader, "J", "ID", "image ID", "unitless", 1.0, 0.0); + gfits_define_bintable_column (&theader, "J", "NFIT", "number of fitted stars", "unitless", 1.0, 0.0); + gfits_define_bintable_column (&theader, "J", "FLAGS", "analysis flags", "unitless", 1.0, 0.0); // generate the output array that carries the data gfits_create_table (&theader, &ftable); - double *crval1 ; - double *crval2 ; - float *crpix1 ; - float *crpix2 ; - float *cdelt1 ; - float *cdelt2 ; - float *pc1_1 ; - float *pc1_2 ; - float *pc2_1 ; - float *pc2_2 ; - float *polyterms ; - char *ctype ; - char *Npolyterms; - float *dXpixSys ; - float *dYpixSys ; - int *imageID ; - int *nFitAstrom; - int *flags ; + double *crval1 ; + double *crval2 ; + float *crpix1 ; + float *crpix2 ; + float *cdelt1 ; + float *cdelt2 ; + float *pc1_1 ; + float *pc1_2 ; + float *pc2_1 ; + float *pc2_2 ; + float *polyterms ; + char *ctype ; + char *Npolyterms ; + float *dXpixSys ; + float *dYpixSys ; + float *refColorBlue; + float *refColorRed ; + int *imageID ; + int *nFitAstrom ; + int *flags ; // create intermediate storage arrays @@ -211,4 +221,6 @@ ALLOCATE (dXpixSys , float , Nimage_pos); ALLOCATE (dYpixSys , float , Nimage_pos); + ALLOCATE (refColorBlue, float , Nimage_pos); + ALLOCATE (refColorRed , float , Nimage_pos); ALLOCATE (imageID , int , Nimage_pos); ALLOCATE (nFitAstrom, int , Nimage_pos); @@ -217,20 +229,22 @@ // assign the storage arrays for (i = 0; i < Nimage_pos; i++) { - crval1 [i] = image_pos[i].coords.crval1 ; - crval2 [i] = image_pos[i].coords.crval2 ; - crpix1 [i] = image_pos[i].coords.crpix1 ; - crpix2 [i] = image_pos[i].coords.crpix2 ; - cdelt1 [i] = image_pos[i].coords.cdelt1 ; - cdelt2 [i] = image_pos[i].coords.cdelt2 ; - pc1_1 [i] = image_pos[i].coords.pc1_1 ; - pc1_2 [i] = image_pos[i].coords.pc1_2 ; - pc2_1 [i] = image_pos[i].coords.pc2_1 ; - pc2_2 [i] = image_pos[i].coords.pc2_2 ; - Npolyterms[i] = image_pos[i].coords.Npolyterms; - dXpixSys [i] = image_pos[i].dXpixSys ; - dYpixSys [i] = image_pos[i].dYpixSys ; - imageID [i] = image_pos[i].imageID ; - nFitAstrom[i] = image_pos[i].nFitAstrom ; - flags [i] = image_pos[i].flags ; + crval1 [i] = image_pos[i].coords.crval1 ; + crval2 [i] = image_pos[i].coords.crval2 ; + crpix1 [i] = image_pos[i].coords.crpix1 ; + crpix2 [i] = image_pos[i].coords.crpix2 ; + cdelt1 [i] = image_pos[i].coords.cdelt1 ; + cdelt2 [i] = image_pos[i].coords.cdelt2 ; + pc1_1 [i] = image_pos[i].coords.pc1_1 ; + pc1_2 [i] = image_pos[i].coords.pc1_2 ; + pc2_1 [i] = image_pos[i].coords.pc2_1 ; + pc2_2 [i] = image_pos[i].coords.pc2_2 ; + Npolyterms [i] = image_pos[i].coords.Npolyterms; + dXpixSys [i] = image_pos[i].dXpixSys ; + dYpixSys [i] = image_pos[i].dYpixSys ; + refColorBlue[i] = image_pos[i].refColorBlue ; + refColorRed [i] = image_pos[i].refColorRed ; + imageID [i] = image_pos[i].imageID ; + nFitAstrom [i] = image_pos[i].nFitAstrom ; + flags [i] = image_pos[i].flags ; // polyterms and ctype are a bit different @@ -240,41 +254,45 @@ // add the columns to the output array - gfits_set_bintable_column (&theader, &ftable, "CRVAL1", crval1 , Nimage_pos); - gfits_set_bintable_column (&theader, &ftable, "CRVAL2", crval2 , Nimage_pos); - gfits_set_bintable_column (&theader, &ftable, "CRPIX1", crpix1 , Nimage_pos); - gfits_set_bintable_column (&theader, &ftable, "CRPIX2", crpix2 , Nimage_pos); - gfits_set_bintable_column (&theader, &ftable, "CDELT1", cdelt1 , Nimage_pos); - gfits_set_bintable_column (&theader, &ftable, "CDELT2", cdelt2 , Nimage_pos); - gfits_set_bintable_column (&theader, &ftable, "PC1_1", pc1_1 , Nimage_pos); - gfits_set_bintable_column (&theader, &ftable, "PC1_2", pc1_2 , Nimage_pos); - gfits_set_bintable_column (&theader, &ftable, "PC2_1", pc2_1 , Nimage_pos); - gfits_set_bintable_column (&theader, &ftable, "PC2_2", pc2_2 , Nimage_pos); - gfits_set_bintable_column (&theader, &ftable, "POLYTERMS", polyterms , Nimage_pos); - gfits_set_bintable_column (&theader, &ftable, "CTYPE", ctype , Nimage_pos); - gfits_set_bintable_column (&theader, &ftable, "NPOLYTERMS", Npolyterms, Nimage_pos); - gfits_set_bintable_column (&theader, &ftable, "XPIX_SYS_ERR",dXpixSys , Nimage_pos); - gfits_set_bintable_column (&theader, &ftable, "YPIX_SYS_ERR",dYpixSys , Nimage_pos); - gfits_set_bintable_column (&theader, &ftable, "ID", imageID , Nimage_pos); - gfits_set_bintable_column (&theader, &ftable, "NFIT", nFitAstrom, Nimage_pos); - gfits_set_bintable_column (&theader, &ftable, "FLAGS", flags , Nimage_pos); - - free (crval1 ); - free (crval2 ); - free (crpix1 ); - free (crpix2 ); - free (cdelt1 ); - free (cdelt2 ); - free (pc1_1 ); - free (pc1_2 ); - free (pc2_1 ); - free (pc2_2 ); - free (polyterms ); - free (ctype ); - free (Npolyterms); - free (dXpixSys ); - free (dYpixSys ); - free (imageID ); - free (nFitAstrom); - free (flags ); + gfits_set_bintable_column (&theader, &ftable, "CRVAL1", crval1 , Nimage_pos); + gfits_set_bintable_column (&theader, &ftable, "CRVAL2", crval2 , Nimage_pos); + gfits_set_bintable_column (&theader, &ftable, "CRPIX1", crpix1 , Nimage_pos); + gfits_set_bintable_column (&theader, &ftable, "CRPIX2", crpix2 , Nimage_pos); + gfits_set_bintable_column (&theader, &ftable, "CDELT1", cdelt1 , Nimage_pos); + gfits_set_bintable_column (&theader, &ftable, "CDELT2", cdelt2 , Nimage_pos); + gfits_set_bintable_column (&theader, &ftable, "PC1_1", pc1_1 , Nimage_pos); + gfits_set_bintable_column (&theader, &ftable, "PC1_2", pc1_2 , Nimage_pos); + gfits_set_bintable_column (&theader, &ftable, "PC2_1", pc2_1 , Nimage_pos); + gfits_set_bintable_column (&theader, &ftable, "PC2_2", pc2_2 , Nimage_pos); + gfits_set_bintable_column (&theader, &ftable, "POLYTERMS", polyterms , Nimage_pos); + gfits_set_bintable_column (&theader, &ftable, "CTYPE", ctype , Nimage_pos); + gfits_set_bintable_column (&theader, &ftable, "NPOLYTERMS", Npolyterms, Nimage_pos); + gfits_set_bintable_column (&theader, &ftable, "XPIX_SYS_ERR", dXpixSys , Nimage_pos); + gfits_set_bintable_column (&theader, &ftable, "YPIX_SYS_ERR", dYpixSys , Nimage_pos); + gfits_set_bintable_column (&theader, &ftable, "REF_COLOR_BLUE", refColorBlue, Nimage_pos); + gfits_set_bintable_column (&theader, &ftable, "REF_COLOR_RED", refColorRed , Nimage_pos); + gfits_set_bintable_column (&theader, &ftable, "ID", imageID , Nimage_pos); + gfits_set_bintable_column (&theader, &ftable, "NFIT", nFitAstrom, Nimage_pos); + gfits_set_bintable_column (&theader, &ftable, "FLAGS", flags , Nimage_pos); + + free (crval1 ); + free (crval2 ); + free (crpix1 ); + free (crpix2 ); + free (cdelt1 ); + free (cdelt2 ); + free (pc1_1 ); + free (pc1_2 ); + free (pc2_1 ); + free (pc2_2 ); + free (polyterms ); + free (ctype ); + free (Npolyterms ); + free (dXpixSys ); + free (dYpixSys ); + free (refColorBlue); + free (refColorRed ); + free (imageID ); + free (nFitAstrom ); + free (flags ); FILE *f = fopen (filename, "w"); Index: /branches/eam_branches/ipp-20140904/Ohana/src/relastro/src/UpdateObjectOffsets.c =================================================================== --- /branches/eam_branches/ipp-20140904/Ohana/src/relastro/src/UpdateObjectOffsets.c (revision 37719) +++ /branches/eam_branches/ipp-20140904/Ohana/src/relastro/src/UpdateObjectOffsets.c (revision 37720) @@ -95,8 +95,10 @@ } +# if (0) UpdateObjectOffsets_parallel_table (table, sky); -# if (0) +# else + int Ngroups; HostTableGroup *groups = HostTableGroups (table, &Ngroups); Index: /branches/eam_branches/ipp-20140904/Ohana/src/relastro/src/args.c =================================================================== --- /branches/eam_branches/ipp-20140904/Ohana/src/relastro/src/args.c (revision 37719) +++ /branches/eam_branches/ipp-20140904/Ohana/src/relastro/src/args.c (revision 37720) @@ -265,4 +265,10 @@ remove_argument (N, &argc, argv); MaxDensityUse = TRUE; + } + + APPLY_OFFSETS = FALSE; + if ((N = get_argument (argc, argv, "-apply-offsets"))) { + remove_argument (N, &argc, argv); + APPLY_OFFSETS = TRUE; } Index: /branches/eam_branches/ipp-20140904/Ohana/src/relastro/src/initialize.c =================================================================== --- /branches/eam_branches/ipp-20140904/Ohana/src/relastro/src/initialize.c (revision 37719) +++ /branches/eam_branches/ipp-20140904/Ohana/src/relastro/src/initialize.c (revision 37720) @@ -9,5 +9,5 @@ if (DCR_BLUE_COLOR_POS) fprintf (stderr, "DCR_BLUE_COLOR_POS: %s - %s\n", DCR_BLUE_COLOR_POS, DCR_BLUE_COLOR_NEG); - if (DCR_BLUE_COLOR_POS) fprintf (stderr, "DCR_BLUE_COLOR_POS: %s - %s\n", DCR_BLUE_COLOR_POS, DCR_BLUE_COLOR_NEG); + if (DCR_RED_COLOR_POS) fprintf (stderr, "DCR_RED_COLOR_POS: %s - %s\n", DCR_RED_COLOR_POS, DCR_RED_COLOR_NEG); if (PHOTCODE_KEEP_LIST) fprintf (stderr, "PHOTCODE_KEEP_LIST: %s\n", PHOTCODE_KEEP_LIST); Index: /branches/eam_branches/ipp-20140904/Ohana/src/relastro/src/relastro_parallel_regions.c =================================================================== --- /branches/eam_branches/ipp-20140904/Ohana/src/relastro/src/relastro_parallel_regions.c (revision 37719) +++ /branches/eam_branches/ipp-20140904/Ohana/src/relastro/src/relastro_parallel_regions.c (revision 37720) @@ -71,5 +71,7 @@ // iterate over catalogs to make detection coordinates consistant - UpdateObjectOffsets (skylist, 0, NULL); + if (APPLY_OFFSETS) { + UpdateObjectOffsets (skylist, 0, NULL); + } if (!PARALLEL) { Index: /branches/eam_branches/ipp-20140904/Ohana/src/relastro/src/share_images_pos.c =================================================================== --- /branches/eam_branches/ipp-20140904/Ohana/src/relastro/src/share_images_pos.c (revision 37719) +++ /branches/eam_branches/ipp-20140904/Ohana/src/relastro/src/share_images_pos.c (revision 37720) @@ -88,9 +88,11 @@ images[seq].coords.mosaic = moscoords; - images[seq].dXpixSys = image_pos[i].dXpixSys ; - images[seq].dYpixSys = image_pos[i].dYpixSys ; - images[seq].imageID = image_pos[i].imageID ; - images[seq].nFitAstrom = image_pos[i].nFitAstrom; - images[seq].flags = image_pos[i].flags ; + images[seq].dXpixSys = image_pos[i].dXpixSys ; + images[seq].dYpixSys = image_pos[i].dYpixSys ; + images[seq].refColorBlue = image_pos[i].refColorBlue; + images[seq].refColorRed = image_pos[i].refColorRed; + images[seq].imageID = image_pos[i].imageID ; + images[seq].nFitAstrom = image_pos[i].nFitAstrom; + images[seq].flags = image_pos[i].flags ; } @@ -146,4 +148,6 @@ image_pos->dXpixSys = image->dXpixSys; image_pos->dYpixSys = image->dYpixSys; + image_pos->refColorBlue = image->refColorBlue; + image_pos->refColorRed = image->refColorRed; image_pos->imageID = image->imageID; image_pos->nFitAstrom = image->nFitAstrom;