Changeset 3954 in Sophya

Timestamp:

Mar 2, 2011, 3:24:17 PM (15 years ago)

Author:

ansari

Message:

Petite correction dans le lecteur PCIEMultiReader pour assurer le traitement des derniers paquets recus,
correction print de MultiDataSaver, ajout mode acq=hdcorrel (acquisition H.Deschamps) et MAJ numero de
version, Reza 02/03/2011

Location:

trunk/AddOn/TAcq

Files:

• bracqvers.h (modified) (1 diff)
• brparam.cc (modified) (1 diff)
• racqurw.cc (modified) (3 diffs)

trunk/AddOn/TAcq/bracqvers.h

@@ -5 +5 @@
    Software version     LAL - 2008-2010 
 */
-#define BAOR_ACQ_VER 7.3
-#define BAOR_ACQ_VER_STR "BaoAcq_v7r3_Nov10 "
+#define BAOR_ACQ_VER 7.4
+#define BAOR_ACQ_VER_STR "BaoAcq_v7r4_Mar11"
 
 #endif

trunk/AddOn/TAcq/brparam.cc

@@ -435 +435 @@
   fgdatafft=false;  fgfftshrink=false;  fgsinglechannel=false;
   reducneedcopy=false;  pqreducmode=BR_TwoChanReduc;
-  if ((acqmode == "std")||(acqmode=="raw2c"))   swapall = BR_Copy ; 
+  if ((acqmode == "std")||(acqmode=="raw2c")||(acqmode=="hdcorrel"))   swapall = BR_Copy ; 
   if (acqmode=="raw1c") { swapall = BR_Copy ;  fgsinglechannel=true;  pqreducmode=BR_OneChanReduc; }
 

trunk/AddOn/TAcq/racqurw.cc

@@ -676 +676 @@
 
   if (npaqfaitg >= nmax_*memgr.NbPaquets())   stopreason_="--Max Nb paquets reached--";
+
+  MoveToNextTarget();  // Pour faire traiter le dernier paquet si plein 
+  MZoneManage(true);  //---- Nettoyage final
     
   setRC(0);
@@ -692 +695 @@
   cout << " --------------------------------------------------------------------" << endl;
 
-  //---- Nettoyage final et arret 
-  MZoneManage(true);
+  usleep(250000);       // Attente de traitement du dernier paquet
   memgr.Stop();   // Pour arreter les autres threads 
 
@@ -878 +880 @@
         if (savesig_) {
           if (fgnulldev) strcpy(fname,"/dev/null");
-          else sprintf(fname,"%ssignal%d.fits",bpar.OutputDirectoryFib(fib).c_str(),(int)fnum);
+          else sprintf(fname,"%ssignal%d.fits",bpar.OutputDirectoryFib(fib).c_str(),(int)fnum-1);
         }
         else sprintf(fname,"MemDataBloc[%d]-NoDataFile",(int)fnum-1);