/[PAMELA software]/PamelaLevel2/src/PamLevel2.cpp
ViewVC logotype

Diff of /PamelaLevel2/src/PamLevel2.cpp

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.82 by mocchiut, Thu Jun 4 15:10:47 2009 UTC revision 1.84 by mocchiut, Thu Aug 6 14:39:33 2009 UTC
# Line 633  void PamLevel2::Delete() { Line 633  void PamLevel2::Delete() {
633      //      //
634      TIter next2(contents);      TIter next2(contents);
635      TChain *questa = 0;      TChain *questa = 0;
636      while (questa = (TChain*) next2()) {      while ( (questa = (TChain*)next2()) ) {
637        TString name = questa->GetName();        TString name = questa->GetName();
638        questa->Delete();        questa->Delete();
639        questa = NULL;        questa = NULL;
# Line 747  void PamLevel2::Reset() { Line 747  void PamLevel2::Reset() {
747      //      //
748      TIter next2(contents);      TIter next2(contents);
749      TChain *questa = 0;      TChain *questa = 0;
750      while (questa = (TChain*) next2()) {      while ( (questa = (TChain*) next2()) ) {
751        TString name = questa->GetName();        TString name = questa->GetName();
752        questa->Delete();        questa->Delete();
753        questa = NULL;        questa = NULL;
# Line 2113  TList* PamLevel2::GetListOfLevel2Files(T Line 2113  TList* PamLevel2::GetListOfLevel2Files(T
2113          if (file.EndsWith(".root")) {          if (file.EndsWith(".root")) {
2114            TString filedir;            TString filedir;
2115            cout << ddir << endl;            cout << ddir << endl;
2116            if (ddir != "") {            if ( ddir != "" ) {
2117              filedir = ddir; // take the input dir              filedir = ddir; // take the input dir
2118            }            }
2119            else {            else {
# Line 2121  TList* PamLevel2::GetListOfLevel2Files(T Line 2121  TList* PamLevel2::GetListOfLevel2Files(T
2121              filedir = gSystem->DirName(file); // this will take the path if exist in the list otherwise it will return automatically the working dir              filedir = gSystem->DirName(file); // this will take the path if exist in the list otherwise it will return automatically the working dir
2122            };            };
2123            filedir.Append("/");            filedir.Append("/");
2124            char *fullpath = gSystem->ConcatFileName(gSystem->DirName(filedir), gSystem->BaseName(file));            //          char *fullpath = gSystem->ConcatFileName(gSystem->DirName(filedir), gSystem->BaseName(file));
2125              char *fullpath = gSystem->ConcatFileName(filedir.Data(), gSystem->BaseName(file));
2126            contents->Add(new TSystemFile(fullpath, gSystem->DirName(fullpath)));// add file to the list            contents->Add(new TSystemFile(fullpath, gSystem->DirName(fullpath)));// add file to the list
2127            cout << fullpath << endl;            cout << fullpath << endl;
2128            delete fullpath;            delete fullpath;
Legend:
Removed from v.1.82  
changed lines
  Added in v.1.84
  ViewVC Help
Powered by ViewVC 1.1.23