Changeset 12071 for trunk/FACT++/src


Ignore:
Timestamp:
09/12/11 14:05:21 (14 years ago)
Author:
lyard
Message:
various small fixes and improvements
Location:
trunk/FACT++/src
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/FACT++/src/Fits.h

    r12035 r12071  
    5656public:
    5757    ///current run number being logged
    58     uint32_t fRunNumber;
     58    int32_t fRunNumber;
    5959
    6060    Fits() : fFile(NULL),
  • trunk/FACT++/src/datalogger.cc

    r12034 r12071  
    9595    string reportName;
    9696    ///the actual run number
    97     uint32_t runNumber;
     97    int32_t runNumber;
    9898    ///the time at which the run number was received
    9999    Time time;
     
    145145    shared_ptr<Converter> fConv;
    146146    ///the current run number used by this subscription
    147     uint32_t runNumber;
     147    int32_t runNumber;
    148148    ///time of the latest received event
    149149    Time lastReceivedEvent;
     
    515515    fServiceSubscriptions[server].clear();
    516516    fServiceSubscriptions.erase(server);
    517     fRunNumberService = NULL;
     517    if (server == "FAD_CONTROL")
     518        fRunNumberService = NULL;
    518519    if (fDebugIsOn)
    519520    {
     
    12411242            if (rit->time < cTime) //this is the run number that we want to use
    12421243            {
     1244                if (rit->runNumber <= 0)//take only positive numbers.
     1245                    break;
    12431246                //Find something better to convert iterator to pointer than the ugly line below....
    12441247                cRunNumber = &(*rit);
Note: See TracChangeset for help on using the changeset viewer.