--- DarthVader/TrackerLevel2/src/TrkProcess.cpp 2013/03/06 14:18:33 1.15 +++ DarthVader/TrackerLevel2/src/TrkProcess.cpp 2014/02/27 11:24:43 1.16 @@ -16,10 +16,12 @@ full1 = 0; geth = 0; get2 = 1; + gete = 1; standalone = false; frame2 = "root"; frame1 = "root"; frameh = "root"; + framee = "root"; outdir = gSystem->WorkingDirectory(); pfolder = "/TrackerFolder"; if (!frame2.CompareTo("root", TString::kIgnoreCase)) ifroot2 = true; @@ -62,10 +64,12 @@ full1 = 0; get2 = 1; geth = 0; + gete = 1; standalone = false; frame2 = "root"; frame1 = "root"; frameh = "root"; + framee = "root"; pfolder = "/TrackerFolder"; file1 = ""; if(f2->IsOpen()){ @@ -145,6 +149,11 @@ continue; } // -----------------------------------------------------// + if (!strcmp(vcustom[i], "--dontgete") ||!strcmp(vcustom[i], "--dontget-exttrack") ){ + gete = 0; + continue; + } + // -----------------------------------------------------// if (!strcmp(vcustom[i], "--standalone") || !strcmp(vcustom[i], "-s")){ standalone = true; continue; @@ -171,6 +180,13 @@ continue; } // -----------------------------------------------------// + if (!strcmp(vcustom[i], "-framee")){ + if (++i >= ncustom)throw -3; + gete = 1; + framee = vcustom[i]; + continue; + } + // -----------------------------------------------------// if (!strcmp(vcustom[i], "-pfa")){ if (++i >= ncustom)throw -3; TrkParams::SetPFA(atoi(vcustom[i])); @@ -224,6 +240,10 @@ else if (!frameh.CompareTo("hbook", TString::kIgnoreCase)) ifrooth =false; else throw -201; + if (!framee.CompareTo("root", TString::kIgnoreCase)) ifroote = true; + else if (!framee.CompareTo("hbook", TString::kIgnoreCase)) ifroote =false; + else throw -201; + if(get1 && !get2)full1=true; ostatus = 0; @@ -249,6 +269,7 @@ // if(get2) analysisflight_(); // + ostatus = F77err; }; @@ -258,20 +279,21 @@ cout << " |-------------------------------------| "<