From: <ka...@us...> - 2003-07-04 14:33:21
|
Update of /cvsroot/nsclspectcl/SpecTcl/Filter In directory sc8-pr-cvs1:/tmp/cvs-serv1220 Modified Files: FilterBufferDecoder.cpp FilterEventProcessor.h FilterEventProcessor.cpp Log Message: Continuing modifications for event filtering. Index: FilterBufferDecoder.cpp =================================================================== RCS file: /cvsroot/nsclspectcl/SpecTcl/Filter/FilterBufferDecoder.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** FilterBufferDecoder.cpp 3 Jul 2003 21:32:10 -0000 1.2 --- FilterBufferDecoder.cpp 4 Jul 2003 14:33:18 -0000 1.3 *************** *** 1,4 **** /* ! FilterEventUnpacker.cpp */ --- 1,4 ---- /* ! FilterBufferDecoder.cpp */ *************** *** 76,79 **** --- 76,80 ---- // Start processing header data. // NOTE: Block size MUST be sufficiently large to read entire header on first pass. + // Also, arrays sizes will always be equal to the number of parameters defined in the header/documentation buffer. XDRuint(m_nParameters); *************** *** 94,99 **** } } else if(m_sTag == "event") { ! // Start processing event data. ******************************************************* ! } else if(m_sTag == "endofrecord") { m_fXDRError = kfFALSE; // Reset error flag, but still ... --- 95,109 ---- } } else if(m_sTag == "event") { ! // Start processing event data. ! if(XDRarray()) { ! Float_t nFloat = 0; ! for(UInt_t i = 0; i < m_nParameters; i++) { ! if((*m_pValidParameterArray)[i] != 0) { ! XDRfloat(nFloat); ! } ! } ! } else { ! break; ! } } else if(m_sTag == "endofrecord") { m_fXDRError = kfFALSE; // Reset error flag, but still ... Index: FilterEventProcessor.h =================================================================== RCS file: /cvsroot/nsclspectcl/SpecTcl/Filter/FilterEventProcessor.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** FilterEventProcessor.h 3 Jul 2003 21:32:10 -0000 1.2 --- FilterEventProcessor.h 4 Jul 2003 14:33:18 -0000 1.3 *************** *** 55,59 **** string m_sTag; UInt_t m_nParameters; ! UInt_t** m_pValidParameterArray; // **************************************************** vector<CParInfo*> m_vParInfo; --- 55,59 ---- string m_sTag; UInt_t m_nParameters; ! UInt_t** m_pValidParameterArray; vector<CParInfo*> m_vParInfo; *************** *** 78,82 **** Bool_t read_array(); Bool_t read_float(Float_t&); ! void read_char(char&); void incr_offset(UInt_t); --- 78,82 ---- Bool_t read_array(); Bool_t read_float(Float_t&); ! Bool_t read_char(char&); void incr_offset(UInt_t); Index: FilterEventProcessor.cpp =================================================================== RCS file: /cvsroot/nsclspectcl/SpecTcl/Filter/FilterEventProcessor.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** FilterEventProcessor.cpp 3 Jul 2003 21:32:10 -0000 1.2 --- FilterEventProcessor.cpp 4 Jul 2003 14:33:18 -0000 1.3 *************** *** 30,34 **** delete m_pValidParameterArray; // Just in case. } ! m_pValidParameterArray = (UInt_t**)kpNULL; // ((Float_t[])*)kpNULL; ****************************************** }; --- 30,34 ---- delete m_pValidParameterArray; // Just in case. } ! m_pValidParameterArray = (UInt_t**)kpNULL; }; *************** *** 160,165 **** } ! void CFilterEventProcessor::read_char(char& rChar) { ! } --- 160,165 ---- } ! Bool_t CFilterEventProcessor::read_char(char& rChar) { // ************************************************************ ! return true; } |