Commit 78813397 authored by Réza Ansari's avatar Réza Ansari
Browse files

correction erreur classe P4FreqBand et modif impression ds VisiP4Reader, Reza 28/2/2017

parent 0afeaf12
......@@ -28,8 +28,8 @@ public:
{
double deltanufft=250./4096; // 250 MHz en 4096 frequences
double freqstart=1250.; // Bande de 1250-1500 MHz
sa_size_t jfmin_=(sa_size_t)((f0_-freqstart-0.5*df_)/deltanufft);
sa_size_t jfmax_=(sa_size_t)((f0_-freqstart+0.5*df_)/deltanufft);
jfmin_=(sa_size_t)((f0_-freqstart-0.5*df_)/deltanufft);
jfmax_=(sa_size_t)((f0_-freqstart+0.5*df_)/deltanufft);
if ((jfmin_<0)||(jfmin_>4095)||(jfmax_<0)||(jfmax_>4095)) {
cout<<"P4FreqBand(f0="<<f0<<" ,df="<<df<<") ERROR -> Out of range (0...4095) jfmin="<<jfmin_<<" jfmax="<<jfmax_<<endl;
throw ParmError("P4FreqBand(f0,df) Out of range (0...4095) jfmin,jfmax");
......
......@@ -137,7 +137,7 @@ int main(int narg, const char* arg[])
int nbands=params.fbands_.size();
if (nbands>5) nbands=5;
bool fgnt=false;
if (nt.NRows()>0) fgnt=true; // il faut remplir le NTuple.
if (nt.NVar()>0) fgnt=true; // il faut remplir le NTuple.
/* ---- FIN creation/calcul/remplissage NTuple - Partie I ---- */
......
......@@ -52,7 +52,7 @@ bool VisiP4Reader::ReadNext_P(TMatrix< complex<r_4> >* vismtx, TMatrix< complex<
bool fgwithmean = false;
if(meanmtx) fgwithmean = true;
if (prtlevel>0) {
if ( (prtlevel>1)||((prtlevel>0)&&(curfilenum%20==0)) ) {
cout << "---- VisiP4Reader::ReadNext() - curfilenum= "<<curfilenum<<" (LastNum="<<last<<")"
<< (fgwithmean ? " Read also mean coef ":" ") <<endl;
}
......
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