Changeset 11651
- Timestamp:
- 07/27/11 14:03:47 (13 years ago)
- Location:
- trunk/FACT++/src
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/FACT++/src/EventBuilderWrapper.h
r11635 r11651 1377 1377 const array<uint16_t,2> roi = {{ event->Roi, event->RoiTM }}; 1378 1378 1379 if (roi!=fVecRoi) 1379 if (roi!=fVecRoi) 1380 { 1380 1381 Update(fDimRoi, roi); 1382 fVecRoi = roi; 1383 } 1381 1384 1382 1385 const FAD::EventHeader *beg = reinterpret_cast<FAD::EventHeader*>(fadhd); … … 1386 1389 { 1387 1390 // Event incomplete 1388 if (ptr->fStartDelimiter==0)1389 return -1;1391 //if (ptr->fStartDelimiter==0) 1392 // return -1; 1390 1393 1391 1394 // Either one of -
trunk/FACT++/src/HeadersFAD.cc
r11626 r11651 21 21 out << "Time: " << setprecision(3) << fixed << fTimeStamp/10000. << "s" << endl; 22 22 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; 24 24 25 25 out << "RefClock: " << dec << fFreqRefClock << endl; … … 63 63 out << " Busy enabled: "; 64 64 if (HasBusyOn()) 65 out << "con tinously enabled" << endl;65 out << "constantly enabled" << endl; 66 66 else 67 out << (HasBusyOff()?"con tinously disabled":"normal") << endl;67 out << (HasBusyOff()?"constantly disabled":"normal") << endl; 68 68 out << " Trigger line enabled: " << (HasTriggerEnabled()?"enabled":"disabled") << endl; 69 69 out << " Continous trigger enabled: " << (HasContTriggerEnabled()?"enabled":"disabled") << endl; -
trunk/FACT++/src/HeadersFAD.h
r11628 r11651 169 169 uint16_t fTriggerCrc; // Receiver timeout / CRC ; 1 byte each 170 170 uint16_t fTriggerType; 171 uint32_t fTrigger Id;171 uint32_t fTriggerCounter; 172 172 // 173 173 uint32_t fEventCounter; … … 204 204 Reverse(&fEventCounter); 205 205 206 Reverse(((uint16_t*)fTrigger Id));207 Reverse(((uint16_t*)fTrigger Id)+1);208 209 Reverse(&fTrigger Id);206 Reverse(((uint16_t*)fTriggerCounter)); 207 Reverse(((uint16_t*)fTriggerCounter)+1); 208 209 Reverse(&fTriggerCounter); 210 210 211 211 Reverse(((uint16_t*)fFreqRefClock)); -
trunk/FACT++/src/fad.cc
r11629 r11651 129 129 fHeader.fPackageLength = sizeof(EventHeader)/2+1; 130 130 fHeader.fEventCounter++; 131 fHeader.fTrigger Id= triggerid;131 fHeader.fTriggerCounter = triggerid; 132 132 fHeader.fTimeStamp = uint32_t((Time(Time::utc).UnixTime()-fStartTime)*10000); 133 133 fHeader.fFreqRefClock = 997+rand()/(RAND_MAX/7);
Note:
See TracChangeset
for help on using the changeset viewer.