Changeset 11284
- Timestamp:
- 07/07/11 19:54:10 (13 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/FACT++/src/fad.cc
r11228 r11284 49 49 void (tcp_connection::*handler)(const bs::error_code&))// const 50 50 { 51 timer.expires_from_now(boost::posix_time:: seconds(seconds));51 timer.expires_from_now(boost::posix_time::milliseconds(seconds)); 52 52 timer.async_wait(boost::bind(handler, shared_from_this(), dummy::error)); 53 53 } … … 152 152 SendData(); 153 153 154 AsyncWait(fTriggerSendData, 1, &tcp_connection::TriggerSendData);154 AsyncWait(fTriggerSendData, fHeader.fTriggerGeneratorPrescaler, &tcp_connection::TriggerSendData); 155 155 } 156 156 … … 225 225 case kCmdContTrigger+0x100: 226 226 if (fBufCommand[0]==kCmdContTrigger) 227 AsyncWait(fTriggerSendData, 1, &tcp_connection::TriggerSendData);227 AsyncWait(fTriggerSendData, 0, &tcp_connection::TriggerSendData); 228 228 else 229 229 fTriggerSendData.cancel(); … … 273 273 break; 274 274 } 275 if (fBufCommand[0]==kCmdWriteRate) 276 { 277 fCommand.resize(1); 278 fCommand[0] = kCmdWriteRate; 279 break; 280 } 275 281 276 282 cout << "Received b=" << bytes_received << ": " << error.message() << " (" << error << ")" << endl; … … 309 315 fRam.fDac[fCommand[1]] = fBufCommand[0]; 310 316 break; 317 318 case kCmdWriteRate: 319 cout << "-> Set Rate =" << fBufCommand[0] << endl; 320 fHeader.fTriggerGeneratorPrescaler = fBufCommand[0]; 321 break; 311 322 } 312 323 … … 337 348 fHeader.fRunNumber = 1; 338 349 fHeader.fDNA = reinterpret_cast<uint64_t>(this); 350 fHeader.fTriggerGeneratorPrescaler = 100; 339 351 fHeader.fStatus = 0xf<<12 | 340 352 FAD::EventHeader::kDenable |
Note:
See TracChangeset
for help on using the changeset viewer.