From f68385ae722e52541f3e5ec0467ac6a526dec584 Mon Sep 17 00:00:00 2001 From: P-A Loizeau <p.-a.loizeau@gsi.de> Date: Fri, 10 Feb 2023 17:32:55 +0100 Subject: [PATCH] Fixes to mCBM 2022 event and reco macros for digievent L1 support --- macro/beamtime/mcbm2022/mcbm_event.C | 5 ++++- macro/beamtime/mcbm2022/mcbm_reco.C | 10 ++++++---- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/macro/beamtime/mcbm2022/mcbm_event.C b/macro/beamtime/mcbm2022/mcbm_event.C index 122aa04331..85d565af27 100644 --- a/macro/beamtime/mcbm2022/mcbm_event.C +++ b/macro/beamtime/mcbm2022/mcbm_event.C @@ -480,7 +480,10 @@ Bool_t mcbm_event(std::string infile, evBuildRaw->ChangeMuchBeamtimeDigiFlag(); // Enable DigiEvent output if requested - if (bDigiEvtsOutput) evBuildRaw->SetDigiEventOutput(); + if (bDigiEvtsOutput) { + evBuildRaw->SetDigiEventOutput(); + evBuildRaw->SetDigiEventExclusiveTrdExtraction(); + } evBuildRaw->SetOutFilename(histosfilename); // evBuildRaw->SetOutputBranchPersistent("CbmEvent", kFALSE); diff --git a/macro/beamtime/mcbm2022/mcbm_reco.C b/macro/beamtime/mcbm2022/mcbm_reco.C index 2e68005e6f..394bdcb7c3 100644 --- a/macro/beamtime/mcbm2022/mcbm_reco.C +++ b/macro/beamtime/mcbm2022/mcbm_reco.C @@ -544,13 +544,15 @@ Bool_t mcbm_reco(UInt_t uRunId = 2391, TString tofGeoTag; if (geoSetup->GetGeoTag(ECbmModuleId::kTof, tofGeoTag)) { TString parFile = gSystem->Getenv("VMCWORKDIR"); - parFile = parFile + "/parameters/tof/tof_matbudget_" + tofGeoTag + ".root "; - // parFile = parFile + "/parameters/tof/tof_matbudget_v21d_mcbm.root"; - std::cout << "Using material budget file " << parFile << std::endl; + //parFile = parFile + "/parameters/tof/tof_matbudget_" + tofGeoTag + ".root ";"; + //std::cout << "Using material budget file " << parFile << std::endl; + // FIXME + parFile = parFile + "/parameters/tof/tof_matbudget_v21d_mcbm.root"; + std::cout << "FIXME: Using material budget file tof_matbudget_v21d_mcbm as right one not in repo!!!" << std::endl; l1->SetTofMaterialBudgetFileName(parFile.Data()); } - + /// PAL, 08/02/2023: Is the following comment still valid with the current master? // Workaround to get it running: // 1) Change fUseGlobal in line 129 of CbmStsParSetModule.h to // Bool_t fUseGlobal = kTRUE; -- GitLab