[Nsclspectcl-cvscommits] SpecTcl/contrib/scriptable MySpecTclApp.cpp, 1.1, 1.1.2.1

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

Update of /cvsroot/nsclspectcl/SpecTcl/contrib/scriptable
In directory sc8-pr-cvs16:/tmp/cvs-serv5605

Modified Files:
      Tag: SpecTcl-2-1-fixes
	MySpecTclApp.cpp 
Log Message:
elect jumbo buffer decoder by default


Index: MySpecTclApp.cpp
===================================================================
RCS file: /cvsroot/nsclspectcl/SpecTcl/contrib/scriptable/MySpecTclApp.cpp,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -d -r1.1 -r1.1.2.1
*** MySpecTclApp.cpp	12 Dec 2003 17:55:15 -0000	1.1
--- MySpecTclApp.cpp	3 May 2007 20:48:46 -0000	1.1.2.1
***************
*** 2,56 ****
  
  ////////////////////////// FILE_NAME.cpp /////////////////////////////////////////////////////
  #include "MySpecTclApp.h"    				
  #include "EventProcessor.h"
- #include "CCAENDigitizerCreator.h"
- #include "CModuleCommand.h"
- #include "CModuleDictionary.h"
- #include "CUnpackerCommand.h"
- #include "CCAENV830Creator.h"
  #include "TCLAnalyzer.h"
! #include "CUnpacker.h"
! #include "CPosition.h"
! #include "CProfile.h"
! #include "CSeeAnalyzer.h"
  
  #include <Event.h>
  #include <Globals.h>
  
! #define SEE_PACKETID 0x8000	// Assigned by Daniel.
! 
! 
! //
! // These event processors produce ppac positions:
! //
! 
! CPosition ppacx("see.ppac.x",
! 		"see.ppac.l",
! 		"see.ppac.r",
! 		"ppac.x.scale1",
! 		"ppac.x.offset1",
! 		"ppac.x.scale2",
! 		"ppac.x.offset2",
! 		"ppac.x.minsum",
! 		"ppac.x.slope",
! 		"ppac.x.offset");
! 
! CPosition ppacy("see.ppac.y",
! 		"see.ppac.u",
! 		"see.ppac.d",
! 		"ppac.y.scale1",
! 		"ppac.y.offset1",
! 		"ppac.y.scale2",
! 		"ppac.y.offset2",
! 		"ppac.y.minsum",
! 		"ppac.y.slope",
! 		"ppac.y.offset");
  
- CProfile xProfile("see.ppac.x_profile",
- 		  "see.ppac.x",
- 		  "ppac.x.profilechans");
- CProfile yProfile("see.ppac.y_profile",
- 		  "see.ppac.y",
- 		  "ppac.y.profilechans");
  
  //  Function: 	
--- 2,20 ----
  
  ////////////////////////// FILE_NAME.cpp /////////////////////////////////////////////////////
+ 
+ #include <config.h>
  #include "MySpecTclApp.h"    				
  #include "EventProcessor.h"
  #include "TCLAnalyzer.h"
! #include "CScriptableUnpacker.h" 
! #include <NSCLJumboBufferDecoder.h>
  
  #include <Event.h>
  #include <Globals.h>
  
! #ifdef HAVE_STD_NAMESPACE
! using namespace std;
! #endif
  
  
  //  Function: 	
***************
*** 78,87 ****
  CMySpecTclApp::CreateAnalysisPipeline(CAnalyzer& rAnalyzer)  
  { 
! 
!   RegisterEventProcessor(*m_pUnpacker);
!   RegisterEventProcessor(ppacx);
!   RegisterEventProcessor(ppacy);
!   RegisterEventProcessor(xProfile);
!   RegisterEventProcessor(yProfile);
  
  }  
--- 42,55 ----
  CMySpecTclApp::CreateAnalysisPipeline(CAnalyzer& rAnalyzer)  
  { 
!   RegisterEventProcessor(*(new CScriptableUnpacker));
!   //
!   // The stuff below is a trick to get the scaler commands also defined:
!   //
!   // Note that this allows people to put event modules or scalers in the
!   // scaler unpacker, but that's unimportant since the scaler unpacker
!   // is never really processed.
!   CScriptableUnpacker* pUnpacker = new CScriptableUnpacker("scaler",
! 							   "scalerbank");
!   pUnpacker->OnAttach(rAnalyzer); // Attachment is when this s really built.
  
  }  
***************
*** 90,97 ****
  
  CMySpecTclApp::CMySpecTclApp () :
!   m_pDictionary(0),
!   m_pUnpackerCommand(0),
!   m_pModuleCommand(0),
!   m_pUnpacker(0)
  {   
  } 
--- 58,62 ----
  
  CMySpecTclApp::CMySpecTclApp () :
!   CTclGrammerApp()
  {   
  } 
***************
*** 243,252 ****
  CMySpecTclApp::CreateAnalyzer(CEventSink* pSink)  
  { 
!   gpAnalyzer = new CSeeAnalyzer(*gpInterpreter,
! 				getParams(),
! 				getListSize());
!   setAnalyzer(gpAnalyzer);
!   gpAnalyzer->AttachSink(*gpEventSink);
! 
  }  
  
--- 208,212 ----
  CMySpecTclApp::CreateAnalyzer(CEventSink* pSink)  
  { 
!   CTclGrammerApp::CreateAnalyzer(pSink);
  }  
  
***************
*** 267,271 ****
  void 
  CMySpecTclApp::SelectDecoder(CAnalyzer& rAnalyzer)  
! { CTclGrammerApp::SelectDecoder(rAnalyzer);
  }  
  
--- 227,234 ----
  void 
  CMySpecTclApp::SelectDecoder(CAnalyzer& rAnalyzer)  
! { // CTclGrammerApp::SelectDecoder(rAnalyzer);
!   gpBufferDecoder = new CNSCLJumboBufferDecoder;
!   rAnalyzer.AttachDecoder(*gpBufferDecoder);
!     
  }  
  
***************
*** 290,337 ****
  { 
    CTclGrammerApp::AddCommands(rInterp);
-   
-   //  Create the low end objects referred to by the commands:
- 
-   m_pDictionary = new CModuleDictionary;
-   m_pUnpacker   = new CUnpacker(SEE_PACKETID);
- 
-   // Create the unpacker command object, linked to the
-   // dictionary and the unpacker created above.
- 
-   m_pUnpackerCommand = new CUnpackerCommand(string("unpack"),
-   					    rInterp,
-   					    *m_pDictionary,
- 					    *m_pUnpacker);
-   // Create the Module command and register creators:
- 
-   m_pModuleCommand = new CModuleCommand(rInterp,
- 					string("module"),
- 					*m_pUnpacker,
- 					*m_pDictionary);
- 
-   // The aliased entries allow for compatibility between
-   // SpecTcl and the readout software.
-   //
-   m_pModuleCommand->RegisterCreator(string("caenvme"), 
- 				    *(new CCAENDigitizerCreator));
-   m_pModuleCommand->RegisterCreator(string("caenv775"),
- 				    *(new CCAENDigitizerCreator));
-   m_pModuleCommand->RegisterCreator(string("caenv785"),
- 				    *(new CCAENDigitizerCreator));
-   m_pModuleCommand->RegisterCreator(string("caenv792"),
- 				    *(new CCAENDigitizerCreator));
- 
-   // The following setup enough of an infrastructure that
-   // scaler modules can be generated, configured and listed.
-   //
-  
-   CModuleDictionary* pScalers = new CModuleDictionary;
-   CUnpacker*         pDummy   = new CUnpacker(0);
-   CModuleCommand*    pScalercmd = new CModuleCommand(rInterp,
- 						     string("scaler"),
- 						     *pDummy,
- 						     *pScalers);
-   pScalercmd->RegisterCreator(string("caenv830"),
- 			      *(new CCAENV830Creator));
  }  
  
--- 253,256 ----