Changeset 11651


Ignore:
Timestamp:
07/27/11 14:03:47 (13 years ago)
Author:
tbretz
Message:
Renamed TriggerId to TriggerCounter
Location:
trunk/FACT++/src
Files:
4 edited

Legend:

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

    r11635 r11651  
    13771377        const array<uint16_t,2> roi = {{ event->Roi, event->RoiTM }};
    13781378
    1379         if (roi!=fVecRoi)
     1379        if (roi!=fVecRoi)
     1380        {
    13801381            Update(fDimRoi, roi);
     1382            fVecRoi = roi;
     1383        }
    13811384
    13821385        const FAD::EventHeader *beg = reinterpret_cast<FAD::EventHeader*>(fadhd);
     
    13861389        {
    13871390            // Event incomplete
    1388             if (ptr->fStartDelimiter==0)
    1389                 return -1;
     1391            //if (ptr->fStartDelimiter==0)
     1392            //    return -1;
    13901393
    13911394                // Either one of
  • trunk/FACT++/src/HeadersFAD.cc

    r11626 r11651  
    2121    out << "Time:       " << setprecision(3) << fixed << fTimeStamp/10000. << "s" << endl;
    2222    out << "EvtCounter: " << fEventCounter << " of " << fNumTriggersToGenerate << endl;
    23     out << "Trigger:    Type=" << fTriggerType << " Id=" << fTriggerId << " Crc=0x" << hex << fTriggerCrc << endl;
     23    out << "Trigger:    Type=" << fTriggerType << " Counter=" << fTriggerCounter << " Crc=0x" << hex << fTriggerCrc << endl;
    2424
    2525    out << "RefClock:   " << dec << fFreqRefClock << endl;
     
    6363    out << "  Busy enabled:              ";
    6464    if (HasBusyOn())
    65         out << "continously enabled" << endl;
     65        out << "constantly enabled" << endl;
    6666    else
    67         out << (HasBusyOff()?"continously disabled":"normal") << endl;
     67        out << (HasBusyOff()?"constantly disabled":"normal") << endl;
    6868    out << "  Trigger line enabled:      " << (HasTriggerEnabled()?"enabled":"disabled") << endl;
    6969    out << "  Continous trigger enabled: " << (HasContTriggerEnabled()?"enabled":"disabled") << endl;
  • trunk/FACT++/src/HeadersFAD.h

    r11628 r11651  
    169169        uint16_t fTriggerCrc;          // Receiver timeout / CRC ; 1 byte each
    170170        uint16_t fTriggerType;
    171         uint32_t fTriggerId;
     171        uint32_t fTriggerCounter;
    172172        //
    173173        uint32_t fEventCounter;
     
    204204            Reverse(&fEventCounter);
    205205
    206             Reverse(((uint16_t*)fTriggerId));
    207             Reverse(((uint16_t*)fTriggerId)+1);
    208 
    209             Reverse(&fTriggerId);
     206            Reverse(((uint16_t*)fTriggerCounter));
     207            Reverse(((uint16_t*)fTriggerCounter)+1);
     208
     209            Reverse(&fTriggerCounter);
    210210
    211211            Reverse(((uint16_t*)fFreqRefClock));
  • trunk/FACT++/src/fad.cc

    r11629 r11651  
    129129        fHeader.fPackageLength = sizeof(EventHeader)/2+1;
    130130        fHeader.fEventCounter++;
    131         fHeader.fTriggerId = triggerid;
     131        fHeader.fTriggerCounter = triggerid;
    132132        fHeader.fTimeStamp = uint32_t((Time(Time::utc).UnixTime()-fStartTime)*10000);
    133133        fHeader.fFreqRefClock = 997+rand()/(RAND_MAX/7);
Note: See TracChangeset for help on using the changeset viewer.