Changeset 15340 for trunk

Timestamp:

04/15/13 12:07:44 (12 years ago)

Author:

tbretz

Message:

Added a missing factOut; replaced bzero by memset (bzero is deprecated); improved the meaning of some ii[2] output

File:

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

trunk/FACT++/src/EventBuilder.c

@@ -2203 +2203 @@
                                   "procEvt: Finished run since new one opened %d",
                                   runCtrl[j1].runId);
+                        factOut (kInfo, -1, str);
                         runFinish1 (runCtrl[j1].runId);
                      }
@@ -2280 +2281 @@
                      if (mBuffer[id].fEvent->StartPix[ip] == -1) {
                         dest = ip * roi;
-                        bzero (&mBuffer[id].fEvent->Adc_Data[dest], roi * 2);
+                        memset (&mBuffer[id].fEvent->Adc_Data[dest], 0, roi * 2);
                      }
                   }
@@ -2287 +2288 @@
                      if (mBuffer[id].fEvent->StartTM[it] == -1) {
                         dest = it * roi + NPIX * roi;
-                        bzero (&mBuffer[id].fEvent->Adc_Data[dest], roi * 2);
+                        memset (&mBuffer[id].fEvent->Adc_Data[dest], 0, roi * 2);
                      }
                   }
@@ -2659 +2660 @@
 {
             if (runCtrl[j].runId == gi_myRun)
-               gi_myRun = g_actTime;
+                gi_myRun = g_actTime;
+
             int ii = 0;
             if (runCtrl[j].closeTime < g_actTime)
-               ii = 2;
-            else if (runCtrl[j].lastTime < g_actTime - 300)
-               ii = 3;
-            else if (runCtrl[j].maxEvt <= runCtrl[j].actEvt)
-               ii = 4;
+               ii |= 1;  // = 2
+            /*else*/ if (runCtrl[j].lastTime < g_actTime - 300)
+               ii |= 2;  // = 3
+            /*else*/ if (runCtrl[j].maxEvt <= runCtrl[j].actEvt)
+               ii |= 4;  // = 4
 
             if (runCtrl[j].procId == 0) {