Changeset 12470 for trunk/FACT++/src

Timestamp:

11/09/11 16:42:52 (13 years ago)

Author:

tbretz

Message:

Adapted the length of the fDimDrsCalibration format; added a proper error message if the path for InitRunNumber doesn't exist.

File:

• trunk/FACT++/src/EventBuilderWrapper.h (modified) (4 diffs)

trunk/FACT++/src/EventBuilderWrapper.h

@@ -162 +162 @@
     {
         if (!DimWriteStatistics::DoesPathExist(path, fMsg))
+        {
+            fMsg.Error("Data path "+path+" does not exist!");
             return -1;
+        }
 
         //const fs::path fullPath = fs::system_complete(fs::path(path));
@@ -191 +194 @@
         fDimRoi         ("FAD_CONTROL/REGION_OF_INTEREST", "S:2",  ""),
         fDimDac         ("FAD_CONTROL/DAC",                "S:336", ""),
-        fDimDrsCalibration("FAD_CONTROL/DRS_CALIBRATION",  "I:3;F:1474560;F:1474560;F:1474560;F:1474560;F:1474560;F:1474560", ""),
+        fDimDrsCalibration("FAD_CONTROL/DRS_CALIBRATION",  "I:3;I:1;F:1474560;F:1474560;F:1474560;F:1474560;F:1474560;F:1474560;F:163840;F:163840", ""),
         fDimStatistics1 ("FAD_CONTROL/STATISTICS1",        "I:3;I:5;X:4;I:3;I:3;I:40;I:1;I:2;C:40;I:40;I:40;X:40", ""),
         fDimStatistics2 ("FAD_CONTROL/STATISTICS2",        "I:1;I:280;X:40;I:40;I:4;I:4;I:2;I:2;I:3;C:40",  ""),
@@ -850 +853 @@
         oldt = newt;
 
-        vector<char> data(sizeof(EVENT)+event->Roi*sizeof(float)*1440);
+        vector<char> data(sizeof(EVENT)+event->Roi*sizeof(float)*(1440+160));
         memcpy(data.data(), event, sizeof(EVENT));
 
@@ -882 +885 @@
             if (ptr->fStartDelimiter==0)
                 continue;
+
+            // ptr->fTriggerType = htons(ptr->fTriggerType)
 
             if (!ptr->HasTriggerLPext() && !ptr->HasTriggerLPint())