Skip to content

Please consider the following formatting changes to #10584 #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
alibuild wants to merge 1 commit into
base: O2LowNeutTransport
Choose a base branch
from
Open

Please consider the following formatting changes to #10584 #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Common/SimConfig/include/SimConfig/G4Params.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ namespace conf
enum class EG4Physics {
kFTFP_BERT_optical = 0, /* just ordinary */
kFTFP_BERT_optical_biasing = 1, /* with biasing enabled */
kFTFP_INCLXX_optical = 2, /* special INCL++ version */
kFTFP_BERT_HP_optical = 3 /* enable low energy neutron transport */
kFTFP_INCLXX_optical = 2, /* special INCL++ version */
kFTFP_BERT_HP_optical = 3 /* enable low energy neutron transport */
};

// parameters to influence the G4 engine
Expand Down
2 changes: 1 addition & 1 deletion Common/SimConfig/include/SimConfig/SimParams.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ struct SimCutParams : public o2::conf::ConfigurableParamHelper<SimCutParams> {
float tunnelZ = 1900; // Z-value from where we apply maxRTrackingZDC (default value taken from standard "hall" dimensions)

float globalDensityFactor = 1.f; // global factor that scales all material densities for systematic studies
bool lowneut = false;
bool lowneut = false;
O2ParamDef(SimCutParams, "SimCutParams");
};

Expand Down
4 changes: 2 additions & 2 deletions Common/SimConfig/src/G4Params.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ namespace conf

namespace
{
static const std::string confstrings[4] = {"FTFP_BERT_EMV+optical", "FTFP_BERT_EMV+optical+biasing", "FTFP_INCLXX_EMV+optical",
"FTFP_BERT_HP_EMV+optical"};
static const std::string confstrings[4] = {"FTFP_BERT_EMV+optical", "FTFP_BERT_EMV+optical+biasing", "FTFP_INCLXX_EMV+optical",
"FTFP_BERT_HP_EMV+optical"};
}

std::string const& G4Params::getPhysicsConfigString() const
Expand Down
5 changes: 3 additions & 2 deletions Detectors/Base/include/DetectorsBase/MaterialManager.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,8 +132,8 @@ class MaterialManager
void SpecialCut(const char* modname, int localindex, ECut parID, Float_t val);

/// Set flag fro low energy neutron transport
void SetLowEnergyNeutronTransport(bool flag) {mLowNeut = flag;}
void SetLowEnergyNeutronTransport(bool flag) { mLowNeut = flag; }

/// load cuts and process flags from a data file (like AliRoot did)
void loadCutsAndProcessesFromFile(const char* modname, const char* filename);
void loadCutsAndProcessesFromJSON(ESpecial special = ESpecial::kFALSE, std::string const& filename = "");
Expand Down Expand Up @@ -269,6 +269,7 @@ class MaterialManager
bool mApplySpecialCuts = true;
/// Flag for low energy neutron transport
bool mLowNeut = false;

public:
ClassDefNV(MaterialManager, 0);
};
Expand Down
5 changes: 3 additions & 2 deletions Detectors/Base/src/MaterialManager.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -255,8 +255,9 @@ void MaterialManager::Cut(ESpecial special, int globalindex, ECut cut, Float_t v
return;
}
// if low energy neutron transport is requested seeting kCUTNEU will set to 0.005eV
if (mLowNeut && cut == ECut::kCUTNEU) val = 5.e-12;

if (mLowNeut && cut == ECut::kCUTNEU)
val = 5.e-12;

auto it = mCutIDToName.find(cut);
if (it == mCutIDToName.end()) {
return;
Expand Down