Commit c13780d7 authored by Eric Jullo's avatar Eric Jullo
Browse files

Uncomment the forme 3 and forme 10 options

parent edfaa121
......@@ -591,13 +591,13 @@ static void chi2_src( double *chi2, double *lhood0 )
if ( I.forme == 2 )
o_flux(I.mult[i],&fluxS);
// if( I.forme <= 3 || I.forme == 10 )
// // etendue method. Source plane error averaged
// // over all the images of the system.
// I2x=I2y=sig2posS(I.sig2pos[i][0],I.mult[i]);
if( I.forme <= 3 || I.forme == 10 )
// etendue method. Source plane error averaged
// over all the images of the system.
I2x=I2y=sig2posS(I.sig2pos[i][0],I.mult[i]);
// if( I.forme == 10 )
// Ix = I2x / I.sig2pos[i]; // Ix: normalised etendue source plane
if( I.forme == 10 )
Ix = I2x / I.sig2pos[i][0]; // Ix: normalised etendue source plane
/*optim_z can be not null only with the o_runz*() functions*/
if (optim_z == 0)
......
......@@ -92,7 +92,6 @@ double o_chi()
OUT=fopen(filename,"w");
#endif
/*variables initialisation*/
chi = 0.;
chish = 0.;
......@@ -228,7 +227,6 @@ double o_chi()
}
chi=chi_im+chis+chil+Min(chi_mult,100000000.);
#ifdef CHIRES
fprintf(OUT,"\nchitot %.2lf\n",chi);
fclose(OUT);
......@@ -593,13 +591,13 @@ static void chi2_src( double *chi2, double *lhood0 )
if ( I.forme == 2 )
o_flux(I.mult[i],&fluxS);
// if( I.forme <= 3 || I.forme == 10 )
// // etendue method. Source plane error averaged
// // over all the images of the system.
// I2x=I2y=sig2posS(I.sig2pos[i][0],I.mult[i]);
if( I.forme <= 3 || I.forme == 10 )
// etendue method. Source plane error averaged
// over all the images of the system.
I2x=I2y=sig2posS(I.sig2pos[i][0],I.mult[i]);
// if( I.forme == 10 )
// Ix = I2x / I.sig2pos[i]; // Ix: normalised etendue source plane
if( I.forme == 10 )
Ix = I2x / I.sig2pos[i][0]; // Ix: normalised etendue source plane
/*optim_z can be not null only with the o_runz*() functions*/
if (optim_z == 0)
......
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