[Nscldaq-cvscommits] SF.net SVN: nscldaq:[2552] trunk/llnlReadout/devices

[<ro...@us...>]

Revision: 2552
          http://nscldaq.svn.sourceforge.net/nscldaq/?rev=2552&view=rev
Author:   ron-fox
Date:     2011-09-28 10:29:27 +0000 (Wed, 28 Sep 2011)
Log Message:
-----------
Looks all correct.

Modified Paths:
--------------
    trunk/llnlReadout/devices/CV1729.cpp
    trunk/llnlReadout/devices/CV1729.h

Modified: trunk/llnlReadout/devices/CV1729.cpp
===================================================================
--- trunk/llnlReadout/devices/CV1729.cpp	2011-09-22 11:51:36 UTC (rev 2551)
+++ trunk/llnlReadout/devices/CV1729.cpp	2011-09-28 10:29:27 UTC (rev 2552)
@@ -237,10 +237,6 @@
   m_pConfiguration->addParameter("-triggerchannels",
 				 CConfigurableObject::isInteger, &ChanMask, "0xf");
 
-  m_pConfiguration->addParameter("-colsread", 
-				 CConfigurableObject::isInteger, &Columns, "128");
-  m_pConfiguration->addParameter("-chanmask",
-					CConfigurableObject::isInteger, &ChanMask, "0xf");
 
   m_pConfiguration->addParameter("-poststoplatency",
 				       CConfigurableObject::isInteger, &PostStop, "4");
@@ -308,11 +304,10 @@
   // Columns to read:
 
   setupList.addWrite32(base+NUMCOLS, setupAmod,
-		      m_pConfiguration->getIntegerParameter("-colsread"));
+		       128);
   // Channel mask (affects total read size).
 
-  setupList.addWrite32(base+CHANMASKS, setupAmod,
-		      m_pConfiguration->getIntegerParameter("-chanmask"));
+
   // Post latency crap:
 
   setupList.addWrite32(base+POSTSTOPLATENCY, setupAmod,
@@ -365,8 +360,7 @@
 CV1729::addReadoutList(CVMUSBReadoutList& list)
 {
   uint32_t base     = m_pConfiguration->getUnsignedParameter("-base");
-  int      chanmask = m_pConfiguration->getIntegerParameter("-chanmask"); // affects read size.
-  int      cols     = m_pConfiguration->getIntegerParameter("-colsread");
+  int      cols     = 128;;
   int      delay    = m_pConfiguration->getIntegerParameter("-delay"); 
   delay = delay*5;						       // VM-USB wants it in 200ns units./
 
@@ -391,15 +385,17 @@
 
   // Figure out the size of the block read
   // Each column is 20*(# of channels) words
-  // in addition there is aheader of 6*nchan words of data.
+  // There's a header consisting of:
+  //  First sample for each channel,
+  //  Verniers for each channel.
+  // Reset baseline for each channel
+  // And a trailer consisting of:
+  // Trigger_rec
+  // Valp_cp
+  // Vali_cp
 
-  int channels = 0;		// Count the channels.
-  for (int i =0; i < 4; i++) {
-    if (chanmask & (1 << i)) {
-      channels++;
-    }
-  }
-  int totalTransferCount = (20*channels*cols + 3*channels)/2 + +2;
+  int channels = 4;		// Count the channels.
+  int totalTransferCount = (20*channels*cols + 3*channels)/2  + 2;
 
   cout << "Channels: " << channels << " Columns: " << cols << endl;
   cout << "Total transfer count is " << totalTransferCount << " longs\n";

Modified: trunk/llnlReadout/devices/CV1729.h
===================================================================
--- trunk/llnlReadout/devices/CV1729.h	2011-09-22 11:51:36 UTC (rev 2551)
+++ trunk/llnlReadout/devices/CV1729.h	2011-09-28 10:29:27 UTC (rev 2552)
@@ -81,10 +81,6 @@
  *                                     to fire.
  *   -triggerchannels 0xf              Only used if internal triggers are allowed.  Set one bit for each
  *                                     channel from which triggers are allowed.
- *  -colsread         128              Number of columns to read for each event.  The actual number of
- *                                     samples will be 20*(-colsread) as each MATACQ chip column is 
- *                                     20 elements.
- *  -chanmask         0xf              Set one bit for each channel for which you want data.
  *  -poststoplatency  4                Sets the post trigger latency register 
  *  -postlatencypretrig 1              Sets the value of the post latency pretrigger register.
  *  -samplingfreq     2ghz             Sampling frequency, can also be 1Ghz.

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.