Changeset 11510 for trunk

Timestamp:

07/21/11 12:04:01 (13 years ago)

Author:

tbretz

Message:

improvements to pulse simulation - needs optimization.

File:

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

trunk/FACT++/src/fad.cc

@@ -143 +143 @@
 
             evtbuf.insert(evtbuf.end(), buf.begin(), buf.end());
-            evtbuf.insert(evtbuf.end(), fChHeader[i].fRegionOfInterest, 0x42+i+11.*rand()/RAND_MAX-5+fHeader.fDac[1]/32);
+            evtbuf.insert(evtbuf.end(), fChHeader[i].fRegionOfInterest, 0x42+i+fHeader.fDac[1]/32);
 
             if (triggerid>0)
@@ -150 +150 @@
                 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
+                    *(evtbuf.end()-fChHeader[i].fRegionOfInterest+ii) +=
+                        rndm*exp(-0.5*(ii-p)*(ii-p)/25); // sigma=10
             }
+
+            for (int ii=0; ii<fChHeader[i].fRegionOfInterest; ii++)
+            {
+                *(evtbuf.end()-fChHeader[i].fRegionOfInterest+ii) +=
+                    6.*rand()/RAND_MAX +  5*exp(-ii/10); // sigma=10
+
+                *(evtbuf.end()-fChHeader[i].fRegionOfInterest+(ii+fChHeader[i].fStartCell)%fChHeader[i].fRegionOfInterest) +=
+                    15*sin(2*3.1415*ii/512); // sigma=10
+            }
+
 
             fHeader.fPackageLength += sizeof(ChannelHeader)/2;