Ignore:
Timestamp:
Sep 10, 2008, 5:40:37 PM (16 years ago)
Author:
garnier
Message:

geant4.8.2 beta

Location:
trunk/source/global/management/include
Files:
54 edited

Legend:

Unmodified
Added
Removed
  • trunk/source/global/management/include/G4Allocator.hh

    r833 r850  
    2626//
    2727// $Id: G4Allocator.hh,v 1.18 2006/06/29 19:01:16 gunter Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: HEAD $
    2929//
    3030//
  • trunk/source/global/management/include/G4AllocatorPool.hh

    r833 r850  
    2626//
    2727// $Id: G4AllocatorPool.hh,v 1.5 2006/06/29 19:01:18 gunter Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: HEAD $
    2929//
    3030//
  • trunk/source/global/management/include/G4ApplicationState.hh

    r833 r850  
    2626//
    2727// $Id: G4ApplicationState.hh,v 1.4 2006/06/29 19:01:20 gunter Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: HEAD $
    2929//
    3030
  • trunk/source/global/management/include/G4DataVector.hh

    r833 r850  
    2626//
    2727// $Id: G4DataVector.hh,v 1.15 2007/11/13 17:35:06 gcosmo Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: HEAD $
    2929//
    3030//
  • trunk/source/global/management/include/G4DataVector.icc

    r833 r850  
    2626//
    2727// $Id: G4DataVector.icc,v 1.2 2006/06/29 19:01:24 gunter Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: HEAD $
    2929//
    3030//
  • trunk/source/global/management/include/G4ErrorPropagatorData.hh

    r833 r850  
    2626//
    2727// $Id: G4ErrorPropagatorData.hh,v 1.3 2007/06/08 10:33:47 gcosmo Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: HEAD $
    2929//
    3030//
  • trunk/source/global/management/include/G4ErrorPropagatorData.icc

    r833 r850  
    2626//
    2727// $Id: G4ErrorPropagatorData.icc,v 1.4 2007/06/08 10:33:47 gcosmo Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: HEAD $
    2929//
    3030//
  • trunk/source/global/management/include/G4ExceptionSeverity.hh

    r833 r850  
    2626//
    2727// $Id: G4ExceptionSeverity.hh,v 1.3 2006/06/29 19:01:27 gunter Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: HEAD $
    2929//
    3030// Class Description:
  • trunk/source/global/management/include/G4FPEDetection.hh

    r833 r850  
    2626//
    2727// $Id: G4FPEDetection.hh,v 1.2 2006/11/15 16:00:18 gcosmo Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: HEAD $
    2929//
    3030//
  • trunk/source/global/management/include/G4FastVector.hh

    r833 r850  
    2626//
    2727// $Id: G4FastVector.hh,v 1.5 2006/06/29 19:01:48 gunter Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: HEAD $
    2929//
    3030//
  • trunk/source/global/management/include/G4GeometryTolerance.hh

    r833 r850  
    2626//
    2727// $Id: G4GeometryTolerance.hh,v 1.2 2007/06/18 13:26:40 gcosmo Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: HEAD $
    2929//
    3030// --------------------------------------------------------------------
  • trunk/source/global/management/include/G4LPhysicsFreeVector.hh

    r833 r850  
    2525//
    2626//
    27 // $Id: G4LPhysicsFreeVector.hh,v 1.8 2006/06/29 19:01:51 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-01-patch-02 $
     27// $Id: G4LPhysicsFreeVector.hh,v 1.10 2008/04/07 14:18:57 gcosmo Exp $
     28// GEANT4 tag $Name: HEAD $
    2929//
    3030//
     
    4242
    4343// F.W. Jones, TRIUMF, 04-JUN-96
    44 //
    45 // 10-JUL-96 FWJ: adapted to changes in G4PhysicsVector.
    46 //
    47 // 27-MAR-97 FWJ: first version for Alpha release
    48 // 20-JUN-97 FWJ: added comment re GetValue(): no longer virtual
    4944// 11-NOV-00 H.Kurashige: use STL vector for dataVector and binVector
    50 //
     45// 02-APR-08 A.Bagulya: use GetValue() from base class
     46// ------------------------------------------------------------------
    5147
    5248#ifndef G4LPhysicsFreeVector_h
     
    5854{
    5955
    60 public:
     56public: // with description
    6157
    6258   G4LPhysicsFreeVector();
    63 
    64 public: // with description
    6559
    6660   G4LPhysicsFreeVector(size_t nbin, G4double binmin, G4double binmax);
     
    7165     // G4PhysicsVector has PutValue() but it is inconvenient.
    7266     // Want to simultaneously fill the bin and data vectors.
    73 
    74    G4double GetValue(G4double theEnergy, G4bool& isOutRange);
    75      // Note that theEnergy could be energy, momentum, or whatever.
    7667
    7768   void SetVerboseLevel(G4int value);
  • trunk/source/global/management/include/G4LPhysicsFreeVector.icc

    r833 r850  
    2525//
    2626//
    27 // $Id: G4LPhysicsFreeVector.icc,v 1.7 2006/06/29 19:02:10 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-01-patch-02 $
     27// $Id: G4LPhysicsFreeVector.icc,v 1.11 2008/09/06 19:52:16 vnivanch Exp $
     28// GEANT4 tag $Name: HEAD $
    2929//
    3030//
     
    4040//
    4141// F.W. Jones, TRIUMF, 04-JUN-96
     42// 05 Sep. 2008, V.Ivanchenko : added protections for zero-length vector
    4243// --------------------------------------------------------------------------
    43 
    44 // G4PhysicsVector has PutValue() but it is inconvenient.
    45 // Want to simultaneously fill the bin and data vectors.
    4644
    4745inline
    4846void G4LPhysicsFreeVector::PutValues(size_t binNumber,
    4947                                     G4double binValue, G4double dataValue)
     48  // G4PhysicsVector has PutValue() but it is inconvenient.
     49  // Want to simultaneously fill the bin and data vectors.
    5050{
    51    binVector[binNumber] = binValue;
    52    dataVector[binNumber] = dataValue;
     51  if(binNumber <= numberOfBin) {
     52    binVector[binNumber] = binValue;
     53    dataVector[binNumber]= dataValue;
     54    if(0 == binNumber) edgeMin = binValue;
     55    else if( numberOfBin - 1 == binNumber) edgeMax = binValue;
     56  }
    5357}
    54 
    55 // Note that theEnergy could be energy, momentum, or whatever.
    56 // Note: GetValue() is no longer virtual in the parent class
    57 // G4PhysicsVector, so at present the following function cannot
    58 // be called through a base class pointer.
    59 
    60 inline
    61 G4double G4LPhysicsFreeVector::GetValue(G4double theEnergy, G4bool& isOutRange)
    62 {
    63    G4double returnValue = 0.;
    64 
    65    //   verboseLevel = 2;
    66 
    67    if (theEnergy < edgeMin)
    68    {
    69       isOutRange = true;
    70 
    71 #ifdef G4VERBOSE
    72       if (verboseLevel > 1)
    73       {
    74          G4cout << "G4LPhysicsFreeVector::GetValue " << theEnergy
    75                 << " " << dataVector[0] << " " << isOutRange << G4endl;
    76       }
    77 #endif
    78       returnValue = dataVector[0];
    79    }
    80    else if (theEnergy > edgeMax)
    81    {
    82       isOutRange = true;
    83 
    84 #ifdef G4VERBOSE
    85       if (verboseLevel > 1)
    86       {
    87          G4cout << "G4LPhysicsFreeVector::GetValue " << theEnergy
    88                 << " " << dataVector[numberOfBin - 1]
    89                 << " " << isOutRange << G4endl;
    90       }
    91 #endif
    92       returnValue = dataVector[numberOfBin - 1];
    93    }
    94    else
    95    {
    96      isOutRange = false;
    97 
    98      G4int n = FindBinLocation(theEnergy);
    99 
    100      G4double dsde = (dataVector[n + 1] - dataVector[n])/
    101                      (binVector[n + 1] - binVector[n]);
    102 #ifdef G4VERBOSE
    103      if (verboseLevel > 1)
    104      {
    105         G4cout << "G4LPhysicsFreeVector::GetValue " << theEnergy
    106                << " " << dataVector[n] + (theEnergy - binVector[n])*dsde
    107                << " " << isOutRange << G4endl;
    108      }
    109 #endif
    110      returnValue = dataVector[n] + (theEnergy - binVector[n])*dsde;
    111    }
    112    return returnValue;
    113 }                                                                 
    11458
    11559inline
  • trunk/source/global/management/include/G4OrderedTable.hh

    r833 r850  
    2626//
    2727// $Id: G4OrderedTable.hh,v 1.14 2007/11/13 17:35:06 gcosmo Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: HEAD $
    2929//
    3030//
  • trunk/source/global/management/include/G4PhysicsFreeVector.hh

    r833 r850  
    2626//
    2727// $Id: G4PhysicsFreeVector.hh,v 1.10 2006/06/29 19:02:18 gunter Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: HEAD $
    2929//
    3030//
  • trunk/source/global/management/include/G4PhysicsLinearVector.hh

    r833 r850  
    2626//
    2727// $Id: G4PhysicsLinearVector.hh,v 1.10 2006/06/29 19:02:21 gunter Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: HEAD $
    2929//
    3030//
  • trunk/source/global/management/include/G4PhysicsLnVector.hh

    r833 r850  
    2626//
    2727// $Id: G4PhysicsLnVector.hh,v 1.12 2006/06/29 19:02:23 gunter Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: HEAD $
    2929//
    3030//
  • trunk/source/global/management/include/G4PhysicsLogVector.hh

    r833 r850  
    2626//
    2727// $Id: G4PhysicsLogVector.hh,v 1.11 2006/06/29 19:02:25 gunter Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: HEAD $
    2929//
    3030//
  • trunk/source/global/management/include/G4PhysicsOrderedFreeVector.hh

    r833 r850  
    2626//
    2727// $Id: G4PhysicsOrderedFreeVector.hh,v 1.9 2006/06/29 19:02:28 gunter Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: HEAD $
    2929//
    3030////////////////////////////////////////////////////////////////////////
  • trunk/source/global/management/include/G4PhysicsOrderedFreeVector.icc

    r833 r850  
    2626//
    2727// $Id: G4PhysicsOrderedFreeVector.icc,v 1.8 2006/06/29 19:02:31 gunter Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: HEAD $
    2929//
    3030////////////////////////////////////////////////////////////////////////
  • trunk/source/global/management/include/G4PhysicsTable.hh

    r833 r850  
    2626//
    2727// $Id: G4PhysicsTable.hh,v 1.18 2007/11/13 17:35:06 gcosmo Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: HEAD $
    2929//
    3030//
  • trunk/source/global/management/include/G4PhysicsTable.icc

    r833 r850  
    2626//
    2727// $Id: G4PhysicsTable.icc,v 1.8 2006/06/29 19:02:36 gunter Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: HEAD $
    2929//
    3030//
  • trunk/source/global/management/include/G4PhysicsVector.hh

    r833 r850  
    2525//
    2626//
    27 // $Id: G4PhysicsVector.hh,v 1.14 2006/06/29 19:02:38 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-01-patch-02 $
     27// $Id: G4PhysicsVector.hh,v 1.17 2008/04/07 14:18:57 gcosmo Exp $
     28// GEANT4 tag $Name: HEAD $
    2929//
    3030//
     
    4848//    01 Jul. 1996, K.Amako : Now GetValue not virtual
    4949//    21 Sep. 1996, K.Amako : Added [] and () operators
    50 //    11 Nov. 2000, H.Kurashige : use STL vector for dataVector and binVector
    51 //    18 Jan. 2001, H.Kurashige : removed ptrNextTable
    52 //    09 Mar. 2001, H.Kurashige : added G4PhysicsVectorType & Store/Retrieve()
     50//    11 Nov. 2000, H.Kurashige : Use STL vector for dataVector and binVector
     51//    09 Mar. 2001, H.Kurashige : Added G4PhysicsVectorType & Store/Retrieve()
     52//    02 Apr. 2008, A.Bagulya : Added SplineInterpolation() and SetSpline()
    5353//
    5454//---------------------------------------------------------------
     
    6363#include <fstream>
    6464
    65 #include  "G4PhysicsVectorType.hh"
     65#include "G4PhysicsVectorType.hh"
    6666
    6767class G4PhysicsVector
     
    6969  public: 
    7070
    71     G4PhysicsVector();
     71    G4PhysicsVector(G4bool spline = false);
    7272         // constructor 
    7373         // This class is an abstract class with pure virtual method of
     
    129129    inline G4PhysicsVectorType GetType() const;
    130130         // Get physics vector type
     131 
     132    inline void SetSpline(G4bool);
     133         // Activate/deactivate Spline interpolation.
    131134
    132135    virtual G4bool Store(std::ofstream& fOut, G4bool ascii=false);
     
    137140
    138141  protected:
    139 
    140     inline G4double LinearInterpolation(G4double theEnergy, size_t theLocBin);
    141          // Linear interpolation function
    142142
    143143    virtual size_t FindBinLocation(G4double theEnergy) const=0;
     
    161161  private:
    162162
    163     G4String comment;
     163    inline G4double LinearInterpolation();
     164         // Linear interpolation function
     165    inline G4double SplineInterpolation();
     166         // Spline interpolation function
     167
     168    inline void Interpolation();
     169
     170    void FillSecondDerivatives();
     171      // Initialise second derivatives for spline
     172
     173    G4double*  secDerivative;
     174
     175    G4String   comment;
     176    G4bool     useSpline;
    164177};
    165178
  • trunk/source/global/management/include/G4PhysicsVector.icc

    r833 r850  
    2525//
    2626//
    27 // $Id: G4PhysicsVector.icc,v 1.9 2006/06/29 19:02:40 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-01-patch-02 $
     27// $Id: G4PhysicsVector.icc,v 1.14 2008/09/05 18:04:45 vnivanch Exp $
     28// GEANT4 tag $Name: HEAD $
    2929//
    3030//
     
    4141//    energy scale, for example like 'log', 'linear', 'free', etc.
    4242//
    43 //---------------------------------------------------------------
    44 
     43// Modified:
     44// 05 Sep. 2008, V.Ivanchenko : added protections for zero-length vector
     45//---------------------------------------------------------------
    4546
    4647inline
     
    5051}
    5152
     53//---------------------------------------------------------------
    5254
    5355inline
     
    5759}
    5860
     61//---------------------------------------------------------------
    5962
    6063inline
     
    6467}
    6568
    66 
    67 
    68 inline
    69  G4double G4PhysicsVector::LinearInterpolation(G4double theEnergy,
    70                                                size_t theLocBin)
    71 {
    72 
     69//---------------------------------------------------------------
     70
     71inline
     72 G4double G4PhysicsVector::LinearInterpolation()
     73{
    7374  // Linear interpolation is used to get the value. If the give energy
    7475  // is in the highest bin, no interpolation will be Done. Because
     
    7778  // numberOfBin-1.
    7879
    79   G4double intplFactor = (theEnergy-binVector[theLocBin])
    80      / (binVector[theLocBin+1]-binVector[theLocBin]); // Interpolation factor
    81 
    82   return dataVector[theLocBin] +
    83          ( dataVector[theLocBin+1]-dataVector[theLocBin] ) * intplFactor;
    84 }
    85 
    86 
    87 inline
    88  G4double G4PhysicsVector::GetValue(G4double theEnergy,
    89                                     G4bool& isOutRange)
    90 {
    91 
     80  G4double intplFactor = (lastEnergy-binVector[lastBin])
     81     / (binVector[lastBin+1]-binVector[lastBin]); // Interpolation factor
     82
     83  return dataVector[lastBin] +
     84         ( dataVector[lastBin+1]-dataVector[lastBin] ) * intplFactor;
     85}
     86
     87//---------------------------------------------------------------
     88
     89inline
     90 G4double G4PhysicsVector::SplineInterpolation()
     91{
     92  // Spline interpolation is used to get the value. If the give energy
     93  // is in the highest bin, no interpolation will be Done. Because
     94  // there is an extra bin hidden from a user at locBin=numberOfBin,
     95  // the following interpolation is valid even the current locBin=
     96  // numberOfBin-1.
     97
     98  if( !secDerivative ) { FillSecondDerivatives(); }
     99
     100  // check bin value
     101  G4double delta = binVector[lastBin+1] - binVector[lastBin];
     102
     103  G4double a = (binVector[lastBin+1] - lastEnergy)/delta;
     104  G4double b = (lastEnergy - binVector[lastBin])/delta;
     105   
     106  // Final evaluation of cubic spline polynomial for return   
     107  G4double y1 = dataVector[lastBin];
     108  G4double y2 = dataVector[lastBin+1];
     109
     110  G4double res = a*y1 + b*y2 +
     111        ((a*a*a - a)*secDerivative[lastBin] +
     112         (b*b*b - b)*secDerivative[lastBin+1])*delta*delta/6.0  ;
     113
     114  return res;
     115}
     116
     117//---------------------------------------------------------------
     118
     119inline
     120 G4double G4PhysicsVector::GetValue(G4double theEnergy, G4bool&)
     121{
    92122  // Use cache for speed up - check if the value 'theEnergy' is same as the
    93123  // last call. If it is same, then use the last bin location. Also the
     
    95125  // bin of last call, then the last bin location is used.
    96126
    97   isOutRange = false;                // No range check.
    98 
    99   size_t locBin = 0;
    100 
    101   if( !(theEnergy != lastEnergy) ) {
    102      return lastValue;       
    103 
    104   } else if( (theEnergy <  lastEnergy)
    105           && (theEnergy >= binVector[lastBin]) ) {
    106      locBin = lastBin;
    107 
    108      lastEnergy = theEnergy;
    109      lastValue = LinearInterpolation(theEnergy, locBin);
    110      return lastValue;
    111 
    112   } else if( theEnergy < edgeMin ){
     127  if( theEnergy == lastEnergy ) {
     128
     129  } else if( theEnergy <= edgeMin ) {
    113130     lastBin = 0;
    114131     lastEnergy = theEnergy;
    115      lastValue = dataVector[0];
    116      return lastValue;
     132     lastValue  = dataVector[0];
     133
     134  } else if(theEnergy < lastEnergy && theEnergy >= binVector[lastBin]) {
     135     lastEnergy = theEnergy;
     136     Interpolation();
     137
     138  } else if(theEnergy < lastEnergy && theEnergy >= binVector[lastBin-1]) {
     139     lastBin--;
     140     lastEnergy = theEnergy;
     141     Interpolation();
    117142
    118143  } else if( theEnergy >= edgeMax ){
    119144     lastBin = numberOfBin-1;
    120      lastEnergy = theEnergy;
    121      lastValue = dataVector[ numberOfBin-1 ];
    122      return lastValue;
    123 
    124   }  else {
    125      locBin = FindBinLocation(theEnergy);
    126 
    127      lastBin = locBin;
    128      lastEnergy = theEnergy;
    129      lastValue = LinearInterpolation(theEnergy, locBin);
    130      return lastValue;
     145     lastEnergy = edgeMax;
     146     lastValue  = dataVector[lastBin];
     147
     148  } else {
     149     lastBin = FindBinLocation(theEnergy);
     150     lastEnergy = theEnergy;
     151     Interpolation();
    131152  }
    132 
    133 }
     153  return lastValue;       
     154}
     155
     156//---------------------------------------------------------------
     157
     158inline
     159 void G4PhysicsVector::Interpolation()
     160{
     161  if(useSpline) { lastValue = SplineInterpolation(); }
     162  else          { lastValue = LinearInterpolation(); }
     163}
     164
     165//---------------------------------------------------------------
    134166
    135167inline
    136168 void G4PhysicsVector::PutValue(size_t binNumber, G4double theValue)
    137169{
    138   dataVector[binNumber] = theValue;
    139 
    140   // Fill the bin which is hidden to user with theValue. This is to
    141   // handle correctly when Energy=theEmax in getValue.
    142   if(binNumber==numberOfBin-1) {
    143     dataVector[binNumber+1] = theValue;
    144   }                                 
    145 }
     170  if(binNumber < numberOfBin) {
     171    dataVector[binNumber] = theValue;
     172
     173    // Fill the bin which is hidden to user with theValue. This is to
     174    // handle correctly when Energy=theEmax in getValue.
     175
     176    if(binNumber==numberOfBin-1) { dataVector[binNumber+1] = theValue; }
     177  }
     178}
     179
     180//---------------------------------------------------------------
    146181
    147182inline
     
    154189}
    155190
     191//---------------------------------------------------------------
    156192
    157193inline
     
    161197}
    162198
     199//---------------------------------------------------------------
     200
    163201inline
    164202 const G4String& G4PhysicsVector::GetComment() const
     
    167205}
    168206
     207//---------------------------------------------------------------
     208
    169209inline
    170210 G4PhysicsVectorType G4PhysicsVector::GetType() const
     
    172212  return type;
    173213}
     214
     215//---------------------------------------------------------------
     216
     217inline
     218 void G4PhysicsVector::SetSpline(G4bool val)
     219{
     220  useSpline = val;
     221}
  • trunk/source/global/management/include/G4PhysicsVectorType.hh

    r833 r850  
    2626//
    2727// $Id: G4PhysicsVectorType.hh,v 1.4 2006/06/29 19:02:42 gunter Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: HEAD $
    2929//
    3030// --------------------------------------------------------------
  • trunk/source/global/management/include/G4ReferenceCountedHandle.hh

    r833 r850  
    2626//
    2727// $Id: G4ReferenceCountedHandle.hh,v 1.15 2006/06/29 19:02:46 gunter Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: HEAD $
    2929//
    3030//
  • trunk/source/global/management/include/G4RotationMatrix.hh

    r833 r850  
    2626//
    2727// $Id: G4RotationMatrix.hh,v 1.5 2006/06/29 19:02:54 gunter Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: HEAD $
    2929//
    3030//
  • trunk/source/global/management/include/G4SIunits.hh

    r833 r850  
    2626//
    2727// $Id: G4SIunits.hh,v 1.5 2006/09/15 08:16:10 gcosmo Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: HEAD $
    2929//
    3030// ----------------------------------------------------------------------
  • trunk/source/global/management/include/G4SliceTimer.hh

    r833 r850  
    2626//
    2727// $Id: G4SliceTimer.hh,v 1.1 2006/10/23 07:43:31 gcosmo Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: HEAD $
    2929//
    3030//
  • trunk/source/global/management/include/G4SliceTimer.icc

    r833 r850  
    2626//
    2727// $Id: G4SliceTimer.icc,v 1.1 2006/10/23 07:43:31 gcosmo Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: HEAD $
    2929//
    3030//
  • trunk/source/global/management/include/G4StateManager.hh

    r833 r850  
    2626//
    2727// $Id: G4StateManager.hh,v 1.10 2006/06/29 19:02:59 gunter Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: HEAD $
    2929//
    3030//
  • trunk/source/global/management/include/G4StateManager.icc

    r833 r850  
    2626//
    2727// $Id: G4StateManager.icc,v 1.2 2006/06/29 19:03:02 gunter Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: HEAD $
    2929//
    3030//
  • trunk/source/global/management/include/G4String.hh

    r833 r850  
    2525//
    2626//
    27 // $Id: G4String.hh,v 1.7.2.1 2008/04/23 09:22:49 gcosmo Exp $
    28 // GEANT4 tag $Name: geant4-09-01-patch-02 $
     27// $Id: G4String.hh,v 1.8 2008/03/13 09:35:08 gcosmo Exp $
     28// GEANT4 tag $Name: HEAD $
    2929//
    3030//
  • trunk/source/global/management/include/G4String.icc

    r833 r850  
    2626//
    2727// $Id: G4String.icc,v 1.9 2007/11/13 17:35:06 gcosmo Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: HEAD $
    2929//
    3030//
  • trunk/source/global/management/include/G4ThreeVector.hh

    r833 r850  
    2626//
    2727// $Id: G4ThreeVector.hh,v 1.5 2006/06/29 19:03:12 gunter Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: HEAD $
    2929//
    3030//
  • trunk/source/global/management/include/G4Timer.hh

    r833 r850  
    2626//
    2727// $Id: G4Timer.hh,v 1.14 2006/06/29 19:03:15 gunter Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: HEAD $
    2929//
    3030//
  • trunk/source/global/management/include/G4Timer.icc

    r833 r850  
    2626//
    2727// $Id: G4Timer.icc,v 1.2 2006/06/29 19:03:17 gunter Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: HEAD $
    2929//
    3030//
  • trunk/source/global/management/include/G4Tokenizer.hh

    r833 r850  
    2626//
    2727// $Id: G4Tokenizer.hh,v 1.2 2006/06/29 19:03:20 gunter Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: HEAD $
    2929//
    3030//
  • trunk/source/global/management/include/G4TwoVector.hh

    r833 r850  
    2626//
    2727// $Id: G4TwoVector.hh,v 1.1 2007/02/09 12:10:30 gcosmo Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: HEAD $
    2929//
    3030//
  • trunk/source/global/management/include/G4Types.hh

    r833 r850  
    2626//
    2727// $Id: G4Types.hh,v 1.14 2006/06/29 19:03:22 gunter Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: HEAD $
    2929//
    3030//
  • trunk/source/global/management/include/G4UnitsTable.hh

    r833 r850  
    2626//
    2727// $Id: G4UnitsTable.hh,v 1.18 2006/11/30 10:37:57 gcosmo Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: HEAD $
    2929//
    3030//
  • trunk/source/global/management/include/G4UnitsTable.icc

    r833 r850  
    2626//
    2727// $Id: G4UnitsTable.icc,v 1.2 2006/06/29 19:03:26 gunter Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: HEAD $
    2929//
    3030//
  • trunk/source/global/management/include/G4UserLimits.hh

    r833 r850  
    2626//
    2727// $Id: G4UserLimits.hh,v 1.9 2006/06/29 19:03:28 gunter Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: HEAD $
    2929//
    3030//
  • trunk/source/global/management/include/G4UserLimits.icc

    r833 r850  
    2626//
    2727// $Id: G4UserLimits.icc,v 1.8 2006/06/29 19:03:31 gunter Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: HEAD $
    2929//
    3030//
  • trunk/source/global/management/include/G4VExceptionHandler.hh

    r833 r850  
    2626//
    2727// $Id: G4VExceptionHandler.hh,v 1.2 2006/06/29 19:03:33 gunter Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: HEAD $
    2929//
    3030//
  • trunk/source/global/management/include/G4VNotifier.hh

    r833 r850  
    2626//
    2727// $Id: G4VNotifier.hh,v 1.2 2006/06/29 19:03:35 gunter Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: HEAD $
    2929//
    3030// class G4VNotifier
  • trunk/source/global/management/include/G4VStateDependent.hh

    r833 r850  
    2626//
    2727// $Id: G4VStateDependent.hh,v 1.5 2006/06/29 19:03:37 gunter Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: HEAD $
    2929//
    3030//
  • trunk/source/global/management/include/G4Version.hh

    r833 r850  
    2525//
    2626//
    27 // $Id: G4Version.hh,v 1.13.2.1 2008/04/23 09:22:49 gcosmo Exp $
    28 // GEANT4 tag $Name: geant4-09-01-patch-02 $
     27// $Id: G4Version.hh,v 1.16 2008/06/26 06:38:51 gcosmo Exp $
     28// GEANT4 tag $Name: HEAD $
    2929//
    3030// Version information
     
    4747
    4848#ifndef G4VERSION_NUMBER
    49 #define G4VERSION_NUMBER  912
     49#define G4VERSION_NUMBER  920
    5050#endif
    5151
    5252#ifndef G4VERSION_TAG
    53 #define G4VERSION_TAG "$Name: geant4-09-01-patch-02 $"
     53#define G4VERSION_TAG "$Name: HEAD $"
    5454#endif
    5555
     
    5858#include "G4String.hh"
    5959
    60 static const G4String G4Version = "$Name: geant4-09-01-patch-02 $";
    61 static const G4String G4Date    = "(9-May-2008)";
     60static const G4String G4Version = "$Name: HEAD $";
     61static const G4String G4Date    = "(4-July-2008)";
    6262
    6363#endif
  • trunk/source/global/management/include/G4coutDestination.hh

    r833 r850  
    2626//
    2727// $Id: G4coutDestination.hh,v 1.6 2006/06/29 19:03:41 gunter Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: HEAD $
    2929//
    3030//
  • trunk/source/global/management/include/G4ios.hh

    r833 r850  
    2626//
    2727// $Id: G4ios.hh,v 1.10 2006/06/29 19:03:43 gunter Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: HEAD $
    2929//
    3030//
  • trunk/source/global/management/include/G4strstreambuf.hh

    r833 r850  
    2626//
    2727// $Id: G4strstreambuf.hh,v 1.16 2007/11/13 17:35:06 gcosmo Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: HEAD $
    2929// ====================================================================
    3030//
  • trunk/source/global/management/include/G4strstreambuf.icc

    r833 r850  
    2626//
    2727// $Id: G4strstreambuf.icc,v 1.13 2006/06/29 19:03:49 gunter Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: HEAD $
    2929// ====================================================================
    3030//   G4strstreambuf.icc
  • trunk/source/global/management/include/globals.hh

    r833 r850  
    2626//
    2727// $Id: globals.hh,v 1.27 2006/06/29 19:03:51 gunter Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: HEAD $
    2929//
    3030//
  • trunk/source/global/management/include/templates.hh

    r833 r850  
    2525//
    2626//
    27 // $Id: templates.hh,v 1.10.8.1 2008/04/23 09:22:49 gcosmo Exp $
    28 // GEANT4 tag $Name: geant4-09-01-patch-02 $
     27// $Id: templates.hh,v 1.13 2008/08/15 12:15:53 gcosmo Exp $
     28// GEANT4 tag $Name: HEAD $
    2929//
    3030//
     
    112112
    113113template <class T>
    114 inline void G4SwapPtr(T* a, T* b) {
    115   T* tmp=a;
     114inline void G4SwapPtr(T*& a, T*& b) {
     115  T* tmp= a;
    116116  a = b;
    117117  b = tmp;
Note: See TracChangeset for help on using the changeset viewer.