--- DarthVader/TrackerLevel2/src/TrkProcess.cpp 2007/05/14 11:03:06 1.10 +++ DarthVader/TrackerLevel2/src/TrkProcess.cpp 2007/08/20 16:07:16 1.11 @@ -11,7 +11,7 @@ TrkProcess::TrkProcess(){ idrun = 0; - dbg_mode.SetNone(); +// dbg_mode.SetNone(); get1 = 0; full1 = 0; geth = 0; @@ -36,6 +36,8 @@ ostatus = 0; + npar=0; + TrkParams::SetTrackingMode(); TrkParams::SetPrecisionFactor(); TrkParams::SetStepMin(); @@ -52,7 +54,7 @@ idrun = run; // DEBUG = false; // VERBOSE = false; - dbg_mode.SetWarning(); +// dbg_mode.SetWarning(); get1 = 0; full1 = 0; get2 = 1; @@ -84,6 +86,8 @@ else if (!frameh.CompareTo("hbook", TString::kIgnoreCase)) ifrooth =false; ostatus = 0; + + npar=0; TrkParams::SetTrackingMode(); TrkParams::SetPrecisionFactor(); @@ -153,15 +157,21 @@ continue; } // -----------------------------------------------------// + if ( atoi(vcustom[i]) < 0){ + if (++i >= ncustom)throw -3; + partype[npar]=-1*atoi(vcustom[i-1]); + parpath[npar]=vcustom[i]; + npar++; + continue; + } + // -----------------------------------------------------// if (!strcmp(vcustom[i], "--verbose") || !strcmp(vcustom[i], "-v")){ -// VERBOSE = true; - this->SetVerboseMode(); + TrkParams::SetVerboseMode(); continue; } // -----------------------------------------------------// else if (!strcmp(vcustom[i], "--debug") || !strcmp(vcustom[i], "-d")){ -// DEBUG = true; - this->SetDebugMode(); + TrkParams::SetDebugMode(); continue; }; } @@ -192,7 +202,6 @@ void TrkProcess::ProcessEvent(TrkLevel0 *l0_event){ // fill Level0 common from Level0 object -// l0_event->GetCommonVar(&level0event_); l0_event->GetLevel0Struct(); // process the event Level0->Level1->Level2 int F77err = 0; @@ -200,9 +209,6 @@ reductionflight_(&F77err); if(F77err < 0)throw F77err; // -// int pfa=0; //<<< ETA -// int pfa=14;//<<< COG4 -// if(get2) analysisflight_(&pfa); if(get2) analysisflight_(); // ostatus = F77err; @@ -210,23 +216,29 @@ }; void TrkProcess::Dump(){ - - cout <