Changeset 3733 in Sophya

Timestamp:

Jan 26, 2010, 6:22:52 PM (16 years ago)

Author:

cmv

Message:

modifs sur calcul de nbinfreq + cosmetique, cmv 26/01/2010

File:

• trunk/AddOn/TAcq/svv2mtx2.cc (modified) (5 diffs)

trunk/AddOn/TAcq/svv2mtx2.cc

@@ -17 +17 @@
 #include <stdlib.h>
 #include <string.h>
+#include <unistd.h>
 #include <sys/stat.h>
 #include <iostream>
@@ -29 +30 @@
 int Usage(void)
 {
-cout<<" --- svv2mtx2.cc : Read PPF files produced by mcrd/visfmib"<<endl
-    <<"     and make time(row) - mean_frequency(col) matrices"<<endl
-    <<"Usage: svv2mtx2 InOutPath Imin,Imax NumFreq1,NumFreq2,NBinFreq"<<endl 
-    << " svv2mtx2 -h for detailed instructions"<<endl;
+cout<<" --- svv2mtx2.cc : Read PPF files produced by visfmib"<<endl
+    <<"                   and make time(row) - mean_frequency(col) matrices"<<endl
+    <<"Usage: svv2mtx2 -T Imin,Imax -F NumFreq1,NumFreq2,NBinFreq -o svvdt2.ppf InOutPath"<<endl;
 return 1;
 }
@@ -40 +40 @@
 {
   // --- Decodage des arguments et traitement 
-  if ((narg>1)&&(strcmp(arg[1],"-h")==0))  return Usage();
-  if (narg<=1) return Usage();
-  string inoutpath = arg[1];
+  string ppfoutname = "svvdt2.ppf";
   int ifilmin=0, ifilmax=-1;
-  if(narg>2) sscanf(arg[2],"%d,%d",&ifilmin,&ifilmax);
+  int jfr1=0, jfr2=0, nbinfreq=0;
+
+  char c;
+  while((c = getopt(narg,arg,"hT:F:o:")) != -1) {
+    switch (c) {
+    case 'T' :
+      sscanf(optarg,"%d,%d",&ifilmin,&ifilmax);
+      break;
+    case 'F' :
+      sscanf(optarg,"%d,%d,%d",&jfr1,&jfr2,&nbinfreq);
+      break;
+    case 'o' :
+      ppfoutname = optarg;
+      break;
+    case 'h' :
+    default :
+      Usage(); return -1;
+    }
+  }
+  if(optind>=narg) {Usage(); return -2;}
+  string inoutpath = arg[optind];
   if(ifilmin<0) ifilmin=0;
-  int jfr1=0, jfr2=0, nbinfreq=0;
-  if(narg>3) sscanf(arg[3],"%d,%d,%d",&jfr1,&jfr2,&nbinfreq);
-  char str[1024];
+  if(nbinfreq<=0) nbinfreq=1;
+  cout<<"inoutpath="<<inoutpath<<endl;
+  cout<<"request: file "<<ifilmin<<" to "<<ifilmax<<endl;
+  cout<<"request: freq "<<jfr1<<" to "<<jfr2<<" grouped in "<<nbinfreq<<" bins"<<endl;
+  char str[2048];
 
   // --- recherche des fichiers de visibilites
@@ -109 +129 @@
         throw ParmError("ERROR: nvisi != chanum.Size() !!!");
       // how many average frequencies ?
-      if(jfr1<=0) jfr1=1;
+      if(jfr1<=0) jfr1=0;
       if(jfr1>=nfreq0) jfr1=nfreq0-1;
       if(jfr2<jfr1 || jfr2>=nfreq0) jfr2=nfreq0-1;
-      if(nbinfreq<=0) nbinfreq=1;
       if(nbinfreq>jfr2-jfr1+1) nbinfreq=jfr2-jfr1+1;
       nmoyfreq = (jfr2-jfr1+1)/nbinfreq;
       if(nmoyfreq*nbinfreq<jfr2-jfr1+1) nmoyfreq++;
+      nbinfreq = (jfr2-jfr1+1) / nmoyfreq;
+      if(nmoyfreq*nbinfreq<jfr2-jfr1+1) nbinfreq++;
       cout<<"frequency averaging: jfr1="<<jfr1<<" jfr2="<<jfr2
           <<" nbinfreq="<<nbinfreq<<" (nmoyfreq="<<nmoyfreq<<")"<<endl;
@@ -162 +183 @@
   }
 
-  sprintf(str, "%s/svvdt2.ppf",inoutpath.c_str());
+  sprintf(str, "%s/%s",inoutpath.c_str(),ppfoutname.c_str());
   cout<<"writing visibility matrix to file "<<str<<endl;
   POutPersist pos(str);