Changeset 3683 in Sophya for trunk/AddOn/TAcq/racqumem.cc

Timestamp:

Nov 27, 2009, 11:32:46 AM (16 years ago)

Author:

ansari

Message:

Mise a jour et ajout de fichier pour taritement multifibres apres

prise de donnees de Nov2009 a Pittsburgh

• Introduction des classes BRMultiFitsReader et BRBaseProcessor Reza, 27/11/2009

File:

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

trunk/AddOn/TAcq/racqumem.cc

@@ -1 +1 @@
 #include "racqumem.h"
+
+using namespace SOPHYA;
 
 //----------------------------------------------------------------
@@ -29 +31 @@
   st.act = (uint_4)MemZA_None;
   st.stat = (uint_4)MemZS_Free;
-  for(int k=0; k<6; k++) st.nbact[k] = 0;
+  for(int k=0; k<MXNACTMZM; k++) st.nbact[k] = 0;
   uint_8 mzsz = nfibres*npaq*paqsz;
   uint_8 procmzsz = nfibres*npaq*procpaqsz;
@@ -40 +42 @@
   serial_ = 0;
   SetFinalizedMask();
+  SetProcSavedReadyMask();
 }
 
@@ -122 +125 @@
         if (rid >= 0) states[rid].act = MemZA_ProcC;              
         break;
+      case MemZA_ProcD:
+        for(uint_4 k=0; k<NbZones(); k++) {
+          if ((states[k].act == MemZA_None) && (states[k].stat & MemZS_Filled) && 
+              (states[k].stat & MemZS_ProcC) && !(states[k].stat & MemZS_ProcD) ) { 
+            if (states[k].serial < bestserial) { rid=k; bestserial=states[k].serial; } 
+          }
+        }
+        if (rid >= 0) states[rid].act = MemZA_ProcD;              
+        break;
+      case MemZA_ProcE:
+        for(uint_4 k=0; k<NbZones(); k++) {
+          if ((states[k].act == MemZA_None) && (states[k].stat & MemZS_Filled) && 
+              (states[k].stat & MemZS_ProcD) && !(states[k].stat & MemZS_ProcE) ) { 
+            if (states[k].serial < bestserial) { rid=k; bestserial=states[k].serial; } 
+          }
+        }
+        if (rid >= 0) states[rid].act = MemZA_ProcE;              
+        break;
+      case MemZA_ProcF:
+        for(uint_4 k=0; k<NbZones(); k++) {
+          if ((states[k].act == MemZA_None) && (states[k].stat & MemZS_Filled) && 
+              (states[k].stat & MemZS_ProcE) && !(states[k].stat & MemZS_ProcF) ) { 
+            if (states[k].serial < bestserial) { rid=k; bestserial=states[k].serial; } 
+          }
+        }
+        if (rid >= 0) states[rid].act = MemZA_ProcF;              
+        break;
+      case MemZA_SaveProc:
+        for(uint_4 k=0; k<NbZones(); k++) {
+          if ((states[k].act == MemZA_None) && 
+              (states[k].stat & mask_saveproc_ready_) && !(states[k].stat & MemZS_SavedProc) ) { 
+            if (states[k].serial < bestserial) { rid=k; bestserial=states[k].serial; } 
+          } 
+        }
+        if (rid >= 0) states[rid].act = MemZA_SaveProc; 
+        break;
       case MemZA_None:   // MTQ pour supprimer un warning
         break;
@@ -177 +216 @@
     case MemZS_ProcC :
       if (states[id].act != MemZA_ProcC)  rc = 64;
-      else states[id].nbact[4]++;         
+      else states[id].nbact[5]++;         
       states[id].stat |= MemZS_ProcC; 
       states[id].act = MemZA_None;
       break;
+    case MemZS_ProcD :
+      if (states[id].act != MemZA_ProcD)  rc = 128;
+      else states[id].nbact[6]++;         
+      states[id].stat |= MemZS_ProcD; 
+      states[id].act = MemZA_None;
+      break;
+    case MemZS_ProcE :
+      if (states[id].act != MemZA_ProcE)  rc = 256;
+      else states[id].nbact[7]++;         
+      states[id].stat |= MemZS_ProcE; 
+      states[id].act = MemZA_None;
+      break;
+    case MemZS_ProcF :
+      if (states[id].act != MemZA_ProcF)  rc = 512;
+      else states[id].nbact[8]++;         
+      states[id].stat |= MemZS_ProcF; 
+      states[id].act = MemZA_None;
+      break;
+    case MemZS_SavedProc :
+      if (states[id].act != MemZA_SaveProc)  rc = 1024;
+      else states[id].nbact[9]++;         
+      states[id].stat |= MemZS_ProcF; 
+      states[id].act = MemZA_None;
+      break;
     default :
-      rc = 128;
+      rc = 65536;
       states[id].serial = 0;
       states[id].stat = MemZS_Free; 
@@ -193 +256 @@
 }
 
-/*  MIS en inline 
-Byte* RAcqMemZoneMgr::GetMemZone(int id)
-{
-  if ((id < 0) || (id >= memzones.size()))  return NULL;
-  return memzones[id];
-}
-*/
 ostream& RAcqMemZoneMgr::Print(ostream& os)
 {
@@ -208 +264 @@
          << " ProcZoneSize()=" << ProcZoneSize() << endl;
   else cout << " ... NO Processed Data Zones" << endl;
-  for(uint_4 k=0; k<states.size(); k++) 
+  for(uint_4 k=0; k<states.size(); k++) {
     os << " [" << k << "] Act=" << states[k].act << " Stat=" << states[k].stat 
-       << " NbAct[0..5]=" << states[k].nbact[0] << "," << states[k].nbact[1]
-       << "," << states[k].nbact[2] << "," << states[k].nbact[3] 
-       << "," << states[k].nbact[4] << "," << states[k].nbact[5] << endl;       
+       << " NbAct[0.."<< MXNACTMZM-1 << "]=" << states[k].nbact[0];
+    for(uint_4 j=1; j<MXNACTMZM; j++)  cout << "," << states[k].nbact[j];
+    cout << endl;
+  }
   return os;   
 }