Changeset 1464 in Sophya for trunk/ArchTOIPipe/ProcWSophya/simtoipr.cc

Timestamp:

Apr 11, 2001, 12:01:44 PM (24 years ago)

Author:

ansari

Message:

1) Fin de passage des flags en int_8
2) TOIRegularWindow mis ds un fichier spare , Reza 11/4/2001

File:

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

trunk/ArchTOIPipe/ProcWSophya/simtoipr.cc

@@ -91 +91 @@
     TVector<int_8> vfg(wsize);
     int k;
-    for(k=0; k<wsize; k++) {
-      vin(k) = getData(0, k+snb);
-      vfg(k) = getFlag(0, k+snb);
-    }
+    for(k=0; k<wsize; k++) 
+      getData(0, k+snb, vin(k), vfg(k));
+
     double s = vin.Sum();
     double mean = s/wsize;
@@ -123 +122 @@
       if (k>=wsize)  {
         valsub = vin(k%wsize);
-        vin(k%wsize) = valadd = getData(0, k+snb);
-        vfg(k%wsize) = getFlag(0, k+snb);
+        getData(0, k+snb, vin(k%wsize), vfg(k%wsize));
+        valadd = vin(k%wsize);
         if ( (valadd < range_min) || (valadd > range_max) ) 
           valadd = mean;
@@ -359 +358 @@
     TVector<int_8> vfg(wsize);
     int k;
-    for(k=0; k<wsize; k++) {
-      vin(k%wsize) = getData(0, k+snb);
-      vfg(k%wsize) = getFlag(0, k+snb);
-    }
+    for(k=0; k<wsize; k++) 
+      getData(0, k+snb, vin(k%wsize), vfg(k%wsize));
+    
     double mean = vin.Sum()/wsize;
     for(k=wsz2+1; k<wsize; k++) { 
@@ -380 +378 @@
         putData(1, k+snb, vin(k%wsize), vfg(k%wsize));
       knext = k+wsz2+1;
-      if (knext<=(sne-snb)) { 
-        vin(knext%wsize) = getData(0, knext+snb);
-        vfg(knext%wsize) = getFlag(0, knext+snb);
-      }
+      if (knext<=(sne-snb)) 
+        getData(0, knext+snb, vin(knext%wsize), vfg(knext%wsize));
+
       else {
         if (!fgfin) { 
@@ -489 +486 @@
     int k,i;
     double out = 0.;
-    unsigned long fgout = 0;
+    double valin = 0.;
+    int_8 fgin = 0;
+    int_8 fgout = 0;
     for(k=snb;k<=sne;k++) {
       out = 0;
       fgout = 0;
       for(i=0; i<nb_input; i++) {
-        out += gains(i)*getData(i, k);
-        fgout = fgout | (unsigned int)getFlag(i,k);
+        getData(i, k, valin, fgin);
+        out += gains(i)*valin;
+        fgout = fgout | fgin;
       }
     putData(0,k,out,fgout);