[Nscldaq-cvscommits] clients/assembler AssembledEvent.cpp, NONE, 1.1 AssembledEvent.h, NONE, 1.1 AssemblerErrors.cpp, 1.3, 1.4 AssemblerErrors.h, 1.3, 1.4 Makefile.am, 1.2, 1.3

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

Update of /cvsroot/nscldaq/clients/assembler
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv6504

Modified Files:
	AssemblerErrors.cpp AssemblerErrors.h Makefile.am 
Added Files:
	AssembledEvent.cpp AssembledEvent.h 
Log Message:
Clean compile on AssembledEvent.{cpp,h}



Index: Makefile.am
===================================================================
RCS file: /cvsroot/nscldaq/clients/assembler/Makefile.am,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Makefile.am	11 Jun 2007 18:55:25 -0000	1.2
--- Makefile.am	13 Jun 2007 17:40:54 -0000	1.3
***************
*** 3,11 ****
  assembler_SOURCES =	AssemblerApplication.cpp	\
  			AssemblerCommand.cpp		\
! 			AssemblerErrors.cpp
  
  noinst_HEADERS = 	AssemblerApplication.h		\
  			AssemblerCommand.h		\
! 			AssemblerErrors.h
  
  
--- 3,13 ----
  assembler_SOURCES =	AssemblerApplication.cpp	\
  			AssemblerCommand.cpp		\
! 			AssemblerErrors.cpp		\
! 			AssembledEvent.cpp
  
  noinst_HEADERS = 	AssemblerApplication.h		\
  			AssemblerCommand.h		\
! 			AssemblerErrors.h		\
! 			AssembledEvent.h
  
  

Index: AssemblerErrors.h
===================================================================
RCS file: /cvsroot/nscldaq/clients/assembler/AssemblerErrors.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** AssemblerErrors.h	11 Jun 2007 12:14:07 -0000	1.3
--- AssemblerErrors.h	13 Jun 2007 17:40:54 -0000	1.4
***************
*** 46,49 ****
--- 46,52 ----
          TooManyParameters,
          TooFewParameters,
+ 	BadEventSize,
+ 	InvalidType,
+ 	InvalidEventBody,
          INVALIDERRORCODE
      } ErrorCode;

Index: AssemblerErrors.cpp
===================================================================
RCS file: /cvsroot/nscldaq/clients/assembler/AssemblerErrors.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** AssemblerErrors.cpp	11 Jun 2007 12:14:07 -0000	1.3
--- AssemblerErrors.cpp	13 Jun 2007 17:40:53 -0000	1.4
***************
*** 39,42 ****
--- 39,45 ----
      "Too many parameters on the command line",
      "Too few parameters on the command line",
+     "Event sizes must be positive integers > 2",
+     "Invalid event/buffer type must be one of 2,3,4,5,11,12,13,14,15",
+     "Invalid event body format",
      "INVALID ERROR CODE!"
  };

--- NEW FILE: AssembledEvent.h ---
#ifndef __ASSEMBLEDEVENT_H
#define __ASSEMBLEDEVENT_H

/*
    This software is Copyright by the Board of Trustees of Michigan
    State University (c) Copyright 2005.

    You may use this software under the terms of the GNU public license
    (GPL).  The terms of this license are described at:

     http://www.gnu.org/licenses/gpl.txt

     Author:
             Ron Fox
	     NSCL
	     Michigan State University
	     East Lansing, MI 48824-1321
*/


/*!
   The AssembledEvent class is the base class for the hierarchy of 
   complete events that can be submitted to the buffer management
   system via the assembler's output stage.  
*/
class AssembledEvent {
  // Public data types:
public:
  enum BufferType {
    Physics        = 1,
    Scaler         = 2,
    SnapshotScaler = 3,
    StateVariables = 4,
    RunVariables   = 5,		// For now these are the same as
    Packets        = 6,		// corresponding  buffer types in
    BeginRun       = 11,	// buftypes.h
    EndRun         = 12,
    PausRun        = 13,
    ResumeRun      = 14
  };
  // Object state data:
private:
  unsigned short m_node;	// Originating node number.
  BufferType     m_type;        // Type of the event.
public:
  AssembledEvent();
  AssembledEvent(unsigned short node,
		 BufferType     type);

  // Selectors:

  unsigned short node() const;
  BufferType     type() const;
};


#endif

--- NEW FILE: AssembledEvent.cpp ---
/*
    This software is Copyright by the Board of Trustees of Michigan
    State University (c) Copyright 2005.

    You may use this software under the terms of the GNU public license
    (GPL).  The terms of this license are described at:

     http://www.gnu.org/licenses/gpl.txt

     Author:
             Ron Fox
	     NSCL
	     Michigan State University
	     East Lansing, MI 48824-1321
*/

#include <config.h>
#include <AssembledEvent.h>

//////////////////////////// Constructors /////////////////////////////
/*!
   The default constructor builds a physics event from node 0,
   that's an assembled physics event.
*/
AssembledEvent::AssembledEvent() :
  m_node(0),
  m_type(AssembledEvent::Physics)
{
}
/*!
   Since some events are not assembled but passed through unassembled,
   we'll also need a constructor that can explicitly set the
   values of the node and type member data:
   \param node   - Originating node id.
   \param type   - Type of the data buffer
*/
AssembledEvent::AssembledEvent(unsigned short             node,
			       AssembledEvent::BufferType type) :
  m_node(node),
  m_type(type)
{}

////////////////////////// Selectors /////////////////////////////

/*!

  \return unsigned short
  \retval the node number.
*/
unsigned short
AssembledEvent::node() const 
{
  return m_node;
}
/*!
   \return AssembledEvent::BufferType
   \retval The type of data in the event.
*/
AssembledEvent::BufferType
AssembledEvent::type() const
{
  return m_type;
}