From: <ro...@us...> - 2003-04-02 18:20:19
|
Update of /cvsroot/nsclspectcl/SpecTcl/SpectrumIO In directory sc8-pr-cvs1:/tmp/cvs-serv12194 Modified Files: NSCLAsciiSpectrumFormatter.cpp NSCLBinarySpectrumFormatter.cpp Log Message: interface changes to be compatible with the spectrum factory. Index: NSCLAsciiSpectrumFormatter.cpp =================================================================== RCS file: /cvsroot/nsclspectcl/SpecTcl/SpectrumIO/NSCLAsciiSpectrumFormatter.cpp,v retrieving revision 4.2 retrieving revision 4.3 diff -C2 -d -r4.2 -r4.3 *** NSCLAsciiSpectrumFormatter.cpp 2 Jan 2003 17:11:33 -0000 4.2 --- NSCLAsciiSpectrumFormatter.cpp 2 Apr 2003 18:20:12 -0000 4.3 *************** *** 494,500 **** CSpectrumFactory Factory; Factory.ExceptionMode(kfFALSE); CSpectrum* pSpectrum = Factory.CreateSpectrum(Name, eSpecType, eDataType, ! vParameters, vResolutions, ! vTransform, vChannels); // Fill in the spectrum: // --- 494,502 ---- CSpectrumFactory Factory; Factory.ExceptionMode(kfFALSE); + /// + /// BUGBUGBUG - creation needs to be figured out and fixed!! + // CSpectrum* pSpectrum = Factory.CreateSpectrum(Name, eSpecType, eDataType, ! vParameters, vChannels); // Fill in the spectrum: // Index: NSCLBinarySpectrumFormatter.cpp =================================================================== RCS file: /cvsroot/nsclspectcl/SpecTcl/SpectrumIO/NSCLBinarySpectrumFormatter.cpp,v retrieving revision 4.2 retrieving revision 4.3 diff -C2 -d -r4.2 -r4.3 *** NSCLBinarySpectrumFormatter.cpp 2 Jan 2003 17:11:33 -0000 4.2 --- NSCLBinarySpectrumFormatter.cpp 2 Apr 2003 18:20:13 -0000 4.3 *************** *** 470,477 **** vector<UInt_t> vChannels; AssurePossibleSpectrum(eSpecType,eDataType); CSpectrum* pSpectrum; pSpectrum = Factory.CreateSpectrum(Name, eSpecType, eDataType, vParameters, ! vResolutions, vTransform, vChannels); pSpectrum->Clear(); //fill in the spectrum --- 470,479 ---- vector<UInt_t> vChannels; + ///// BUGBUGBUG - CreateSpectrum needs to be fixed still + AssurePossibleSpectrum(eSpecType,eDataType); CSpectrum* pSpectrum; pSpectrum = Factory.CreateSpectrum(Name, eSpecType, eDataType, vParameters, ! vChannels); pSpectrum->Clear(); //fill in the spectrum |