Changeset 1315 for trunk/source/processes/hadronic/models/management

Timestamp:

Jun 18, 2010, 11:42:07 AM (15 years ago)

Author:

garnier

Message:

update geant4-09-04-beta-cand-01 interfaces-V09-03-09 vis-V09-03-08

Location:

trunk/source/processes/hadronic/models/management

Files:

• History (modified) (1 diff)
• include/G4HadronicInteraction.hh (modified) (4 diffs)
• src/G4HadronicInteraction.cc (modified) (2 diffs)
• src/G4HadronicInteractionRegistry.cc (modified) (2 diffs)

trunk/source/processes/hadronic/models/management/History

@@ -14 +14 @@
      * Please list in reverse chronological order (last date on top)
      ---------------------------------------------------------------
+
+02 April 2010 - Dennis Wright (hadr-modman-V09-03-01)
+-----------------------------------------------------
+- G4HadronicInteraction - add two methods, GetEnergyMomentumCheckLevels
+  and SetEnergyMomentumCheckLevels in order to implement checking
+  of energy/momentum conservation
+   
+25 March 2010 - V.Ivanchenko (hadr-modman-V09-03-00)
+------------------------------------------------------
+-  G4HadronicInteractionRegistry - do not pop_back vector of pointers
+   when DeRegister cross section data set - big fixed for Windows
 
 2 December 2009 - V.Ivanchenko (hadr-modman-V09-02-08)

trunk/source/processes/hadronic/models/management/include/G4HadronicInteraction.hh

@@ -25 +25 @@
 //
 //
-// $Id: G4HadronicInteraction.hh,v 1.13 2009/10/02 17:18:33 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03 $
+// $Id: G4HadronicInteraction.hh,v 1.14 2010/04/03 00:40:45 dennis Exp $
+// GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
 //
 // Hadronic Interaction  abstract base class
@@ -139 +139 @@
 
   G4bool IsBlocked( const G4Material *aMaterial ) const;
-
   G4bool IsBlocked( const G4Element *anElement) const;
 
@@ -153 +152 @@
   inline G4bool operator!=(const G4HadronicInteraction &right ) const
   { return ( this != (G4HadronicInteraction *) &right ); }
+
+
+  inline std::pair<G4double, G4double> GetEnergyMomentumCheckLevels() const
+  { return epCheckLevels; }
+    
+  inline void SetEnergyMomentumCheckLevels(G4double relativeLevel, G4double absoluteLevel)
+  { epCheckLevels.first = relativeLevel;
+    epCheckLevels.second = absoluteLevel; }
     
 private:
     
   G4HadronicInteraction(const G4HadronicInteraction &right );
-    
   const G4HadronicInteraction& operator=(const G4HadronicInteraction &right);
 
@@ -191 +197 @@
 
   G4String theModelName;
-    
+
+  std::pair<G4double, G4double> epCheckLevels;
+
   std::vector<std::pair<G4double, const G4Material *> > theMinEnergyList;
   std::vector<std::pair<G4double, const G4Material *> > theMaxEnergyList;

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

@@ -24 +24 @@
 // ********************************************************************
 //
-// $Id: G4HadronicInteraction.cc,v 1.6 2009/08/30 16:12:34 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03 $
+// $Id: G4HadronicInteraction.cc,v 1.7 2010/04/03 00:40:57 dennis Exp $
+// GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
 //
 // Hadronic Interaction  base class
@@ -40 +40 @@
 G4HadronicInteraction::G4HadronicInteraction(const G4String& modelName) :
   verboseLevel(0), theMinEnergy(0.0), theMaxEnergy(25.0*GeV), 
-  isBlocked(false), recoilEnergyThreshold(0.0), theModelName(modelName)
+  isBlocked(false), recoilEnergyThreshold(0.0), theModelName(modelName),
+  epCheckLevels(DBL_MAX, DBL_MAX)
 { 
   G4HadronicInteractionRegistry::Instance()->RegisterMe(this);
 }
-    
+
+
 G4HadronicInteraction::~G4HadronicInteraction()
 {
   G4HadronicInteractionRegistry::Instance()->RemoveMe(this);
 }
+
 
 G4double 

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

@@ -24 +24 @@
 // ********************************************************************
 //
-// $Id: G4HadronicInteractionRegistry.cc,v 1.9 2009/12/02 15:57:57 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03 $
+// $Id: G4HadronicInteractionRegistry.cc,v 1.10 2010/03/25 15:31:42 vnivanch Exp $
+// GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
 //
 // 23-Jan-2009 V.Ivanchenko make the class to be a singleton
@@ -96 +96 @@
       //<< ">  " << i << G4endl;
       allModels[i] = 0;
-      if(i == nModels-1) allModels.pop_back();
       return;
     }