Changeset 1532 in Sophya for trunk/ArchTOIPipe/ProcWSophya

Timestamp:

Jun 15, 2001, 2:58:44 PM (24 years ago)

Author:

aubourg

Message:

flags uint_8

Location:

trunk/ArchTOIPipe/ProcWSophya

Files:

• genwproc.cc (modified) (10 diffs)
• genwproc.h (modified) (2 diffs)
• map2toi.cc (modified) (1 diff)
• simtoipr.cc (modified) (6 diffs)

trunk/ArchTOIPipe/ProcWSophya/genwproc.cc

@@ -89 +89 @@
 }
 
-TVector<int_8> GenWindowTOIProcessor::GetWFlag(int_4 numtoi)
+TVector<uint_8> GenWindowTOIProcessor::GetWFlag(int_4 numtoi)
 {
   if(numtoi<0 || numtoi>=NbInput)
@@ -108 +108 @@
 }
  
-int_8 * GenWindowTOIProcessor::GetWFlagPointer(int_4 numtoi)
+uint_8 * GenWindowTOIProcessor::GetWFlagPointer(int_4 numtoi)
 {
   if(numtoi<0 || numtoi>=NbInput)
@@ -117 +117 @@
 }
 
-void GenWindowTOIProcessor::GetData(int_4 numtoi, int_8 numsample, r_8 & data, int_8 & flag)
+void GenWindowTOIProcessor::GetData(int_4 numtoi, int_8 numsample, r_8 & data, uint_8 & flag)
 {
   if(numtoi<0 || numtoi>=NbInput)
@@ -133 +133 @@
 ////////////////////////////////////////////////////////////////
 void GenWindowTOIProcessor::PutWData(int numtoi,int_8 numsample
-                                    ,TVector<r_8>& data,TVector<int_8>& flag)
+                                    ,TVector<r_8>& data,TVector<uint_8>& flag)
 {
   if(numtoi<0 || numtoi>=NbOutput || NbOutput<=0)
@@ -151 +151 @@
 
 void GenWindowTOIProcessor::PutWData(int numtoi,int_8 numsample
-                                    ,r_8 data,int_8 flag)
+                                    , r_8 data, uint_8 flag)
 {
   if(numtoi<0 || numtoi>=NbOutput || NbOutput<=0)
@@ -170 +170 @@
 /******* cmv routines
 void GenWindowTOIProcessor::PutWData(int_4 numtoi,int_8 numsample
-                                    ,TVector<r_8>& data,TVector<int_8>& flag)
+                                    ,TVector<r_8>& data,TVector<uint_8>& flag)
 {
   if(numtoi<0 || numtoi>=NbOutput || NbOutput<=0)
@@ -186 +186 @@
 
 void GenWindowTOIProcessor::PutWData(int_4 numtoi,int_8 numsample
-                                    ,r_8 data,int_8 flag)
+                                    ,r_8 data, uint_8 flag)
 {
   if(numtoi<0 || numtoi>=NbOutput || NbOutput<=0)
@@ -253 +253 @@
 }
 
-TVector<int_8> GenWindowTOIProcessor::GetWFlag(char cw,int_4 numtoi)
+TVector<uint_8> GenWindowTOIProcessor::GetWFlag(char cw,int_4 numtoi)
 // cr='l' fenetre de gauche, 'c' du centre, 'r' de droite, autre = tout
 {
@@ -275 +275 @@
 }
  
-int_8 * GenWindowTOIProcessor::GetWFlagPointer(char cw,int_4 numtoi,int_4& n)
+uint_8 * GenWindowTOIProcessor::GetWFlagPointer(char cw,int_4 numtoi,int_4& n)
 // cr='l' fenetre de gauche, 'c' du centre, 'r' de droite, autre = tout
 {
@@ -500 +500 @@
 int i,ii=0;
 r_8   * datatot = WDataIn[0].Data();
-int_8 * flagtot = WFlagIn[0].Data();
+uint_8 * flagtot = WFlagIn[0].Data();
 r_8   * data = GetWDataPointer();
-int_8 * flag = GetWFlagPointer();
+uint_8 * flag = GetWFlagPointer();
 int_4 nl,nc,nr;
 r_8   * datal = GetWDataPointer('l',nl);
-int_8 * flagl = GetWFlagPointer('l',nl);
+uint_8 * flagl = GetWFlagPointer('l',nl);
 r_8   * datac = GetWDataPointer('c',nc);
-int_8 * flagc = GetWFlagPointer('c',nc);
+uint_8 * flagc = GetWFlagPointer('c',nc);
 r_8   * datar = GetWDataPointer('r',nr);
-int_8 * flagr = GetWFlagPointer('r',nr);
+uint_8 * flagr = GetWFlagPointer('r',nr);
 
 cout<<"-------- ks = "<<ks<<endl;

trunk/ArchTOIPipe/ProcWSophya/genwproc.h

@@ -42 +42 @@
 
   TVector<r_8> GetWData(int_4 numtoi=0);
-  TVector<int_8> GetWFlag(int_4 numtoi=0);
+  TVector<uint_8> GetWFlag(int_4 numtoi=0);
   r_8 * GetWDataPointer(int_4 numtoi=0);
-  int_8 * GetWFlagPointer(int_4 numtoi=0);
-  void GetData(int_4 numtoi, int_8 numsample, r_8 & data, int_8 & flag);
-  inline void GetData(int_8 numsample, r_8 & data, int_8 & flag)
+  uint_8 * GetWFlagPointer(int_4 numtoi=0);
+  void GetData(int_4 numtoi, int_8 numsample, r_8 & data, uint_8 & flag);
+  inline void GetData(int_8 numsample, r_8 & data, uint_8 & flag)
                       { GetData(0, numsample, data, flag); }
 
   TVector<r_8> GetWData(char cw,int_4 numtoi=0);
-  TVector<int_8> GetWFlag(char cw,int_4 numtoi=0);
+  TVector<uint_8> GetWFlag(char cw,int_4 numtoi=0);
   r_8   * GetWDataPointer(char cw,int_4 numtoi,int_4& n);
-  int_8 * GetWFlagPointer(char cw,int_4 numtoi,int_4& n);
+  uint_8 * GetWFlagPointer(char cw,int_4 numtoi,int_4& n);
   inline   r_8 * GetWDataPointer(char cw,int_4& n)
                  {return GetWDataPointer(cw,0,n);}
-  inline int_8 * GetWFlagPointer(char cw,int_4& n)
+  inline uint_8 * GetWFlagPointer(char cw,int_4& n)
                  {return GetWFlagPointer(cw,0,n);}
 
-  void PutWData(int_4 numtoi,int_8 numsample,TVector<r_8>& data,TVector<int_8>& flag);
-  void PutWData(int_4 numtoi,int_8 numsample,r_8 data,int_8 flag);
-  inline void PutWData(int_8 numsample,TVector<r_8>& data,TVector<int_8>& flag)
+  void PutWData(int_4 numtoi,int_8 numsample,TVector<r_8>& data,TVector<uint_8>& flag);
+  void PutWData(int_4 numtoi,int_8 numsample,r_8 data,uint_8 flag);
+  inline void PutWData(int_8 numsample,TVector<r_8>& data,TVector<uint_8>& flag)
                       {PutWData(0,numsample,data,flag);}
-  inline void PutWData(int_8 numsample,r_8 data,int_8 flag)
+  inline void PutWData(int_8 numsample,r_8 data,uint_8 flag)
                       {PutWData(0,numsample,data,flag);}
 
@@ -100 +100 @@
 
   vector< TVector<r_8>   > WDataIn;
-  vector< TVector<int_8> > WFlagIn;
+  vector< TVector<uint_8> > WFlagIn;
   vector< bool > WInFlg;
   vector< TVector<r_8>   > WDataOut;
-  vector< TVector<int_8> > WFlagOut;
+  vector< TVector<uint_8> > WFlagOut;
   vector< bool > WOutFlg;
   vector< bool > WPutOutFlg;

trunk/ArchTOIPipe/ProcWSophya/map2toi.cc

@@ -88 +88 @@
 for(int k=snb;k<=sne;k++) {
 
-  int_8 flg = 0;
+  uint_8 flg = 0;
   double coord1 = getData(0,k);
   double coord2 = getData(1,k);

trunk/ArchTOIPipe/ProcWSophya/simtoipr.cc

@@ -114 +114 @@
     Vector vrec(wrecsize);
 
-    TVector<int_8> vfg(wsize);
+    TVector<uint_8> vfg(wsize);
     int wsz2 = wsize/2;
     // Le debut 
@@ -464 +464 @@
     int wsz2 = wsize/2;
     Vector vin(wsize);
-    TVector<int_8> vfg(wsize);
+    TVector<uint_8> vfg(wsize);
     int k;
     for(k=0; k<wsize; k++) 
@@ -595 +595 @@
     double out = 0.;
     double valin = 0.;
-    int_8 fgin = 0;
-    int_8 fgout = 0;
+    uint_8 fgin = 0;
+    uint_8 fgout = 0;
     for(k=snb;k<=sne;k++) {
       out = 0;
@@ -694 +694 @@
     Vector vin(wsize);
     Vector vout(wsize);
-    TVector<int_8> vfg(wsize);
+    TVector<uint_8> vfg(wsize);
     TVector< complex<r_8> > vfft, vfftmean;
     Vector meanpowerspectra;
@@ -756 +756 @@
     // 2eme partie, on traite la fin du bloc d'echantillons si necessaire
     double inval;
-    int_8 inflg;
+    uint_8 inflg;
     if (klast < sne) 
       for(k=klast+1; k<=sne; k++) {
@@ -887 +887 @@
     Timer tm("SimpleFanOut::run()");
     double valin = 0.;
-    int_8 fgin = 0;
+    uint_8 fgin = 0;
     for(int k=snb;k<=sne;k++) {
       for(int i=0;i<nb_input;i++) {