Import Geant4 10.6.1 source tree

source/particles/History

@@ -16,6 +16,10 @@ committal in the CVS repository !
      * Reverse chronological order (last date on top), please *
      ----------------------------------------------------------
 
+- 06 February 2020 Makoto Asai (particles-V10-05-11)
+  Fix broken if-block in G4DecayTableMessenger.cc.
+  Addressing to Bug report #2193.
+
 - 05 November 2019 Vladimir Ivanchenko (particles-V10-05-10)
   G4NucleiProperties - in some hadronic models a fragment may be
   produced consisting of only neutrons or only protons; 

source/particles/management/src/G4DecayTableMessenger.cc

@@ -167,17 +167,18 @@ G4ParticleDefinition* G4DecayTableMessenger::SetCurrentParticle()
     currentParticle = theParticleTable->FindParticle(particleName);
     idxCurrentChannel = -1;
     currentDecayTable = nullptr;
-    if (currentParticle != nullptr ){
-      currentDecayTable = currentParticle->GetDecayTable();
-      if ((currentDecayTable != nullptr ) && (idxCurrentChannel >0) ) {
-	currentChannel = currentDecayTable->GetDecayChannel(idxCurrentChannel);
-      } else {
-	idxCurrentChannel = -1;
-	currentChannel = nullptr;
-      }
-    }
-
   }
+
+  if (currentParticle != nullptr ){
+    currentDecayTable = currentParticle->GetDecayTable();
+    if ((currentDecayTable != nullptr ) && (idxCurrentChannel >0) ) {
+      currentChannel = currentDecayTable->GetDecayChannel(idxCurrentChannel);
+    } else {
+      idxCurrentChannel = -1;
+      currentChannel = nullptr;
+    }
+  }
+
   return currentParticle;
 }