From e10894084b934b0d973ef44c6c1dde84002d9acf Mon Sep 17 00:00:00 2001 From: Luca Fedeli Date: Wed, 23 Oct 2019 18:02:48 +0200 Subject: Revert "moved ignore_table_test block at the beginning of InitBW and InitQS methods" This reverts commit e74d1f6c7326dfceac938d504af66fd58b946ce2. --- Source/Particles/MultiParticleContainer.cpp | 29 ++++++++++++++--------------- 1 file changed, 14 insertions(+), 15 deletions(-) (limited to 'Source/Particles/MultiParticleContainer.cpp') diff --git a/Source/Particles/MultiParticleContainer.cpp b/Source/Particles/MultiParticleContainer.cpp index f56a34525..74409a57f 100644 --- a/Source/Particles/MultiParticleContainer.cpp +++ b/Source/Particles/MultiParticleContainer.cpp @@ -767,13 +767,6 @@ void MultiParticleContainer::InitQED () void MultiParticleContainer::InitQuantumSync () { - //Only temporary for test purposes, will be removed - ParmParse pp("qed_qs"); - bool ignore_tables = false; - pp.query("ignore_tables_for_test", ignore_tables); - if(ignore_tables) return; - //_________________________________________________ - bool generate_table; PicsarQuantumSynchrotronCtrl ctrl; std::string filename; @@ -786,6 +779,13 @@ void MultiParticleContainer::InitQuantumSync () } ParallelDescriptor::Barrier(); + //Only temporary for test purposes, will be removed + ParmParse pp("qed_qs"); + bool ignore_tables = false; + pp.query("ignore_tables_for_test", ignore_tables); + if(ignore_tables) return; + //_________________________________________________ + Vector table_data; ParallelDescriptor::ReadAndBcastFile(filename, table_data); if(!qs_engine.init_lookup_tables_from_raw_data(table_data)) @@ -794,14 +794,6 @@ void MultiParticleContainer::InitQuantumSync () void MultiParticleContainer::InitBreitWheeler () { - - //Only temporary for test purposes, will be removed - ParmParse pp("qed_bw"); - bool ignore_tables = false; - pp.query("ignore_tables_for_test", ignore_tables); - if(ignore_tables) return; - //_________________________________________________ - bool generate_table; PicsarBreitWheelerCtrl ctrl; std::string filename; @@ -814,6 +806,13 @@ void MultiParticleContainer::InitBreitWheeler () } ParallelDescriptor::Barrier(); + //Only temporary for test purposes, will be removed + ParmParse pp("qed_bw"); + bool ignore_tables = false; + pp.query("ignore_tables_for_test", ignore_tables); + if(ignore_tables) return; + //_________________________________________________ + Vector table_data; ParallelDescriptor::ReadAndBcastFile(filename, table_data); if(!bw_engine.init_lookup_tables_from_raw_data(table_data)) -- cgit v1.2.3