IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Ignore:
Timestamp:
Oct 8, 2016, 5:25:41 AM (10 years ago)
Author:
eugene
Message:

plug leaks; skip unused variable

Location:
branches/czw_branch/20160809/Ohana/src/relastro/src
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • branches/czw_branch/20160809/Ohana/src/relastro/src/FitChip.c

    r39731 r39738  
    227227  image[0].nFitAstrom = fit[0].Npts;
    228228
    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);
    230230
    231231  if (fit) fit_free (fit);
  • branches/czw_branch/20160809/Ohana/src/relastro/src/FitPM.c

    r39731 r39738  
    7171
    7272  // Iteratively reweight and solve
    73   double sigma_hat = 0.0; // save for the error model
     73  // double sigma_hat = 0.0; // save for the error model
    7474  int converged = FALSE;
    7575  int iterations = 0;
     
    107107        points[i].u = sqrt(SQ(points[i].rx / points[i].dX) + SQ(points[i].ry / points[i].dY));
    108108      }
    109       sigma_hat = MedianAbsDeviation(points, Npoints) / 0.6745;
     109      // sigma_hat = MedianAbsDeviation(points, Npoints) / 0.6745;
    110110      break;
    111111    }
     
    122122      points[i].u = sqrt(SQ(points[i].rx / points[i].dX) + SQ(points[i].ry / points[i].dY));
    123123    }
    124     sigma_hat = MedianAbsDeviation(points, Npoints) / 0.6745;
     124    // sigma_hat = MedianAbsDeviation(points, Npoints) / 0.6745;
    125125   
    126126    // Check convergence
  • branches/czw_branch/20160809/Ohana/src/relastro/src/FitPMandPar.c

    r39731 r39738  
    7171
    7272  // Iteratively reweight and solve
    73   double sigma_hat = 0.0; // save for the error model
     73  // double sigma_hat = 0.0; // save for the error model
    7474  int converged = FALSE;
    7575  int iterations = 0;
     
    108108        points[i].u = sqrt(SQ(points[i].rx / points[i].dX) + SQ(points[i].ry / points[i].dY));
    109109      }
    110       sigma_hat = MedianAbsDeviation(points, Npoints) / 0.6745;
     110      // sigma_hat = MedianAbsDeviation(points, Npoints) / 0.6745;
    111111      break;
    112112    }
     
    123123      points[i].u = sqrt(SQ(points[i].rx / points[i].dX) + SQ(points[i].ry / points[i].dY));
    124124    }
    125     sigma_hat = MedianAbsDeviation(points, Npoints) / 0.6745;
     125    // sigma_hat = MedianAbsDeviation(points, Npoints) / 0.6745;
    126126
    127127    // Check convergence
  • branches/czw_branch/20160809/Ohana/src/relastro/src/FitPosPMfixed.c

    r39731 r39738  
    107107
    108108  // Iteratively reweight and solve
    109   double sigma_hat = 0.0; // save for the error model
     109  // double sigma_hat = 0.0; // save for the error model
    110110  int converged = FALSE;
    111111  int iterations = 0;
     
    141141        points[i].u = sqrt(SQ(points[i].rx / points[i].dX) + SQ(points[i].ry / points[i].dY));
    142142      }
    143       sigma_hat = MedianAbsDeviation(points, Npoints) / 0.6745;
     143      // sigma_hat = MedianAbsDeviation(points, Npoints) / 0.6745;
    144144      break;
    145145    }
     
    156156      points[i].u = sqrt(SQ(points[i].rx / points[i].dX) + SQ(points[i].ry / points[i].dY));
    157157    }
    158     sigma_hat = MedianAbsDeviation(points, Npoints) / 0.6745;
     158    // sigma_hat = MedianAbsDeviation(points, Npoints) / 0.6745;
    159159   
    160160    // Check convergence
  • branches/czw_branch/20160809/Ohana/src/relastro/src/relastro_images.c

    r39731 r39738  
    9292    case SET_CHIPS:
    9393      // we just want to fit the selected chips to the mean positions
    94       UpdateChips (catalog, Ncatalog, i);   // measure.X,Y -> R,D, fit image.coords
     94      UpdateChips (catalog, Ncatalog, 0);   // measure.X,Y -> R,D, fit image.coords
    9595      MARKTIME("update chips: %f sec\n", dtime);
    9696
     
    109109  }
    110110
    111   if (!UPDATE) {
    112     freeStarMaps();
    113     gfits_db_free (&db);
    114     ohana_memcheck (VERBOSE);
    115     ohana_memdump (VERBOSE);
    116     exit (0);
    117   }
    118 
    119111  // free the image / measurement pointers
    120112  freeImageBins (Ncatalog);
     
    124116  free (catalog);
    125117  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  }
    126126
    127127  // 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.