diff --git a/reco/KF/CbmKF.cxx b/reco/KF/CbmKF.cxx index 000627f1c6968c36f855840e185c5e1ae29209db..14b5a66e5706a86021a020b6798e0c8908560d0a 100644 --- a/reco/KF/CbmKF.cxx +++ b/reco/KF/CbmKF.cxx @@ -99,7 +99,7 @@ InitStatus CbmKF::Init() if (!CbmTrackingDetectorInterfaceInit::Instance()) { LOG(fatal) << "CbmKF::Init(): CbmTrackingDetectorInterfaceInit instance was not found. Please, add it as a task to your " - "reco macro before the KF and L1 tasks:\n" + "reco macro right before the KF and L1 tasks and after all the tasks before KF:\n" << "\033[1;30mrun->AddTask(new CbmTrackingDetectorInterfaceInit());\033[0m"; } diff --git a/reco/L1/CbmL1Performance.cxx b/reco/L1/CbmL1Performance.cxx index d5721ae82cf2db3e7037ca544e40cc5be7710821..6c972c209cd7aeda7747949ce85889dba332926e 100644 --- a/reco/L1/CbmL1Performance.cxx +++ b/reco/L1/CbmL1Performance.cxx @@ -41,9 +41,9 @@ #include "TH1.h" #include "TH2.h" +#include "TMath.h" #include "TProfile.h" #include <TFile.h> -#include "TMath.h" #include <iostream> #include <list> @@ -597,10 +597,10 @@ void CbmL1::HistoPerformance() // TODO: check if works correctly. Change vHitRe h_acc_phi_prim = new TH1F("h_acc_phi_prim", "Azimuthal angle of accepted primary tracks", 1000, -3.15, 3.15); h_acc_phi_sec = new TH1F("h_acc_phi_sec", "Azimuthal angle of accepted secondary tracks", 1000, -3.15, 3.15); h_reco_phi_prim = new TH1F("h_reco_phi_prim", "Azimuthal angle of reconstructed primary tracks", 1000, -3.15, 3.15); - h_reco_phi_sec = new TH1F("h_reco_phi_sec", "Azimuthal angle of reconstructed secondary tracks", 1000, -3.15, 3.15); + h_reco_phi_sec = new TH1F("h_reco_phi_sec", "Azimuthal angle of reconstructed secondary tracks", 1000, -3.15, 3.15); h_rest_phi_prim = new TH1F("h_rest_phi_prim", "Azimuthal angle of not found primary tracks", 1000, -3.15, 3.15); h_rest_phi_sec = new TH1F("h_rest_phi_sec", "Azimuthal angle of not found secondary tracks", 1000, -3.15, 3.15); - + h_reg_nhits_prim = new TH1F("h_reg_nhits_prim", "Number of hits in registered primary track", 51, -0.1, 10.1); h_reg_nhits_sec = new TH1F("h_reg_nhits_sec", "Number of hits in registered secondary track", 51, -0.1, 10.1); h_acc_nhits_prim = new TH1F("h_acc_nhits_prim", "Number of hits in accepted primary track", 51, -0.1, 10.1); @@ -797,11 +797,13 @@ void CbmL1::HistoPerformance() // TODO: check if works correctly. Change vHitRe CbmL1Track* prtra = &(*rtraIt); if ((prtra->Hits).size() < 1) continue; { // fill histos - if (fabs(prtra->T[4]) > 1.e-10) h_reco_mom->Fill(fabs(1.0 / prtra->T[4])); // TODO: Is it a right precision? In FairTrackParam it is 1.e-4 (S.Zharko) + if (fabs(prtra->T[4]) > 1.e-10) + h_reco_mom->Fill( + fabs(1.0 / prtra->T[4])); // TODO: Is it a right precision? In FairTrackParam it is 1.e-4 (S.Zharko) // NOTE: p = (TMath::Abs(fQp) > 1.e-4) ? 1. / TMath::Abs(fQp) : 1.e4; // FairTrackParam::Momentum(TVector3) // h_reco_mom->Fill(TMath::Abs(prtra->T[4] > 1.e-4) ? 1. / TMath::Abs(prtra->T[4]) : 1.e+4); // this should be correct - h_reco_phi->Fill(TMath::ATan2(-prtra->T[3], -prtra->T[2])); // TODO: What is precision? + h_reco_phi->Fill(TMath::ATan2(-prtra->T[3], -prtra->T[2])); // TODO: What is precision? h_reco_nhits->Fill((prtra->Hits).size()); CbmL1HitStore& mh = fvHitStore[prtra->Hits[0]]; h_reco_station->Fill(mh.iStation); diff --git a/reco/L1/L1Algo/L1InputData.h b/reco/L1/L1Algo/L1InputData.h index 945bee3e237fef7aa697deeb7e133e2762c075bd..06572efbe0f482883db95130a90f71d0f442d474 100644 --- a/reco/L1/L1Algo/L1InputData.h +++ b/reco/L1/L1Algo/L1InputData.h @@ -90,9 +90,9 @@ private: L1Vector<L1Hit> fvHits = {"L1InputData::fvHits"}; ///< Sorted sample of input hits ///< \note Hits in the vector are sorted as follows. Among two hits ///< the largest has the largest station index in the active - ///< stations array. If both indexes were measured withing one - ///< station, the largest hit has the largest y component of - ///< the coordinates + ///< stations array. If both indexes were measured withing one + ///< station, the largest hit has the largest y component of + ///< the coordinates /// Index of the first hit in the sorted hits vector for a given station std::array<L1HitIndex_t, L1Constants::size::kMaxNstations> fvStartHitIndexes = {0}; diff --git a/reco/L1/L1Algo/L1TrackFitter.cxx b/reco/L1/L1Algo/L1TrackFitter.cxx index cc3f85ee6430115b4af6eef9decf8c0b25c74375..222d850c01d0ab52b7ea0d4a7e08e3fae44246b8 100644 --- a/reco/L1/L1Algo/L1TrackFitter.cxx +++ b/reco/L1/L1Algo/L1TrackFitter.cxx @@ -193,7 +193,7 @@ void L1Algo::KFTrackFitter_simple() // TODO: Add pipe. const L1Hit& hit0 = (*vHits)[hits[0]]; const L1Hit& hit1 = (*vHits)[hits[1]]; const L1Hit& hit2 = (*vHits)[hits[2]]; - + int ista0 = hit0.iSt; int ista1 = hit1.iSt; int ista2 = hit2.iSt;