Changeset 3926 in Sophya for trunk/AddOn/TAcq

Timestamp:

Dec 13, 2010, 5:57:43 PM (15 years ago)

Author:

cmv

Message:

add protection against corrupted and mising files, cmv 13/12/2010

Location:

trunk/AddOn/TAcq

Files:

• chanum_1210.cc (modified) (1 diff)
• svv2mtx2_1210.cc (modified) (5 diffs)

trunk/AddOn/TAcq/chanum_1210.cc

@@ -97 +97 @@
   for(uint_4 i=0;i<vcode.size();i++) {
     char str[128];
-    sprintf(str,"svv2mtx2_1210 -T 0,999999 -F 0,9999,1 -f %.7f",freq0);
+    sprintf(str,"svv2mtx2_1210 -T 0,99999 -F 0,9999,1 -f %.7f",freq0);
     string argu = str;
     uint_4 ip = IVcode(i);

trunk/AddOn/TAcq/svv2mtx2_1210.cc

@@ -41 +41 @@
   bool dupli = false;
   double freq0 = 0.;
-  int ifilmin=0, ifilmax=999999;
+  int ifilmin=0, ifilmax=99999;
   int jfr1=0, jfr2=-1, ngrpfreq=1;
   char str[2048];
@@ -89 +89 @@
 
   // --- recherche et comptage des fichiers de visibilites
+  // ATTENTION: il peut manquer des fichiers au debut ou dans la sequence
+  struct stat buffer;
   int nfile = 0;
   {
-  struct stat buffer;
-  int i2 = ifilmax; ifilmax = 0;
+  int ifmin2 = ifilmin, ifmax2 = ifilmax; ifilmax = -1;
   bool foundfirst = false;
-  for(int ifile=0; ifile<=i2; ifile++) {
+  for(int ifile=ifmin2; ifile<=ifmax2; ifile++) {
     sprintf(str, "%s/vismtx_%d_%d.ppf",indir.c_str(),numthread,ifile);
     int status = stat(str,&buffer);
@@ -104 +105 @@
     if(!foundfirst) continue;
     if(ifile<ifilmin) continue;
-    if(foundfirst && status) break;
+    if(foundfirst && status!=0) continue;
     nfile++;
     ifilmax = ifile;
@@ -127 +128 @@
   int lpmod = nfile/10; if(lpmod<=0) lpmod=1;
 
-  int ntimefill = 0;
+  int ntimefill = 0, ntimebad = 0;
   for(int ifile=ifilmin; ifile<=ifilmax; ifile++) {
 
     // --- Lecture d'une visi elementaire (fichier acq)
     sprintf(str, "%s/vismtx_%d_%d.ppf",indir.c_str(),numthread,ifile);
+    int status = stat(str,&buffer);
+    if(status) continue; // fichier inexistant
     if(ifile==ifilmin || ifile==ifilmax || (ifile-ifilmin)%lpmod==0)
-      cout<<ifile<<" opening: "<<str<<endl;
-    PInPersist pin(str);
+        cout<<ntimefill<<" "<<ifile<<" opening: "<<str<<endl;
     TMatrix< complex<r_4> > vismtx;
-    pin >> vismtx;
+    try {
+      PInPersist pin(str);
+      pin >> vismtx;
+    } catch(...) {
+      cout<<"ERROR: bad file "<<str<<endl;
+      ntimebad++;
+      continue;
+    }
     tufin = (string)vismtx.Info()["DATEOBS"];
 
     // --- Time keeping and number of summed elementary visibilities
-    MeanTT(ifile-ifilmin) = (double)vismtx.Info()["MeanTT"]/125.e6;
+    MeanTT(ntimefill) = (double)vismtx.Info()["MeanTT"]/125.e6;
     uint_4 npaqsum = vismtx.Info()["NPAQSUM"];
 
@@ -189 +198 @@
         int f = jfr1 + i*ngrpfreq + j;
         if(f>jfr2) break;
-        MVisi(ifile-ifilmin,i) += vismtx(numrow,f);
+        MVisi(ntimefill,i) += vismtx(numrow,f);
         nf++;
       }
-      Npaqsum(ifile-ifilmin) = nf * npaqsum;
-      MVisi(ifile-ifilmin,i) /= double(Npaqsum(ifile-ifilmin));
+      Npaqsum(ntimefill) = nf * npaqsum;
+      MVisi(ntimefill,i) /= double(Npaqsum(ntimefill));
     }
     ntimefill++;
 
   }  // fin boucle sur le fichiers d'acq
-  cout<<"ntimefill = "<<ntimefill<<" / "<<nfile<<endl;
+  cout<<"ntimefill = "<<ntimefill<<" / "<<nfile<<" , ntimebad="<<ntimebad<<" bad files"<<endl;
 
   // --- keeping info with visi