From a3456d4e17127445b1de966202907f0f62f0877e Mon Sep 17 00:00:00 2001 From: sgorbuno <se.gorbunov@gsi.de> Date: Tue, 24 Nov 2020 15:48:48 +0000 Subject: [PATCH] cleanup --- reco/L1/CbmL1.cxx | 6 ++---- reco/L1/CbmL1.h | 2 -- reco/L1/CbmL1Performance.cxx | 9 +++------ 3 files changed, 5 insertions(+), 12 deletions(-) diff --git a/reco/L1/CbmL1.cxx b/reco/L1/CbmL1.cxx index 9052a7ec41..1c9e5ab9d1 100644 --- a/reco/L1/CbmL1.cxx +++ b/reco/L1/CbmL1.cxx @@ -177,7 +177,6 @@ CbmL1::CbmL1() , dFEI2vMCPoints() , dFEI2vMCTracks() , fData(nullptr) - , histodir(nullptr) , fFindParticlesMode() , fStsMatBudgetFileName("") , fMvdMatBudgetFileName("") @@ -287,7 +286,6 @@ CbmL1::CbmL1(const char* name, , dFEI2vMCPoints() , dFEI2vMCTracks() , fData(nullptr) - , histodir(nullptr) , fFindParticlesMode(findParticleMode_) , fStsMatBudgetFileName("") , fMvdMatBudgetFileName("") @@ -389,7 +387,7 @@ InitStatus CbmL1::Init() { fUseMVD = 0; - histodir = gROOT->mkdir("L1"); + fHistoDir = gROOT->mkdir("L1"); // turn on reconstruction in sub-detectors @@ -1620,7 +1618,7 @@ void CbmL1::Finish() { // Open output file and write histograms TFile* outfile = new TFile("L1_histo.root", "RECREATE"); outfile->cd(); - writedir2current(histodir); + writedir2current(fHistoDir); outfile->Close(); outfile->Delete(); diff --git a/reco/L1/CbmL1.h b/reco/L1/CbmL1.h index 8f5d020214..bfd59ff358 100644 --- a/reco/L1/CbmL1.h +++ b/reco/L1/CbmL1.h @@ -349,8 +349,6 @@ private: // DFEI2I::iterator map_it; L1AlgoInputData* fData; - TDirectory* histodir; - static CbmL1* fInstance; private: diff --git a/reco/L1/CbmL1Performance.cxx b/reco/L1/CbmL1Performance.cxx index 26ffa1d53a..41bb7a49d7 100644 --- a/reco/L1/CbmL1Performance.cxx +++ b/reco/L1/CbmL1Performance.cxx @@ -675,8 +675,7 @@ void CbmL1:: first_call = 0; TDirectory* curdir = gDirectory; - gDirectory = histodir; - gDirectory->cd("L1"); + gDirectory = fHistoDir; p_eff_all_vs_mom = new TProfile("p_eff_all_vs_mom", "AllSet Efficiency vs Momentum", @@ -1553,8 +1552,7 @@ void CbmL1::TrackFitPerformance() { first_call = 0; TDirectory* currentDir = gDirectory; - gDirectory = histodir; - gDirectory->cd("L1"); + gDirectory = fHistoDir; gDirectory->mkdir("Fit"); gDirectory->cd("Fit"); { @@ -2283,8 +2281,7 @@ void CbmL1::InputPerformance() { first_call = 0; TDirectory* currentDir = gDirectory; - gDirectory = histodir; - gDirectory->cd("L1"); + gDirectory = fHistoDir; gDirectory->mkdir("Input"); gDirectory->cd("Input"); gDirectory->mkdir("STS"); -- GitLab