From ae887b0688dcece1b7b4c3e5340c365c759d05e4 Mon Sep 17 00:00:00 2001 From: Luca Fedeli Date: Thu, 14 Nov 2019 11:23:00 +0100 Subject: bugfixing --- Source/Particles/MultiParticleContainer.cpp | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) (limited to 'Source/Particles/MultiParticleContainer.cpp') diff --git a/Source/Particles/MultiParticleContainer.cpp b/Source/Particles/MultiParticleContainer.cpp index 4cb4c948e..91aa181b7 100644 --- a/Source/Particles/MultiParticleContainer.cpp +++ b/Source/Particles/MultiParticleContainer.cpp @@ -644,9 +644,8 @@ void MultiParticleContainer::InitQuantumSync () bool generate_table; PicsarQuantumSynchrotronCtrl ctrl; std::string filename; - std::tie(generate_table, filename, ctrl) = ParseQuantumSyncParams(); - //Only temporary for test purposes, will be removed + //Use dummy tables for test purposes if required ParmParse pp("qed_qs"); bool use_dummy_builtin_tables = false; pp.query("use_dummy_builtin_tables", use_dummy_builtin_tables); @@ -656,6 +655,7 @@ void MultiParticleContainer::InitQuantumSync () } //_________________________________________________ + std::tie(generate_table, filename, ctrl) = ParseQuantumSyncParams(); if(generate_table && ParallelDescriptor::IOProcessor()){ m_shr_p_qs_engine->compute_lookup_tables(ctrl); @@ -683,7 +683,6 @@ void MultiParticleContainer::InitBreitWheeler () bool generate_table; PicsarBreitWheelerCtrl ctrl; std::string filename; - std::tie(generate_table, filename, ctrl) = ParseBreitWheelerParams(); //Use dummy tables for test purposes if required ParmParse pp("qed_bw"); @@ -696,6 +695,8 @@ void MultiParticleContainer::InitBreitWheeler () } //_________________________________________________ + std::tie(generate_table, filename, ctrl) = ParseBreitWheelerParams(); + if(generate_table && ParallelDescriptor::IOProcessor()){ m_shr_p_bw_engine->compute_lookup_tables(ctrl); Vector all_data = m_shr_p_bw_engine->export_lookup_tables_data(); @@ -732,13 +733,6 @@ MultiParticleContainer::ParseQuantumSyncParams () // the optical depth is not evolved and photon generation is ignored pp.query("chi_min", ctrl.chi_part_min); - //Only temporary for test purposes, will be removed - bool ignore_tables = false; - pp.query("ignore_tables_for_test", ignore_tables); - if(ignore_tables) - return std::make_tuple(false, "__DUMMY__", ctrl); - //_________________________________________________ - pp.query("generate_table", generate_table); if(generate_table){ int t_int = 0; -- cgit v1.2.3