Changeset 3958 in Sophya

Timestamp:

Mar 3, 2011, 3:20:33 PM (15 years ago)

Author:

ansari

Message:

correction bug ds RAcqMemZoneMgr, taille fiber_id, Reza 03/03/2011

File:

• trunk/AddOn/TAcq/racqumem.cc (modified) (4 diffs)

trunk/AddOn/TAcq/racqumem.cc

@@ -10 +10 @@
 /* --Methode-- */
 RAcqMemZoneMgr::RAcqMemZoneMgr(uint_4 nz, uint_4 np, uint_4 psz)
-  : mex(true), nzones(nz), nfibres(1), npaq(np), paqsz(psz), procpaqsz(0), stop_(false), runstate_(MemZR_Running)
+  : mex(true), nzones(nz), nfibres(1), npaq(np), paqsz(psz), procpaqsz(0), 
+    fiber_id(1), stop_(false), runstate_(MemZR_Running)
 {
   Init();
@@ -18 +19 @@
 RAcqMemZoneMgr::RAcqMemZoneMgr(uint_4 nzon, uint_4 nfib, uint_4 npaq, uint_4 paqsz, uint_4 procsz)
   : mex(true), nzones(nzon), nfibres(nfib), npaq(npaq), paqsz(paqsz), procpaqsz(procsz), 
-    stop_(false), runstate_(MemZR_Running)
+    fiber_id(nfib), stop_(false), runstate_(MemZR_Running)
 {
   Init();
@@ -35 +36 @@
   uint_8 procmzsz = nfibres*npaq*procpaqsz;
 
-   for(unsigned int k=0; k<NbZones(); k++) {
-     memzones.push_back(new Byte[mzsz] );
-     states.push_back(st);
-     auxdatap.push_back(new RAcqMZAuxData );
-     fiber_id.push_back(0);
-     if (procmzsz > 0)  procmemzones.push_back(new Byte[procmzsz] );
-   }
+  for(unsigned int k=0; k<NbZones(); k++) {
+    memzones.push_back(new Byte[mzsz] );
+    states.push_back(st);
+    auxdatap.push_back(new RAcqMZAuxData );
+    if (procmzsz > 0)  procmemzones.push_back(new Byte[procmzsz] );
+  }
+  for(size_t k=0; k<NbFibres(); k++) fiber_id[k]=0;
   dummy_=0;
   serial_ = 0;
@@ -329 +330 @@
 {
   os << "RAcqMemZoneMgr::Print() NbZones=" << NbZones() << " PaqSize()=" << PaqSize()
-     << " NbPaquets()=" << NbPaquets() << " ZoneSize()=" << ZoneSize() << endl;
+     << " NbPaquets()=" << NbPaquets() << " NbFibres()=" << NbFibres() << " ZoneSize()=" 
+     << ZoneSize() << endl;
   if (ProcPaqSize() > 0)  
     cout << " ... With Processed Data Zones ProcPaqSize()=" << ProcPaqSize()