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

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

Revision: 2166
          http://nscldaq.svn.sourceforge.net/nscldaq/?rev=2166&view=rev
Author:   ron-fox
Date:     2009-07-03 14:32:41 +0000 (Fri, 03 Jul 2009)

Log Message:
-----------
- Add support for common stop mode.
- Bump version to 3.1 finally.

Modified Paths:
--------------
    trunk/llnlReadout/configure.in
    trunk/llnlReadout/devices/C785.cpp
    trunk/llnlReadout/tclserver/CGDG.cpp

Modified: trunk/llnlReadout/configure.in
===================================================================
--- trunk/llnlReadout/configure.in	2009-07-02 09:41:32 UTC (rev 2165)
+++ trunk/llnlReadout/configure.in	2009-07-03 14:32:41 UTC (rev 2166)
@@ -8,7 +8,7 @@
 
 #    Separate device libraries.
 
-AM_INIT_AUTOMAKE(llnlReadout, 3.0)  
+AM_INIT_AUTOMAKE(llnlReadout, 3.1)  
 
 #
 #   The variable below should track the

Modified: trunk/llnlReadout/devices/C785.cpp
===================================================================
--- trunk/llnlReadout/devices/C785.cpp	2009-07-02 09:41:32 UTC (rev 2165)
+++ trunk/llnlReadout/devices/C785.cpp	2009-07-03 14:32:41 UTC (rev 2166)
@@ -272,7 +272,8 @@
    -highwater       MEBDepth*3/4  (3/4 full event buffer).
    -fastclear       0
    -supressrange    true
-   -timescale       600 (ns).
+   -timescale       600 (ns).  (775 only)
+   -commonstop      false      (775 only)
 \endverbatim
 
    All others have no default values.   If, during initialization one of those
@@ -320,6 +321,8 @@
 
   m_pConfiguration->addParameter("-requiredata", CConfigurableObject::isBool,
 				 NULL, "true");
+  m_pConfiguration->addParameter("-commonstop", CConfigurableObject::isBool,
+				 NULL, "false");
   
 }
 /*!
@@ -438,12 +441,26 @@
 
   if (type == 775) {
     int    range   = getIntegerParameter("-timescale");
+    int    reg2Offset;
     //
     // Compute the register value (see 4.33 of the V775 manual).
     //
     float  nsRange = static_cast<float>(range);
     float  rRange  = 36040.0/(nsRange + 1.3333);
     controller.vmeWrite16(base+FSRange, initamod, static_cast<uint16_t>(rRange + 0.5));
+
+    // Set common start/stop mode.
+
+    bool commonStop = getBoolParameter("-commonstop");
+    if (commonStop) {
+      
+      reg2Offset = BSet2;
+    } 
+    else {
+      reg2Offset = BClear2;
+    }
+    controller.vmeWrite16(base + reg2Offset, initamod,
+			  static_cast<uint16_t>(0x400));
   }
 
   // Finally, ensure that at the end of a readout we'll get a BERR, rather than

Modified: trunk/llnlReadout/tclserver/CGDG.cpp
===================================================================
--- trunk/llnlReadout/tclserver/CGDG.cpp	2009-07-02 09:41:32 UTC (rev 2165)
+++ trunk/llnlReadout/tclserver/CGDG.cpp	2009-07-03 14:32:41 UTC (rev 2166)
@@ -22,9 +22,9 @@
 
 #include <stdint.h>
 #include <stdio.h>
+#include <stdlib.h>
 
 
-
 using namespace std;
 
 // MDD8 register etc. definitions.


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