Changeset 3962 in Sophya

Timestamp:

Mar 4, 2011, 4:37:56 PM (15 years ago)

Author:

ansari

Message:

suite debug/amelioration visfits2dt.cc remplissage DataTable mis en option, Reza+Cedric, 04/03/2011

File:

• trunk/AddOn/TAcq/visfits2dt.cc (modified) (9 diffs)

trunk/AddOn/TAcq/visfits2dt.cc

@@ -57 +57 @@
   cout << " --- visfits2dt : Read fits visibility matrices produced by visfmib to make \n"
        << "     time-frequency matrices and Visibilites=f(time) datatable " << endl;
-  cout << " Usage: visfits2dt InOutPath Imin,Imax,step NumFreq1,NumFreq2,NBinFreq [VisMtxRowList] \n" << endl;
+  cout << " Usage: visfits2dt InOutPath Imin,Imax,step NumFreq1,NumFreq2,NBinFreq VisMtxRowList [DT] \n" << endl;
   if (fgshort) {
     cout << " svv2mtx -h for detailed instructions" << endl;
@@ -66 +66 @@
        << "    FileNames=InOutPath/vismtxII.fits Imin<=II<=Imax II+=IStep \n" 
        << " NumFreq1,NumFreq2,NBinFreq: Freq Zone and number of frequency bins for DataTable\n"
-       << " VisMtxRowList : List of visibiliy matrix rows (0,2,...) -> time-freq map \n" << endl;
+       << " VisMtxRowList : List of visibiliy matrix rows (0,2,...) -> time-freq map \n" 
+       << " DT : Fill datatable if DT arg specified " << endl;
   return 1;
 }
@@ -75 +76 @@
 {
   if ((narg>1)&&(strcmp(arg[1],"-h")==0))  return Usage(false);
-  if (narg<4) return Usage(true);
+  if (narg<5) return Usage(true);
   HiStatsInitiator _inia;
   //   TArrayInitiator  _inia;
@@ -110 +111 @@
 //       Traitement fichiers produits par vismfib  (V Nov09)
 /* --Fonction-- */
+static  bool fgfilldt=false;
+
 int DecodeProc(int narg, char* arg[])
 {
@@ -124 +127 @@
   int card=1;
   vector<sa_size_t> rowlist;
-  if (narg>3) { 
-    EnumeratedSequence es;
-    int nbad;
-    es.Append(arg[3], nbad, ",");
-    for(int j=0; j<es.Size(); j++) rowlist.push_back((int)es.Value(j));
-  }
+  EnumeratedSequence es;
+  int nbad;
+  es.Append(arg[3], nbad, ",");
+  for(int j=0; j<es.Size(); j++) rowlist.push_back((int)es.Value(j));
+  fgfilldt=false;
+  if ((narg>4)&&(strcmp(arg[4],"DT")==0))  fgfilldt=true;
   //  if (rowlist.size()<1) rowlist.push_back(0);
 
@@ -165 +168 @@
   if (djf<1) djf=1;
 
-  cout << " --- ProcVisMtxFiles jf1=" << jf1 << " jf2= " << jf2 << " djf=" << djf << endl;
+  cout << " --- ProcVisMtxFiles Frequency binng Start=" << jf1 << " End= " << jf2 << " DFreq=" << djf << " NBinFreq=" << nfreq << endl;
   char fname[1024];
 
@@ -179 +182 @@
   cout << " ---- ProcVisMtxFiles()-Read chanum done " << endl;
   sa_size_t nrows = (imax-imin+1)/istep;
-  sa_size_t kr=0;
-
-  sa_size_t mtf_binfreq=25;
-  sa_size_t mtf_bintime=5;
+  sa_size_t ktime=0;
+
+  //  sa_size_t mtf_binfreq=25;
+  sa_size_t mtf_bintime=1;
 
   sa_size_t ncols=1;
@@ -197 +200 @@
       ncols = vismtx.NCols();
       cout << " ProcVisMtxFiles/Info: Output Time-Frequency matrices NRows(time) " 
-           << nrows/mtf_bintime+1 << " NCols(freq) =" << ncols/mtf_binfreq+1 << endl;
+           << nrows/mtf_bintime+1 << " NCols(freq) =" << nfreq << endl;
       for(size_t j=0; j<rowlist.size(); j++)   
-        vmtf.push_back(TMatrix< r_4 >(nrows/mtf_bintime+1, ncols/mtf_binfreq+1));
+        vmtf.push_back(TMatrix< r_4 >(nrows/mtf_bintime+1, nfreq));
     }
 
     if (rowlist.size()>0) {
-      for(size_t j=0; j<rowlist.size(); j++) 
-        for(sa_size_t icf=0; icf<ncols; icf++)  {
-          vmtf[j](kr/mtf_bintime,icf/mtf_binfreq)+=vismtx(rowlist[j],icf);
+      for(size_t j=0; j<rowlist.size(); j++) {
+        sa_size_t jfreb=0;
+        for(sa_size_t jf=jf1; jf<jf2; jf+=djf) {
+          sa_size_t jfreb=(jf-jf1)/djf;
+          if (jfreb>=nfreq)  break;
+          vmtf[j](ktime/mtf_bintime,jfreb)+=vismtx(rowlist[j],jf);
         }
+      }
     }
     //    cout << " DBG* kr=" << kr << " kr/mtf_bintime=" << kr/mtf_bintime 
     //     << " ncols/2/mtf_binfreq=" << ncols/2/mtf_binfreq << endl;
-    kr++;
+    ktime++;
 
      
 // Calcul moyenne dans des bandes en frequence 
-    FillVisDTable(visdt, vismtx, chanum, jf1, jf2, djf);
+    if (fgfilldt)   FillVisDTable(visdt, vismtx, chanum, jf1, jf2, djf);
   }
 
@@ -221 +228 @@
     cout << "ProcVisMtxFiles: Opening file " << fname << " for writing Visi(Freq,Time) matrices" << endl;  
     FitsInOutFile fo(fname, FitsInOutFile::Fits_Create);
-    for(size_t j=0; j<rowlist.size(); j++)  
+    for(size_t j=0; j<rowlist.size(); j++)  {
+      cout << " Writing Time-Freq visibility matrix for " << chanum(rowlist[j]) << endl;
       fo << vmtf[j];
-  }
-  cout << visdt;
-  sprintf(fname, "!%s/visidt.ppf",inoutpath.c_str());
-  cout << "ProcVisMtxFiles: writing visibility datatable to file " << fname << endl;
-  FitsInOutFile fod(fname, FitsInOutFile::Fits_Create);
-  fod << visdt;
-
+    }
+  }
+  if (fgfilldt)  {
+    cout << visdt;
+    sprintf(fname, "!%s/visidt.fits",inoutpath.c_str());
+    cout << "ProcVisMtxFiles: writing visibility datatable to file " << fname << endl;
+    FitsInOutFile fod(fname, FitsInOutFile::Fits_Create);
+    fod << visdt;
+  }
   return 0;
 }