Merge branch 'mtfix_calotest' into 'master'

MT build calo test fix

See merge request !98

source/lhcb/tests/G4SamplingCaloTest/G4SamplingCaloTest.cc

@@ -67,7 +67,7 @@ int main(int argc,char** argv) {
 #ifdef G4MULTITHREADED
   G4MTRunManager* runManager = new G4MTRunManager;
   // Number of threads can be defined via 3rd argument
-  G4int nThreads = 4;
+  G4int nThreads = 1;
   if (argc==3) {
     if(G4String(argv[2]) == "NMAX") {
       nThreads = G4Threading::G4GetNumberOfCores();

source/lhcb/tests/G4SamplingCaloTest/scripts/G4SamplingCaloTest.py

@@ -30,6 +30,7 @@ def create_cfg_file(n_evts=10000, name='G4SamplingCaloTest.mac'):
                          '#\n' +
                          '# LHCB ECAL model\n' +
                          '#\n' +
+                         '/control/cout/ignoreThreadsExcept 0\n' +
                          '/control/verbose 2\n' +
                          '/run/verbose 1\n' +
                          '#\n' +
@@ -41,6 +42,8 @@ def create_cfg_file(n_evts=10000, name='G4SamplingCaloTest.mac'):
                          '#\n' +
                          '/testem/phys/addPhysics emstandard_opt2\n' +
                          '#\n' +
+                         '/run/initialize\n' +
+                         '#\n' +
                          '#/gun/particle e-\n' +
                          '#/gun/energy 100 GeV\n' +
                          '#\n' +