Changeset 18631 for trunk/FACT++

Timestamp:

09/18/16 19:12:43 (8 years ago)

Author:

tbretz

Message:

Added support for run and event number.

File:

• trunk/FACT++/src/evtserver.cc (modified) (4 diffs)

trunk/FACT++/src/evtserver.cc

@@ -45 +45 @@
     uint32_t      fQoS;
     double        fTime;
+    uint32_t      fRun;
+    uint32_t      fEvt;
     //vector<float> fAvg;
     //vector<float> fRms;
@@ -100 +102 @@
             }
 
+            // Requiered columns
             try
             {
@@ -118 +121 @@
             }
 
+            // Non requiered columns
+            fRun = 0;
+            fEvt = 0;
+            try
+            {
+                fIn->SetRefAddress("run",  fRun);
+                fIn->SetRefAddress("evt",  fEvt);
+            }
+            catch (const runtime_error &e) { }
+
             Info("File "+name+" open.");
         }
@@ -172 +185 @@
         out << scale << '\n';
         out << setprecision(3);
-        out << "DEMO\nDEMO\nDEMO\x7f";
+        if (fRun>0)
+            //out << "DEMO [" << fEvt << "]\nDEMO [" << fRun << "]\nDEMO\x7f";
+            out << fEvt << '\n' << fRun << "\nDEMO\x7f";
+        else
+            out << "DEMO\nDEMO\nDEMO\x7f";
+
         //out << sorted[1439] << '\n';
         //out << sorted[719]  << '\n';