Changeset 1439 in Sophya for trunk/ArchTOIPipe/ProcWSophya

Timestamp:

Mar 13, 2001, 7:23:14 PM (25 years ago)

Author:

ansari

Message:

Correction bugs, protections, ameliorations - Reza 13/3/2001

File:

• trunk/ArchTOIPipe/ProcWSophya/rztoi.cc (modified) (5 diffs)

trunk/ArchTOIPipe/ProcWSophya/rztoi.cc

@@ -45 +45 @@
     if (outppf.length() > 0)    fgppf = true;
     
-    Vector vin, vout;
+    Vector vin, vout, vsave(_width2);
     TVector< complex<r_8> > vfft;
+    double vlast = 0.;
 
     for (int k=0; k<_nmax; k++) {
-      istart = snb + k*_width1;
-      //      if (k>0)  istart -= _width2;
+      //      istart = snb + k*_width1;
+      istart = snb + k*_width1 - k*_width2;
       iend = istart +_width1;
-      cout << " RzTOIProc::run() - Processing bloc k= " << k 
+      cout << "---RzTOIProc::run() - Processing bloc k= " << k 
            << " istart= " << istart << " iend= " << iend << endl;
       if (iend > sne) {
@@ -60 +61 @@
       //      Vector vin = getData(0, istart, iend);
       vin.ReSize(_width1);
-      jj = 0;
-      for(ii=istart; ii<iend; ii++)  
-        vin(jj++) = getData(0, ii);
-      
-      cout << " End of getData() for bloc " << k << endl;
+      if (k == 0) {
+        jj = 0;
+        for(ii=istart; ii<iend; ii++)  
+          vin(jj++) = getData(0, ii);
+      }
+      else {
+        vin(Range(0,-1,_width2)) = vsave;
+        jj = _width2;
+        for(ii=istart+_width2; ii<iend; ii++)  
+          vin(jj++) = getData(0, ii);
+      }
+
+      vsave = vin(Range(_width1-_width2, -1,_width2));
+      cout << "> End of getData() for bloc " << k << endl;
 
       vout.ReSize(vin.Size());
-      double vlast = 0.;
+      //      cout << " DBG : Bloc[" << k << "] FirstSN=" << istart
+      //           << " LastSN= " << istart+vout.Size()-_width2-1 << endl;
       for(int i=0; i<vout.Size()-_width2; i++) {
         vout(i) = vin(Range(i,-1,_width2)).Sum()/(r_8)_width2;
@@ -76 +87 @@
       for(int i=vout.Size()-_width2; i<vout.Size(); i++) {
         vout(i) = vlast;
-        putData(0, i+istart, vout(i));
+        //      putData(0, i+istart, vout(i));
       }
 
-      cout << " End of putData() for bloc " << k << " Mean vout= " 
-           << vout.Sum()/vout.Size() << endl;
+      cout << ">> End of putData() for bloc[" << k << "] FirstSN=" 
+           << istart << " LastSN= " << istart+vout.Size()-_width2-1 
+           << " Mean vout= " << vout.Sum()/vout.Size() << endl;
 
       vin -= vout;
@@ -121 +133 @@
     }
 
-    cout << " Filling -9999 : putData(0, ii, -9999.) ii: "
+    cout << " Filling with flag!=0  : putData(0, ii, flag) ii: "
          << iend << " .. " << sne << endl;
+    for(ii=iend-_width2; ii<iend; ii++) {
+      putData(0, ii, vlast, 1);
+    }
+
     double xxx;
     for(ii=iend; ii<sne; ii++) {
@@ -129 +145 @@
              << endl;
       xxx=getData(0,ii);
-      putData(0,ii,xxx-9999.);
+      putData(0,ii,xxx,2);
     }