NSCL SpecTcl Histogramming system

Update of /cvsroot/nsclspectcl/SpecTcl/Filter
In directory sc8-pr-cvs1:/tmp/cvs-serv32074

Modified Files:
	EventFilter.h GatedEventFilter.h 
Added Files:
	FilterDictionary.h 
Log Message:
Updated.

--- NEW FILE: FilterDictionary.h ---
/*
  FilterDictionary.h
*/

// Preprocessor includes, definitions.
#ifndef __FILTERDICTIONARY_H //Required for current class
#define __FILTERDICTIONARY_H

#ifndef __HISTOTYPES_H
#include <histotypes.h>
#define __HISTOTYPES_H
#endif

#ifndef __DICTIONARY_H
#include "Dictionary.h"
#define __DICTIONARY_H
#endif

#ifndef __PARAMETER_H
#include "Parameter.h"
#define __PARAMETER_H
#endif

#ifndef __EVENTSINK_H
#include "EventSink.h"
#define __EVENTSINK_H
#endif

#ifndef __HISTOTYPES_H
#include <histotypes.h>
#define __HISTOTYPES_H
#endif

#ifndef __GATECONTAINER_H
#include <GateContainer.h>
#define __GATECONTAINER_H
#endif

#ifndef __STL_STRING
#include <string>
#define __STL_STRING
#endif

#ifndef __STL_VECTOR
#include <vector>
#define __STL_VECTOR
#endif

#ifndef __OUTPUTEVENTSTREAM_H
#include <OutputEventStream.h>
#define __OUTPUTEVENTSTREAM_H
#endif

#ifndef __EVENT_H
#include <Event.h>
#define __EVENT_H
#endif

#ifndef __GATEDEVENTFILTER_H
#include <GatedEventFilter.h>
#define __GATEDEVENTFILTER_H
#endif

// Class. (Singleton Pattern)
class CFilterDictionary : public CDictionary<CGatedEventFilter*> {
  // Attributes.
 private:
  static CFilterDictionary* m_pInstance;

  // Constructors.
 protected:
  CFilterDictionary();
  //CFilterDictionary(const CFilterDictionary&);
  //CFilterDictionary& operator=(const CFilterDictionary&);

  // Additional functions.
 public: //protected:
  static CFilterDictionary* GetInstance();
}; // CFilterDictionary.

#endif

Index: EventFilter.h
===================================================================
RCS file: /cvsroot/nsclspectcl/SpecTcl/Filter/EventFilter.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** EventFilter.h	10 Feb 2003 19:22:16 -0000	1.1
--- EventFilter.h	21 Feb 2003 16:38:54 -0000	1.2
***************
*** 9,16 ****
--- 9,18 ----
  #ifndef __HISTOTYPES_H
  #include <histotypes.h>
+ #define __HISTOTYPES_H
  #endif

  #ifndef __DICTIONARY_H
  #include "Dictionary.h"
+ #define __DICTIONARY_H
  #endif

***************
*** 21,32 ****
--- 23,37 ----
  #ifndef __EVENTSINK_H
  #include "EventSink.h"
+ #define __EVENTSINK_H
  #endif

  #ifndef __HISTOTYPES_H
  #include <histotypes.h>
+ #define __HISTOTYPES_H
  #endif

  #ifndef __GATECONTAINER_H
  #include <GateContainer.h>
+ #define __GATECONTAINER_H
  #endif

***************
*** 60,67 ****
   public:
    // Constructors.
!   //CEventFilter();
    CEventFilter(COutputEventStream&);
    CEventFilter(const CEventFilter&);
!   virtual ~CEventFilter();

    // Operators.
--- 65,72 ----
   public:
    // Constructors.
!   CEventFilter();
    CEventFilter(COutputEventStream&);
    CEventFilter(const CEventFilter&);
!   /*virtual*/ ~CEventFilter();

    // Operators.
***************
*** 74,87 ****
    void Enable();
    void Disable();
!   virtual void FormatOutputEvent(CEvent&) = 0;
    COutputEventStream& AttachOutputEventStream(COutputEventStream&);
    COutputEventStream& DetachOutputEventStream();
    //protected: // Commented out for now.
!   virtual Bool_t CheckCondition(CEvent&) = 0;
  }; // CEventFilter.

  // Dictionary types:
! typedef CDictionary<CEventFilter>		FilterDictionary;
! typedef FilterDictionary::DictionaryIterator	FilterDictionaryIterator;

  #endif
--- 79,94 ----
    void Enable();
    void Disable();
!   /*virtual*/ void FormatOutputEvent(CEvent&); // = 0;
    COutputEventStream& AttachOutputEventStream(COutputEventStream&);
    COutputEventStream& DetachOutputEventStream();
    //protected: // Commented out for now.
!   /*virtual*/ Bool_t CheckCondition(CEvent&); // = 0;
  }; // CEventFilter.

  // Dictionary types:
! /*
! typedef CDictionary<CEventFilter>		CFilterDictionary;
! typedef CFilterDictionary::DictionaryIterator	CFilterDictionaryIterator;
! */

  #endif

Index: GatedEventFilter.h
===================================================================
RCS file: /cvsroot/nsclspectcl/SpecTcl/Filter/GatedEventFilter.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** GatedEventFilter.h	10 Feb 2003 19:22:17 -0000	1.1
--- GatedEventFilter.h	21 Feb 2003 16:38:54 -0000	1.2
***************
*** 9,28 ****
--- 9,33 ----
  #ifndef __DICTIONARY_H
  #include "Dictionary.h"
+ #define __DICTIONARY_H
  #endif

  #ifndef __PARAMETER_H
  #include "Parameter.h"
+ #define __PARAMETER_H
  #endif

  #ifndef __EVENTSINK_H
  #include "EventSink.h"
+ #define __EVENTSINK_H
  #endif

  #ifndef __HISTOTYPES_H
  #include <histotypes.h>
+ #define __HISTOTYPES_H
  #endif

  #ifndef __GATECONTAINER_H
  #include <GateContainer.h>
+ #define __GATECONTAINTER_H
  #endif

***************
*** 56,64 ****
   public:
    // Constructors.
!   //CGatedEventFilter(const CGatedEventFilter&);
!   virtual ~CGatedEventFilter();

    // Operators.
!   virtual Bool_t operator()();
    CGatedEventFilter& operator=(const CGatedEventFilter&);
    Bool_t operator==(const CGatedEventFilter&);
--- 61,71 ----
   public:
    // Constructors.
!   CGatedEventFilter();
!   CGatedEventFilter(COutputEventStream&);
!   CGatedEventFilter(const CGatedEventFilter&);
!   ~CGatedEventFilter(); // Virtual.

    // Operators.
!   Bool_t operator()(); // Virtual.
    CGatedEventFilter& operator=(const CGatedEventFilter&);
    Bool_t operator==(const CGatedEventFilter&);
***************
*** 70,74 ****
    Bool_t CheckCondition(const CEvent& rEvent);
   public:
!   virtual void FormatOutputEvent(const CEvent& rEvent);
  }; // CGatedEventFilter.

--- 77,81 ----
    Bool_t CheckCondition(const CEvent& rEvent);
   public:
!   void FormatOutputEvent(const CEvent& rEvent); // Virtual.
  }; // CGatedEventFilter.

Thanks for helping keep SourceForge clean.

NSCL SpecTcl Histogramming system

Brought to you by: cerizza, jkusler, jrtomps, rmblair, ron-fox

[Nsclspectcl-cvscommits] SpecTcl/Filter FilterDictionary.h,NONE,1.1 EventFilter.h,1.1,1.2 GatedEventFilter.h,1.1,1.2

Thread view