diff --git a/macro/qa/configs/qa_tasks_config_mcbm_beam_2021_07_surveyed.yaml b/macro/qa/configs/qa_tasks_config_mcbm_beam_2021_07_surveyed.yaml index e12dd8c0e4a1d8cb1f6ab871bcc206409e89d3ae..4ffb5ab665c82a712f4dc5c5854e63b20c27b6c2 100644 --- a/macro/qa/configs/qa_tasks_config_mcbm_beam_2021_07_surveyed.yaml +++ b/macro/qa/configs/qa_tasks_config_mcbm_beam_2021_07_surveyed.yaml @@ -45,5 +45,6 @@ qa: pull_x_station_%d: true pull_y_station_%d: true pull_t_station_%d: true - + pull_t_station_4: false + ... diff --git a/sim/transport/gconfig/g4Config.C b/sim/transport/gconfig/g4Config.C index aad1a727f00ff0b26656f26e871b321174ff88f5..0ba3c7eb3cad9600a7b27da08e73270fa6a9d5a7 100644 --- a/sim/transport/gconfig/g4Config.C +++ b/sim/transport/gconfig/g4Config.C @@ -52,10 +52,12 @@ void Config() TString configm(gSystem->Getenv("CONFIG_DIR")); TString configm1 = configm + "/g4config.in"; + configm1.ReplaceAll("//", "/"); cout << " -I g4Config() using g4conf macro: " << configm1 << endl; // set the common cuts TString cuts = configm + "/SetCuts.C"; + cuts.ReplaceAll("//", "/"); cout << "Physics cuts with script \n " << cuts.Data() << endl; Int_t cut = gROOT->LoadMacro(cuts.Data()); if (cut == 0) gInterpreter->ProcessLine("SetCuts()"); diff --git a/sim/transport/steer/CbmGeant4Settings.h b/sim/transport/steer/CbmGeant4Settings.h index 6b58e44deee2f5ec827dbf5e54a5d3b5c76b0d3e..98b2e11c7d0396ae9f9fd6f8c94ef65a43994ad7 100644 --- a/sim/transport/steer/CbmGeant4Settings.h +++ b/sim/transport/steer/CbmGeant4Settings.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2020 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt +/* Copyright (C) 2020-2025 GSI Helmholtzzentrum fuer Schwerionenforschung, Darmstadt SPDX-License-Identifier: GPL-3.0-only Authors: Florian Uhlig [committer] */ @@ -25,7 +25,7 @@ class TVirtualMC; class CbmGeant4Settings : public CbmVMCSettings { -public: + public: CbmGeant4Settings() = default; ~CbmGeant4Settings() = default; CbmGeant4Settings(const CbmGeant4Settings&) = delete; @@ -94,25 +94,25 @@ public: **/ Int_t GetMaximumNumberOfSteps() { return fMaxNumSteps; } -private: - std::array<std::string, 3> fG4RunConfig {{"geomRoot", "QGSP_BERT_EMV+optical", "stepLimiter"}}; + private: + std::array<std::string, 3> fG4RunConfig{{"geomRoot", "QGSP_BERT_EMV+optical", "stepLimiter+specialCuts"}}; /* See https://redmine.cbm.gsi.de/issues/2913 As of Geant4-10.5 these commands were changed. Tested for Geant4-11 */ - std::vector<std::string> fG4Commands {"/process/optical/verbose 0", - "/process/optical/cerenkov/setMaxPhotons 20", - "/process/optical/cerenkov/setMaxBetaChange 0.1", - "/process/optical/cerenkov/setTrackSecondariesFirst true", - "/process/optical/processActivation Cerenkov true", - "/process/optical/processActivation OpAbsorption true", - "/process/optical/processActivation OpBoundary true"}; + std::vector<std::string> fG4Commands{"/process/optical/verbose 0", + "/process/optical/cerenkov/setMaxPhotons 20", + "/process/optical/cerenkov/setMaxBetaChange 0.1", + "/process/optical/cerenkov/setTrackSecondariesFirst true", + "/process/optical/processActivation Cerenkov true", + "/process/optical/processActivation OpAbsorption true", + "/process/optical/processActivation OpBoundary true"}; - Int_t fMaxNumSteps {10000000}; + Int_t fMaxNumSteps{10000}; - Int_t fRandomSeed {0}; + Int_t fRandomSeed{0}; ClassDef(CbmGeant4Settings, 4); };