Changeset 13170 for trunk/FACT++

Timestamp:

03/22/12 15:01:38 (13 years ago)

Author:

tbretz

Message:

Added checks for the consistency of the event and trigger number.

File:

• trunk/FACT++/src/EventBuilderWrapper.h (modified) (1 diff)

trunk/FACT++/src/EventBuilderWrapper.h

@@ -868 +868 @@
                 CloseRunFile(runNr, 0, 0);
                 break;
-            }
+                }
+                */
             if (beg->fEventCounter != ptr->fEventCounter)
             {
-                Error("Inconsist run number detected.... closing run.");
+                fMsg.Error("Inconsistent FAD event number detected.... closing run.");
                 CloseRunFile(runNr, 0, 0);
-                break;
-            }
+                return -1;
+            }
+
             if (beg->fTriggerCounter != ptr->fTriggerCounter)
             {
-                Error("Inconsist trigger number detected.... closing run.");
+                fMsg.Error("Inconsistent FTM trigger number detected.... closing run.");
                 CloseRunFile(runNr, 0, 0);
-                break;
-            }*/
+                return -1;
+            }
 
             if (beg->fAdcClockPhaseShift != ptr->fAdcClockPhaseShift)