Commit cd4b72b8 authored by Johann Cohen-Tanuji's avatar Johann Cohen-Tanuji
Browse files

fix missed merge conflict from previous commit

parent dcb1ef67
......@@ -1496,37 +1496,24 @@ void onesource::writeSpec(vector<SED*> fulllib, vector<SED*> fulllibIR, cosmo lc
// Extract the rest-frame spectra for the continuum
ind0=(fulllibIR[indminIR])->index_z0;
GalSED SED_galIR(*(fulllibIR[ind0]));
<<<<<<< HEAD
// Generate the spectra at the right redshift
if(zminIR>0){
SED_galIR.generate_spectra(zminIR,dmminIR,opaAll);
// GAL: Loop over the full vector with the two vectors concatenated, put the SED in magnitude
for (vector<oneElLambda>::iterator it=SED_galIR.lamb_flux.begin(); it<SED_galIR.lamb_flux.end(); ++it){
if(it->lamb>minl && it->lamb<maxl){
=======
if(zminIR>0){
if(zminIR>0){
// Generate the spectra at the right redshift
SED_galIR.generate_spectra(zminIR,dmminIR,opaAll);
// GAL: Loop over the full vector with the two vectors concatenated, put the SED in magnitude
for (vector<oneElLambda>::iterator it=SED_galIR.lamb_flux.begin(); it<SED_galIR.lamb_flux.end(); ++it){
if(it->lamb>minl && it->lamb<maxl){
>>>>>>> u/jct/dev
lIR.push_back(it->lamb) ;
if(it->val*pow(it->lamb,2.)>0){
mIR.push_back(-2.5*log10(it->val*pow(it->lamb,2.)/c)-48.59 + lcdm.distMod(zminIR));
}else{
mIR.push_back(999);
lIR.push_back(it->lamb) ;
if(it->val*pow(it->lamb,2.)>0){
mIR.push_back(-2.5*log10(it->val*pow(it->lamb,2.)/c)-48.59 + lcdm.distMod(zminIR));
}else{
mIR.push_back(999);
}
}
}
}
<<<<<<< HEAD
}
=======
}
>>>>>>> u/jct/dev
}else{
GalSED SED_galIR("Bidon");
}
}
......@@ -1541,24 +1528,14 @@ void onesource::writeSpec(vector<SED*> fulllib, vector<SED*> fulllibIR, cosmo lc
ind0=(fulllib[indmin[1]])->index_z0;
QSOSED SED_QSO(*(fulllib[ind0]));
<<<<<<< HEAD
// Generate the spectra at the right redshift, opacity, emission lines
if(zmin[1]>0){
=======
if(zmin[1]>0){
// Generate the spectra at the right redshift, opacity, emission lines
>>>>>>> u/jct/dev
SED_QSO.generate_spectra(zmin[1],dmmin[1],opaAll);
// QSO: Loop over the full vector with the two vectors concatenated, put the SED in magnitude
for (vector<oneElLambda>::iterator it=SED_QSO.lamb_flux.begin(); it<SED_QSO.lamb_flux.end(); ++it){
<<<<<<< HEAD
if(it->lamb>minl && it->lamb<maxl && (it->val*pow(it->lamb,2.))>0){lQ.push_back(it->lamb) ; mQ.push_back(-2.5*log10(it->val*pow(it->lamb,2.)/c)-48.59 + lcdm.distMod(zmin[1]));
=======
if(it->lamb>minl && it->lamb<maxl && (it->val*pow(it->lamb,2.))>0){lQ.push_back(it->lamb) ; mQ.push_back(-2.5*log10(it->val*pow(it->lamb,2.)/c)-48.59 + lcdm.distMod(zmin[1]));
}
>>>>>>> u/jct/dev
}
}
}
......
Supports Markdown
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