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

Timestamp:

Nov 25, 2009, 5:13:58 PM (15 years ago)

Author:

garnier

Message:

update CVS release candidate geant4.9.3.01

Location:

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

Files:

• G4HadronicInteraction.cc (modified) (9 diffs)
• G4HadronicInteractionRegistry.cc (modified) (6 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

@@ -24 +24 @@
 // ********************************************************************
 //
-// $Id: G4HadronicInteraction.cc,v 1.4 2009/01/24 11:56:27 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-beta-cand-01 $
+// $Id: G4HadronicInteraction.cc,v 1.6 2009/08/30 16:12:34 vnivanch Exp $
+// GEANT4 tag $Name: geant4-09-03-cand-01 $
 //
 // Hadronic Interaction  base class
@@ -39 +39 @@
 
 G4HadronicInteraction::G4HadronicInteraction(const G4String& modelName) :
-  verboseLevel(0), theMinEnergy(0.0*GeV), theMaxEnergy(25.0*GeV), 
-  isBlocked(false), theModelName(modelName)
+  verboseLevel(0), theMinEnergy(0.0), theMaxEnergy(25.0*GeV), 
+  isBlocked(false), recoilEnergyThreshold(0.0), theModelName(modelName)
 { 
   G4HadronicInteractionRegistry::Instance()->RegisterMe(this);
@@ -48 +48 @@
 {
   G4HadronicInteractionRegistry::Instance()->RemoveMe(this);
+}
+
+G4double 
+G4HadronicInteraction::SampleInvariantT(const G4ParticleDefinition*, 
+                                        G4double, G4int, G4int)
+{
+  return 0.0;
 }
  
@@ -75 +82 @@
  
 void G4HadronicInteraction::SetMinEnergy(G4double anEnergy,
-                                         G4Element *anElement )
+                                         const G4Element *anElement )
 {
   if( IsBlocked(anElement) )
@@ -90 +97 @@
       }
     }
-  theMinEnergyListElements.push_back(std::pair<G4double, G4Element *>(anEnergy, anElement));
+  theMinEnergyListElements.push_back(std::pair<G4double, const G4Element *>(anEnergy, anElement));
 }
  
 void G4HadronicInteraction::SetMinEnergy(G4double anEnergy,
-                                         G4Material *aMaterial )
+                                         const G4Material *aMaterial )
 {
   if( IsBlocked(aMaterial) )
@@ -109 +116 @@
         }
     }
-  theMinEnergyList.push_back(std::pair<G4double, G4Material *>(anEnergy, aMaterial));
+  theMinEnergyList.push_back(std::pair<G4double, const G4Material *>(anEnergy, aMaterial));
 }
  
@@ -116 +123 @@
 {
   size_t i;
-  if( IsBlocked(aMaterial) )return 0.0*GeV;
-  if( IsBlocked(anElement) )return 0.0*GeV;
+  if( IsBlocked(aMaterial) )return 0.0;
+  if( IsBlocked(anElement) )return 0.0;
   for( i=0; i<theMaxEnergyListElements.size(); ++i )
     {
@@ -123 +130 @@
         return theMaxEnergyListElements[i].first;
     }
-    for( i=0; i<theMaxEnergyList.size(); ++i )
+  for( i=0; i<theMaxEnergyList.size(); ++i )
     {
       if( aMaterial == theMaxEnergyList[i].second )
         return theMaxEnergyList[i].first;
     }
-    if(IsBlocked()) return 0.*GeV;
-    if( verboseLevel > 0 )
+  if(IsBlocked()) return 0.*GeV;
+  if( verboseLevel > 0 ) {
       G4cout << "*** Warning from HadronicInteraction::GetMaxEnergy" << G4endl
              << "    material " << aMaterial->GetName()
              << " not found in min energy List" << G4endl;
-    
-    return theMaxEnergy;
+  }
+  return theMaxEnergy;
 }
  
 void G4HadronicInteraction::SetMaxEnergy(G4double anEnergy,
-                                         G4Element *anElement ) 
-{
-  if( IsBlocked(anElement) )
+                                         const G4Element *anElement ) 
+{
+  if( IsBlocked(anElement) ) {
     G4cout << "*** Warning from HadronicInteraction::SetMaxEnergy" << G4endl
            << "Warning: The model is not active for the Element  "
            << anElement->GetName() << "." << G4endl;
-    
+  }
   for( size_t i=0; i<theMaxEnergyListElements.size(); ++i )
     {
@@ -153 +160 @@
       }
     }
-  theMaxEnergyListElements.push_back(std::pair<G4double, G4Element *>(anEnergy, anElement));
+  theMaxEnergyListElements.push_back(std::pair<G4double, const G4Element *>(anEnergy, anElement));
 }
 
 void G4HadronicInteraction::SetMaxEnergy(G4double anEnergy,
-                                         G4Material *aMaterial )
-{
-  if( IsBlocked(aMaterial) ) 
+                                         const G4Material *aMaterial )
+{
+  if( IsBlocked(aMaterial) ) {
     G4cout << "*** Warning from HadronicInteraction::SetMaxEnergy" << G4endl
            << "Warning: The model is not active for the Material "
            << aMaterial->GetName() << "." << G4endl;
-    
+  }
   for( size_t i=0; i<theMaxEnergyList.size(); ++i )
     {
       if( aMaterial == theMaxEnergyList[i].second )
         {
-        theMaxEnergyList[i].first = anEnergy;
-        return;
-        }
-    }
-  theMaxEnergyList.push_back(std::pair<G4double, G4Material *>(anEnergy, aMaterial));
-}
-
-void G4HadronicInteraction::DeActivateFor( G4Material *aMaterial )
+          theMaxEnergyList[i].first = anEnergy;
+          return;
+        }
+    }
+  theMaxEnergyList.push_back(std::pair<G4double, const G4Material *>(anEnergy, aMaterial));
+}
+
+void G4HadronicInteraction::DeActivateFor( const G4Material *aMaterial )
 {
   theBlockedList.push_back(aMaterial);
 }
 
-void G4HadronicInteraction::DeActivateFor( G4Element *anElement )
+void G4HadronicInteraction::DeActivateFor( const G4Element *anElement )
 {
   theBlockedListElements.push_back(anElement);

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

@@ -24 +24 @@
 // ********************************************************************
 //
-// $Id: G4HadronicInteractionRegistry.cc,v 1.7 2009/02/25 16:30:18 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-beta-cand-01 $
+// $Id: G4HadronicInteractionRegistry.cc,v 1.8 2009/08/30 16:12:34 vnivanch Exp $
+// GEANT4 tag $Name: geant4-09-03-cand-01 $
 //
 // 23-Jan-2009 V.Ivanchenko make the class to be a singleton
@@ -44 +44 @@
 
 G4HadronicInteractionRegistry::G4HadronicInteractionRegistry()
-{
-  nModels = 0;
-}
+{}
 
 G4HadronicInteractionRegistry::~G4HadronicInteractionRegistry()
@@ -56 +54 @@
 {
   //G4cout << "G4HadronicInteractionRegistry::Clean() start " << nModels << G4endl;
+  size_t nModels = allModels.size();
   if(0 < nModels) {
-    for (G4int i=0; i<nModels; i++) {
+    for (size_t i=0; i<nModels; ++i) {
       if( allModels[i] ) {
         //G4cout << "delete " << i << G4endl;
@@ -66 +65 @@
     }
   }
+  allModels.clear();
   //G4cout << "G4HadronicInteractionRegistry::Clean() is done " << G4endl; 
-  nModels = 0;
 }
 
@@ -73 +72 @@
 RegisterMe(G4HadronicInteraction * aModel)
 {
+  size_t nModels = allModels.size();
   if(nModels > 0) {
-    for (G4int i=0; i<nModels; i++) {
+    for (size_t i=0; i<nModels; ++i) {
       if( aModel == allModels[i] ) return;
     }
   }
   //G4cout << "Register model <" << aModel->GetModelName() 
-  //<< ">  " << nModels << G4endl;
+  //<< ">  " << nModels+1 << G4endl;
   allModels.push_back(aModel);
-  nModels++;
 }
 
@@ -87 +86 @@
 RemoveMe(G4HadronicInteraction * aModel)
 {
-  if(nModels > 0) {
-    for (G4int i=0; i<nModels; i++) {
-      if( aModel == allModels[i] ) {
-        //G4cout << "DeRegister model <" << aModel->GetModelName() 
-        //<< ">  " << i << G4endl;
-        allModels[i] = 0;
-        return;
-      }
+  size_t nModels = allModels.size();
+  if(0 == nModels) return;
+  for (size_t i=0; i<nModels; ++i) {
+    if( aModel == allModels[i] ) {
+      //G4cout << "DeRegister model <" << aModel->GetModelName() 
+      //<< ">  " << i << G4endl;
+      allModels[i] = 0;
+      if(i == nModels-1) allModels.pop_back();
+      return;
     }
   }

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-beta-cand-01 $
+// GEANT4 tag $Name: geant4-09-03-cand-01 $
 //
 // 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-02 $
+// GEANT4 tag $Name: geant4-09-03-cand-01 $
 //
 #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-02 $
+// GEANT4 tag $Name: geant4-09-03-cand-01 $
 //
 // 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-02 $
+// GEANT4 tag $Name: geant4-09-03-cand-01 $
 //
 // $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-02 $
+// GEANT4 tag $Name: geant4-09-03-cand-01 $
 //
 #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-02 $
+// GEANT4 tag $Name: geant4-09-03-cand-01 $
 //
 

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-02 $
+// GEANT4 tag $Name: geant4-09-03-cand-01 $
 //