From 121f4b48abeb2b6201513a0ce94662b712361ccc Mon Sep 17 00:00:00 2001 From: hristov Date: Mon, 5 May 2014 19:28:49 +0200 Subject: [PATCH] Revert "Streamer level can be specified by the static function fro AliTRDreconstructor" This reverts commit d0177bb64755aa2321c9652eb9bebbbc070998d8. --- TRD/AliTRDReconstructor.cxx | 3 --- TRD/AliTRDReconstructor.h | 3 --- TRD/AliTRDseedV1.cxx | 4 ++-- TRD/AliTRDtrackerV1.cxx | 29 ++++++++++++++--------------- 4 files changed, 16 insertions(+), 23 deletions(-) diff --git a/TRD/AliTRDReconstructor.cxx b/TRD/AliTRDReconstructor.cxx index fecdec89f98..1f47c83015e 100644 --- a/TRD/AliTRDReconstructor.cxx +++ b/TRD/AliTRDReconstructor.cxx @@ -52,9 +52,6 @@ ClassImp(AliTRDReconstructor) -Int_t AliTRDReconstructor::fgStreamLevel = 1; // stream (debug) level - - AliESDTrdTrigger AliTRDReconstructor::fgTriggerFlags; AliTRDonlineTrackMatching AliTRDReconstructor::fgOnlineTrackMatcher; TClonesArray *AliTRDReconstructor::fgClusters = NULL; diff --git a/TRD/AliTRDReconstructor.h b/TRD/AliTRDReconstructor.h index 401ddb82f0d..afb02c1af2b 100644 --- a/TRD/AliTRDReconstructor.h +++ b/TRD/AliTRDReconstructor.h @@ -82,14 +82,11 @@ public: static void SetTracklets(TClonesArray *tracklets) { fgTracklets = tracklets;} static void SetTracks(TClonesArray *tracks) { fgTracks = tracks;} void SetOption(Option_t *opt); - static Int_t GetStreamLevel() { return fgStreamLevel;} - static void SetStreamLevel(Int_t level) { fgStreamLevel = level;} private: AliTRDReconstructor(const AliTRDReconstructor &r); //Not implemented AliTRDReconstructor& operator = (const AliTRDReconstructor&); //Not implemented void ResetContainers() const; - static Int_t fgStreamLevel; // flag for streaming - for TRD reconstruction static Char_t const *fgSteerNames[kNsteer];//! steering names static Char_t const *fgSteerFlags[kNsteer];//! steering flags diff --git a/TRD/AliTRDseedV1.cxx b/TRD/AliTRDseedV1.cxx index 99027a39582..2babc75a58f 100644 --- a/TRD/AliTRDseedV1.cxx +++ b/TRD/AliTRDseedV1.cxx @@ -1303,7 +1303,7 @@ Bool_t AliTRDseedV1::AttachClusters(AliTRDtrackingChamber *const chamber, Bool_ // initialize debug streamer TTreeSRedirector *pstreamer(NULL); - if((recoParam->GetStreamLevel(AliTRDrecoParam::kTracker) > 3 && fkReconstructor->IsDebugStreaming())||AliTRDReconstructor::GetStreamLevel()>3) pstreamer = fkReconstructor->GetDebugStream(AliTRDrecoParam::kTracker); + if(recoParam->GetStreamLevel(AliTRDrecoParam::kTracker) > 3 && fkReconstructor->IsDebugStreaming()) pstreamer = fkReconstructor->GetDebugStream(AliTRDrecoParam::kTracker); if(pstreamer){ // save config. for calibration TVectorD vdy[2], vdx[2], vs2[2]; @@ -1330,7 +1330,7 @@ Bool_t AliTRDseedV1::AttachClusters(AliTRDtrackingChamber *const chamber, Bool_ << "\n"; vdx[0].Clear(); vdy[0].Clear(); vs2[0].Clear(); vdx[1].Clear(); vdy[1].Clear(); vs2[1].Clear(); - if(recoParam->GetStreamLevel(AliTRDrecoParam::kTracker) > 4 ||AliTRDReconstructor::GetStreamLevel()>4){ + if(recoParam->GetStreamLevel(AliTRDrecoParam::kTracker) > 4){ Int_t idx(idxRow[1]); if(idx<0){ for(Int_t ir(0); irGetHisto2d()) calibra->UpdateHistogramsV1(&track); // save calibration object - if (fkRecoParam->GetStreamLevel(AliTRDrecoParam::kTracker) > 0 || AliTRDReconstructor::GetStreamLevel()>0 ) { + if (fkRecoParam->GetStreamLevel(AliTRDrecoParam::kTracker) > 0) { AliTRDtrackV1 *calibTrack = new AliTRDtrackV1(track); calibTrack->SetOwner(); seed->AddCalibObject(calibTrack); @@ -516,7 +516,7 @@ Int_t AliTRDtrackerV1::RefitInward(AliESDEvent *event) Double_t xTPC = 250.0; if(FollowProlongation(track)){ // Update the friend track - if (fkRecoParam->GetStreamLevel(AliTRDrecoParam::kTracker) > 0 || AliTRDReconstructor::GetStreamLevel()>0 ){ + if (fkRecoParam->GetStreamLevel(AliTRDrecoParam::kTracker) > 0){ TObject *o = NULL; Int_t ic = 0; AliTRDtrackV1 *calibTrack = NULL; while((o = seed->GetCalibObject(ic++))){ @@ -650,7 +650,7 @@ Int_t AliTRDtrackerV1::FollowProlongation(AliTRDtrackV1 &t) } } - if(fkRecoParam->GetStreamLevel(AliTRDrecoParam::kTracker) > 1 || AliTRDReconstructor::GetStreamLevel()>1){ + if(fkRecoParam->GetStreamLevel(AliTRDrecoParam::kTracker) > 1){ Int_t index; for(int iplane=0; iplaneIsDebugStreaming() ? fkRecoParam->GetStreamLevel(AliTRDrecoParam::kTracker) : 0; - if ( AliTRDReconstructor::GetStreamLevel()>0) debugLevel= AliTRDReconstructor::GetStreamLevel(); TTreeSRedirector *cstreamer = fkReconstructor->IsDebugStreaming() ? fkReconstructor->GetDebugStream(AliTRDrecoParam::kTracker) : 0x0; Bool_t kStoreIn(kTRUE), // toggel store track params. at TRD entry @@ -2274,7 +2273,7 @@ Int_t AliTRDtrackerV1::Clusters2TracksSM(Int_t sector, AliESDEvent *esd) Int_t id = esd->AddTrack(esdTrack); // set ESD id to stand alone TRD tracks - if (fkRecoParam->GetStreamLevel(AliTRDrecoParam::kTracker) > 0 || AliTRDReconstructor::GetStreamLevel()>0 ){ + if (fkRecoParam->GetStreamLevel(AliTRDrecoParam::kTracker) > 0){ esdTrack=esd->GetTrack(id); TObject *o(NULL); Int_t ic(0); AliTRDtrackV1 *calibTrack(NULL); @@ -2342,7 +2341,7 @@ Int_t AliTRDtrackerV1::Clusters2TracksStack(AliTRDtrackingChamber **stack, TClon // Build initial seeding configurations Double_t quality = BuildSeedingConfigs(stack, configs); - if(fkRecoParam->GetStreamLevel(AliTRDrecoParam::kTracker) > 10 || AliTRDReconstructor::GetStreamLevel()>10){ + if(fkRecoParam->GetStreamLevel(AliTRDrecoParam::kTracker) > 10){ AliInfo(Form("Plane config %d %d %d Quality %f" , configs[0], configs[1], configs[2], quality)); } @@ -2519,7 +2518,7 @@ Int_t AliTRDtrackerV1::Clusters2TracksStack(AliTRDtrackingChamber **stack, TClon esdTrack->SetLabel(track->GetLabel()); track->UpdateESDtrack(esdTrack); // write ESD-friends if neccessary - if (fkRecoParam->GetStreamLevel(AliTRDrecoParam::kTracker) > 0 || AliTRDReconstructor::GetStreamLevel()>0 ){ + if (fkRecoParam->GetStreamLevel(AliTRDrecoParam::kTracker) > 0){ AliTRDtrackV1 *calibTrack = new AliTRDtrackV1(*track); calibTrack->SetOwner(); esdTrack->AddCalibObject(calibTrack); @@ -2547,7 +2546,7 @@ Int_t AliTRDtrackerV1::Clusters2TracksStack(AliTRDtrackingChamber **stack, TClon chamber->Build(fGeom);//Indices(fSieveSeeding); } - if(fkRecoParam->GetStreamLevel(AliTRDrecoParam::kTracker) > 10 || AliTRDReconstructor::GetStreamLevel()>10){ + if(fkRecoParam->GetStreamLevel(AliTRDrecoParam::kTracker) > 10){ AliInfo(Form("Sieve level %d Plane config %d %d %d Quality %f", fSieveSeeding, configs[0], configs[1], configs[2], quality)); } } while(fSieveSeeding<10); // end stack clusters sieve @@ -2788,7 +2787,7 @@ Int_t AliTRDtrackerV1::MakeSeeds(AliTRDtrackingChamber **stack, AliTRDseedV1 * c } Bool_t isFake = kFALSE; - if((fkRecoParam->GetStreamLevel(AliTRDrecoParam::kTracker) >= 2 && fkReconstructor->IsDebugStreaming()) ||AliTRDReconstructor::GetStreamLevel()>=2 ){ + if(fkRecoParam->GetStreamLevel(AliTRDrecoParam::kTracker) >= 2 && fkReconstructor->IsDebugStreaming()){ if (c[0]->GetLabel(0) != c[3]->GetLabel(0)) isFake = kTRUE; if (c[1]->GetLabel(0) != c[3]->GetLabel(0)) isFake = kTRUE; if (c[2]->GetLabel(0) != c[3]->GetLabel(0)) isFake = kTRUE; @@ -2931,7 +2930,7 @@ Int_t AliTRDtrackerV1::MakeSeeds(AliTRDtrackingChamber **stack, AliTRDseedV1 * c // AliInfo("Extrapolation done."); // Debug Stream containing all the 6 tracklets - if((fkRecoParam->GetStreamLevel(AliTRDrecoParam::kTracker) >= 2 && fkReconstructor->IsDebugStreaming())||AliTRDReconstructor::GetStreamLevel()>=2){ + if(fkRecoParam->GetStreamLevel(AliTRDrecoParam::kTracker) >= 2 && fkReconstructor->IsDebugStreaming()){ TTreeSRedirector &cstreamer = *fkReconstructor->GetDebugStream(AliTRDrecoParam::kTracker); TLinearFitter *tiltedRieman = GetTiltedRiemanFitter(); Int_t eventNumber = AliTRDtrackerDebug::GetEventNumber(); @@ -2965,7 +2964,7 @@ Int_t AliTRDtrackerV1::MakeSeeds(AliTRDtrackingChamber **stack, AliTRDseedV1 * c // calculate track quality fTrackQuality[ntracks] = CalculateTrackLikelihood(&chi2Vals[0]); - if((fkRecoParam->GetStreamLevel(AliTRDrecoParam::kTracker) >= 2 && fkReconstructor->IsDebugStreaming()) ||AliTRDReconstructor::GetStreamLevel()>=2){ + if(fkRecoParam->GetStreamLevel(AliTRDrecoParam::kTracker) >= 2 && fkReconstructor->IsDebugStreaming()){ TTreeSRedirector &cstreamer = *fkReconstructor->GetDebugStream(AliTRDrecoParam::kTracker); Int_t eventNumber = AliTRDtrackerDebug::GetEventNumber(); Int_t candidateNumber = AliTRDtrackerDebug::GetCandidateNumber(); @@ -3126,7 +3125,7 @@ AliTRDtrackV1* AliTRDtrackerV1::MakeTrack(AliTRDseedV1 * const tracklet) track.ResetCovariance(1); Int_t nc = TMath::Abs(FollowBackProlongation(track)); - if((fkRecoParam->GetStreamLevel(AliTRDrecoParam::kTracker) > 5 && fkReconstructor->IsDebugStreaming()) ||AliTRDReconstructor::GetStreamLevel()>5){ + if(fkRecoParam->GetStreamLevel(AliTRDrecoParam::kTracker) > 5 && fkReconstructor->IsDebugStreaming()){ Int_t eventNumber = AliTRDtrackerDebug::GetEventNumber(); Int_t candidateNumber = AliTRDtrackerDebug::GetCandidateNumber(); Double_t p[5]; // Track Params for the Debug Stream @@ -3255,7 +3254,7 @@ Bool_t AliTRDtrackerV1::ImproveSeedQuality(AliTRDtrackingChamber **stack, AliTRD AliDebug(2, Form("Iter[%d] Q[%f] chi2[%f]", iter, quality, chi2)); - if((fkRecoParam->GetStreamLevel(AliTRDrecoParam::kTracker) >= 7 && fkReconstructor->IsDebugStreaming())||AliTRDReconstructor::GetStreamLevel()>=7){ + if(fkRecoParam->GetStreamLevel(AliTRDrecoParam::kTracker) >= 7 && fkReconstructor->IsDebugStreaming()){ Int_t eventNumber = AliTRDtrackerDebug::GetEventNumber(); Int_t candidateNumber = AliTRDtrackerDebug::GetCandidateNumber(); TLinearFitter *tiltedRieman = GetTiltedRiemanFitter(); @@ -3330,7 +3329,7 @@ Double_t AliTRDtrackerV1::CalculateTrackLikelihood(Double_t *chi2){ , chi2[3], likeChi2Phi )); - if((fkRecoParam->GetStreamLevel(AliTRDrecoParam::kTracker) >= 2 && fkReconstructor->IsDebugStreaming())||AliTRDReconstructor::GetStreamLevel()>=2){ + if(fkRecoParam->GetStreamLevel(AliTRDrecoParam::kTracker) >= 2 && fkReconstructor->IsDebugStreaming()){ Int_t eventNumber = AliTRDtrackerDebug::GetEventNumber(); Int_t candidateNumber = AliTRDtrackerDebug::GetCandidateNumber(); TTreeSRedirector &cstreamer = *fkReconstructor->GetDebugStream(AliTRDrecoParam::kTracker); @@ -3395,7 +3394,7 @@ Double_t AliTRDtrackerV1::CookLikelihood(AliTRDseedV1 *cseed, Int_t planes[4]) Double_t likeN = TMath::Exp(-(fkRecoParam->GetNMeanClusters() - nclusters) / fkRecoParam->GetNSigmaClusters()); Double_t like = likea * likechi2y * likechi2z * likeN; - if((fkRecoParam->GetStreamLevel(AliTRDrecoParam::kTracker) >= 2 && fkReconstructor->IsDebugStreaming())||AliTRDReconstructor::GetStreamLevel()>=2){ + if(fkRecoParam->GetStreamLevel(AliTRDrecoParam::kTracker) >= 2 && fkReconstructor->IsDebugStreaming()){ Int_t eventNumber = AliTRDtrackerDebug::GetEventNumber(); Int_t candidateNumber = AliTRDtrackerDebug::GetCandidateNumber(); Int_t nTracklets = 0; Float_t meanNcls = 0; -- 2.43.0