Changeset 11284 for trunk/FACT++

Timestamp:

07/07/11 19:54:10 (13 years ago)

Author:

tbretz

Message:

Added the possibility to set the update rate for self triggered events.

File:

• trunk/FACT++/src/fad.cc (modified) (6 diffs)

trunk/FACT++/src/fad.cc

@@ -49 +49 @@
                                void (tcp_connection::*handler)(const bs::error_code&))// const
     {
-        timer.expires_from_now(boost::posix_time::seconds(seconds));
+        timer.expires_from_now(boost::posix_time::milliseconds(seconds));
         timer.async_wait(boost::bind(handler, shared_from_this(), dummy::error));
     }
@@ -152 +152 @@
             SendData();
 
-        AsyncWait(fTriggerSendData, 1, &tcp_connection::TriggerSendData);
+        AsyncWait(fTriggerSendData, fHeader.fTriggerGeneratorPrescaler, &tcp_connection::TriggerSendData);
     }
 
@@ -225 +225 @@
             case kCmdContTrigger+0x100:
                 if (fBufCommand[0]==kCmdContTrigger)
-                    AsyncWait(fTriggerSendData, 1, &tcp_connection::TriggerSendData);
+                    AsyncWait(fTriggerSendData, 0, &tcp_connection::TriggerSendData);
                 else
                     fTriggerSendData.cancel();
@@ -273 +273 @@
                     break;
                 }
+                if (fBufCommand[0]==kCmdWriteRate)
+                {
+                    fCommand.resize(1);
+                    fCommand[0] = kCmdWriteRate;
+                    break;
+                }
 
                 cout << "Received b=" << bytes_received << ": " << error.message() << " (" << error << ")" << endl;
@@ -309 +315 @@
             fRam.fDac[fCommand[1]] = fBufCommand[0];
             break;
+
+        case kCmdWriteRate:
+            cout << "-> Set Rate =" << fBufCommand[0] << endl;
+            fHeader.fTriggerGeneratorPrescaler = fBufCommand[0];
+            break;
         }
 
@@ -337 +348 @@
         fHeader.fRunNumber = 1;
         fHeader.fDNA = reinterpret_cast<uint64_t>(this);
+        fHeader.fTriggerGeneratorPrescaler = 100;
         fHeader.fStatus = 0xf<<12 |
             FAD::EventHeader::kDenable    |