Changeset 3675 in Sophya

Timestamp:

Nov 15, 2009, 12:06:04 PM (16 years ago)

Author:

ansari

Message:

Correction bug avec reduction taille de paquet - Reza 15/11/2009

Location:

trunk/AddOn/TAcq

Files:

• bracqvers.h (modified) (1 diff)
• brpaqu.cc (modified) (1 diff)
• makefile (modified) (1 diff)
• racqurw.cc (modified) (4 diffs)
• tbrpaq.cc (modified) (3 diffs)

trunk/AddOn/TAcq/bracqvers.h

@@ -5 +5 @@
    Software version     LAL - 2008-2010 
 */
-#define BAOR_ACQ_VER 6.4
-#define BAOR_ACQ_VER_STR "BaoAcq_v6r4_Oct09 "
+#define BAOR_ACQ_VER 6.5
+#define BAOR_ACQ_VER_STR "BaoAcq_v6r5_Nov09 "
 
 #endif

trunk/AddOn/TAcq/brpaqu.cc

@@ -210 +210 @@
 {
   if (ract==BR_CopyRA) {
-    if (PaquetSize()!=pq.PaquetSize()) 
+    if (PaquetSize()!=pq.PaquetSize()) {
       throw BAORadioException("BRPaquet::CopyFrom(BR_CopyRA) - NOT equal paquet size");
-      memcpy(Begin(), pq.Begin(), PaquetSize()); 
-      return;
+    }
+    memcpy(Begin(), pq.Begin(), PaquetSize()); 
+    return;
   }
   // Recopie de l'entete HDR et trailer TRL 
   memcpy(Header(), pq.Header(), HeaderSize()); 
+  //memcpy(dst_, pq.dst_, 24); 
+  // SetHDRMarker64(pq.HDRMarker64());
+  // SetTimeTag(pq.TimeTag());
   memcpy(Trailer(), pq.Trailer(), TrailerSize());
   // Recopie partielle des donnees 

trunk/AddOn/TAcq/makefile

@@ -6 +6 @@
 # all : traidio  tmtfft tstminifits tbrpaq tpciew tmtacq tstrdfits mfits2spec tsok 
 # all : traidio  tmtfft tstminifits tmtacq tstrdfits mfits2spec tsok mcrd
-all :  mfacq tmtacq mfits2spec mcrd svv2mtx tsok traidio tstminifits
+all :  mfacq tmtacq mfits2spec mcrd svv2mtx tsok traidio tstminifits tbrpaq
 
 clean :

trunk/AddOn/TAcq/racqurw.cc

@@ -498 +498 @@
   
   cout << " PCIEMultiReader::run() - Starting , NMaxMemZones=" << nmax_ 
-       << " memgr.NbPaquets()=" << memgr.NbPaquets() << "Paqsize " << packSize_
-       << "  " << BRPaquet::FmtConvToString(swapall_) << endl;  
+       << " memgr.NbPaquets(),PaqSz=" << memgr.NbPaquets() << " ," << memgr.PaqSize() 
+       << " DMA-Paqsize " << packSize_ << "  " << BRPaquet::FmtConvToString(swapall_) << endl;  
   setRC(1);     
 
   // sigaddset(&act.sa_mask,SIGINT);  // pour proteger le transfert DMA
   //sigaction(SIGINT,&act,NULL);        
-  // uint_4 paqsz = memgr[0]->PaqSize();
+  uint_4 paqszmm = memgr.PaqSize();
   uint_4 paqsz =  packSize_;
   uint_4 dmasz = vec_pciw_[0]->TransferSize();
@@ -600 +600 @@
             BRPaquet paqc(tampon[fib], nextpaq, paqsz, swapall_);
           }
-          BRPaquet paq(nextpaq, paqsz);
+          BRPaquet paq(nextpaq, packSizeInMgr_);
           npaqfait[fib]++;
           if (fib==nbDma_-1) npaqfaitg++;  // Ne pas oublier le compteur de paquets faits 
@@ -647 +647 @@
           BRPaquet paqc(Datas[fib]+curoff, nextpaq, paqsz, swapall_);
         }
-        BRPaquet paq(nextpaq, paqsz);
+        BRPaquet paq(nextpaq, packSizeInMgr_);
         npaqfait[fib]++;
         if (fib==nbDma_-1) npaqfaitg++;  // Ne pas oublier le compteur de paquets faits 
@@ -918 +918 @@
     mff[fib].AddKeyD("ACQVER", acpar.AcqVersion(), " BAORadio Acq Software version ") ;
     mff[fib].AddKeyS("ACQCONF", acpar.GetParams().AcqMode, " BAORadio Acq run  mode" );
+    mff[fib].AddKeyI("FIBERNUM", acpar.GetParams().FiberNum[fib], " Fiber number/id") ;
     if (hassrc) 
       mff[fib].AddKeyS("SKYSOURC", skysrc, " Source identification" );

trunk/AddOn/TAcq/tbrpaq.cc

@@ -40 +40 @@
       
   if (narg < 3) {
-    cout << "tbrpaq.cc/Erreur arg: tbrpaq paqsz filename [neltsprint=8] [OutPPFFileName]" << endl;
+    cout << "tbrpaq.cc/Erreur arg: tbrpaq paqsz paqredsz [neltsprint=8] [OutPPFFileName]" << endl;
     return 1;
   }
@@ -51 +51 @@
 
   int paqsz = atoi(arg[1]);
-  string filename = arg[2];
+  int redpsz = atoi(arg[2]);
   int nelt = 8;
   if (narg>3) nelt = atoi(arg[3]);
 
-  cout << " tbrpaq : reading from file " << filename
-       << " PaqSize=" << paqsz << endl;
-  FILE* fip = NULL;
-  fip = fopen(filename.c_str(),"rb");
-  if (fip == NULL) {
-    cout << " tbrpaq : ERROR opening file" << endl;
-    return 2;
-  }
+  cout << " tbrpaq :  PaqSize=" << paqsz << " RedPaqSize " << endl;
   Byte * src = new Byte[paqsz];
   Byte * dst = new Byte[paqsz];
 
-  fread(src, 1, (size_t)(paqsz), fip);
-  fclose(fip);
-
+  for(int kk=0; kk<paqsz; kk++) src[kk]=kk%256;
   cout << " tbrpaq : Creating BRPaquet(src,dst,paqsz) ... " << endl;
 
@@ -75 +66 @@
   paq.Print(cout, nelt, true);
 
-  if (narg>4) {
-    string outppf = arg[4];
-    cout << " tbrpaq: Creating OutPPF file from data to file" << outppf << endl;
-    TVector<int_2> vd(paq.DataSize());
-    for(int k=0; k<paq.DataSize(); k++)  vd(k) = (int_2)(*(paq.Data()+k));
-    POutPersist po(outppf);
-    po << vd; 
+  int NN=100;
+  Byte * rdst = new Byte[NN*redpsz];
+
+  for(int n=0; n<NN; n++) {
+    BRPaquet paqc(rdst+n*redpsz, redpsz);
+    paqc.CopyFrom(paq, BR_TwoChanReduc, 0);
+    if ((n==0)||(n==NN-1)) paqc.Print(cout, nelt, true);
   }
+
   // Cleanup
   delete[] src;
   delete[] dst;
+  delete[] rdst;
 
   PrtTim("FIN tbrpaq.cc");