Changeset 15342

Timestamp:

04/15/13 12:42:57 (12 years ago)

Author:

tbretz

Message:

Another update to the ii's

File:

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

trunk/FACT++/src/EventBuilder.c

@@ -2460 +2460 @@
                      if (i < 0)
                         ii = 1;
-                     else 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;
+                     /*else*/ if (runCtrl[j].closeTime < g_actTime)
+                        ii |= 2; // = 2;
+                     /*else*/ if (runCtrl[j].lastTime < g_actTime - 300)
+                        ii |= 4; // = 3;
+                     /*else*/ if (runCtrl[j].maxEvt <= runCtrl[j].actEvt)
+                        ii |= 8; // = 4;
 
 
@@ -2547 +2547 @@
             int ii = 0;
             if (runCtrl[j].closeTime < g_actTime)
-               ii |= 1;  // = 2
+               ii |= 2;  // = 2
             /*else*/ if (runCtrl[j].lastTime < g_actTime - 300)
-               ii |= 2;  // = 3
+               ii |= 4;  // = 3
             /*else*/ if (runCtrl[j].maxEvt <= runCtrl[j].actEvt)
-               ii |= 4;  // = 4
+               ii |= 8;  // = 4
 
             if (runCtrl[j].procId == 0) {
@@ -2608 +2608 @@
          int ii = 0;
          if (runCtrl[j].closeTime < g_actTime)
-            ii |= 1; // = 2
+            ii |= 2; // = 2
          /*else*/ if (runCtrl[j].lastTime < g_actTime - 300)
-            ii |= 2; // = 3
+            ii |= 4; // = 3
          /*else*/ if (runCtrl[j].maxEvt <= runCtrl[j].actEvt)
-            ii |= 4; // = 4
+            ii |= 8; // = 4
          if (i < 0) {
              factPrintf(kError, 506, "writeEvt: Error closing run %d (runClose[3],i=%d)", runCtrl[j].runId, i);