Commit 6204b82c authored by Johan Richard's avatar Johan Richard
Browse files

Removed duplicated lines in BayesCl

parents 726cf9fe 97e100de
......@@ -33,7 +33,6 @@
static void snake(int verbose);
static void marchingSquares(int verbose);
static void cl_connectdots(int verbose);
void criticnew(int verbose)
{
......@@ -47,8 +46,6 @@ void criticnew(int verbose)
else
{
marchingSquares(verbose);
w_critic();
cl_connectdots(verbose);
}
}
......@@ -571,7 +568,7 @@ static void marchingSquares(int verbose)
}
}
static void cl_connectdots(int verbose)
void cl_connectdots(int verbose)
{
extern struct g_cline CL;
extern struct biline radial[], tangent[];
......
......@@ -42,6 +42,9 @@ double interpol(double xx, const double *fxx, const double *fyy, const double *
double bilinear(double **map, double x, double y, int xmax, int ymax)
{
int x1,y1;
//Difference of wcs2pix reference (starts at 1,1) and map reference (starts at pixel 0,0)
x=x-1;
y=y-1;
x1=(int)(x-0.5);
y1=(int)(y-0.5);
if(x1<0) x1=0;
......
......@@ -173,6 +173,7 @@ int main(int argc, char *argv[])
if ( G.nlens > 0 )
{
criticnew(1);
w_critic();
};
// if there is only 1 clump
......@@ -181,7 +182,10 @@ int main(int argc, char *argv[])
/* calcul des zones d'images multiples */
if ( CL.zone != 0 )
{
cl_connectdots(1);
zonemult();
}
}
if ( M.marker != 0 )
......
......@@ -155,8 +155,6 @@ int main( int argc, char** argv )
for (j = 0; j < ntline; j++)
{
fprintf(OUT, "%d\t%lf\t%lf\t%lf\t%lf\t\n", radial[j].i,
radial[j].I.x, radial[j].I.y, radial[j].S.x, radial[j].S.y);
fprintf(OUT, "%d\t%lf\t%lf\t%lf\t%lf\t\n", tangent[j].i,
tangent[j].I.x, tangent[j].I.y, tangent[j].S.x, tangent[j].S.y);
};
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment