Menu
▾
▴
[Nscldaq-cvscommits] SF.net SVN: nscldaq:[2783] branches/hira-sisstuff
|
From: <ro...@us...> - 2012-08-03 20:00:30
|
Revision: 2783
http://nscldaq.svn.sourceforge.net/nscldaq/?rev=2783&view=rev
Author: ron-fox
Date: 2012-08-03 20:00:24 +0000 (Fri, 03 Aug 2012)
Log Message:
-----------
Issue #1216 - Support hira module that pairs an SIS FADC and an XLM in one packet
Modified Paths:
--------------
branches/hira-sisstuff/ChangeLog
branches/hira-sisstuff/configure.ac
branches/hira-sisstuff/usb/ccusb/ccusb.xml
branches/hira-sisstuff/usb/vmusb/vmusbReadout.xml
Modified: branches/hira-sisstuff/ChangeLog
===================================================================
--- branches/hira-sisstuff/ChangeLog 2012-08-03 19:31:09 UTC (rev 2782)
+++ branches/hira-sisstuff/ChangeLog 2012-08-03 20:00:24 UTC (rev 2783)
@@ -262,6 +262,8 @@
- Issue #1195 - Provide visual indication that runs are
starting/stopping.
+10.1-006 - HiRA Support software.
+
Modified: branches/hira-sisstuff/configure.ac
===================================================================
--- branches/hira-sisstuff/configure.ac 2012-08-03 19:31:09 UTC (rev 2782)
+++ branches/hira-sisstuff/configure.ac 2012-08-03 20:00:24 UTC (rev 2783)
@@ -2,7 +2,7 @@
# Process this file with autoconf to produce a configure script.
AC_PREREQ(2.61)
-AC_INIT(nscldaq, 10.1-005, fo...@ns...)
+AC_INIT(nscldaq, 10.1-006, fo...@ns...)
AC_CONFIG_SRCDIR([/utilities/StringsToIntegers.h])
AC_CONFIG_HEADER([config.h])
@@ -559,6 +559,7 @@
usb/vmusb/rdothread/Makefile usb/vmusb/tclserver/Makefile
usb/vmusb/daqconfig/Makefile usb/vmusb/commands/Makefile
usb/vmusb/driverkit/Makefile usb/vmusb/driverkit/Makefile-template
+ usb/vmusb/tcldrivers/Makefile
usb/vmusb/driverkit/VMUSBDriverIncludes
usb/ccusb/Makefile
usb/ccusb/ccusb/Makefile usb/ccusb/devices/Makefile
Modified: branches/hira-sisstuff/usb/ccusb/ccusb.xml
===================================================================
--- branches/hira-sisstuff/usb/ccusb/ccusb.xml 2012-08-03 19:31:09 UTC (rev 2782)
+++ branches/hira-sisstuff/usb/ccusb/ccusb.xml 2012-08-03 20:00:24 UTC (rev 2783)
@@ -702,7 +702,7 @@
object to the driver methods. The driver must take the
swig pointer like parameter and turn it into a SWIG object
before it can be used. A Tcl fragment that shows how to
- turn the CCCUSB pointer into a SWIG CCCUSB object is shon
+ turn the CCCUSB pointer into a SWIG CCCUSB object is shown
below:
</para>
<informalexample>
Modified: branches/hira-sisstuff/usb/vmusb/vmusbReadout.xml
===================================================================
--- branches/hira-sisstuff/usb/vmusb/vmusbReadout.xml 2012-08-03 19:31:09 UTC (rev 2782)
+++ branches/hira-sisstuff/usb/vmusb/vmusbReadout.xml 2012-08-03 20:00:24 UTC (rev 2783)
@@ -2762,7 +2762,104 @@
</refsect1>
</refentry>
+ <refentry id="vmusb3-hira">
+ <refmeta>
+ <refentrytitle>hira</refentrytitle>
+ <manvolnum>3vmusb</manvolnum>
+ </refmeta>
+ <refnamediv>
+ <refname>hira</refname>
+ <refpurpose>Pair an XLM and FADC for HiRA</refpurpose>
+ </refnamediv>
+
+ <refsynopsisdiv>
+ <cmdsynopsis>
+ <command>
+hira create <replaceable>name ?options?</replaceable>
+ </command>
+ </cmdsynopsis>
+ <cmdsynopsis>
+ <command>
+hira config <replaceable>name options</replaceable>
+ </command>
+ </cmdsynopsis>
+ <cmdsynopsis>
+ <command>
+hira cget <replaceable>name</replaceable>
+ </command>
+ </cmdsynopsis>
+
+ </refsynopsisdiv>
+ <refsect1>
+ <title>DESCRIPTION</title>
+ <para>
+ In situations where an XLM-XXV is not available, Wash-U chip boards
+ can be read out using an XLM and an SIS3300/SIS3301 FADC module.
+ This command allows you to combine these into a single module.
+ from the point of view of a stack.
+ </para>
+ <para>
+ The command produces the following data format:
+ </para>
+ <informalexample>
+ <programlisting>
++------------------------------------+
+| id (16) bits |
++------------------------------------+
+| tag and timing data from the |
+| xlm module |
++------------------------------------+
+| Data from the FADC module |
++------------------------------------+
+ </programlisting>
+ </informalexample>
+ </refsect1>
+ <refsect1>
+ <title>
+ OPTIONS
+ </title>
+ <variablelist>
+ <varlistentry>
+ <term><option>-id</option> <replaceable>integer</replaceable></term>
+ <listitem>
+ <para>
+ Provides the id tag that precedes the data from the
+ two actual modules.
+ </para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term><option>-xlm</option> <replaceable>module-name</replaceable></term>
+ <listitem>
+ <para>
+ This parameter is the name of the XLM module that reads
+ out the tagging and timing information from the
+ XLM.
+ </para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term><option>-fadc</option> <replaceable>module-name</replaceable></term>
+ <listitem>
+ <para>
+ This parameter is the name of the sis330x module that
+ gets the analog data
+ </para>
+ </listitem>
+ </varlistentry>
+ </variablelist>
+ <note>
+ <title>Note:</title>
+ <para>
+ The software does not check that the XLM is an XLM or that the
+ fadc is an SIS 330x module.
+ </para>
+ </note>
+ </refsect1>
+
+ </refentry>
+
<refentry id="vmusb3-hytec">
<refmeta>
<refentrytitle>hytec</refentrytitle>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|