Changeset 3659 in Sophya for trunk/AddOn/TAcq/brpaqu.cc

Timestamp:

Oct 19, 2009, 3:43:12 PM (16 years ago)

Author:

ansari

Message:

amelioration classe BRPaqChecker et ajout methode d'acces en SByte et TwoByteComplex aux donnees de la classe BRPaquet - Reza 19/10/2009

File:

• trunk/AddOn/TAcq/brpaqu.cc (modified) (10 diffs)

trunk/AddOn/TAcq/brpaqu.cc

@@ -77 +77 @@
 
     // on reoordonne les coeff FFT et on swappe en mem temps  (Byte-swap sur 8 octets)
-    if (fgswap == BR_FFTOneChan) ReorderFFTData(src+HeaderSize(), dst_+HeaderSize(), DataSize());
+    if (fgswap == BR_FFTOneChan) ReorderFFTData((SByte*)(src+HeaderSize()), (SByte*)(dst_+HeaderSize()), DataSize());
     else if (fgswap == BR_FFTTwoChan) {
-      ReorderFFTData(src+HeaderSize(), dst_+HeaderSize(), DataSize()/2);
-      ReorderFFTData(src+HeaderSize()+DataSize()/2, dst_+HeaderSize()+DataSize()/2, DataSize()/2);
+      ReorderFFTData((SByte*)(src+HeaderSize()), (SByte*)(dst_+HeaderSize()), DataSize()/2);
+      ReorderFFTData((SByte*)(src+HeaderSize()+DataSize()/2), (SByte*)(dst_+HeaderSize()+DataSize()/2), DataSize()/2);
     }
     // Byte swap (sur 8 octets) du trailer 
@@ -100 +100 @@
   
     // on reoordonne et on swappe en mem temps (Echange de deux mots de 4 octets)
-    if (fgswap == BR_FFTOneChan32) ReorderFFTData32(src+HeaderSize(), dst_+HeaderSize(), DataSize());
+    if (fgswap == BR_FFTOneChan32) ReorderFFTData32((SByte*)(src+HeaderSize()), (SByte*)(dst_+HeaderSize()), DataSize());
     else if (fgswap == BR_FFTTwoChan32) {
-      ReorderFFTData32(src+HeaderSize(), dst_+HeaderSize(), DataSize()/2);
-      ReorderFFTData32(src+HeaderSize()+DataSize()/2, dst_+HeaderSize()+DataSize()/2, DataSize()/2);
+      ReorderFFTData32((SByte*)(src+HeaderSize()), (SByte*)(dst_+HeaderSize()), DataSize()/2);
+      ReorderFFTData32((SByte*)(src+HeaderSize()+DataSize()/2), (SByte*)(dst_+HeaderSize()+DataSize()/2), DataSize()/2);
     }
     // swap du trailler uniquement : Echange de deux mots de 4 octets
@@ -120 +120 @@
 
     // on reoordonne les coeff FFT (pas de swap) 
-    if (fgswap == BR_FFTOneChanNoSwap) ReorderFFTDataNoSwap(src+HeaderSize(), dst_+HeaderSize(), DataSize());
+    if (fgswap == BR_FFTOneChanNoSwap) ReorderFFTDataNoSwap((SByte*)(src+HeaderSize()), (SByte*)(dst_+HeaderSize()), DataSize());
     else if (fgswap == BR_FFTTwoChanNoSwap) {
-      ReorderFFTDataNoSwap(src+HeaderSize(), dst_+HeaderSize(), DataSize()/2);
-      ReorderFFTDataNoSwap(src+HeaderSize()+DataSize()/2, dst_+HeaderSize()+DataSize()/2, DataSize()/2);
+      ReorderFFTDataNoSwap((SByte*)(src+HeaderSize()), (SByte*)(dst_+HeaderSize()), DataSize()/2);
+      ReorderFFTDataNoSwap((SByte*)(src+HeaderSize()+DataSize()/2), (SByte*)(dst_+HeaderSize()+DataSize()/2), DataSize()/2);
     }
     // copie du trailler uniquement : 
@@ -143 +143 @@
 
     // on reoordonne les coeff FFT (pas de swap) 
-    if (fgswap == BR_FFTOneChanNoSwap) ReorderFFTDataNoSwap(src+HeaderSize(), tmp+HeaderSize(), DataSize());
+    if (fgswap == BR_FFTOneChanNoSwap) ReorderFFTDataNoSwap((SByte*)(src+HeaderSize()), (SByte*)(tmp+HeaderSize()), DataSize());
     else if (fgswap == BR_FFTTwoChanNoSwap) {
-      ReorderFFTDataNoSwap(src+HeaderSize(), tmp+HeaderSize(), DataSize()/2);
-      ReorderFFTDataNoSwap(src+HeaderSize()+DataSize()/2, tmp+HeaderSize()+DataSize()/2, DataSize()/2);
+      ReorderFFTDataNoSwap((SByte*)(src+HeaderSize()), (SByte*)(tmp+HeaderSize()), DataSize()/2);
+      ReorderFFTDataNoSwap((SByte*)(src+HeaderSize()+DataSize()/2), (SByte*)(tmp+HeaderSize()+DataSize()/2), DataSize()/2);
     }
     memcpy(tmp+ HeaderSize(), src+(binMin+ HeaderSize()), nbBin); 
@@ -294 +294 @@
 
 /* --Methode__ */
-void BRPaquet::ReorderFFTData(Byte* src, Byte* dst, int N)
+void BRPaquet::ReorderFFTData(SByte* src, SByte* dst, int N)
 {
   // Code recopie depuis /Dev/DisplayData/HistoWindow.cc 
@@ -342 +342 @@
 }
 
-void BRPaquet::ReorderFFTData32(Byte* src, Byte* dst, int N)
+void BRPaquet::ReorderFFTData32(SByte* src, SByte* dst, int N)
 {
   // Code recopie depuis /Dev/DisplayData/HistoWindow.cc 
@@ -384 +384 @@
   return ; 
 }
-void BRPaquet::ReorderFFTDataNoSwap(Byte* src, Byte* dst, int N)
+void BRPaquet::ReorderFFTDataNoSwap(SByte* src, SByte* dst, int N)
 {
   // Code recopie depuis /Dev/DisplayData/HistoWindow.cc 
@@ -483 +483 @@
   lostframes = 0;
   frclst = 0;
+  lastframenum = 0;
   cnt_saut = 0;
   maxprt_ = maxprt;
@@ -506 +507 @@
 
 
-bool BRPaqChecker::Check(BRPaquet& paq)
+bool BRPaqChecker::Check(BRPaquet& paq, UInt64& numframe)
 {
   totnframes++; 
+  numframe=0;
   if (paq.HDRMarker64() != HDRTag()) return false;
   if (cktrl_&&(paq.TRLMarker64() != TRLTag())) return false;
@@ -534 +536 @@
     }
   }
-  nframeok++; frclst = curfc; 
+  nframeok++; frclst=curfc; 
+  lastframenum+=(unsigned long long)delfc;  // numero de frame sans repliement a 65535 
+  numframe=lastframenum;
 //DBG  if (cnt_pb<5) { cnt_pb++; paq.Print(); }
   return true;