Changeset 15469 for trunk/FACT++

Timestamp:

05/01/13 10:57:07 (12 years ago)

Author:

tbretz

Message:

Replaced all previosuly assigned IDs (previosly pointing to the entry in the mBuffer) by the loop index k0

File:

• trunk/FACT++/src/EventBuilder.c (modified) (11 diffs)

trunk/FACT++/src/EventBuilder.c

@@ -1405 +1405 @@
       for (int k0=evtCtrl_frstPtr; k0!=evtCtrl_lastPtr; k0++, k0 %= MAX_EVT*MAX_RUN)
       {
-          /*
-          if (k0==evtCtrl_frstPtr && evtCtrl[k0].evtStat<0)
-          {
-              evtCtrl_frstPtr++;
-              evtCtrl_frstPtr %= MAX_EVT * MAX_RUN;
-
-              // Continue because evtCtrl.evtStat[k0] must be <0
-              continue;
-          }*/
-
           // Check the more likely case first: incomplete events
           if (evtCtrl[k0].evtStat>0 && evtCtrl[k0].evtStat<92)
@@ -1421 +1411 @@
 
               // Event has not yet timed out or was reported already
-              const int id = k0;//vtCtrl[k0].mBuffer_idx;
-
-              if (evtCtrl[k0].evtStat>=90 || evtCtrl[id].pcTime[0]/*evtCtrl[k0].lastRecv*/>=g_actTime - 30)
+              if (evtCtrl[k0].evtStat>=90 || evtCtrl[k0].pcTime[0]/*evtCtrl[k0].lastRecv*/>=g_actTime - 30)
                   continue;
 
-              reportIncomplete(id);
+              reportIncomplete(k0);
 
               //timeout for incomplete events
@@ -1442 +1430 @@
           if (evtCtrl[k0].evtStat==0 || evtCtrl[k0].evtStat >= 9000)
           {
-              const int id = k0;//evtCtrl[k0].mBuffer_idx;
-#ifdef EVTDEBUG
-              factPrintf(kDebug, -1, "%5d free event buffer, nb=%3d", evtCtrl[id].evNum, evtCtrl[id].nBoard);
-#endif
-              mBufFree (id);   //event written--> free memory
+              mBufFree(k0);   //event written--> free memory
               evtCtrl[k0].evtStat = -1;
 
@@ -1456 +1440 @@
               else
                   factPrintf(kDebug, -1, "Freed a non-first slot");
-
 
               gj.evtWrite++;
@@ -1569 +1552 @@
              if (evtCtrl[k0].evtStat > minclear)
              {
-                 const int id = k0;//evtCtrl[k0].mBuffer_idx;
-#ifdef EVTDEBUG
-                 factPrintf(kDebug, -1, "ev %5d free event buffer, nb=%3d", evtCtrl[id].evNum, evtCtrl[id].nBoard);
-#endif
-                 mBufFree (id);   //event written--> free memory
+                 mBufFree(k0);   //event written--> free memory
                  evtCtrl[k0].evtStat = -1;
 
-              if (k0==evtCtrl_frstPtr)
-              {
-                  evtCtrl_frstPtr++;
-                  evtCtrl_frstPtr %= MAX_EVT * MAX_RUN;
-              }
-              else
-                  factPrintf(kDebug, -1, "Freed a non-first slot");
+                 if (k0==evtCtrl_frstPtr)
+                 {
+                     evtCtrl_frstPtr++;
+                     evtCtrl_frstPtr %= MAX_EVT * MAX_RUN;
+                 }
+                 else
+                     factPrintf(kDebug, -1, "Freed a non-first slot");
              }
              else
                  if (evtCtrl[k0].evtStat > 0)
                      numclear++;      //writing is still ongoing...
-
-             /*
-             if (k0 == evtCtrl_frstPtr && evtCtrl[k0].evtStat < 0)
-             {
-                 evtCtrl_frstPtr++;
-                 evtCtrl_frstPtr %= MAX_EVT * MAX_RUN;
-             }*/
          }
 
@@ -1654 +1626 @@
             }
 
-            /*** if (evtCtrl.evtStat[k0] == 1000 + threadID) ****/
-
             int jret = 9100; // flag to be deleted (gi_resetR>1 : flush buffers asap)
 
             if (gi_resetR<=1)
             {
-                const int id = k0;//evtCtrl[k0].mBuffer_idx;
-
-                jret = subProcEvt(threadID, evtCtrl[id].FADhead,
-                                  evtCtrl[id].fEvent, NULL/*mBuffer[id].buffer*/);
+                jret = subProcEvt(threadID, evtCtrl[k0].FADhead,
+                                  evtCtrl[k0].fEvent, NULL/*mBuffer[id].buffer*/);
 
 
@@ -1762 +1730 @@
            //-------- it is better to open the run already here, so call can be used to initialize
            //-------- buffers etc. needed to interprete run (e.g. DRS calibration)
-           const int id = k0;//evtCtrl[k0].mBuffer_idx;
-
-           const uint32_t irun = evtCtrl[id].runNum;
-           const int32_t  ievt = evtCtrl[id].evNum;
+           const uint32_t irun = evtCtrl[k0].runNum;
+           const int32_t  ievt = evtCtrl[k0].evNum;
 
            // Find entry in runCtrl which belongs to the event mBuffer[id]
@@ -1779 +1745 @@
                if (j>=MAX_RUN)
                {
-                   factPrintf(kFatal, 901, "writeEvt: Can not find run %d for event %d in %d", irun, ievt, id);
+                   factPrintf(kFatal, 901, "writeEvt: Can not find run %d for event %d in %d", irun, ievt, k0);
                    // FIXME: What is the right action? (Flag event for deletion?)
                    continue;
@@ -1808 +1774 @@
                actRun.Version =  1;
                actRun.RunType = -1;  //to be adapted
-               actRun.Nroi    = evtCtrl[id].nRoi;      //runCtrl[lastRun].roi0;
-               actRun.NroiTM  = evtCtrl[id].nRoiTM;    //runCtrl[lastRun].roi8;
-               actRun.RunTime = evtCtrl[id].pcTime[0]; //runCtrl[lastRun].firstTime;
-               actRun.RunUsec = evtCtrl[id].pcTime[1]; //runCtrl[lastRun].firstUsec;
+               actRun.Nroi    = evtCtrl[k0].nRoi;      //runCtrl[lastRun].roi0;
+               actRun.NroiTM  = evtCtrl[k0].nRoiTM;    //runCtrl[lastRun].roi8;
+               actRun.RunTime = evtCtrl[k0].pcTime[0]; //runCtrl[lastRun].firstTime;
+               actRun.RunUsec = evtCtrl[k0].pcTime[1]; //runCtrl[lastRun].firstUsec;
                actRun.NBoard  = NBOARDS;
                actRun.NPix    = NPIX;
                actRun.NTm     = NTMARK;
 
-               memcpy(actRun.FADhead, evtCtrl[id].FADhead, NBOARDS*sizeof(PEVNT_HEADER));
+               memcpy(actRun.FADhead, evtCtrl[k0].FADhead, NBOARDS*sizeof(PEVNT_HEADER));
 
                runCtrl[lastRun].fileHd = runOpen (irun, &actRun, sizeof (actRun));
@@ -1856 +1822 @@
            //--------
 
-           //const int roi = mBuffer[id].nRoi;
-           //const int roiTM = mBuffer[id].nRoiTM;
-
-           //make sure unused pixels/tmarks are cleared to zero
-           //ETIENNE don't reset it to zero as it is taken care of in DataWriteFits
-           //                  if (roiTM == roi)
-           //                     roiTM = 0;
-           /*
-           for (int ip=0; ip<NPIX; ip++)
-           {
-               if (mBuffer[id].fEvent->StartPix[ip] == -1)
-               {
-                   const int dest = ip * roi;
-                   memset(&mBuffer[id].fEvent->Adc_Data[dest], 0, roi * 2);
-               }
-           }
-
-           for (int it=0; it<NTMARK; it++)
-           {
-               if (mBuffer[id].fEvent->StartTM[it] == -1)
-               {
-                   const int dest = it * roi + NPIX * roi;
-                   memset(&mBuffer[id].fEvent->Adc_Data[dest], 0, roi * 2);
-               }
-           }*/
-
            //and set correct event header ; also check for consistency in event (not yet)
-           evtCtrl[id].fEvent->Roi         = evtCtrl[id].nRoi;
-           evtCtrl[id].fEvent->RoiTM       = evtCtrl[id].nRoiTM;
-           evtCtrl[id].fEvent->EventNum    = evtCtrl[id].evNum;
-           evtCtrl[id].fEvent->TriggerNum  = evtCtrl[id].trgNum;
-           evtCtrl[id].fEvent->TriggerType = evtCtrl[id].trgTyp;
-           evtCtrl[id].fEvent->Errors[0]   = evtCtrl[id].Errors[0];
-           evtCtrl[id].fEvent->Errors[1]   = evtCtrl[id].Errors[1];
-           evtCtrl[id].fEvent->Errors[2]   = evtCtrl[id].Errors[2];
-           evtCtrl[id].fEvent->Errors[3]   = evtCtrl[id].Errors[3];
-           evtCtrl[id].fEvent->SoftTrig    = 0;
+           evtCtrl[k0].fEvent->Roi         = evtCtrl[k0].nRoi;
+           evtCtrl[k0].fEvent->RoiTM       = evtCtrl[k0].nRoiTM;
+           evtCtrl[k0].fEvent->EventNum    = evtCtrl[k0].evNum;
+           evtCtrl[k0].fEvent->TriggerNum  = evtCtrl[k0].trgNum;
+           evtCtrl[k0].fEvent->TriggerType = evtCtrl[k0].trgTyp;
+           evtCtrl[k0].fEvent->Errors[0]   = evtCtrl[k0].Errors[0];
+           evtCtrl[k0].fEvent->Errors[1]   = evtCtrl[k0].Errors[1];
+           evtCtrl[k0].fEvent->Errors[2]   = evtCtrl[k0].Errors[2];
+           evtCtrl[k0].fEvent->Errors[3]   = evtCtrl[k0].Errors[3];
+           evtCtrl[k0].fEvent->SoftTrig    = 0;
 
 
@@ -1898 +1838 @@
            {
                // board is not read
-               if (evtCtrl[id].board[ib] == -1)
+               if (evtCtrl[k0].board[ib] == -1)
                {
-                   evtCtrl[id].FADhead[ib].start_package_flag = 0;
-                   evtCtrl[id].fEvent->BoardTime[ib] = 0;
+                   evtCtrl[k0].FADhead[ib].start_package_flag = 0;
+                   evtCtrl[k0].fEvent->BoardTime[ib] = 0;
                }
                else
                {
-                   evtCtrl[id].fEvent->BoardTime[ib] = evtCtrl[id].FADhead[ib].time;
+                   evtCtrl[k0].fEvent->BoardTime[ib] = evtCtrl[k0].FADhead[ib].time;
                }
            }
 
-           const int rc = eventCheck(evtCtrl[id].runNum, evtCtrl[id].FADhead,
-                                     evtCtrl[id].fEvent);
+           const int rc = eventCheck(evtCtrl[k0].runNum, evtCtrl[k0].FADhead,
+                                     evtCtrl[k0].fEvent);
            //gi.procTot++;
            numProc++;