Changeset 1228 for trunk/source/processes/hadronic/models/management/src

Timestamp:

Jan 8, 2010, 11:56:51 AM (14 years ago)

Author:

garnier

Message:

update geant4.9.3 tag

Location:

trunk/source/processes/hadronic/models/management/src

Files:

• G4HadronicInteraction.cc (modified) (1 diff)
• G4HadronicInteractionRegistry.cc (modified) (5 diffs)
• G4InelasticInteraction.cc (modified) (1 diff)
• G4V3DNucleus.cc (modified) (1 diff)
• G4VHighEnergyGenerator.cc (modified) (1 diff)
• G4VIntraNuclearTransportModel.cc (modified) (1 diff)
• G4VKineticNucleon.cc (modified) (1 diff)
• G4VNuclearDensity.cc (modified) (1 diff)
• G4VPreCompoundModel.cc (modified) (1 diff)

trunk/source/processes/hadronic/models/management/src/G4HadronicInteraction.cc

@@ -25 +25 @@
 //
 // $Id: G4HadronicInteraction.cc,v 1.6 2009/08/30 16:12:34 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Interaction  base class

trunk/source/processes/hadronic/models/management/src/G4HadronicInteractionRegistry.cc

@@ -24 +24 @@
 // ********************************************************************
 //
-// $Id: G4HadronicInteractionRegistry.cc,v 1.8 2009/08/30 16:12:34 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// $Id: G4HadronicInteractionRegistry.cc,v 1.9 2009/12/02 15:57:57 vnivanch Exp $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // 23-Jan-2009 V.Ivanchenko make the class to be a singleton
@@ -53 +53 @@
 void G4HadronicInteractionRegistry::Clean()
 {
+  size_t nModels = allModels.size();
   //G4cout << "G4HadronicInteractionRegistry::Clean() start " << nModels << G4endl;
-  size_t nModels = allModels.size();
   if(0 < nModels) {
     for (size_t i=0; i<nModels; ++i) {
@@ -60 +60 @@
         //G4cout << "delete " << i << G4endl;
         //G4cout << allModels[i]->GetModelName() << G4endl;
-        delete allModels[i];
+        G4HadronicInteraction * model = allModels[i];
         allModels[i] = 0;
+        delete model;
       }
     }
+    allModels.clear();
   }
-  allModels.clear();
   //G4cout << "G4HadronicInteractionRegistry::Clean() is done " << G4endl; 
 }
@@ -72 +73 @@
 RegisterMe(G4HadronicInteraction * aModel)
 {
+  if(!aModel) { return; }
   size_t nModels = allModels.size();
   if(nModels > 0) {
     for (size_t i=0; i<nModels; ++i) {
-      if( aModel == allModels[i] ) return;
+      if( aModel == allModels[i] ) { return; }
     }
   }
@@ -86 +88 @@
 RemoveMe(G4HadronicInteraction * aModel)
 {
+  if(!aModel) { return; }
   size_t nModels = allModels.size();
-  if(0 == nModels) return;
+  if(0 == nModels) { return; }
   for (size_t i=0; i<nModels; ++i) {
     if( aModel == allModels[i] ) {

trunk/source/processes/hadronic/models/management/src/G4InelasticInteraction.cc

@@ -25 +25 @@
 //
 // $Id: G4InelasticInteraction.cc,v 1.12 2009/01/24 11:56:27 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Hadronic Process: Inelastic Interaction 

trunk/source/processes/hadronic/models/management/src/G4V3DNucleus.cc

@@ -26 +26 @@
 //
 // $Id: G4V3DNucleus.cc,v 1.5 2006/06/29 20:45:59 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 #include "G4V3DNucleus.hh"

trunk/source/processes/hadronic/models/management/src/G4VHighEnergyGenerator.cc

@@ -26 +26 @@
 //
 // $Id: G4VHighEnergyGenerator.cc,v 1.5 2006/06/29 20:46:03 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // G4VHighEnergyGenerator

trunk/source/processes/hadronic/models/management/src/G4VIntraNuclearTransportModel.cc

@@ -26 +26 @@
 //
 // $Id: G4VIntraNuclearTransportModel.cc,v 1.5 2007/01/11 05:28:56 dennis Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // $Id: G4VIntraNuclearTransportModel.cc,v 1.0 1998/06/30

trunk/source/processes/hadronic/models/management/src/G4VKineticNucleon.cc

@@ -26 +26 @@
 //
 // $Id: G4VKineticNucleon.cc,v 1.3 2006/06/29 20:46:07 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 #include "G4VKineticNucleon.hh"

trunk/source/processes/hadronic/models/management/src/G4VNuclearDensity.cc

@@ -26 +26 @@
 //
 // $Id: G4VNuclearDensity.cc,v 1.3 2006/06/29 20:46:09 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 

trunk/source/processes/hadronic/models/management/src/G4VPreCompoundModel.cc

@@ -26 +26 @@
 //
 // $Id: G4VPreCompoundModel.cc,v 1.6 2007/01/11 05:29:10 dennis Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //