Changeset 39738 for branches/czw_branch/20160809/Ohana
- Timestamp:
- Oct 8, 2016, 5:25:41 AM (10 years ago)
- Location:
- branches/czw_branch/20160809/Ohana/src/relastro/src
- Files:
-
- 5 edited
-
FitChip.c (modified) (1 diff)
-
FitPM.c (modified) (3 diffs)
-
FitPMandPar.c (modified) (3 diffs)
-
FitPosPMfixed.c (modified) (3 diffs)
-
relastro_images.c (modified) (3 diffs)
Legend:
- Unmodified
- Added
- Removed
-
branches/czw_branch/20160809/Ohana/src/relastro/src/FitChip.c
r39731 r39738 227 227 image[0].nFitAstrom = fit[0].Npts; 228 228 229 fprintf (stderr, "%s | %6.3f %6.3f | %4d %4d | %6.3f %6.3f\n", image[0].name, image[0].refColorRed, image[0].refColorBlue, Ncolor, image[0].nFitAstrom, image[0].dXpixSys, image[0].dYpixSys);229 if (VERBOSE2) fprintf (stderr, "%s | %6.3f %6.3f | %4d %4d | %6.3f %6.3f\n", image[0].name, image[0].refColorRed, image[0].refColorBlue, Ncolor, image[0].nFitAstrom, image[0].dXpixSys, image[0].dYpixSys); 230 230 231 231 if (fit) fit_free (fit); -
branches/czw_branch/20160809/Ohana/src/relastro/src/FitPM.c
r39731 r39738 71 71 72 72 // Iteratively reweight and solve 73 double sigma_hat = 0.0; // save for the error model73 // double sigma_hat = 0.0; // save for the error model 74 74 int converged = FALSE; 75 75 int iterations = 0; … … 107 107 points[i].u = sqrt(SQ(points[i].rx / points[i].dX) + SQ(points[i].ry / points[i].dY)); 108 108 } 109 sigma_hat = MedianAbsDeviation(points, Npoints) / 0.6745;109 // sigma_hat = MedianAbsDeviation(points, Npoints) / 0.6745; 110 110 break; 111 111 } … … 122 122 points[i].u = sqrt(SQ(points[i].rx / points[i].dX) + SQ(points[i].ry / points[i].dY)); 123 123 } 124 sigma_hat = MedianAbsDeviation(points, Npoints) / 0.6745;124 // sigma_hat = MedianAbsDeviation(points, Npoints) / 0.6745; 125 125 126 126 // Check convergence -
branches/czw_branch/20160809/Ohana/src/relastro/src/FitPMandPar.c
r39731 r39738 71 71 72 72 // Iteratively reweight and solve 73 double sigma_hat = 0.0; // save for the error model73 // double sigma_hat = 0.0; // save for the error model 74 74 int converged = FALSE; 75 75 int iterations = 0; … … 108 108 points[i].u = sqrt(SQ(points[i].rx / points[i].dX) + SQ(points[i].ry / points[i].dY)); 109 109 } 110 sigma_hat = MedianAbsDeviation(points, Npoints) / 0.6745;110 // sigma_hat = MedianAbsDeviation(points, Npoints) / 0.6745; 111 111 break; 112 112 } … … 123 123 points[i].u = sqrt(SQ(points[i].rx / points[i].dX) + SQ(points[i].ry / points[i].dY)); 124 124 } 125 sigma_hat = MedianAbsDeviation(points, Npoints) / 0.6745;125 // sigma_hat = MedianAbsDeviation(points, Npoints) / 0.6745; 126 126 127 127 // Check convergence -
branches/czw_branch/20160809/Ohana/src/relastro/src/FitPosPMfixed.c
r39731 r39738 107 107 108 108 // Iteratively reweight and solve 109 double sigma_hat = 0.0; // save for the error model109 // double sigma_hat = 0.0; // save for the error model 110 110 int converged = FALSE; 111 111 int iterations = 0; … … 141 141 points[i].u = sqrt(SQ(points[i].rx / points[i].dX) + SQ(points[i].ry / points[i].dY)); 142 142 } 143 sigma_hat = MedianAbsDeviation(points, Npoints) / 0.6745;143 // sigma_hat = MedianAbsDeviation(points, Npoints) / 0.6745; 144 144 break; 145 145 } … … 156 156 points[i].u = sqrt(SQ(points[i].rx / points[i].dX) + SQ(points[i].ry / points[i].dY)); 157 157 } 158 sigma_hat = MedianAbsDeviation(points, Npoints) / 0.6745;158 // sigma_hat = MedianAbsDeviation(points, Npoints) / 0.6745; 159 159 160 160 // Check convergence -
branches/czw_branch/20160809/Ohana/src/relastro/src/relastro_images.c
r39731 r39738 92 92 case SET_CHIPS: 93 93 // we just want to fit the selected chips to the mean positions 94 UpdateChips (catalog, Ncatalog, i); // measure.X,Y -> R,D, fit image.coords94 UpdateChips (catalog, Ncatalog, 0); // measure.X,Y -> R,D, fit image.coords 95 95 MARKTIME("update chips: %f sec\n", dtime); 96 96 … … 109 109 } 110 110 111 if (!UPDATE) {112 freeStarMaps();113 gfits_db_free (&db);114 ohana_memcheck (VERBOSE);115 ohana_memdump (VERBOSE);116 exit (0);117 }118 119 111 // free the image / measurement pointers 120 112 freeImageBins (Ncatalog); … … 124 116 free (catalog); 125 117 freeMosaics (); 118 119 if (!UPDATE) { 120 freeStarMaps(); 121 dvo_image_unlock (&db); 122 freeImages (db.ftable.buffer); 123 gfits_db_free (&db); 124 return TRUE; 125 } 126 126 127 127 // If we did NOT use all images, then we applied the measured corrections to a subset of
Note:
See TracChangeset
for help on using the changeset viewer.
