LMU/musrfit
5
0
Fork 0
Code Issues 6 Pull Requests Actions Packages Projects Releases 4 Activity

* Define a function for the XML-reading workaround in order to clean up a bit.

Browse Source 
For the moment we keep to copies of it -- one for the use within the various
  musrfit programs, one that can be used in user functions.

* musrt0 is now again activated in musrgui/musredit by default.
This commit is contained in:
Bastian M. Wojek
2011-06-23 11:00:09 +00:00
parent dc48ea9712
commit caa3fdfc12
16 changed files with 174 additions and 505 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/musrt0.cpp
View File

@ -34,7 +34,6 @@
#include <string.h>
#include <iostream>
#include <fstream>
using namespace std;
#include <TApplication.h>
@ -276,9 +275,6 @@ Int_t main(Int_t argc, Char_t *argv[])
}
// read startup file
fstream xmlFile;
unsigned int xmlSize = 0;
char *xmlBuffer = 0;
Char_t startup_path_name[128];
TSAXParser *saxParser = new TSAXParser();
PStartupHandler *startupHandler = new PStartupHandler();
@ -298,22 +294,9 @@ Int_t main(Int_t argc, Char_t *argv[])
strcpy(startup_path_name, startupHandler->GetStartupFilePath().Data());
saxParser->ConnectToHandler("PStartupHandler", startupHandler);
//status = saxParser->ParseFile(startup_path_name);
// parsing the file as above seems to lead to problems in certain environments; try working around through a buffer as follows
xmlFile.open(startup_path_name, ios::in | ios::ate); // open file for reading and go to the end of the file
if (xmlFile.is_open()) { // check if file has been opened successfully
xmlSize = xmlFile.tellg(); // get the position within the stream == size of the file (since we are at the end)
xmlFile.seekg(0, ios::beg); // go back to the beginning of the stream
xmlBuffer = new char[xmlSize]; // allocate buffer memory for the whole XML file
xmlFile.read(xmlBuffer, xmlSize); // read in the whole XML file into the buffer
xmlFile.close(); // close the XML file
}
if (!xmlBuffer) { // file has not been read into the buffer
status = 1;
} else {
status = saxParser->ParseBuffer(xmlBuffer, xmlSize); // parse buffer
delete[] xmlBuffer; // free the buffer memory
xmlBuffer = 0;
}
// parsing the file as above seems to lead to problems in certain environments;
// use the parseXmlFile function instead (see PStartupHandler.cpp for the definition)
status = parseXmlFile(saxParser, startup_path_name);
// check for parse errors
if (status) { // error
cerr << endl << ">> musrt0 **WARNING** Reading/parsing musrfit_startup.xml failed.";