Changeset 11493

Timestamp:

07/20/11 18:10:27 (13 years ago)

Author:

tbretz

Message:

Receive the trigger id from the ftm; added gauss pulses in case the data was triggered from the ftm.

File:

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

trunk/FACT++/src/fad.cc

@@ -36 +36 @@
 
 public:
-    Trigger() : fCmd("FAD/TRIGGER", "C", this)
+    Trigger() : fCmd("FAD/TRIGGER", "I:1", this)
     {
     }
@@ -91 +91 @@
         fTrigger.Add(this);
     }
-    void PostTrigger()
+    void PostTrigger(uint32_t triggerid)
     {
         if (fTriggerEnabled)
-            get_io_service().post(boost::bind(&tcp_connection::SendData, this));
+            get_io_service().post(boost::bind(&tcp_connection::SendData, this, triggerid));
     }
 
@@ -123 +123 @@
     deque<vector<uint16_t>> fOutQueue;
 
-    void SendData()
+    void SendData(uint32_t triggerid)
     {
         fHeader.fPackageLength = sizeof(EventHeader)/2+1;
         fHeader.fEventCounter++;
-        fHeader.fTriggerId = fHeader.fEventCounter;
+        fHeader.fTriggerId = triggerid;
         fHeader.fTimeStamp = uint32_t((Time(Time::utc).UnixTime()-fStartTime)*10000);
         fHeader.fFreqRefClock = 997+rand()/(RAND_MAX/7);
@@ -143 +143 @@
 
             evtbuf.insert(evtbuf.end(), buf.begin(), buf.end());
-            evtbuf.insert(evtbuf.end(), fChHeader[i].fRegionOfInterest, 0x42+i+11.*rand()/RAND_MAX-5);
+            evtbuf.insert(evtbuf.end(), fChHeader[i].fRegionOfInterest, 0x42+i+11.*rand()/RAND_MAX-5+fHeader.fDac[1]/32);
+
+            if (triggerid>0)
+            {
+                int    p    = 5.*rand()/RAND_MAX+20;
+                double rndm = 500.*rand()/RAND_MAX+500;
+                for (int ii=0; ii<fChHeader[i].fRegionOfInterest; ii++)
+                    *(evtbuf.end()-fChHeader[i].fRegionOfInterest+ii) = rndm*exp(-0.5*(ii-p)*(ii-p)/25); // sigma=10
+            }
 
             fHeader.fPackageLength += sizeof(ChannelHeader)/2;
@@ -192 +200 @@
         // The deadline has passed.
         if (fTriggerEnabled)
-            SendData();
+            SendData(0);
 
         AsyncWait(fTriggerSendData, fHeader.fTriggerGeneratorPrescaler, &tcp_connection::TriggerSendData);
@@ -281 +289 @@
             case kCmdSingleTrigger:
                 cout << "-> Trigger " << fBoardId << endl;
-                SendData();
+                SendData(0);
                 break;
 
@@ -438 +446 @@
 void Trigger::commandHandler()
 {
+    if (!getCommand())
+        return;
+
     for (vector<tcp_connection*>::iterator it=vec.begin();
          it!=vec.end(); it++)
-        {
-            (*it)->PostTrigger();
-        }
+        (*it)->PostTrigger(getCommand()->getInt());
 }