Changeset 1228 for trunk/source/processes/hadronic/models/im_r_matrix/include

Timestamp:

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

Author:

garnier

Message:

update geant4.9.3 tag

Location:

trunk/source/processes/hadronic/models/im_r_matrix/include

Files:

• G4CollisionInitialState.hh (modified) (1 diff)
• G4ListOfCollisions.hh (modified) (1 diff)
• G4VCrossSectionSource.hh (modified) (1 diff)
• G4XNNElasticLowE.hh (modified) (1 diff)
• G4XNNTotalLowE.hh (modified) (1 diff)
• G4XPDGElastic.hh (modified) (3 diffs)
• G4XPDGTotal.hh (modified) (2 diffs)

trunk/source/processes/hadronic/models/im_r_matrix/include/G4CollisionInitialState.hh

@@ -26 +26 @@
 //
 // $Id: G4CollisionInitialState.hh,v 1.4.4.2 2006/06/29 20:31:14 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // $Id: G4CollisionInitialState.hh,v 1.0 1998/06/30

trunk/source/processes/hadronic/models/im_r_matrix/include/G4ListOfCollisions.hh

@@ -26 +26 @@
 //
 // $Id: G4ListOfCollisions.hh,v 1.1.4.2 2006/06/29 20:35:35 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // $Id: G4ListOfCollisions.hh,v 1.0 1998/06/30

trunk/source/processes/hadronic/models/im_r_matrix/include/G4VCrossSectionSource.hh

@@ -76 +76 @@
                    G4double eParam, G4double power) const;
 
-  G4String FindKeyParticle(const G4KineticTrack& trk1,const G4KineticTrack& trk2) const;
+  G4ParticleDefinition * FindKeyParticle(const G4KineticTrack& trk1,const G4KineticTrack& trk2) const;
   
   // Transverse pion mass

trunk/source/processes/hadronic/models/im_r_matrix/include/G4XNNElasticLowE.hh

@@ -78 +78 @@
   static const G4double _eStepLog;
 
-  std::map <G4String, G4PhysicsVector*, std::less<G4String> > xMap;
+  std::map <G4ParticleDefinition *, G4PhysicsVector*, std::less<G4ParticleDefinition *> > xMap;
 
   G4double _eMin;

trunk/source/processes/hadronic/models/im_r_matrix/include/G4XNNTotalLowE.hh

@@ -66 +66 @@
   static const G4int tableSize;
 
-  std::map <G4String, G4LowEXsection *, std::less<G4String> > theCrossSections;
-  typedef std::map <G4String, G4LowEXsection*, std::less<G4String> > LowEMap;
+  std::map <G4ParticleDefinition *, G4LowEXsection *,
+  std::less<G4ParticleDefinition *> > theCrossSections;
+  typedef std::map <G4ParticleDefinition *, G4LowEXsection*, std::less<G4ParticleDefinition *> > LowEMap;
 
 };

trunk/source/processes/hadronic/models/im_r_matrix/include/G4XPDGElastic.hh

@@ -25 +25 @@
 //
 //
-// $Id: G4XPDGElastic.hh,v 1.2 2006/06/29 20:36:48 gunter Exp $ //
+// $Id: G4XPDGElastic.hh,v 1.2.2.1 2009/11/20 16:25:08 gunter Exp $ //
 // ---------------------------------------------------------------
 //      GEANT4 Class file
@@ -48 +48 @@
 #include <map>
 
-typedef std::pair<G4String,G4String> G4StringPair;
+typedef std::pair<G4ParticleDefinition *,G4ParticleDefinition *> G4pDefPair;
 
 class G4KineticTrack;
@@ -96 +96 @@
   static const G4double npbarPDGFit[7];
 
-  std::map <G4StringPair, std::vector<G4double>, std::less<G4StringPair> > xMap;
+  std::map <G4pDefPair, std::vector<G4double>, std::less<G4pDefPair> > xMap;
 
-  typedef std::map <G4StringPair, std::vector<G4double>, std::less<G4StringPair> > PairDoubleMap;
+  typedef std::map <G4pDefPair, std::vector<G4double>, std::less<G4pDefPair> > PairDoubleMap;
 
   //  G4double pMinFit;

trunk/source/processes/hadronic/models/im_r_matrix/include/G4XPDGTotal.hh

@@ -48 +48 @@
 #include <vector>
 
-typedef std::pair<G4String,G4String> G4StringPair;
+typedef std::pair<G4ParticleDefinition *,G4ParticleDefinition *> G4pDefPair;
 
 class G4KineticTrack;
@@ -97 +97 @@
   static const G4double gammagammaPDGFit[5];
 
-  std::map <G4StringPair, std::vector<G4double>, std::less<G4StringPair> > xMap;
-  typedef std::map <G4StringPair, std::vector<G4double>, std::less<G4StringPair> > PairDoubleMap;
+  std::map <G4pDefPair, std::vector<G4double>, std::less<G4pDefPair> > xMap;
+  typedef std::map <G4pDefPair, std::vector<G4double>, std::less<G4pDefPair> > PairDoubleMap;
 
   //  G4double eMinFit;