diff --git a/core/detectors/rich/CbmRichDetectorData.h b/core/detectors/rich/CbmRichDetectorData.h index 41179c4b06e701977b7f12b1457c87b1ed2c18f9..6a5c4d24148e024dd34da4924fa242f60c61d0fa 100644 --- a/core/detectors/rich/CbmRichDetectorData.h +++ b/core/detectors/rich/CbmRichDetectorData.h @@ -19,17 +19,17 @@ #include <vector> // for vector class CbmRichPixelData { -public: + public: Int_t fAddress; Double_t fX; // global x coordinate Double_t fY; // global y coordinate Double_t fZ; // global z coordinate - Int_t fPixelId; // pixel index [0, 63] row major, view from -z to z + Int_t fPixelId; // pixel index [0, 63] row major, view from z to -z Int_t fPmtId; }; class CbmRichPmtData { -public: + public: Bool_t ContainsPixel(Int_t address) { return std::find(fPixelAddresses.begin(), fPixelAddresses.end(), address) != fPixelAddresses.end(); diff --git a/macro/rich/run/run_digi.C b/macro/rich/run/run_digi.C index 4073d6c545e1e24090e8a90bfa4db0dfb7178968..ca7ef61ee891c964a900052ef26b376744a6454d 100644 --- a/macro/rich/run/run_digi.C +++ b/macro/rich/run/run_digi.C @@ -28,7 +28,7 @@ void run_digi(TString traFile = "", TString parFile = "", TString digiFile = "", TString macroDir = macroPath(0, macroPath.Last('/') + 1); if (traFile.IsNull()) traFile = macroDir + "data/test.tra.root"; if (parFile.IsNull()) parFile = macroDir + "data/test.par.root"; - if (digiFile.IsNull()) digiFile = macroDir + "data/test.geo.root"; + if (digiFile.IsNull()) digiFile = macroDir + "data/test.digi.root"; remove(digiFile); // ------------------------------------------------------------------------ diff --git a/macro/rich/run/run_qa.C b/macro/rich/run/run_qa.C index aecfafd39062caeeaa8aa3f3daa9890aa14a7a19..de4172d08ff6cc7a1a00e1bd1fa5d9868d5a39a1 100644 --- a/macro/rich/run/run_qa.C +++ b/macro/rich/run/run_qa.C @@ -45,7 +45,7 @@ void run_qa(TString traFile = "", TString parFile = "", TString digiFile = "", T TString macroDir = macroPath(0, macroPath.Last('/') + 1); if (traFile.IsNull()) traFile = macroDir + "data/test.tra.root"; if (parFile.IsNull()) parFile = macroDir + "data/test.par.root"; - if (digiFile.IsNull()) digiFile = macroDir + "data/test.geo.root"; + if (digiFile.IsNull()) digiFile = macroDir + "data/test.digi.root"; if (recoFile.IsNull()) recoFile = macroDir + "data/test.reco.root"; if (qaFile.IsNull()) qaFile = macroDir + "data/test.qa.root"; diff --git a/macro/rich/run/run_reco.C b/macro/rich/run/run_reco.C index 92d7ddd9d4ef458cdcf36c577672c3301d2bf60c..7eb1e7e2cbd5d8c2a43d2c763405e21ff0646f1f 100644 --- a/macro/rich/run/run_reco.C +++ b/macro/rich/run/run_reco.C @@ -60,7 +60,7 @@ void run_reco(TString traFile = "", TString parFile = "", TString digiFile = "", TString macroDir = macroPath(0, macroPath.Last('/') + 1); if (traFile.IsNull()) traFile = macroDir + "data/test.tra.root"; if (parFile.IsNull()) parFile = macroDir + "data/test.par.root"; - if (digiFile.IsNull()) digiFile = macroDir + "data/test.geo.root"; + if (digiFile.IsNull()) digiFile = macroDir + "data/test.digi.root"; if (recoFile.IsNull()) recoFile = macroDir + "data/test.reco.root"; remove(recoFile);