From 30e47a83241589563db42bd500cbeb0eb61f4f8b Mon Sep 17 00:00:00 2001 From: Norbert Herrmann <n.herrmann@physi.uni-heidelberg.de> Date: Mon, 19 Apr 2021 15:28:34 +0200 Subject: [PATCH] format --- macro/beamtime/mcbm2021/ana_trks.C | 3 ++- reco/detectors/tof/CbmTofEventClusterizer.cxx | 1 + reco/detectors/tof/CbmTofEventClusterizer.h | 16 ++++++++-------- 3 files changed, 11 insertions(+), 9 deletions(-) diff --git a/macro/beamtime/mcbm2021/ana_trks.C b/macro/beamtime/mcbm2021/ana_trks.C index db8e166ede..01512dd791 100644 --- a/macro/beamtime/mcbm2021/ana_trks.C +++ b/macro/beamtime/mcbm2021/ana_trks.C @@ -163,7 +163,7 @@ void ana_trks(Int_t nEvents = 10000, Int_t iSel = 1, Int_t iGenCor = 1, TString //tofFindTracks->SetTtTarg(0.055); // target value Nov2019 (triple stack run 831) //tofFindTracks->SetTtTarg(0.048); // target value Nov2019 (double stack run 714) //tofFindTracks->SetTtTarg(0.047); // target value Mar2020, after T0 fix (full run 600) - tofFindTracks->SetTtTarg(0.042); // target value Mar2021, after T0 fix (double stack run 1058) + tofFindTracks->SetTtTarg(0.042); // target value Mar2021, after T0 fix (double stack run 1058) //tofFindTracks->SetTtTarg(0.038); // target value Mar2021, after T0 fix (double stack run 1051) //tofFindTracks->SetTtTarg(0.035); // target value for inverse velocity, > 0.033 ns/cm! tofFindTracks->SetCalParFileName(cTrkFile); // Tracker parameter value file name @@ -171,6 +171,7 @@ void ana_trks(Int_t nEvents = 10000, Int_t iSel = 1, Int_t iGenCor = 1, TString tofFindTracks->SetR0Lim(20.); tofFindTracks->SetStationMaxHMul(30); // Max Hit Multiplicity in any used station + tofFindTracks->SetT0MAX(dScalFac); // in ns tofFindTracks->SetSIGT(0.08); // default in ns tofFindTracks->SetSIGX(0.3); // default in cm diff --git a/reco/detectors/tof/CbmTofEventClusterizer.cxx b/reco/detectors/tof/CbmTofEventClusterizer.cxx index 5ff43a3380..02f414ddeb 100644 --- a/reco/detectors/tof/CbmTofEventClusterizer.cxx +++ b/reco/detectors/tof/CbmTofEventClusterizer.cxx @@ -3342,6 +3342,7 @@ Bool_t CbmTofEventClusterizer::WriteHistos() fChannelInfo->GetSizey(), dVscal, dV, dVW, 2. * ff->GetParameter(1), 2. * ff->GetParError(1), ff->GetParameter(2), ff->GetParError(2), ff->GetParameter(3), ff->GetParError(3)); + for (Int_t iPar = 0; iPar < 4; iPar++) fhSmCluFpar[iSmType][iPar]->Fill((Double_t)(iSm * iNbRpc + iRpc), ff->GetParameter(2 + iPar)); } diff --git a/reco/detectors/tof/CbmTofEventClusterizer.h b/reco/detectors/tof/CbmTofEventClusterizer.h index 6e28173523..2d32e03827 100644 --- a/reco/detectors/tof/CbmTofEventClusterizer.h +++ b/reco/detectors/tof/CbmTofEventClusterizer.h @@ -246,19 +246,19 @@ private: Bool_t fbWriteHitsInOut; Bool_t fbWriteDigisInOut; std::vector<CbmTofDigi>* fTofCalDigiVec = nullptr; //! // Calibrated TOF Digis - TClonesArray* fTofHitsColl; // TOF hits - TClonesArray* fTofDigiMatchColl; // TOF Digi Links + TClonesArray* fTofHitsColl; // TOF hits + TClonesArray* fTofDigiMatchColl; // TOF Digi Links //TClonesArray * fTofCalDigisCollOut; // Calibrated TOF Digis - std::vector<CbmTofDigi>* fTofCalDigiVecOut = - nullptr; //! // Calibrated TOF Digis - TClonesArray* fTofHitsCollOut; // TOF hits - TClonesArray* fTofDigiMatchCollOut; // TOF Digi Links + std::vector<CbmTofDigi>* fTofCalDigiVecOut = nullptr; //! // Calibrated TOF Digis + TClonesArray* fTofHitsCollOut; // TOF hits + TClonesArray* fTofDigiMatchCollOut; // TOF Digi Links std::vector<CbmMatch>* fTofDigiPointMatchesOut = nullptr; // TOF Digi MC Point Matches - Int_t fiNbHits; // Index of the CbmTofHit TClonesArray + Int_t fiNbHits; // Index of the CbmTofHit TClonesArray // Generic Int_t fVerbose; + // Intermediate storage variables std::vector<std::vector<std::vector<std::vector<CbmTofDigi*>>>> fStorDigi; //[nbType][nbSm*nbRpc][nbCh][nDigis] std::vector<std::vector<std::vector<std::vector<Int_t>>>> fStorDigiInd; //[nbType][nbSm*nbRpc][nbCh][nDigis] @@ -304,7 +304,7 @@ private: std::vector<TH2*> fhRpcDigiDTLD; //[nbDet] std::vector<TH2*> fhRpcDigiDTFD; //[nbDet] std::vector<TH2*> fhRpcDigiDTMul; //[nbDet] - std::vector<TH1*> fhRpcDigiRate; //[nbDet] + std::vector<TH1*> fhRpcDigiRate; //[nbDet] std::vector<TH1*> fhRpcCluMul; //[nbDet] std::vector<TH1*> fhRpcCluRate; //[nbDet] std::vector<TH1*> fhRpcCluRate10s; //[nbDet] -- GitLab