Ajout argument prtlev ds les deux prog rdvisip4.cc et visi2ntac.cc, Reza 01/03/2015

rdvisip4.cc

@@ -48,7 +48,7 @@ int Usage(bool fgea)
 {
   cout << " --- rdvisip4.cc : Read PPF files produced by mfacq time-frequency\n" << endl;
   if (fgea) cout << " rdvisip4: Missing or wrong argument ! " << endl;
-  cout << " Usage: rdvisip4 InPathBAO5 InPathBAO6 Imin,Imax,step OutPPFFile \n"
+  cout << " Usage: rdvisip4 InPathBAO5 InPathBAO6 Imin,Imax,step OutPPFFile [PrintLev=1] \n"
        << "  InPathBAO5/6: path for input vismtx_J_iii.ppf on bao5/6 \n"
        << "  Imin,Imax,step : read files for Imin<=iii<=Imax  iii+=step \n"
        << "  OutPPFFile: Output PPF file name \n"<<endl;
@@ -72,8 +72,12 @@ int main(int narg, char* arg[])
   int Imin,Imax,Istep; 
   sscanf(arg[3],"%d,%d,%d",&Imin,&Imax,&Istep);
   string outfile=arg[4];
+  int prtlev=1;
+  if (narg>5) prtlev=atoi(arg[5]);
+
   cout << " rdvisip4/Info: Path BAO5:"<<path5<<" BAO6:"<<path6<<"\n"
-       << " Imin,max,step="<<Imin<<","<<Imax<<","<<Istep<<"  OutFile:"<<outfile<<endl;
+       << " Imin,max,step="<<Imin<<","<<Imax<<","<<Istep<<"  OutFile:"<<outfile
+       << " PrtLev="<<prtlev<<endl;
   
   HiStatsInitiator _inia;
   //   TArrayInitiator  _inia;
@@ -86,7 +90,7 @@ int main(int narg, char* arg[])
     paths.push_back(path6);
  
     VisiP4Reader vreader(paths, Imin,Imax,Istep,true);
-    vreader.setPrintLevel(1);
+    vreader.setPrintLevel(prtlev);
     bool fgok=true;
     TMatrix< complex<r_4> > vismtx;
     TMatrix< complex<r_4> > vismtx_mean;

visi2ntac.cc

@@ -48,7 +48,7 @@ int Usage(bool fgea)
 {
   cout << " --- visi2ntac.cc : Read PPF files produced by mfacq time-frequency\n" << endl;
   if (fgea) cout << " visi2ntac: Missing or wrong argument ! " << endl;
-  cout << " Usage: visi2ntac InPathBAO5 InPathBAO6 Imin,Imax OutPPFFile [Jf1,Jf2] [DeltaIAvg] \n"
+  cout << " Usage: visi2ntac InPathBAO5 InPathBAO6 Imin,Imax OutPPFFile [Jf1,Jf2] [DeltaIAvg] [PrtLev=0] \n"
        << "  InPathBAO5/6: path for input vismtx_J_iii.ppf on bao5/6 \n"
        << "  Imin,Imax : read files for Imin<=iii<=Imax  iii+=step \n"
        << "  OutPPFFile: Output PPF file name \n"
@@ -84,9 +84,12 @@ int main(int narg, char* arg[])
   int deltaIavg=1;
   if (narg>6)  deltaIavg=atoi(arg[6]);
   if (deltaIavg<1)  deltaIavg=1;
+  int prtlev=1;
+  if (narg>7) prtlev=atoi(arg[7]);
+
   cout << " visi2ntac/Info: Path BAO5:"<<path5<<" BAO6:"<<path6<<"\n"
        << " Imin,max,step="<<Imin<<","<<Imax<<","<<Istep<<"  OutFile:"<<outfile<<"\n"
-       << JFmin<<" <=NumFreq<= "<<JFmax<<"  DeltaIAvg="<<deltaIavg<<endl;
+       << JFmin<<" <=NumFreq<= "<<JFmax<<"  DeltaIAvg="<<deltaIavg<<" PrtLev="<<prtlev<<endl;
   
   HiStatsInitiator _inia;
   //   TArrayInitiator  _inia;
@@ -106,7 +109,7 @@ int main(int narg, char* arg[])
     double pac[8];  // autocorrelation power
     Range freqs(JFmin,JFmax);
     VisiP4Reader vreader(paths, Imin,Imax,Istep,true);
-    vreader.setPrintLevel(1);
+    vreader.setPrintLevel(prtlev);
     bool fgok=true;
     TMatrix< complex<r_4> > vismtx;
     TimeStamp dateobs;