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

changed WKMFULLDATAPATH to MUSRFULLDATAPATH

Browse Source
This commit is contained in:
nemu 2009-11-13 12:01:09 +00:00
parent 7ccd021cfc
commit 13ef385056
1 changed files with 19 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/classes/PRunDataHandler.cpp
View File

@ -322,11 +322,11 @@ Bool_t PRunDataHandler::FileExistsCheck(PMsrRunBlock &runInfo, const UInt_t idx)
} }
} }
// check if the file is found in the directories given by WKMFULLDATAPATH // check if the file is found in the directories given by MUSRFULLDATAPATH
const Char_t *wkmpath = gSystem->Getenv("WKMFULLDATAPATH"); const Char_t *musrpath = gSystem->Getenv("MUSRFULLDATAPATH");
if (pathName.CompareTo("???") == 0) { // not found in local directory and xml path if (pathName.CompareTo("???") == 0) { // not found in local directory and xml path
str = TString(wkmpath); str = TString(musrpath);
// WKMFULLDATAPATH has the structure: path_1:path_2:...:path_n // MUSRFULLDATAPATH has the structure: path_1:path_2:...:path_n
TObjArray *tokens = str.Tokenize(":"); TObjArray *tokens = str.Tokenize(":");
TObjString *ostr; TObjString *ostr;
for (Int_t i=0; i<tokens->GetEntries(); i++) { for (Int_t i=0; i<tokens->GetEntries(); i++) {
@ -337,12 +337,17 @@ Bool_t PRunDataHandler::FileExistsCheck(PMsrRunBlock &runInfo, const UInt_t idx)
break; break;
} }
} }
// cleanup
if (tokens) {
delete tokens;
tokens = 0;
}
} }
// check if the file is found in the WKM generated default path // check if the file is found in the generated default path
if (pathName.CompareTo("???") == 0) { // not found in WKMFULLDATAPATH search if (pathName.CompareTo("???") == 0) { // not found in MUSRFULLDATAPATH search
str = TString(wkmpath); str = TString(musrpath);
// WKMFULLDATAPATH has the structure: path_1:path_2:...:path_n // MUSRFULLDATAPATH has the structure: path_1:path_2:...:path_n
TObjArray *tokens = str.Tokenize(":"); TObjArray *tokens = str.Tokenize(":");
TObjString *ostr; TObjString *ostr;
pstr = runInfo.GetInstitute(idx); pstr = runInfo.GetInstitute(idx);
@ -374,6 +379,11 @@ Bool_t PRunDataHandler::FileExistsCheck(PMsrRunBlock &runInfo, const UInt_t idx)
break; break;
} }
} }
// clean up
if (tokens) {
delete tokens;
tokens = 0;
}
} }
// no proper path name found // no proper path name found
@ -382,7 +392,7 @@ Bool_t PRunDataHandler::FileExistsCheck(PMsrRunBlock &runInfo, const UInt_t idx)
cerr << endl << " standard search pathes are:"; cerr << endl << " standard search pathes are:";
cerr << endl << " 1. the local directory"; cerr << endl << " 1. the local directory";
cerr << endl << " 2. the data directory given in the startup XML file"; cerr << endl << " 2. the data directory given in the startup XML file";
cerr << endl << " 3. the directories listed in WKMFULLDATAPATH"; cerr << endl << " 3. the directories listed in MUSRFULLDATAPATH";
cerr << endl << " 4. default path construct which is described in the manual"; cerr << endl << " 4. default path construct which is described in the manual";
return false; return false;
} }