Changeset 12071 for trunk/FACT++/src

Timestamp:

09/12/11 14:05:21 (14 years ago)

Author:

lyard

Message:

various small fixes and improvements

Location:

trunk/FACT++/src

Files:

• Fits.h (modified) (1 diff)
• datalogger.cc (modified) (4 diffs)

trunk/FACT++/src/Fits.h

@@ -56 +56 @@
 public:
     ///current run number being logged
-    uint32_t fRunNumber;
+    int32_t fRunNumber;
 
     Fits() : fFile(NULL),

trunk/FACT++/src/datalogger.cc

@@ -95 +95 @@
     string reportName;
     ///the actual run number
-    uint32_t runNumber;
+    int32_t runNumber;
     ///the time at which the run number was received
     Time time;
@@ -145 +145 @@
     shared_ptr<Converter> fConv;
     ///the current run number used by this subscription
-    uint32_t runNumber;
+    int32_t runNumber;
     ///time of the latest received event
     Time lastReceivedEvent;
@@ -515 +515 @@
     fServiceSubscriptions[server].clear();
     fServiceSubscriptions.erase(server);
-    fRunNumberService = NULL;
+    if (server == "FAD_CONTROL")
+        fRunNumberService = NULL;
     if (fDebugIsOn)
     {
@@ -1241 +1242 @@
             if (rit->time < cTime) //this is the run number that we want to use
             {
+                if (rit->runNumber <= 0)//take only positive numbers.
+                    break;
                 //Find something better to convert iterator to pointer than the ugly line below....
                 cRunNumber = &(*rit);